@napi-rs/canvas 0.1.67 → 0.1.69

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%2Fm133-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm136-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

@@ -3,6 +3,279 @@ import { ReadableStream } from 'node:stream/web'
 // Clear all type of caches in Skia
 export function clearAllCache(): void
 
+interface CanvasRenderingContext2D
+  extends CanvasCompositing,
+    CanvasDrawPath,
+    CanvasFillStrokeStyles,
+    CanvasFilters,
+    CanvasImageData,
+    CanvasImageSmoothing,
+    CanvasPath,
+    CanvasPathDrawingStyles,
+    CanvasRect,
+    CanvasSettings,
+    CanvasShadowStyles,
+    CanvasState,
+    CanvasText,
+    CanvasTextDrawingStyles,
+    CanvasTransform {}
+
+interface CanvasState {
+  isContextLost(): boolean
+  reset(): void
+  restore(): void
+  save(): void
+}
+interface CanvasShadowStyles {
+  shadowBlur: number
+  shadowColor: string
+  shadowOffsetX: number
+  shadowOffsetY: number
+}
+interface CanvasRenderingContext2DSettings {
+  alpha?: boolean
+  colorSpace?: PredefinedColorSpace
+  desynchronized?: boolean
+  willReadFrequently?: boolean
+}
+interface CanvasSettings {
+  getContextAttributes(): CanvasRenderingContext2DSettings
+}
+
+interface CanvasRect {
+  clearRect(x: number, y: number, w: number, h: number): void
+  fillRect(x: number, y: number, w: number, h: number): void
+  strokeRect(x: number, y: number, w: number, h: number): void
+}
+
+interface TextMetrics {
+  readonly actualBoundingBoxAscent: number
+  readonly actualBoundingBoxDescent: number
+  readonly actualBoundingBoxLeft: number
+  readonly actualBoundingBoxRight: number
+  readonly alphabeticBaseline: number
+  readonly emHeightAscent: number
+  readonly emHeightDescent: number
+  readonly fontBoundingBoxAscent: number
+  readonly fontBoundingBoxDescent: number
+  readonly hangingBaseline: number
+  readonly ideographicBaseline: number
+  readonly width: number
+}
+
+interface CanvasText {
+  fillText(text: string, x: number, y: number, maxWidth?: number): void
+  measureText(text: string): TextMetrics
+  strokeText(text: string, x: number, y: number, maxWidth?: number): void
+}
+
+type CanvasLineCap = 'butt' | 'round' | 'square'
+type CanvasLineJoin = 'bevel' | 'miter' | 'round'
+
+interface CanvasPathDrawingStyles {
+  lineCap: CanvasLineCap
+  lineDashOffset: number
+  lineJoin: CanvasLineJoin
+  lineWidth: number
+  miterLimit: number
+  getLineDash(): number[]
+  setLineDash(segments: number[]): void
+}
+
+interface CanvasPath {
+  arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterclockwise?: boolean): void
+  arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void
+  bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void
+  closePath(): void
+  ellipse(
+    x: number,
+    y: number,
+    radiusX: number,
+    radiusY: number,
+    rotation: number,
+    startAngle: number,
+    endAngle: number,
+    counterclockwise?: boolean,
+  ): void
+  lineTo(x: number, y: number): void
+  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 | DOMPointInit | (number | DOMPointInit)[]): void
+}
+
+type ImageSmoothingQuality = 'high' | 'low' | 'medium'
+
+interface CanvasImageSmoothing {
+  imageSmoothingEnabled: boolean
+  imageSmoothingQuality: ImageSmoothingQuality
+}
+
+interface CanvasTransform {
+  resetTransform(): void
+  rotate(angle: number): void
+  scale(x: number, y: number): void
+  setTransform(a: number, b: number, c: number, d: number, e: number, f: number): void
+  setTransform(transform?: DOMMatrix2DInit): void
+  transform(a: number, b: number, c: number, d: number, e: number, f: number): void
+  translate(x: number, y: number): void
+}
+type PredefinedColorSpace = 'display-p3' | 'srgb'
+
+interface ImageDataSettings {
+  colorSpace?: PredefinedColorSpace
+}
+interface CanvasImageData {
+  createImageData(sw: number, sh: number, settings?: ImageDataSettings): ImageData
+  createImageData(imagedata: ImageData): ImageData
+  getImageData(sx: number, sy: number, sw: number, sh: number, settings?: ImageDataSettings): ImageData
+  putImageData(imagedata: ImageData, dx: number, dy: number): void
+  putImageData(
+    imagedata: ImageData,
+    dx: number,
+    dy: number,
+    dirtyX: number,
+    dirtyY: number,
+    dirtyWidth: number,
+    dirtyHeight: number,
+  ): void
+}
+
+type CanvasDirection = 'inherit' | 'ltr' | 'rtl'
+type CanvasFontKerning = 'auto' | 'none' | 'normal'
+type CanvasFontStretch =
+  | 'condensed'
+  | 'expanded'
+  | 'extra-condensed'
+  | 'extra-expanded'
+  | 'normal'
+  | 'semi-condensed'
+  | 'semi-expanded'
+  | 'ultra-condensed'
+  | 'ultra-expanded'
+type CanvasFontVariantCaps =
+  | 'all-petite-caps'
+  | 'all-small-caps'
+  | 'normal'
+  | 'petite-caps'
+  | 'small-caps'
+  | 'titling-caps'
+  | 'unicase'
+type CanvasTextAlign = 'center' | 'end' | 'left' | 'right' | 'start'
+type CanvasTextBaseline = 'alphabetic' | 'bottom' | 'hanging' | 'ideographic' | 'middle' | 'top'
+type CanvasTextRendering = 'auto' | 'geometricPrecision' | 'optimizeLegibility' | 'optimizeSpeed'
+
+interface CanvasTextDrawingStyles {
+  direction: CanvasDirection
+  font: string
+  fontKerning: CanvasFontKerning
+  fontStretch: CanvasFontStretch
+  fontVariantCaps: CanvasFontVariantCaps
+  letterSpacing: string
+  textAlign: CanvasTextAlign
+  textBaseline: CanvasTextBaseline
+  textRendering: CanvasTextRendering
+  wordSpacing: string
+}
+
+interface CanvasFilters {
+  filter: string
+}
+
+interface CanvasFillStrokeStyles {
+  fillStyle: string | CanvasGradient | CanvasPattern
+  strokeStyle: string | CanvasGradient | CanvasPattern
+  createConicGradient(startAngle: number, x: number, y: number): CanvasGradient
+  createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient
+  createRadialGradient(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): CanvasGradient
+}
+
+type CanvasFillRule = 'evenodd' | 'nonzero'
+
+interface CanvasDrawPath {
+  beginPath(): void
+  clip(fillRule?: CanvasFillRule): void
+  clip(path: Path2D, fillRule?: CanvasFillRule): void
+  fill(fillRule?: CanvasFillRule): void
+  fill(path: Path2D, fillRule?: CanvasFillRule): void
+  isPointInPath(x: number, y: number, fillRule?: CanvasFillRule): boolean
+  isPointInPath(path: Path2D, x: number, y: number, fillRule?: CanvasFillRule): boolean
+  isPointInStroke(x: number, y: number): boolean
+  isPointInStroke(path: Path2D, x: number, y: number): boolean
+  stroke(): void
+  stroke(path: Path2D): void
+}
+
+type GlobalCompositeOperation =
+  | 'color'
+  | 'color-burn'
+  | 'color-dodge'
+  | 'copy'
+  | 'darken'
+  | 'destination-atop'
+  | 'destination-in'
+  | 'destination-out'
+  | 'destination-over'
+  | 'difference'
+  | 'exclusion'
+  | 'hard-light'
+  | 'hue'
+  | 'lighten'
+  | 'lighter'
+  | 'luminosity'
+  | 'multiply'
+  | 'overlay'
+  | 'saturation'
+  | 'screen'
+  | 'soft-light'
+  | 'source-atop'
+  | 'source-in'
+  | 'source-out'
+  | 'source-over'
+  | 'xor'
+
+interface CanvasCompositing {
+  globalAlpha: number
+  globalCompositeOperation: GlobalCompositeOperation
+}
+
+interface DOMPointInit {
+  w?: number
+  x?: number
+  y?: number
+  z?: number
+}
+interface CanvasPattern {
+  setTransform(transform?: DOMMatrix2DInit): void
+}
+
+interface CanvasGradient {
+  addColorStop(offset: number, color: string): void
+}
+
+interface DOMRectInit {
+  height?: number
+  width?: number
+  x?: number
+  y?: number
+}
+
+interface DOMMatrixInit extends DOMMatrix2DInit {
+  is2D?: boolean
+  m13?: number
+  m14?: number
+  m23?: number
+  m24?: number
+  m31?: number
+  m32?: number
+  m33?: number
+  m34?: number
+  m43?: number
+  m44?: number
+}
+
+// ----------- added types
+
 export interface DOMMatrix2DInit {
   a: number
   b: number
@@ -107,9 +380,7 @@ export interface DOMMatrix extends DOMMatrixReadOnly {
   toJSON(): { [K in OmitNeverOfMatrix]: DOMMatrix[K] }
 }
 
-type OmitMatrixMethod = {
-  [K in keyof DOMMatrix]: DOMMatrix[K] extends (...args: any[]) => any ? never : K
-}
+type OmitMatrixMethod = { [K in keyof DOMMatrix]: DOMMatrix[K] extends (...args: any[]) => any ? never : K }
 
 type OmitNeverOfMatrix = OmitMatrixMethod[keyof OmitMatrixMethod]
 
@@ -252,11 +523,7 @@ export interface StrokeOptions {
   join?: StrokeJoin
 }
 
-export interface SKRSContext2D
-  extends Omit<
-    CanvasRenderingContext2D,
-    'drawImage' | 'createPattern' | 'getTransform' | 'drawFocusIfNeeded' | 'scrollPathIntoView' | 'canvas'
-  > {
+export interface SKRSContext2D extends CanvasRenderingContext2D {
   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.
@@ -278,7 +545,7 @@ export interface SKRSContext2D
     dh: number,
   ): void
   createPattern(
-    image: Image | ImageData,
+    image: Image | ImageData | Canvas | SvgCanvas,
     repeat: 'repeat' | 'repeat-x' | 'repeat-y' | 'no-repeat' | null,
   ): CanvasPattern
   getContextAttributes(): { alpha: boolean; desynchronized: boolean }
@@ -392,21 +659,20 @@ export function createCanvas(width: number, height: number): Canvas
 
 export function createCanvas(width: number, height: number, svgExportFlag: SvgExportFlag): SvgCanvas
 
+export declare class FontKey {
+  // make it a unique type
+  private readonly key: symbol
+}
+
 interface IGlobalFonts {
-  readonly families: {
-    family: string
-    styles: {
-      weight: number
-      width: string
-      style: string
-    }[]
-  }[]
+  readonly families: { family: string; styles: { weight: number; width: string; style: string }[] }[]
   // return true if succeeded
-  register(font: Buffer, nameAlias?: string): boolean
+  register(font: Buffer, nameAlias?: string): FontKey | null
   // absolute path
   registerFromPath(path: string, nameAlias?: string): boolean
   has(name: string): boolean
   loadFontsFromDir(path: string): number
+  remove(key: FontKey): void
 }
 
 export const GlobalFonts: IGlobalFonts

package/index.js

@@ -9,7 +9,7 @@ const {
   Path: Path2D,
   ImageData,
   Image,
-  CanvasPattern,
+  FontKey,
   GlobalFonts,
   PathOp,
   FillType,
@@ -28,9 +28,6 @@ const SvgExportFlag = {
   RelativePathEncoding: 0x04,
 }
 
-// eslint-disable-next-line sonarjs/no-unused-collection
-const Fonts = []
-
 if (!('families' in GlobalFonts)) {
   Object.defineProperty(GlobalFonts, 'families', {
     get: function () {
@@ -113,4 +110,5 @@ module.exports = {
   DOMMatrix,
   DOMRect,
   loadImage,
+  FontKey,
 }

package/js-binding.js

@@ -1,269 +1,387 @@
-const { existsSync, readFileSync } = require('fs')
-const { join } = require('path')
-
-const { platform, arch } = process
+// prettier-ignore
+/* eslint-disable */
+// @ts-nocheck
+/* auto-generated by NAPI-RS */
 
+const { readFileSync } = require('fs')
 let nativeBinding = null
-let localFileExisted = false
-let loadError = null
+const loadErrors = []
 
-function isMusl() {
-  // For Node 10
-  if (!process.report || typeof process.report.getReport !== 'function') {
-    try {
-      return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-    } catch (e) {
+const isMusl = () => {
+  let musl = false
+  if (process.platform === 'linux') {
+    musl = isMuslFromFilesystem()
+    if (musl === null) {
+      musl = isMuslFromReport()
+    }
+    if (musl === null) {
+      musl = isMuslFromChildProcess()
+    }
+  }
+  return musl
+}
+
+const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-')
+
+const isMuslFromFilesystem = () => {
+  try {
+    return readFileSync('/usr/bin/ldd', 'utf-8').includes('musl')
+  } catch {
+    return null
+  }
+}
+
+const isMuslFromReport = () => {
+  const report = typeof process.report.getReport === 'function' ? process.report.getReport() : null
+  if (!report) {
+    return null
+  }
+  if (report.header && report.header.glibcVersionRuntime) {
+    return false
+  }
+  if (Array.isArray(report.sharedObjects)) {
+    if (report.sharedObjects.some(isFileMusl)) {
       return true
     }
-  } else {
-    const { glibcVersionRuntime } = process.report.getReport().header
-    return !glibcVersionRuntime
   }
+  return false
 }
 
-switch (platform) {
-  case 'android':
-    switch (arch) {
-      case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'skia.android-arm64.node'))
+const isMuslFromChildProcess = () => {
+  try {
+    return require('child_process').execSync('ldd --version', { encoding: 'utf8' }).includes('musl')
+  } catch (e) {
+    // If we reach this case, we don't know if the system is musl or not, so is better to just fallback to false
+    return false
+  }
+}
+
+function requireNative() {
+  if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) {
+    try {
+      nativeBinding = require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH);
+    } catch (err) {
+      loadErrors.push(err);
+    }
+  } else if (process.platform === 'android') {
+    if (process.arch === 'arm64') {
+      try {
+        return require('./skia.android-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-android-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm') {
+      try {
+        return require('./skia.android-arm-eabi.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-android-arm-eabi')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Android ${process.arch}`))
+    }
+  } else if (process.platform === 'win32') {
+    if (process.arch === 'x64') {
+      try {
+        return require('./skia.win32-x64-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-win32-x64-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'ia32') {
+      try {
+        return require('./skia.win32-ia32-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-win32-ia32-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./skia.win32-arm64-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-win32-arm64-msvc')
+      } 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)
+      }
+
+    if (process.arch === 'x64') {
+      try {
+        return require('./skia.darwin-x64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-darwin-x64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./skia.darwin-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-darwin-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on macOS: ${process.arch}`))
+    }
+  } else if (process.platform === 'freebsd') {
+    if (process.arch === 'x64') {
+      try {
+        return require('./skia.freebsd-x64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-freebsd-x64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./skia.freebsd-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-freebsd-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on FreeBSD: ${process.arch}`))
+    }
+  } else if (process.platform === 'linux') {
+    if (process.arch === 'x64') {
+      if (isMusl()) {
         try {
-          if (localFileExisted) {
-            nativeBinding = require('./skia.android-arm64.node')
-          } else {
-            nativeBinding = require('@napi-rs/canvas-android-arm64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'skia.android-arm-eabi.node'))
+        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 {
-          if (localFileExisted) {
-            nativeBinding = require('./skia.android-arm-eabi.node')
-          } else {
-            nativeBinding = require('@napi-rs/canvas-android-arm-eabi')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Android ${arch}`)
-    }
-    break
-  case 'win32':
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'skia.win32-x64-msvc.node'))
+        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 {
-          if (localFileExisted) {
-            nativeBinding = require('./skia.win32-x64-msvc.node')
-          } else {
-            nativeBinding = require('@napi-rs/canvas-win32-x64-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'ia32':
-        localFileExisted = existsSync(join(__dirname, 'skia.win32-ia32-msvc.node'))
+        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 {
-          if (localFileExisted) {
-            nativeBinding = require('./skia.win32-ia32-msvc.node')
-          } else {
-            nativeBinding = require('@napi-rs/canvas-win32-ia32-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'skia.win32-arm64-msvc.node'))
+        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 {
-          if (localFileExisted) {
-            nativeBinding = require('./skia.win32-arm64-msvc.node')
-          } else {
-            nativeBinding = require('@napi-rs/canvas-win32-arm64-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Windows: ${arch}`)
-    }
-    break
-  case 'darwin':
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'skia.darwin-x64.node'))
+        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 {
-          if (localFileExisted) {
-            nativeBinding = require('./skia.darwin-x64.node')
-          } else {
-            nativeBinding = require('@napi-rs/canvas-darwin-x64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'skia.darwin-arm64.node'))
+        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 {
-          if (localFileExisted) {
-            nativeBinding = require('./skia.darwin-arm64.node')
-          } else {
-            nativeBinding = require('@napi-rs/canvas-darwin-arm64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on macOS: ${arch}`)
+        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)
+      }
+
+      }
+    } else if (process.arch === 'ppc64') {
+      try {
+        return require('./skia.linux-ppc64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-linux-ppc64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 's390x') {
+      try {
+        return require('./skia.linux-s390x-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@napi-rs/canvas-linux-s390x-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Linux: ${process.arch}`))
     }
-    break
-  case 'freebsd':
-    if (arch !== 'x64') {
-      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
+  } else {
+    loadErrors.push(new Error(`Unsupported OS: ${process.platform}, architecture: ${process.arch}`))
+  }
+}
+
+nativeBinding = requireNative()
+
+if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
+  try {
+    nativeBinding = require('./skia.wasi.cjs')
+  } catch (err) {
+    if (process.env.NAPI_RS_FORCE_WASI) {
+      loadErrors.push(err)
     }
-    localFileExisted = existsSync(join(__dirname, 'skia.freebsd-x64.node'))
+  }
+  if (!nativeBinding) {
     try {
-      if (localFileExisted) {
-        nativeBinding = require('./skia.freebsd-x64.node')
-      } else {
-        nativeBinding = require('@napi-rs/canvas-freebsd-x64')
+      nativeBinding = require('@napi-rs/canvas-wasm32-wasi')
+    } catch (err) {
+      if (process.env.NAPI_RS_FORCE_WASI) {
+        loadErrors.push(err)
       }
-    } catch (e) {
-      loadError = e
-    }
-    break
-  case 'linux':
-    switch (arch) {
-      case 'x64':
-        if (isMusl()) {
-          localFileExisted = existsSync(join(__dirname, 'skia.linux-x64-musl.node'))
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./skia.linux-x64-musl.node')
-            } else {
-              nativeBinding = require('@napi-rs/canvas-linux-x64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(join(__dirname, 'skia.linux-x64-gnu.node'))
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./skia.linux-x64-gnu.node')
-            } else {
-              nativeBinding = require('@napi-rs/canvas-linux-x64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        }
-        break
-      case 'arm64':
-        if (isMusl()) {
-          localFileExisted = existsSync(join(__dirname, 'skia.linux-arm64-musl.node'))
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./skia.linux-arm64-musl.node')
-            } else {
-              nativeBinding = require('@napi-rs/canvas-linux-arm64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(join(__dirname, 'skia.linux-arm64-gnu.node'))
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./skia.linux-arm64-gnu.node')
-            } else {
-              nativeBinding = require('@napi-rs/canvas-linux-arm64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        }
-        break
-      case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'skia.linux-arm-gnueabihf.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./skia.linux-arm-gnueabihf.node')
-          } else {
-            nativeBinding = require('@napi-rs/canvas-linux-arm-gnueabihf')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'riscv64':
-        localFileExisted = existsSync(join(__dirname, 'skia.linux-riscv64-gnu.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./skia.linux-riscv64-gnu.node')
-          } else {
-            nativeBinding = require('@napi-rs/canvas-linux-riscv64-gnu')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Linux: ${arch}`)
     }
-    break
-  default:
-    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
+  }
 }
 
 if (!nativeBinding) {
-  if (loadError) {
-    throw loadError
+  if (loadErrors.length > 0) {
+    // TODO Link to documentation with potential fixes
+    //  - The package owner could build/publish bindings for this arch
+    //  - The user may need to bundle the correct files
+    //  - The user may need to re-install node_modules to get new packages
+    throw new Error('Failed to load native binding', { cause: loadErrors })
   }
   throw new Error(`Failed to load native binding`)
 }
 
-const {
-  ChromaSubsampling,
-  SvgExportFlag,
-  CanvasRenderingContext2D,
-  CanvasGradient,
-  ImageData,
-  Image,
-  PathOp,
-  FillType,
-  StrokeCap,
-  StrokeJoin,
-  Path,
-  CanvasPattern,
-  convertSVGTextToPath,
-  CanvasElement,
-  SVGCanvas,
-  clearAllCache,
-  GlobalFonts,
-} = nativeBinding
-
-module.exports.ChromaSubsampling = ChromaSubsampling
-module.exports.SvgExportFlag = SvgExportFlag
-module.exports.CanvasRenderingContext2D = CanvasRenderingContext2D
-module.exports.CanvasGradient = CanvasGradient
-module.exports.ImageData = ImageData
-module.exports.Image = Image
-module.exports.PathOp = PathOp
-module.exports.FillType = FillType
-module.exports.StrokeCap = StrokeCap
-module.exports.StrokeJoin = StrokeJoin
-module.exports.Path = Path
-module.exports.CanvasPattern = CanvasPattern
-module.exports.convertSVGTextToPath = convertSVGTextToPath
-module.exports.CanvasElement = CanvasElement
-module.exports.SVGCanvas = SVGCanvas
-module.exports.clearAllCache = clearAllCache
-module.exports.GlobalFonts = GlobalFonts
+module.exports.GlobalFonts = nativeBinding.GlobalFonts
+module.exports.CanvasElement = nativeBinding.CanvasElement
+module.exports.CanvasGradient = nativeBinding.CanvasGradient
+module.exports.CanvasPattern = nativeBinding.CanvasPattern
+module.exports.CanvasRenderingContext2D = nativeBinding.CanvasRenderingContext2D
+module.exports.FontKey = nativeBinding.FontKey
+module.exports.Image = nativeBinding.Image
+module.exports.ImageData = nativeBinding.ImageData
+module.exports.Path = nativeBinding.Path
+module.exports.SVGCanvas = nativeBinding.SVGCanvas
+module.exports.ChromaSubsampling = nativeBinding.ChromaSubsampling
+module.exports.clearAllCache = nativeBinding.clearAllCache
+module.exports.convertSVGTextToPath = nativeBinding.convertSVGTextToPath
+module.exports.FillType = nativeBinding.FillType
+module.exports.PathOp = nativeBinding.PathOp
+module.exports.StrokeCap = nativeBinding.StrokeCap
+module.exports.StrokeJoin = nativeBinding.StrokeJoin
+module.exports.SvgExportFlag = nativeBinding.SvgExportFlag

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/canvas",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "description": "Canvas for Node.js with skia backend",
   "main": "index.js",
   "repository": {
@@ -81,7 +81,7 @@
     "@types/semver": "^7",
     "ava": "^6.1.1",
     "canvas": "^3.0.0",
-    "canvaskit-wasm": "^0.39.1",
+    "canvaskit-wasm": "^0.40.0",
     "colorette": "^2.0.20",
     "conventional-changelog-cli": "^5.0.0",
     "core-js": "^3.38.0",
@@ -90,7 +90,7 @@
     "lint-staged": "^15.2.1",
     "lodash": "^4.17.21",
     "npm-run-all2": "^7.0.0",
-    "oxlint": "^0.15.0",
+    "oxlint": "^0.16.0",
     "pinst": "^3.0.0",
     "png.js": "^0.2.1",
     "prettier": "^3.2.5",
@@ -98,7 +98,7 @@
     "semver": "^7.5.4",
     "skia-canvas": "^2.0.0",
     "table": "^6.8.1",
-    "tinybench": "^3.0.6",
+    "tinybench": "^4.0.0",
     "typescript": "^5.3.3"
   },
   "lint-staged": {
@@ -136,17 +136,17 @@
     "singleQuote": true,
     "arrowParens": "always"
   },
-  "packageManager": "yarn@4.6.0",
+  "packageManager": "yarn@4.8.1",
   "optionalDependencies": {
-    "@napi-rs/canvas-linux-x64-gnu": "0.1.67",
-    "@napi-rs/canvas-darwin-x64": "0.1.67",
-    "@napi-rs/canvas-win32-x64-msvc": "0.1.67",
-    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.67",
-    "@napi-rs/canvas-linux-x64-musl": "0.1.67",
-    "@napi-rs/canvas-linux-arm64-gnu": "0.1.67",
-    "@napi-rs/canvas-linux-arm64-musl": "0.1.67",
-    "@napi-rs/canvas-darwin-arm64": "0.1.67",
-    "@napi-rs/canvas-android-arm64": "0.1.67",
-    "@napi-rs/canvas-linux-riscv64-gnu": "0.1.67"
+    "@napi-rs/canvas-linux-x64-gnu": "0.1.69",
+    "@napi-rs/canvas-darwin-x64": "0.1.69",
+    "@napi-rs/canvas-win32-x64-msvc": "0.1.69",
+    "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.69",
+    "@napi-rs/canvas-linux-x64-musl": "0.1.69",
+    "@napi-rs/canvas-linux-arm64-gnu": "0.1.69",
+    "@napi-rs/canvas-linux-arm64-musl": "0.1.69",
+    "@napi-rs/canvas-darwin-arm64": "0.1.69",
+    "@napi-rs/canvas-android-arm64": "0.1.69",
+    "@napi-rs/canvas-linux-riscv64-gnu": "0.1.69"
   }
 }