@napi-rs/canvas 0.1.30 → 0.1.32

package/README.md

@@ -1,7 +1,7 @@
 # `skr canvas`
 
 ![CI](https://github.com/Brooooooklyn/canvas/workflows/CI/badge.svg)
-![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm106-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm110-hotpink)
 [![install size](https://packagephobia.com/badge?p=@napi-rs/canvas)](https://packagephobia.com/result?p=@napi-rs/canvas)
 [![Downloads](https://img.shields.io/npm/dm/@napi-rs/canvas.svg?sanitize=true)](https://npmcharts.com/compare/@napi-rs/canvas?minimal=true)
 

package/index.d.ts

@@ -220,6 +220,7 @@ export class Path2D {
   moveTo(x: number, y: number): void
   quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void
   rect(x: number, y: number, w: number, h: number): void
+  roundRect(x: number, y: number, w: number, h: number, radii?: number | number[]): void
 
   // PathKit methods
   op(path: Path2D, operation: PathOp): Path2D
@@ -248,8 +249,9 @@ export interface StrokeOptions {
 export interface SKRSContext2D
   extends Omit<
     CanvasRenderingContext2D,
-    'drawImage' | 'createPattern' | 'getTransform' | 'drawFocusIfNeeded' | 'scrollPathIntoView'
+    'drawImage' | 'createPattern' | 'getTransform' | 'drawFocusIfNeeded' | 'scrollPathIntoView' | 'canvas'
   > {
+  canvas: Canvas
   /**
    * @param startAngle The angle at which to begin the gradient, in radians. Angle measurements start vertically above the centre and move around clockwise.
    * @param x The x-axis coordinate of the centre of the gradient.
@@ -274,14 +276,7 @@ export interface SKRSContext2D
     repeat: 'repeat' | 'repeat-x' | 'repeat-y' | 'no-repeat' | null,
   ): CanvasPattern
   getContextAttributes(): { alpha: boolean; desynchronized: boolean }
-  getTransform(): {
-    a: number
-    b: number
-    c: number
-    d: number
-    e: number
-    f: number
-  }
+  getTransform(): DOMMatrix
 }
 
 export type ColorSpace = 'srgb' | 'display-p3'

package/index.js

@@ -31,20 +31,36 @@ const SvgExportFlag = {
 // eslint-disable-next-line sonarjs/no-unused-collection
 const Fonts = []
 
-Object.defineProperty(GlobalFonts, 'families', {
-  get: function () {
-    return JSON.parse(GlobalFonts.getFamilies())
-  },
-})
+if (!('families' in GlobalFonts)) {
+  Object.defineProperty(GlobalFonts, 'families', {
+    get: function () {
+      return JSON.parse(GlobalFonts.getFamilies())
+    },
+  })
+}
+
+if (!('has' in GlobalFonts)) {
+  Object.defineProperty(GlobalFonts, 'has', {
+    value: function has(name) {
+      return !!JSON.parse(GlobalFonts.getFamilies()).find(({ family }) => family === name)
+    },
+    configurable: false,
+    enumerable: false,
+    writable: false,
+  })
+}
 
-Object.defineProperty(GlobalFonts, 'has', {
-  value: function has(name) {
-    return !!JSON.parse(GlobalFonts.getFamilies()).find(({ family }) => family === name)
-  },
-  configurable: false,
-  enumerable: false,
-  writable: false,
-})
+const _getTransform = CanvasRenderingContext2D.prototype.getTransform
+
+CanvasRenderingContext2D.prototype.getTransform = function getTransform() {
+  const transform = _getTransform.apply(this, arguments)
+  // monkey patched, skip
+  if (transform instanceof DOMMatrix) {
+    return transform
+  }
+  const { a, b, c, d, e, f } = transform
+  return new DOMMatrix([a, b, c, d, e, f])
+}
 
 function createCanvas(width, height, flag) {
   const isSvgBackend = typeof flag !== 'undefined'

package/load-image.js

@@ -32,7 +32,7 @@ module.exports = async function loadImage(source, options = {}) {
   // if source is a string or URL instance
   if (typeof source === 'string' || source instanceof URL) {
     // if the source exists as a file, construct image from that file
-    if (fs.existsSync(source)) {
+    if (await exists(source)) {
       return createImage(await fs.promises.readFile(source), options.alt)
     } else {
       // the source is a remote url here
@@ -101,3 +101,12 @@ function isBufferLike(src) {
     src instanceof Object.getPrototypeOf(Uint8Array)
   )
 }
+
+async function exists(path) {
+  try {
+    await fs.promises.access(path, fs.constants.F_OK)
+    return true
+  } catch {
+    return false
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/canvas",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "description": "Canvas for Node.js with skia backend",
   "main": "index.js",
   "repository": "https://github.com/Brooooooklyn/canvas.git",
@@ -57,44 +57,46 @@
     "lint": "eslint . -c ./.eslintrc.yml",
     "prepublishOnly": "pinst --disable && napi prepublish -t npm",
     "postpublish": "pinst --enable",
+    "test:ci": "ava -c 1",
     "test": "ava",
     "version": "napi version && conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md"
   },
   "devDependencies": {
-    "@jimp/core": "^0.16.1",
-    "@jimp/custom": "^0.16.1",
-    "@jimp/jpeg": "^0.16.1",
-    "@jimp/png": "^0.16.1",
-    "@napi-rs/cli": "^2.11.4",
-    "@octokit/rest": "^19.0.4",
-    "@swc-node/register": "^1.5.1",
-    "@types/lodash": "^4.14.184",
-    "@types/node": "^18.7.13",
-    "@typescript-eslint/eslint-plugin": "^5.35.1",
-    "@typescript-eslint/parser": "^5.35.1",
-    "ava": "^4.3.3",
+    "@jimp/core": "^0.16.2",
+    "@jimp/custom": "^0.16.2",
+    "@jimp/jpeg": "^0.16.2",
+    "@jimp/png": "^0.16.2",
+    "@napi-rs/cli": "^2.14.0",
+    "@octokit/rest": "^19.0.5",
+    "@swc-node/register": "^1.5.4",
+    "@swc/core": "^1.3.24",
+    "@types/lodash": "^4.14.191",
+    "@types/node": "^18.11.18",
+    "@typescript-eslint/eslint-plugin": "^5.47.1",
+    "@typescript-eslint/parser": "^5.47.1",
+    "ava": "^5.1.0",
     "benny": "^3.7.1",
-    "canvas": "^2.9.3",
-    "canvaskit-wasm": "^0.37.0",
+    "canvas": "^2.11.0",
+    "canvaskit-wasm": "^0.37.2",
     "colorette": "^2.0.19",
     "conventional-changelog-cli": "^2.2.2",
-    "echarts": "^5.3.3",
-    "eslint": "^8.22.0",
+    "echarts": "^5.4.1",
+    "eslint": "^8.31.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-sonarjs": "^0.15.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
+    "eslint-plugin-sonarjs": "^0.17.0",
+    "husky": "^8.0.2",
+    "lint-staged": "^13.1.0",
     "lodash": "^4.17.21",
     "npm-run-all": "^4.1.5",
     "pinst": "^3.0.0",
     "png.js": "^0.2.1",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.1",
     "pretty-bytes": "^6.0.0",
-    "skia-canvas": "^1.0.0",
-    "table": "^6.8.0",
-    "typescript": "^4.7.4"
+    "skia-canvas": "^1.0.1",
+    "table": "^6.8.1",
+    "typescript": "^4.9.4"
   },
   "lint-staged": {
     "*.@(js|ts|tsx|yml|yaml|md|json|html)": [
@@ -130,16 +132,16 @@
     "singleQuote": true,
     "arrowParens": "always"
   },
-  "packageManager": "yarn@3.2.3",
+  "packageManager": "yarn@3.3.1",
   "optionalDependencies": {
-    "@napi-rs/canvas-win32-x64-msvc": "0.1.30",
-    "@napi-rs/canvas-darwin-x64": "0.1.30",
-    "@napi-rs/canvas-linux-x64-gnu": "0.1.30",
-    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.30",
-    "@napi-rs/canvas-linux-x64-musl": "0.1.30",
-    "@napi-rs/canvas-linux-arm64-gnu": "0.1.30",
-    "@napi-rs/canvas-linux-arm64-musl": "0.1.30",
-    "@napi-rs/canvas-darwin-arm64": "0.1.30",
-    "@napi-rs/canvas-android-arm64": "0.1.30"
+    "@napi-rs/canvas-win32-x64-msvc": "0.1.32",
+    "@napi-rs/canvas-darwin-x64": "0.1.32",
+    "@napi-rs/canvas-linux-x64-gnu": "0.1.32",
+    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.32",
+    "@napi-rs/canvas-linux-x64-musl": "0.1.32",
+    "@napi-rs/canvas-linux-arm64-gnu": "0.1.32",
+    "@napi-rs/canvas-linux-arm64-musl": "0.1.32",
+    "@napi-rs/canvas-darwin-arm64": "0.1.32",
+    "@napi-rs/canvas-android-arm64": "0.1.32"
   }
 }