@napi-rs/canvas 0.1.26 → 0.1.27

package/README.md

@@ -76,7 +76,7 @@ ctx.closePath()
 ctx.stroke()
 
 async function main() {
-  const pngData = await canvas.encode('png') // JPEG and WebP is also supported
+  const pngData = await canvas.encode('png') // JPEG, AVIF and WebP are also supported
   // encoding in libuv thread pool, non-blocking
   await promises.writeFile(join(__dirname, 'simple.png'), pngData)
 }

package/index.d.ts

@@ -360,7 +360,7 @@ export enum PathOp {
   Difference = 0, // subtract the op path from the first path
   Intersect = 1, // intersect the two paths
   Union = 2, // union (inclusive-or) the two paths
-  XOR = 3, // exclusive-or the two paths
+  Xor = 3, // exclusive-or the two paths
   ReverseDifference = 4, // subtract the first path from the op path
 }
 

package/index.js

@@ -11,95 +11,35 @@ const {
   Image,
   CanvasPattern,
   GlobalFonts,
-  convertSVGTextToPath: _convertSVGTextToPath,
+  PathOp,
+  FillType,
+  StrokeJoin,
+  StrokeCap,
+  convertSVGTextToPath,
 } = require('./js-binding')
 
 const { DOMPoint, DOMMatrix, DOMRect } = require('./geometry')
 
 const loadImage = require('./load-image')
 
-const StrokeJoin = {
-  Miter: 0,
-  Round: 1,
-  Bevel: 2,
-}
-
-const StrokeCap = {
-  Butt: 0,
-  Round: 1,
-  Square: 2,
-}
-
-const PathOp = {
-  Difference: 0, // subtract the op path from the first path
-  Intersect: 1, // intersect the two paths
-  Union: 2, // union (inclusive-or) the two paths
-  XOR: 3, // exclusive-or the two paths
-  ReverseDifference: 4, // subtract the first path from the op path
-}
-
-const FillType = {
-  Winding: 0,
-  EvenOdd: 1,
-  InverseWinding: 2,
-  InverseEvenOdd: 3,
-}
-
 const SvgExportFlag = {
   ConvertTextToPaths: 0x01,
   NoPrettyXML: 0x02,
   RelativePathEncoding: 0x04,
 }
 
-const GlobalFontsSingleton = new GlobalFonts()
-let FamilyNamesSet = JSON.parse(GlobalFontsSingleton._families)
-
 // eslint-disable-next-line sonarjs/no-unused-collection
 const Fonts = []
 
