Skip to content

Commit

Permalink
convert to node-addon-api
Browse files Browse the repository at this point in the history
  • Loading branch information
chearon committed Apr 17, 2023
1 parent 38e0a32 commit 3404d01
Show file tree
Hide file tree
Showing 35 changed files with 1,978 additions and 2,080 deletions.
5 changes: 4 additions & 1 deletion binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
},
{
'target_name': 'canvas',
'include_dirs': ["<!(node -e \"require('nan')\")"],
'include_dirs': ["<!(node -p \"require('node-addon-api').include_dir\")"],
'defines': [ 'NAPI_DISABLE_CPP_EXCEPTIONS', 'NODE_ADDON_API_ENABLE_MAYBE' ],
'sources': [
'src/backend/Backend.cc',
'src/backend/ImageBackend.cc',
Expand Down Expand Up @@ -142,7 +143,9 @@
'cflags_cc!': ['-fno-exceptions']
}],
['OS=="mac"', {
'cflags+': ['-fvisibility=hidden'],
'xcode_settings': {
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
}
}],
Expand Down
3 changes: 3 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ const PDFStream = require('./lib/pdfstream')
const JPEGStream = require('./lib/jpegstream')
const { DOMPoint, DOMMatrix } = require('./lib/DOMMatrix')

bindings.setDOMMatrix(DOMMatrix)
bindings.setParseFont(parseFont)

function createCanvas (width, height, type) {
return new Canvas(width, height, type)
}
Expand Down
3 changes: 0 additions & 3 deletions lib/context2d.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@
*/

const bindings = require('./bindings')
const parseFont = require('./parse-font')
const { DOMMatrix } = require('./DOMMatrix')

bindings.CanvasRenderingContext2dInit(DOMMatrix, parseFont)
module.exports = bindings.CanvasRenderingContext2d
2 changes: 0 additions & 2 deletions lib/pattern.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
*/

const bindings = require('./bindings')
const { DOMMatrix } = require('./DOMMatrix')

bindings.CanvasPatternInit(DOMMatrix)
module.exports = bindings.CanvasPattern

bindings.CanvasPattern.prototype.toString = function () {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"types": "types/index.d.ts",
"dependencies": {
"@mapbox/node-pre-gyp": "^1.0.0",
"nan": "^2.17.0",
"node-addon-api": "^6.0.0",
"simple-get": "^3.0.3"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions src/Backends.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#include "backend/PdfBackend.h"
#include "backend/SvgBackend.h"

using namespace v8;
using namespace Napi;

void Backends::Initialize(Local<Object> target) {
Nan::HandleScope scope;
void
Backends::Initialize(Napi::Env env, Napi::Object exports) {
Napi::Object obj = Napi::Object::New(env);

Local<Object> obj = Nan::New<Object>();
ImageBackend::Initialize(obj);
PdfBackend::Initialize(obj);
SvgBackend::Initialize(obj);

Nan::Set(target, Nan::New<String>("Backends").ToLocalChecked(), obj).Check();
exports.Set("Backends", obj);
}
8 changes: 4 additions & 4 deletions src/Backends.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once

#include "backend/Backend.h"
#include <nan.h>
#include <v8.h>
#include <napi.h>
#include <uv.h>

class Backends : public Nan::ObjectWrap {
class Backends : public Napi::ObjectWrap<Backends> {
public:
static void Initialize(v8::Local<v8::Object> target);
static void Initialize(Napi::Env env, Napi::Object exports);
};

0 comments on commit 3404d01

Please sign in to comment.