fix: update ffi api usage due to breaking changes in pointer api (#51)

* fix: new Deno update

* chore: fmt

Author: load1n9

scripts/build_skia.ts

@@ -1,4 +1,4 @@
-const CURRENT_HASH = "2290b0b75a8abb80e23d9cb9aced5b5cebbf702d";
+const _CURRENT_HASH = "2290b0b75a8abb80e23d9cb9aced5b5cebbf702d";
 const CURRENT_HASH_SHORT = "2290b0b";
 
 Deno.chdir(new URL("../skia", import.meta.url));
@@ -56,6 +56,7 @@ if (Deno.env.get("SKIA_FROM_SOURCE") !== "1") {
   }
   try {
     Deno.mkdirSync("./out/Release", { recursive: true });
+    // deno-lint-ignore no-empty
   } catch (_) {}
   for (const name of toDownload) {
     let file = name;
@@ -78,6 +79,7 @@ if (Deno.env.get("SKIA_FROM_SOURCE") !== "1") {
   Deno.exit(0);
 }
 
+// deno-lint-ignore no-explicit-any
 const BUILD_ARGS: Record<string, any> = {
   cc: Deno.build.os === "windows" ? '"clang-cl"' : '"clang"',
   cxx: Deno.build.os === "windows" ? '"clang-cl"' : '"clang++"',

src/canvas.ts

@@ -86,7 +86,7 @@ export class Canvas {
       width,
       height,
     );
-    if (this.#ptr === 0) {
+    if (this.#ptr === null) {
       throw new Error("Failed to create canvas");
     }
     CANVAS_FINALIZER.register(this, this.#ptr);
@@ -126,17 +126,20 @@ export class Canvas {
       OUT_DATA_PTR,
     );
 
-    if (bufptr === 0) {
+    if (bufptr === null) {
       throw new Error("Failed to encode canvas");
     }
 
     const size = OUT_SIZE[0];
-    const ptr = OUT_DATA[0];
+    const ptr = Deno.UnsafePointer.create(OUT_DATA[0]);
     const buffer = new Uint8Array(getBuffer(bufptr, 0, size));
     SK_DATA_FINALIZER.register(buffer, ptr);
     return buffer;
   }
 
+  /**
+   * Creates a data url from the canvas data
+   */
   toDataURL(format: ImageFormat = "png", quality = 100) {
     const buffer = this.encode(format, quality);
     return `data:image/${format};base64,${encodeBase64(buffer)}`;
@@ -168,6 +171,9 @@ export class Canvas {
     return pixels;
   }
 
+  /**
+   * Returns the Rendering Context of the canvas
+   */
   getContext(type: "2d"): CanvasRenderingContext2D;
   getContext(type: string): CanvasRenderingContext2D | null {
     switch (type) {
@@ -179,6 +185,9 @@ export class Canvas {
     }
   }
 
+  /**
+   * Resizes the Canvas to the specified dimensions
+   */
   resize(width: number, height: number) {
     if (this.#width === width && this.#height === height) return;
     sk_canvas_set_size(this.#ptr, width, height);

src/context2d.ts

@@ -188,7 +188,7 @@ export type GlobalCompositeOperation = keyof typeof CGlobalCompositeOperation;
 export type ImageSmoothingQuality = keyof typeof CImageSmoothingQuality;
 
 const METRICS = new Float32Array(7);
-const METRICS_PTR = Number(Deno.UnsafePointer.of(METRICS));
+const METRICS_PTR = Deno.UnsafePointer.of(METRICS);
 
 export type Style = string | CanvasGradient | CanvasPattern;
 
@@ -259,7 +259,7 @@ export class CanvasRenderingContext2D {
   constructor(canvas: Canvas, ptr: Deno.PointerValue) {
     this.#canvas = canvas;
     this.#ptr = ptr;
-    if (this.#ptr === 0) {
+    if (this.#ptr === null) {
       throw new Error("Failed to create context");
     }
   }
@@ -291,7 +291,7 @@ export class CanvasRenderingContext2D {
         y,
         maxWidth ?? 100_000,
         1,
-        0,
+        null,
       )
     ) {
       throw new Error("failed to fill text");
@@ -309,7 +309,7 @@ export class CanvasRenderingContext2D {
         y,
         maxWidth ?? 100_000,
         0,
-        0,
+        null,
       )
     ) {
       throw new Error("failed to stroke text");
@@ -773,13 +773,16 @@ export class CanvasRenderingContext2D {
     const pathptr =
       typeof path === "object" && path !== null && path instanceof Path2D
         ? path._unsafePointer
-        : 0;
+        : null;
     const irule = (typeof path === "string" ? path : rule) ?? "nonzero";
     sk_context_fill(this.#ptr, pathptr, irule === "evenodd" ? 1 : 0);
   }
 
   stroke(path?: Path2D) {
-    sk_context_stroke(this.#ptr, path ? path._unsafePointer : 0);
+    sk_context_stroke(
+      this.#ptr,
+      path ? path._unsafePointer : null,
+    );
   }
 
   drawFocusIfNeeded() {
@@ -800,7 +803,7 @@ export class CanvasRenderingContext2D {
   ) {
     const pathptr = typeof path === "object" && path !== null
       ? path._unsafePointer
-      : 0;
+      : null;
     const fillRuleStr = typeof path === "string" ? path : fillRule;
     const ifillRule = fillRuleStr === "evenodd" ? 1 : 0;
     sk_context_clip(this.#ptr, pathptr, ifillRule);
@@ -825,7 +828,7 @@ export class CanvasRenderingContext2D {
   ): boolean {
     const pathptr = typeof path === "object" && path !== null
       ? path._unsafePointer
-      : 0;
+      : null;
     const ifillRule = (typeof y === "string" ? y : fillRule) === "evenodd"
       ? 1
       : 0;
@@ -854,7 +857,7 @@ export class CanvasRenderingContext2D {
   ): boolean {
     const pathptr = typeof path === "object" && path !== null
       ? path._unsafePointer
-      : 0;
+      : null;
     return sk_context_is_point_in_stroke(
       this.#ptr,
       typeof path === "number" ? path : x,
@@ -978,7 +981,7 @@ export class CanvasRenderingContext2D {
     asw?: number,
     ash?: number,
   ) {
-    if (image instanceof Image && image._unsafePointer === 0) {
+    if (image instanceof Image && image._unsafePointer === null) {
       return;
     }
     const dx = asx ?? adx;
@@ -991,8 +994,8 @@ export class CanvasRenderingContext2D {
     const sh = ash === undefined ? image.height : adh ?? image.height;
     sk_context_draw_image(
       this.#ptr,
-      image instanceof Canvas ? image._unsafePointer : 0,
-      image instanceof Image ? image._unsafePointer : 0,
+      image instanceof Canvas ? image._unsafePointer : null,
+      image instanceof Image ? image._unsafePointer : null,
       dx,
       dy,
       dw,

src/ffi.ts

@@ -979,6 +979,7 @@ const {
   ) => ArrayBuffer;
   op_base64_encode: (buf: Uint8Array) => string;
   op_base64_decode: (base64: string) => Uint8Array;
+  // deno-lint-ignore no-explicit-any
 } = (Deno as any)[(Deno as any).internal].core.ops;
 
 export function cstr(str: string) {

src/filter.ts

@@ -99,6 +99,7 @@ export function parseFilterString(filter: string): Filter[] {
   let state: "fn" | "args" = "fn";
   let fn = "";
   let argc = 0;
+  // deno-lint-ignore no-explicit-any
   let argv: any[] = [];
 
   let i = 0;
@@ -137,6 +138,7 @@ export function parseFilterString(filter: string): Filter[] {
         continue;
       }
 
+      // deno-lint-ignore no-inner-declarations
       function parsePixel() {
         let numPart = "";
         let unitPart = "";
@@ -182,6 +184,7 @@ export function parseFilterString(filter: string): Filter[] {
         }
       }
 
+      // deno-lint-ignore no-inner-declarations
       function parsePercentage() {
         if (!arg.match(/^[0-9\.]+%?$/)) {
           throw new Error(`Invalid percentage: ${arg}`);
@@ -197,6 +200,7 @@ export function parseFilterString(filter: string): Filter[] {
         return num / 100;
       }
 
+      // deno-lint-ignore no-inner-declarations
       function parseAngle() {
         if (arg.endsWith("deg")) {
           const num = parseFloat(arg.slice(0, arg.length - 3));
@@ -227,6 +231,7 @@ export function parseFilterString(filter: string): Filter[] {
         }
       }
 
+      // deno-lint-ignore no-explicit-any
       let v: any = undefined;
 
       switch (fn) {

src/image.ts

@@ -17,8 +17,8 @@ const SK_IMAGE_FINALIZER = new FinalizationRegistry(
 export type ImageSource = Uint8Array | string;
 
 export class Image extends EventTarget {
-  #token: { ptr: Deno.PointerValue } = { ptr: 0 };
-  #ptr: Deno.PointerValue = 0;
+  #token: { ptr: Deno.PointerValue } = { ptr: null };
+  #ptr: Deno.PointerValue = null;
   #src?: ImageSource;
 
   get _unsafePointer() {
@@ -35,16 +35,16 @@ export class Image extends EventTarget {
   }
 
   set src(data: ImageSource | undefined) {
-    if (this.#ptr !== 0) {
+    if (this.#ptr !== null) {
       sk_image_destroy(this.#ptr);
       SK_IMAGE_FINALIZER.unregister(this.#token);
-      this.#ptr = 0;
+      this.#ptr = null;
     }
 
     if (data === undefined) {
       this.#src = undefined;
-      this.#ptr = 0;
-      this.#token.ptr = 0;
+      this.#ptr = null;
+      this.#token.ptr = null;
       return;
     }
 
@@ -79,7 +79,7 @@ export class Image extends EventTarget {
       ? sk_image_from_encoded(data, data.byteLength)
       : sk_image_from_file(cstr(data));
 
-    if (this.#ptr === 0) {
+    if (this.#ptr === null) {
       const error = new Error("Failed to load image");
       queueMicrotask(() => {
         this.dispatchEvent(
@@ -94,7 +94,7 @@ export class Image extends EventTarget {
     this.#token.ptr = this.#ptr;
     this.#src = data;
 
-    if (this.#ptr !== 0) {
+    if (this.#ptr !== null) {
       SK_IMAGE_FINALIZER.register(this, this.#ptr, this.#token);
     }
 
@@ -114,6 +114,7 @@ export class Image extends EventTarget {
     return this.#onerror;
   }
 
+  // deno-lint-ignore adjacent-overload-signatures
   set onload(fn: EventListenerOrEventListenerObject | undefined) {
     if (this.#onload) {
       this.removeEventListener("load", this.#onload);
@@ -122,6 +123,7 @@ export class Image extends EventTarget {
     if (fn) this.addEventListener("load", fn);
   }
 
+  // deno-lint-ignore adjacent-overload-signatures
   set onerror(fn: EventListenerOrEventListenerObject | undefined) {
     if (this.#onerror) {
       this.removeEventListener("error", this.#onerror);
@@ -148,17 +150,17 @@ export class Image extends EventTarget {
   }
 
   get width() {
-    if (this._unsafePointer === 0) return 0;
+    if (this._unsafePointer === null) return 0;
     return sk_image_width(this.#ptr);
   }
 
   get height() {
-    if (this._unsafePointer === 0) return 0;
+    if (this._unsafePointer === null) return 0;
     return sk_image_height(this.#ptr);
   }
 
   [Symbol.for("Deno.customInspect")]() {
-    if (this._unsafePointer === 0) {
+    if (this._unsafePointer === null) {
       return `Image { pending, src: ${Deno.inspect(this.src)} }`;
     }
     return `Image { width: ${this.width}, height: ${this.height} }`;

src/parse_font.ts

@@ -29,13 +29,15 @@ const sizeFamilyRe = new RegExp(
  * Cache font parsing.
  */
 
+// deno-lint-ignore no-explicit-any
 const cache: Record<string, any> = {};
 
 const defaultHeight = 16; // pt, common browser default
 
 /**
  * Parse font `str`.
  */
+// deno-lint-ignore no-explicit-any
 export function parseFont(str: string): any {
   // Cached
   if (cache[str]) return cache[str];
@@ -45,6 +47,7 @@ export function parseFont(str: string): any {
   if (!sizeFamily) return; // invalid
 
   // Default values and required properties
+  // deno-lint-ignore no-explicit-any
   const font: any = {
     weight: "normal",
     style: "normal",

src/path2d.ts

@@ -1,4 +1,5 @@
 import { FillRule } from "./context2d.ts";
+import { DOMMatrix } from "./dommatrix.ts";
 import ffi, { cstr } from "./ffi.ts";
 
 const {
@@ -82,7 +83,7 @@ export class Path2D {
       : typeof path === "object" && path !== null && path instanceof Path2D
       ? sk_path_create_copy(path._unsafePointer)
       : sk_path_create();
-    if (this.#ptr === 0) {
+    if (this.#ptr === null) {
       throw new Error("Failed to create path");
     }
     PATH_FINALIZER.register(this, this.#ptr);
@@ -200,7 +201,7 @@ export class Path2D {
   toSVGString() {
     const skstr = sk_path_to_svg(this.#ptr, OUT_PTR_U8, OUT_SIZE_U8);
     const buffer = Deno.UnsafePointerView.getArrayBuffer(
-      OUT_PTR[0],
+      Deno.UnsafePointer.create(OUT_PTR[0])!,
       OUT_SIZE[0],
     );
     const str = new TextDecoder().decode(buffer);
@@ -248,7 +249,7 @@ export class Path2D {
       ]);
       sk_path_add_path_buf(this.#ptr, path._unsafePointer, TU8);
     } else {
-      sk_path_add_path_ptr(this.#ptr, path._unsafePointer, 0);
+      sk_path_add_path_ptr(this.#ptr, path._unsafePointer, null);
     }
   }
 }

src/pattern.ts

@@ -30,7 +30,7 @@ export class CanvasPattern {
   }
 
   constructor(image: CanvasPatternImage, repetition: CanvasPatternRepeat) {
-    if (image._unsafePointer === 0) throw new Error("Image not loaded");
+    if (image._unsafePointer === null) throw new Error("Image not loaded");
     this.#ptr = sk_pattern_new_image(image._unsafePointer, repeat[repetition]);
     PATTERN_FINALIZER.register(this, this.#ptr);
   }