-Object.defineProperty(GlobalFontsSingleton, 'register', {
-  value: function register(fontData, nameAlias = '') {
-    const result = GlobalFontsSingleton._register(fontData, nameAlias)
-    FamilyNamesSet = JSON.parse(GlobalFontsSingleton._families)
-    Fonts.push(fontData)
-    return result
-  },
-  configurable: false,
-  enumerable: false,
-  writable: false,
-})
-
-Object.defineProperty(GlobalFontsSingleton, 'registerFromPath', {
-  value: function registerFromPath(path, nameAlias = '') {
-    const result = GlobalFontsSingleton._registerFromPath(path, nameAlias)
-    FamilyNamesSet = JSON.parse(GlobalFontsSingleton._families)
-    return result
-  },
-  configurable: false,
-  enumerable: false,
-  writable: false,
-})
-
-Object.defineProperty(GlobalFontsSingleton, 'loadFontsFromDir', {
-  value: function loadFontsFromDir(path) {
-    const result = GlobalFontsSingleton._loadFontsFromDir(path)
-    FamilyNamesSet = JSON.parse(GlobalFontsSingleton._families)
-    return result
-  },
-  configurable: false,
-  enumerable: false,
-  writable: false,
-})
-
-Object.defineProperty(GlobalFontsSingleton, 'families', {
+Object.defineProperty(GlobalFonts, 'families', {
   get: function () {
-    return FamilyNamesSet
+    return JSON.parse(GlobalFonts.getFamilies())
   },
 })
 
-Object.defineProperty(GlobalFontsSingleton, 'has', {
+Object.defineProperty(GlobalFonts, 'has', {
   value: function has(name) {
-    return !!FamilyNamesSet.find(({ family }) => family === name)
+    return !!JSON.parse(GlobalFonts.getFamilies()).find(({ family }) => family === name)
   },
   configurable: false,
   enumerable: false,
@@ -129,27 +69,6 @@ CanvasRenderingContext2D.prototype.getImageData = function getImageData(x, y, w,
   return new ImageData(data, w, h)
 }
 
-Path2D.prototype.stroke = function stroke(strokeOptions = {}) {
-  const width = typeof strokeOptions.width === 'undefined' ? 1 : strokeOptions.width
-  const miterLimit = typeof strokeOptions.miterLimit === 'undefined' ? 4 : strokeOptions.miterLimit
-  const join = typeof strokeOptions.join === 'undefined' ? StrokeJoin.Miter : strokeOptions.join
-  const cap = typeof strokeOptions.cap === 'undefined' ? StrokeCap.Butt : strokeOptions.cap
-
-  return this._stroke(width, miterLimit, join, cap)
-}
-
-Path2D.prototype.getFillTypeString = function getFillTypeString() {
-  const fillType = this.getFillType()
-
-  if (fillType === FillType.Winding) {
-    return 'nonzero'
-  } else if (fillType === FillType.EvenOdd) {
-    return 'evenodd'
-  } else {
-    return 'nonzero' // default
-  }
-}
-
 function createCanvas(width, height, flag) {
   const isSvgBackend = typeof flag !== 'undefined'
   const canvasElement = isSvgBackend ? new SVGCanvas(width, height) : new CanvasElement(width, height)
@@ -163,8 +82,8 @@ function createCanvas(width, height, flag) {
     ctx = ctx
       ? ctx
       : isSvgBackend
-      ? new CanvasRenderingContext2D(this.width, this.height, GlobalFontsSingleton, attrs.colorSpace, flag)
-      : new CanvasRenderingContext2D(this.width, this.height, GlobalFontsSingleton, attrs.colorSpace)
+      ? new CanvasRenderingContext2D(this.width, this.height, attrs.colorSpace, flag)
+      : new CanvasRenderingContext2D(this.width, this.height, attrs.colorSpace)
     createContext(ctx, this.width, this.height, attrs)
 
     // napi can not define writable: true but enumerable: false property
@@ -258,26 +177,21 @@ class Canvas {
 }
 
 if (!process.env.DISABLE_SYSTEM_FONTS_LOAD) {
-  GlobalFontsSingleton.loadSystemFonts()
+  GlobalFonts.loadSystemFonts()
   const platformName = platform()
   const homedirPath = homedir()
   switch (platformName) {
     case 'win32':
-      GlobalFontsSingleton.loadFontsFromDir(join(homedirPath, 'AppData', 'Local', 'Microsoft', 'Windows', 'Fonts'))
+      GlobalFonts.loadFontsFromDir(join(homedirPath, 'AppData', 'Local', 'Microsoft', 'Windows', 'Fonts'))
       break
     case 'darwin':
-      GlobalFontsSingleton.loadFontsFromDir(join(homedirPath, 'Library', 'Fonts'))
+      GlobalFonts.loadFontsFromDir(join(homedirPath, 'Library', 'Fonts'))
       break
     case 'linux':
-      GlobalFontsSingleton.loadFontsFromDir(join('usr', 'local', 'share', 'fonts'))
-      GlobalFontsSingleton.loadFontsFromDir(join(homedirPath, '.fonts'))
+      GlobalFonts.loadFontsFromDir(join('usr', 'local', 'share', 'fonts'))
+      GlobalFonts.loadFontsFromDir(join(homedirPath, '.fonts'))
       break
   }
-  FamilyNamesSet = JSON.parse(GlobalFontsSingleton._families)
-}
-
-function convertSVGTextToPath(input) {
-  return _convertSVGTextToPath(Buffer.isBuffer(input) ? input : Buffer.from(input), GlobalFontsSingleton)
 }
 
 module.exports = {
@@ -291,7 +205,7 @@ module.exports = {
   StrokeCap,
   StrokeJoin,
   SvgExportFlag,
-  GlobalFonts: GlobalFontsSingleton,
+  GlobalFonts: GlobalFonts,
   convertSVGTextToPath,
   DOMPoint,
   DOMMatrix,

package/js-binding.js

@@ -200,21 +200,29 @@ const {
   CanvasElement,
   createContext,
   SVGCanvas,
-  Path2D,
+  Path,
   ImageData,
   Image,
   CanvasPattern,
   GlobalFonts,
   convertSVGTextToPath,
+  PathOp,
+  FillType,
+  StrokeJoin,
+  StrokeCap,
 } = nativeBinding
 
 module.exports.CanvasRenderingContext2D = CanvasRenderingContext2D
 module.exports.CanvasElement = CanvasElement
 module.exports.createContext = createContext
 module.exports.SVGCanvas = SVGCanvas
-module.exports.Path2D = Path2D
+module.exports.Path2D = Path
 module.exports.ImageData = ImageData
 module.exports.Image = Image
 module.exports.CanvasPattern = CanvasPattern
 module.exports.GlobalFonts = GlobalFonts
 module.exports.convertSVGTextToPath = convertSVGTextToPath
+module.exports.PathOp = PathOp
+module.exports.FillType = FillType
+module.exports.StrokeJoin = StrokeJoin
+module.exports.StrokeCap = StrokeCap

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/canvas",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "description": "Canvas for Node.js with skia backend",
   "main": "index.js",
   "repository": "https://github.com/Brooooooklyn/canvas.git",
@@ -83,7 +83,7 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-sonarjs": "^0.14.0",
+    "eslint-plugin-sonarjs": "^0.15.0",
     "husky": "^8.0.1",
     "lint-staged": "^13.0.0",
     "lodash": "^4.17.21",
@@ -130,14 +130,14 @@
   },
   "packageManager": "yarn@3.2.2",
   "optionalDependencies": {
-    "@napi-rs/canvas-win32-x64-msvc": "0.1.26",
-    "@napi-rs/canvas-darwin-x64": "0.1.26",
-    "@napi-rs/canvas-linux-x64-gnu": "0.1.26",
-    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.26",
-    "@napi-rs/canvas-linux-x64-musl": "0.1.26",
-    "@napi-rs/canvas-linux-arm64-gnu": "0.1.26",
-    "@napi-rs/canvas-linux-arm64-musl": "0.1.26",
-    "@napi-rs/canvas-darwin-arm64": "0.1.26",
-    "@napi-rs/canvas-android-arm64": "0.1.26"
+    "@napi-rs/canvas-win32-x64-msvc": "0.1.27",
+    "@napi-rs/canvas-darwin-x64": "0.1.27",
+    "@napi-rs/canvas-linux-x64-gnu": "0.1.27",
+    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.27",
+    "@napi-rs/canvas-linux-x64-musl": "0.1.27",
+    "@napi-rs/canvas-linux-arm64-gnu": "0.1.27",
+    "@napi-rs/canvas-linux-arm64-musl": "0.1.27",
+    "@napi-rs/canvas-darwin-arm64": "0.1.27",
+    "@napi-rs/canvas-android-arm64": "0.1.27"
   }
 }