@napi-rs/canvas 0.1.70 → 0.1.72

package/README.md

@@ -1,7 +1,7 @@
 # `skr canvas`
 
 [![CI](https://github.com/Brooooooklyn/canvas/actions/workflows/CI.yaml/badge.svg)](https://github.com/Brooooooklyn/canvas/actions/workflows/CI.yaml)
-![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm136-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm138-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/geometry.js

@@ -473,7 +473,7 @@ class DOMMatrix {
     console.info([mat.slice(0, 4), mat.slice(4, 8), mat.slice(8, 12), mat.slice(12, 16)])
   }
 
-  [inspect.custom](depth, options) {
+  [inspect.custom](depth) {
     if (depth < 0) return '[DOMMatrix]'
 
     const { a, b, c, d, e, f, is2D, isIdentity } = this

package/index.js

@@ -59,6 +59,37 @@ CanvasRenderingContext2D.prototype.getTransform = function getTransform() {
   return new DOMMatrix([a, b, c, d, e, f])
 }
 
+// Workaround for webpack bundling issue with drawImage
+// Store the original drawImage method
+const _drawImage = CanvasRenderingContext2D.prototype.drawImage
+
+// Override drawImage to ensure proper type recognition in bundled environments
+CanvasRenderingContext2D.prototype.drawImage = function drawImage(image, ...args) {
+  // If the image is a Canvas-like object but not recognized due to bundling,
+  // we need to ensure it's properly identified
+  if (image && typeof image === 'object') {
+    // First check if it's a wrapped canvas object
+    if (image.canvas instanceof CanvasElement || image.canvas instanceof SVGCanvas) {
+      image = image.canvas
+    } else if (image._canvas instanceof CanvasElement || image._canvas instanceof SVGCanvas) {
+      image = image._canvas
+    }
+    // Then check if it's a Canvas-like object by checking for getContext method
+    else if (typeof image.getContext === 'function' && image.width && image.height) {
+      // If it has canvas properties but isn't recognized as CanvasElement or SVGCanvas,
+      // try to correct the prototype chain
+      if (!(image instanceof CanvasElement) && !(image instanceof SVGCanvas)) {
+        // Try to create a proper CanvasElement from the canvas-like object
+        // This helps when webpack has transformed the prototype chain
+        Object.setPrototypeOf(image, CanvasElement.prototype)
+      }
+    }
+  }
+  
+  // Call the original drawImage with the potentially corrected image
+  return _drawImage.apply(this, [image, ...args])
+}
+
 function createCanvas(width, height, flag) {
   const isSvgBackend = typeof flag !== 'undefined'
   return isSvgBackend ? new SVGCanvas(width, height, flag) : new CanvasElement(width, height)
@@ -111,4 +142,7 @@ module.exports = {
   DOMRect,
   loadImage,
   FontKey,
+  // Export these for better webpack compatibility
+  CanvasElement,
+  SVGCanvas,
 }

package/js-binding.js

@@ -59,9 +59,9 @@ const isMuslFromChildProcess = () => {
 function requireNative() {
   if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) {
     try {
-      nativeBinding = require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
+      nativeBinding = require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH)
     } catch (err) {
-      loadErrors.push(err);
+      loadErrors.push(err)
     }
   } else if (process.platform === 'android') {
     if (process.arch === 'arm64') {
@@ -75,7 +75,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 'arm') {
       try {
         return require('./skia.android-arm-eabi.node')
@@ -87,7 +86,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else {
       loadErrors.push(new Error(`Unsupported architecture on Android ${process.arch}`))
     }
@@ -103,7 +101,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 'ia32') {
       try {
         return require('./skia.win32-ia32-msvc.node')
@@ -115,7 +112,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 'arm64') {
       try {
         return require('./skia.win32-arm64-msvc.node')
@@ -127,21 +123,20 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else {
       loadErrors.push(new Error(`Unsupported architecture on Windows: ${process.arch}`))
     }
   } else if (process.platform === 'darwin') {
     try {
-        return require('./skia.darwin-universal.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/canvas-darwin-universal')
-      } catch (e) {
-        loadErrors.push(e)
-      }
+      return require('./skia.darwin-universal.node')
+    } catch (e) {
+      loadErrors.push(e)
+    }
+    try {
+      return require('@napi-rs/canvas-darwin-universal')
+    } catch (e) {
+      loadErrors.push(e)
+    }
 
     if (process.arch === 'x64') {
       try {
@@ -154,7 +149,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 'arm64') {
       try {
         return require('./skia.darwin-arm64.node')
@@ -166,7 +160,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else {
       loadErrors.push(new Error(`Unsupported architecture on macOS: ${process.arch}`))
     }
@@ -182,7 +175,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 'arm64') {
       try {
         return require('./skia.freebsd-arm64.node')
@@ -194,7 +186,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else {
       loadErrors.push(new Error(`Unsupported architecture on FreeBSD: ${process.arch}`))
     }
@@ -202,106 +193,98 @@ function requireNative() {
     if (process.arch === 'x64') {
       if (isMusl()) {
         try {
-        return require('./skia.linux-x64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/canvas-linux-x64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./skia.linux-x64-musl.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/canvas-linux-x64-musl')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       } else {
         try {
-        return require('./skia.linux-x64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/canvas-linux-x64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./skia.linux-x64-gnu.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/canvas-linux-x64-gnu')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       }
     } else if (process.arch === 'arm64') {
       if (isMusl()) {
         try {
-        return require('./skia.linux-arm64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/canvas-linux-arm64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./skia.linux-arm64-musl.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/canvas-linux-arm64-musl')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       } else {
         try {
-        return require('./skia.linux-arm64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/canvas-linux-arm64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./skia.linux-arm64-gnu.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/canvas-linux-arm64-gnu')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       }
     } else if (process.arch === 'arm') {
       if (isMusl()) {
         try {
-        return require('./skia.linux-arm-musleabihf.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/canvas-linux-arm-musleabihf')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./skia.linux-arm-musleabihf.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/canvas-linux-arm-musleabihf')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       } else {
         try {
-        return require('./skia.linux-arm-gnueabihf.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/canvas-linux-arm-gnueabihf')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./skia.linux-arm-gnueabihf.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/canvas-linux-arm-gnueabihf')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       }
     } else if (process.arch === 'riscv64') {
       if (isMusl()) {
         try {
-        return require('./skia.linux-riscv64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/canvas-linux-riscv64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./skia.linux-riscv64-musl.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/canvas-linux-riscv64-musl')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       } else {
         try {
-        return require('./skia.linux-riscv64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/canvas-linux-riscv64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./skia.linux-riscv64-gnu.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/canvas-linux-riscv64-gnu')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       }
     } else if (process.arch === 'ppc64') {
       try {
@@ -314,7 +297,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 's390x') {
       try {
         return require('./skia.linux-s390x-gnu.node')
@@ -326,7 +308,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else {
       loadErrors.push(new Error(`Unsupported architecture on Linux: ${process.arch}`))
     }

package/load-image.js

@@ -36,7 +36,7 @@ module.exports = async function loadImage(source, options = {}) {
   // if source is a string or URL instance
   if (typeof source === 'string') {
     // if the source exists as a file, construct image from that file
-    if ((!source.startsWith('http') && !source.startsWith('https')) && await exists(source)) {
+    if (!source.startsWith('http') && !source.startsWith('https') && (await exists(source))) {
       return createImage(source, options.alt)
     } else {
       // the source is a remote url here

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@napi-rs/canvas",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "description": "Canvas for Node.js with skia backend",
   "main": "index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Brooooooklyn/canvas.git"
   },
+  "workspaces": [
+    "e2e/*"
+  ],
   "license": "MIT",
   "keywords": [
     "napi-rs",
@@ -64,42 +67,43 @@
     "postpublish": "pinst --enable",
     "test:ci": "ava -c 1",
     "test": "ava",
+    "e2e": "yarn workspace @napi-rs/canvas-e2e-webpack test",
     "version": "napi version && conventional-changelog -p angular -i CHANGELOG.md -s && git add ."
   },
   "devDependencies": {
-    "@jimp/core": "^1.0.0",
-    "@jimp/custom": "^0.22.10",
-    "@jimp/jpeg": "^0.22.10",
-    "@jimp/png": "^0.22.10",
-    "@napi-rs/cli": "^3.0.0-alpha.70",
-    "@octokit/rest": "^21.0.0",
-    "@swc-node/register": "^1.8.0",
-    "@swc/core": "^1.4.0",
+    "@jimp/core": "^1.6.0",
+    "@jimp/custom": "^0.22.12",
+    "@jimp/jpeg": "^0.22.12",
+    "@jimp/png": "^0.22.12",
+    "@napi-rs/cli": "^3.0.0-alpha.91",
+    "@octokit/rest": "^22.0.0",
+    "@swc-node/register": "^1.10.10",
+    "@swc/core": "^1.11.31",
     "@taplo/cli": "^0.7.0",
-    "@types/lodash": "^4.14.202",
-    "@types/node": "^20.11.16",
+    "@types/lodash": "^4.17.17",
+    "@types/node": "^22.15.30",
     "@types/semver": "^7",
-    "ava": "^6.1.1",
-    "canvas": "^3.0.0",
+    "ava": "^6.3.0",
+    "canvas": "^3.1.0",
     "canvaskit-wasm": "^0.40.0",
     "colorette": "^2.0.20",
     "conventional-changelog-cli": "^5.0.0",
-    "core-js": "^3.38.0",
-    "echarts": "^5.4.3",
-    "husky": "^9.0.10",
-    "lint-staged": "^15.2.1",
+    "core-js": "^3.42.0",
+    "echarts": "^5.6.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^16.1.0",
     "lodash": "^4.17.21",
-    "npm-run-all2": "^7.0.0",
-    "oxlint": "^0.16.0",
+    "npm-run-all2": "^8.0.4",
+    "oxlint": "^1.0.0",
     "pinst": "^3.0.0",
     "png.js": "^0.2.1",
-    "prettier": "^3.2.5",
+    "prettier": "^3.5.3",
     "pretty-bytes": "^7.0.0",
-    "semver": "^7.5.4",
-    "skia-canvas": "^2.0.0",
-    "table": "^6.8.1",
-    "tinybench": "^4.0.0",
-    "typescript": "^5.3.3"
+    "semver": "^7.7.2",
+    "skia-canvas": "^2.0.2",
+    "table": "^6.9.0",
+    "tinybench": "^4.0.1",
+    "typescript": "^5.8.3"
   },
   "lint-staged": {
     "*.@(js|ts|tsx|yml|yaml|md|json|html)": [
@@ -136,17 +140,17 @@
     "singleQuote": true,
     "arrowParens": "always"
   },
-  "packageManager": "yarn@4.9.1",
+  "packageManager": "yarn@4.9.2",
   "optionalDependencies": {
-    "@napi-rs/canvas-linux-x64-gnu": "0.1.70",
-    "@napi-rs/canvas-darwin-x64": "0.1.70",
-    "@napi-rs/canvas-win32-x64-msvc": "0.1.70",
-    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.70",
-    "@napi-rs/canvas-linux-x64-musl": "0.1.70",
-    "@napi-rs/canvas-linux-arm64-gnu": "0.1.70",
-    "@napi-rs/canvas-linux-arm64-musl": "0.1.70",
-    "@napi-rs/canvas-darwin-arm64": "0.1.70",
-    "@napi-rs/canvas-android-arm64": "0.1.70",
-    "@napi-rs/canvas-linux-riscv64-gnu": "0.1.70"
+    "@napi-rs/canvas-linux-x64-gnu": "0.1.72",
+    "@napi-rs/canvas-darwin-x64": "0.1.72",
+    "@napi-rs/canvas-win32-x64-msvc": "0.1.72",
+    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.72",
+    "@napi-rs/canvas-linux-x64-musl": "0.1.72",
+    "@napi-rs/canvas-linux-arm64-gnu": "0.1.72",
+    "@napi-rs/canvas-linux-arm64-musl": "0.1.72",
+    "@napi-rs/canvas-darwin-arm64": "0.1.72",
+    "@napi-rs/canvas-android-arm64": "0.1.72",
+    "@napi-rs/canvas-linux-riscv64-gnu": "0.1.72"
   }
 }