@shopify/react-native-skia 0.1.142 → 0.1.143

package/lib/module/skia/web/JsiSkPathFactory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkPathFactory.ts"],"names":["Host","ckEnum","toValue","NotImplementedOnRNWeb","JsiSkPath","JsiSkPathFactory","constructor","CanvasKit","Make","Path","MakeFromSVGString","str","path","MakeFromOp","one","two","op","MakeFromCmds","cmds","flat","MakeFromText","_text","_x","_y","_font"],"mappings":"AAKA,SAASA,IAAT,EAAeC,MAAf,EAAuBC,OAAvB,EAAgCC,qBAAhC,QAA6D,QAA7D;AACA,SAASC,SAAT,QAA0B,aAA1B;AAEA,OAAO,MAAMC,gBAAN,SAA+BL,IAA/B,CAA2D;AAChEM,EAAAA,WAAW,CAACC,SAAD,EAAuB;AAChC,UAAMA,SAAN;AACD;;AAEDC,EAAAA,IAAI,GAAG;AACL,WAAO,IAAIJ,SAAJ,CAAc,KAAKG,SAAnB,EAA8B,IAAI,KAAKA,SAAL,CAAeE,IAAnB,EAA9B,CAAP;AACD;;AAEDC,EAAAA,iBAAiB,CAACC,GAAD,EAAc;AAC7B,UAAMC,IAAI,GAAG,KAAKL,SAAL,CAAeE,IAAf,CAAoBC,iBAApB,CAAsCC,GAAtC,CAAb;;AACA,QAAIC,IAAI,KAAK,IAAb,EAAmB;AACjB,aAAO,IAAP;AACD;;AACD,WAAO,IAAIR,SAAJ,CAAc,KAAKG,SAAnB,EAA8BK,IAA9B,CAAP;AACD;;AAEDC,EAAAA,UAAU,CAACC,GAAD,EAAcC,GAAd,EAA2BC,EAA3B,EAAuC;AAC/C,UAAMJ,IAAI,GAAG,KAAKL,SAAL,CAAeE,IAAf,CAAoBI,UAApB,CACXX,OAAO,CAACY,GAAD,CADI,EAEXZ,OAAO,CAACa,GAAD,CAFI,EAGXd,MAAM,CAACe,EAAD,CAHK,CAAb;;AAKA,QAAIJ,IAAI,KAAK,IAAb,EAAmB;AACjB,aAAO,IAAP;AACD;;AACD,WAAO,IAAIR,SAAJ,CAAc,KAAKG,SAAnB,EAA8BK,IAA9B,CAAP;AACD;;AAEDK,EAAAA,YAAY,CAACC,IAAD,EAAsB;AAChC,UAAMN,IAAI,GAAG,KAAKL,SAAL,CAAeE,IAAf,CAAoBQ,YAApB,CAAiCC,IAAI,CAACC,IAAL,EAAjC,CAAb;;AACA,QAAIP,IAAI,KAAK,IAAb,EAAmB;AACjB,aAAO,IAAP;AACD;;AACD,WAAO,IAAIR,SAAJ,CAAc,KAAKG,SAAnB,EAA8BK,IAA9B,CAAP;AACD;;AAEDQ,EAAAA,YAAY,CACVC,KADU,EAEVC,EAFU,EAGVC,EAHU,EAIVC,KAJU,EAKK;AACf,UAAM,IAAIrB,qBAAJ,EAAN;AACD;;AA5C+D","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { PathCommand, PathOp, SkFont, SkPath } from \"../types\";\nimport type { PathFactory } from \"../types/Path/PathFactory\";\n\nimport { Host, ckEnum, toValue, NotImplementedOnRNWeb } from \"./Host\";\nimport { JsiSkPath } from \"./JsiSkPath\";\n\nexport class JsiSkPathFactory extends Host implements PathFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  Make() {\n    return new JsiSkPath(this.CanvasKit, new this.CanvasKit.Path());\n  }\n\n  MakeFromSVGString(str: string) {\n    const path = this.CanvasKit.Path.MakeFromSVGString(str);\n    if (path === null) {\n      return null;\n    }\n    return new JsiSkPath(this.CanvasKit, path);\n  }\n\n  MakeFromOp(one: SkPath, two: SkPath, op: PathOp) {\n    const path = this.CanvasKit.Path.MakeFromOp(\n      toValue(one),\n      toValue(two),\n      ckEnum(op)\n    );\n    if (path === null) {\n      return null;\n    }\n    return new JsiSkPath(this.CanvasKit, path);\n  }\n\n  MakeFromCmds(cmds: PathCommand[]) {\n    const path = this.CanvasKit.Path.MakeFromCmds(cmds.flat());\n    if (path === null) {\n      return null;\n    }\n    return new JsiSkPath(this.CanvasKit, path);\n  }\n\n  MakeFromText(\n    _text: string,\n    _x: number,\n    _y: number,\n    _font: SkFont\n  ): SkPath | null {\n    throw new NotImplementedOnRNWeb();\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkPathFactory.ts"],"names":["Host","ckEnum","NotImplementedOnRNWeb","JsiSkPath","JsiSkPathFactory","constructor","CanvasKit","Make","Path","MakeFromSVGString","str","path","MakeFromOp","one","two","op","fromValue","MakeFromCmds","cmds","flat","MakeFromText","_text","_x","_y","_font"],"mappings":"AAKA,SAASA,IAAT,EAAeC,MAAf,EAAuBC,qBAAvB,QAAoD,QAApD;AACA,SAASC,SAAT,QAA0B,aAA1B;AAEA,OAAO,MAAMC,gBAAN,SAA+BJ,IAA/B,CAA2D;AAChEK,EAAAA,WAAW,CAACC,SAAD,EAAuB;AAChC,UAAMA,SAAN;AACD;;AAEDC,EAAAA,IAAI,GAAG;AACL,WAAO,IAAIJ,SAAJ,CAAc,KAAKG,SAAnB,EAA8B,IAAI,KAAKA,SAAL,CAAeE,IAAnB,EAA9B,CAAP;AACD;;AAEDC,EAAAA,iBAAiB,CAACC,GAAD,EAAc;AAC7B,UAAMC,IAAI,GAAG,KAAKL,SAAL,CAAeE,IAAf,CAAoBC,iBAApB,CAAsCC,GAAtC,CAAb;;AACA,QAAIC,IAAI,KAAK,IAAb,EAAmB;AACjB,aAAO,IAAP;AACD;;AACD,WAAO,IAAIR,SAAJ,CAAc,KAAKG,SAAnB,EAA8BK,IAA9B,CAAP;AACD;;AAEDC,EAAAA,UAAU,CAACC,GAAD,EAAcC,GAAd,EAA2BC,EAA3B,EAAuC;AAC/C,UAAMJ,IAAI,GAAG,KAAKL,SAAL,CAAeE,IAAf,CAAoBI,UAApB,CACXT,SAAS,CAACa,SAAV,CAAoBH,GAApB,CADW,EAEXV,SAAS,CAACa,SAAV,CAAoBF,GAApB,CAFW,EAGXb,MAAM,CAACc,EAAD,CAHK,CAAb;;AAKA,QAAIJ,IAAI,KAAK,IAAb,EAAmB;AACjB,aAAO,IAAP;AACD;;AACD,WAAO,IAAIR,SAAJ,CAAc,KAAKG,SAAnB,EAA8BK,IAA9B,CAAP;AACD;;AAEDM,EAAAA,YAAY,CAACC,IAAD,EAAsB;AAChC,UAAMP,IAAI,GAAG,KAAKL,SAAL,CAAeE,IAAf,CAAoBS,YAApB,CAAiCC,IAAI,CAACC,IAAL,EAAjC,CAAb;;AACA,QAAIR,IAAI,KAAK,IAAb,EAAmB;AACjB,aAAO,IAAP;AACD;;AACD,WAAO,IAAIR,SAAJ,CAAc,KAAKG,SAAnB,EAA8BK,IAA9B,CAAP;AACD;;AAEDS,EAAAA,YAAY,CACVC,KADU,EAEVC,EAFU,EAGVC,EAHU,EAIVC,KAJU,EAKK;AACf,UAAM,IAAItB,qBAAJ,EAAN;AACD;;AA5C+D","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { PathCommand, PathOp, SkFont, SkPath } from \"../types\";\nimport type { PathFactory } from \"../types/Path/PathFactory\";\n\nimport { Host, ckEnum, NotImplementedOnRNWeb } from \"./Host\";\nimport { JsiSkPath } from \"./JsiSkPath\";\n\nexport class JsiSkPathFactory extends Host implements PathFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  Make() {\n    return new JsiSkPath(this.CanvasKit, new this.CanvasKit.Path());\n  }\n\n  MakeFromSVGString(str: string) {\n    const path = this.CanvasKit.Path.MakeFromSVGString(str);\n    if (path === null) {\n      return null;\n    }\n    return new JsiSkPath(this.CanvasKit, path);\n  }\n\n  MakeFromOp(one: SkPath, two: SkPath, op: PathOp) {\n    const path = this.CanvasKit.Path.MakeFromOp(\n      JsiSkPath.fromValue(one),\n      JsiSkPath.fromValue(two),\n      ckEnum(op)\n    );\n    if (path === null) {\n      return null;\n    }\n    return new JsiSkPath(this.CanvasKit, path);\n  }\n\n  MakeFromCmds(cmds: PathCommand[]) {\n    const path = this.CanvasKit.Path.MakeFromCmds(cmds.flat());\n    if (path === null) {\n      return null;\n    }\n    return new JsiSkPath(this.CanvasKit, path);\n  }\n\n  MakeFromText(\n    _text: string,\n    _x: number,\n    _y: number,\n    _font: SkFont\n  ): SkPath | null {\n    throw new NotImplementedOnRNWeb();\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkPicture.js

@@ -1,13 +1,15 @@
 // TODO: suggest to rename SkPicture to Picture for consistency
-import { HostObject, toValue, ckEnum } from "./Host";
+import { HostObject, ckEnum } from "./Host";
 import { JsiSkShader } from "./JsiSkShader";
+import { JsiSkMatrix } from "./JsiSkMatrix";
+import { JsiSkRect } from "./JsiSkRect";
 export class JsiSkPicture extends HostObject {
   constructor(CanvasKit, ref) {
     super(CanvasKit, ref, "Picture");
   }
 
   makeShader(tmx, tmy, mode, localMatrix, tileRect) {
-    return new JsiSkShader(this.CanvasKit, this.ref.makeShader(ckEnum(tmx), ckEnum(tmy), ckEnum(mode), localMatrix ? toValue(localMatrix) : undefined, tileRect ? toValue(tileRect) : undefined));
+    return new JsiSkShader(this.CanvasKit, this.ref.makeShader(ckEnum(tmx), ckEnum(tmy), ckEnum(mode), localMatrix ? JsiSkMatrix.fromValue(localMatrix) : undefined, tileRect ? JsiSkRect.fromValue(this.CanvasKit, tileRect) : undefined));
   }
 
   serialize() {

package/lib/module/skia/web/JsiSkPicture.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkPicture.ts"],"names":["HostObject","toValue","ckEnum","JsiSkShader","JsiSkPicture","constructor","CanvasKit","ref","makeShader","tmx","tmy","mode","localMatrix","tileRect","undefined","serialize"],"mappings":"AAAA;AAWA,SAASA,UAAT,EAAqBC,OAArB,EAA8BC,MAA9B,QAA4C,QAA5C;AACA,SAASC,WAAT,QAA4B,eAA5B;AAEA,OAAO,MAAMC,YAAN,SACGJ,UADH,CAGP;AACEK,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAAqC;AAC9C,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,SAAtB;AACD;;AAEDC,EAAAA,UAAU,CACRC,GADQ,EAERC,GAFQ,EAGRC,IAHQ,EAIRC,WAJQ,EAKRC,QALQ,EAMR;AACA,WAAO,IAAIV,WAAJ,CACL,KAAKG,SADA,EAEL,KAAKC,GAAL,CAASC,UAAT,CACEN,MAAM,CAACO,GAAD,CADR,EAEEP,MAAM,CAACQ,GAAD,CAFR,EAGER,MAAM,CAACS,IAAD,CAHR,EAIEC,WAAW,GAAGX,OAAO,CAACW,WAAD,CAAV,GAA0BE,SAJvC,EAKED,QAAQ,GAAGZ,OAAO,CAACY,QAAD,CAAV,GAAuBC,SALjC,CAFK,CAAP;AAUD;;AAEDC,EAAAA,SAAS,GAAG;AACV,WAAO,KAAKR,GAAL,CAASQ,SAAT,EAAP;AACD;;AA1BH","sourcesContent":["// TODO: suggest to rename SkPicture to Picture for consistency\nimport type { CanvasKit, SkPicture as Picture } from \"canvaskit-wasm\";\n\nimport type {\n  FilterMode,\n  SkRect,\n  TileMode,\n  SkPicture,\n  SkMatrix,\n} from \"../types\";\n\nimport { HostObject, toValue, ckEnum } from \"./Host\";\nimport { JsiSkShader } from \"./JsiSkShader\";\n\nexport class JsiSkPicture\n  extends HostObject<Picture, \"Picture\">\n  implements SkPicture\n{\n  constructor(CanvasKit: CanvasKit, ref: Picture) {\n    super(CanvasKit, ref, \"Picture\");\n  }\n\n  makeShader(\n    tmx: TileMode,\n    tmy: TileMode,\n    mode: FilterMode,\n    localMatrix?: SkMatrix,\n    tileRect?: SkRect\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.ref.makeShader(\n        ckEnum(tmx),\n        ckEnum(tmy),\n        ckEnum(mode),\n        localMatrix ? toValue(localMatrix) : undefined,\n        tileRect ? toValue(tileRect) : undefined\n      )\n    );\n  }\n\n  serialize() {\n    return this.ref.serialize();\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkPicture.ts"],"names":["HostObject","ckEnum","JsiSkShader","JsiSkMatrix","JsiSkRect","JsiSkPicture","constructor","CanvasKit","ref","makeShader","tmx","tmy","mode","localMatrix","tileRect","fromValue","undefined","serialize"],"mappings":"AAAA;AAWA,SAASA,UAAT,EAAqBC,MAArB,QAAmC,QAAnC;AACA,SAASC,WAAT,QAA4B,eAA5B;AACA,SAASC,WAAT,QAA4B,eAA5B;AACA,SAASC,SAAT,QAA0B,aAA1B;AAEA,OAAO,MAAMC,YAAN,SACGL,UADH,CAGP;AACEM,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAAqC;AAC9C,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,SAAtB;AACD;;AAEDC,EAAAA,UAAU,CACRC,GADQ,EAERC,GAFQ,EAGRC,IAHQ,EAIRC,WAJQ,EAKRC,QALQ,EAMR;AACA,WAAO,IAAIZ,WAAJ,CACL,KAAKK,SADA,EAEL,KAAKC,GAAL,CAASC,UAAT,CACER,MAAM,CAACS,GAAD,CADR,EAEET,MAAM,CAACU,GAAD,CAFR,EAGEV,MAAM,CAACW,IAAD,CAHR,EAIEC,WAAW,GAAGV,WAAW,CAACY,SAAZ,CAAsBF,WAAtB,CAAH,GAAwCG,SAJrD,EAKEF,QAAQ,GAAGV,SAAS,CAACW,SAAV,CAAoB,KAAKR,SAAzB,EAAoCO,QAApC,CAAH,GAAmDE,SAL7D,CAFK,CAAP;AAUD;;AAEDC,EAAAA,SAAS,GAAG;AACV,WAAO,KAAKT,GAAL,CAASS,SAAT,EAAP;AACD;;AA1BH","sourcesContent":["// TODO: suggest to rename SkPicture to Picture for consistency\nimport type { CanvasKit, SkPicture as Picture } from \"canvaskit-wasm\";\n\nimport type {\n  FilterMode,\n  SkRect,\n  TileMode,\n  SkPicture,\n  SkMatrix,\n} from \"../types\";\n\nimport { HostObject, ckEnum } from \"./Host\";\nimport { JsiSkShader } from \"./JsiSkShader\";\nimport { JsiSkMatrix } from \"./JsiSkMatrix\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkPicture\n  extends HostObject<Picture, \"Picture\">\n  implements SkPicture\n{\n  constructor(CanvasKit: CanvasKit, ref: Picture) {\n    super(CanvasKit, ref, \"Picture\");\n  }\n\n  makeShader(\n    tmx: TileMode,\n    tmy: TileMode,\n    mode: FilterMode,\n    localMatrix?: SkMatrix,\n    tileRect?: SkRect\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.ref.makeShader(\n        ckEnum(tmx),\n        ckEnum(tmy),\n        ckEnum(mode),\n        localMatrix ? JsiSkMatrix.fromValue(localMatrix) : undefined,\n        tileRect ? JsiSkRect.fromValue(this.CanvasKit, tileRect) : undefined\n      )\n    );\n  }\n\n  serialize() {\n    return this.ref.serialize();\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkPictureRecorder.js

@@ -1,13 +1,14 @@
-import { HostObject, toValue } from "./Host";
+import { HostObject } from "./Host";
 import { JsiSkCanvas } from "./JsiSkCanvas";
 import { JsiSkPicture } from "./JsiSkPicture";
+import { JsiSkRect } from "./JsiSkRect";
 export class JsiSkPictureRecorder extends HostObject {
   constructor(CanvasKit, ref) {
     super(CanvasKit, ref, "PictureRecorder");
   }
 
   beginRecording(bounds) {
-    return new JsiSkCanvas(this.CanvasKit, this.ref.beginRecording(toValue(bounds)));
+    return new JsiSkCanvas(this.CanvasKit, this.ref.beginRecording(JsiSkRect.fromValue(this.CanvasKit, bounds)));
   }
 
   finishRecordingAsPicture() {

package/lib/module/skia/web/JsiSkPictureRecorder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkPictureRecorder.ts"],"names":["HostObject","toValue","JsiSkCanvas","JsiSkPicture","JsiSkPictureRecorder","constructor","CanvasKit","ref","beginRecording","bounds","finishRecordingAsPicture"],"mappings":"AAKA,SAASA,UAAT,EAAqBC,OAArB,QAAoC,QAApC;AACA,SAASC,WAAT,QAA4B,eAA5B;AACA,SAASC,YAAT,QAA6B,gBAA7B;AAEA,OAAO,MAAMC,oBAAN,SACGJ,UADH,CAGP;AACEK,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAA6C;AACtD,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,iBAAtB;AACD;;AAEDC,EAAAA,cAAc,CAACC,MAAD,EAAiB;AAC7B,WAAO,IAAIP,WAAJ,CACL,KAAKI,SADA,EAEL,KAAKC,GAAL,CAASC,cAAT,CAAwBP,OAAO,CAACQ,MAAD,CAA/B,CAFK,CAAP;AAID;;AAEDC,EAAAA,wBAAwB,GAAG;AACzB,WAAO,IAAIP,YAAJ,CACL,KAAKG,SADA,EAEL,KAAKC,GAAL,CAASG,wBAAT,EAFK,CAAP;AAID;;AAjBH","sourcesContent":["import type { CanvasKit, PictureRecorder } from \"canvaskit-wasm\";\n\nimport type { SkRect } from \"../types\";\nimport type { SkPictureRecorder } from \"../types/Picture/PictureRecorder\";\n\nimport { HostObject, toValue } from \"./Host\";\nimport { JsiSkCanvas } from \"./JsiSkCanvas\";\nimport { JsiSkPicture } from \"./JsiSkPicture\";\n\nexport class JsiSkPictureRecorder\n  extends HostObject<PictureRecorder, \"PictureRecorder\">\n  implements SkPictureRecorder\n{\n  constructor(CanvasKit: CanvasKit, ref: PictureRecorder) {\n    super(CanvasKit, ref, \"PictureRecorder\");\n  }\n\n  beginRecording(bounds: SkRect) {\n    return new JsiSkCanvas(\n      this.CanvasKit,\n      this.ref.beginRecording(toValue(bounds))\n    );\n  }\n\n  finishRecordingAsPicture() {\n    return new JsiSkPicture(\n      this.CanvasKit,\n      this.ref.finishRecordingAsPicture()\n    );\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkPictureRecorder.ts"],"names":["HostObject","JsiSkCanvas","JsiSkPicture","JsiSkRect","JsiSkPictureRecorder","constructor","CanvasKit","ref","beginRecording","bounds","fromValue","finishRecordingAsPicture"],"mappings":"AAKA,SAASA,UAAT,QAA2B,QAA3B;AACA,SAASC,WAAT,QAA4B,eAA5B;AACA,SAASC,YAAT,QAA6B,gBAA7B;AACA,SAASC,SAAT,QAA0B,aAA1B;AAEA,OAAO,MAAMC,oBAAN,SACGJ,UADH,CAGP;AACEK,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAA6C;AACtD,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,iBAAtB;AACD;;AAEDC,EAAAA,cAAc,CAACC,MAAD,EAAiB;AAC7B,WAAO,IAAIR,WAAJ,CACL,KAAKK,SADA,EAEL,KAAKC,GAAL,CAASC,cAAT,CAAwBL,SAAS,CAACO,SAAV,CAAoB,KAAKJ,SAAzB,EAAoCG,MAApC,CAAxB,CAFK,CAAP;AAID;;AAEDE,EAAAA,wBAAwB,GAAG;AACzB,WAAO,IAAIT,YAAJ,CACL,KAAKI,SADA,EAEL,KAAKC,GAAL,CAASI,wBAAT,EAFK,CAAP;AAID;;AAjBH","sourcesContent":["import type { CanvasKit, PictureRecorder } from \"canvaskit-wasm\";\n\nimport type { SkRect } from \"../types\";\nimport type { SkPictureRecorder } from \"../types/Picture/PictureRecorder\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkCanvas } from \"./JsiSkCanvas\";\nimport { JsiSkPicture } from \"./JsiSkPicture\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkPictureRecorder\n  extends HostObject<PictureRecorder, \"PictureRecorder\">\n  implements SkPictureRecorder\n{\n  constructor(CanvasKit: CanvasKit, ref: PictureRecorder) {\n    super(CanvasKit, ref, \"PictureRecorder\");\n  }\n\n  beginRecording(bounds: SkRect) {\n    return new JsiSkCanvas(\n      this.CanvasKit,\n      this.ref.beginRecording(JsiSkRect.fromValue(this.CanvasKit, bounds))\n    );\n  }\n\n  finishRecordingAsPicture() {\n    return new JsiSkPicture(\n      this.CanvasKit,\n      this.ref.finishRecordingAsPicture()\n    );\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkPoint.js

@@ -1,5 +1,13 @@
-import { HostObject } from "./Host";
-export class JsiSkPoint extends HostObject {
+import { BaseHostObject } from "./Host";
+export class JsiSkPoint extends BaseHostObject {
+  static fromValue(point) {
+    if (point instanceof JsiSkPoint) {
+      return point.ref;
+    }
+
+    return new Float32Array([point.x, point.y]);
+  }
+
   constructor(CanvasKit, ref) {
     super(CanvasKit, ref, "Point");
   }

package/lib/module/skia/web/JsiSkPoint.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkPoint.ts"],"names":["HostObject","JsiSkPoint","constructor","CanvasKit","ref","x","y"],"mappings":"AAIA,SAASA,UAAT,QAA2B,QAA3B;AAEA,OAAO,MAAMC,UAAN,SAAyBD,UAAzB,CAAuE;AAC5EE,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAAmC;AAC5C,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,OAAtB;AACD;;AAEI,MAADC,CAAC,GAAG;AACN,WAAO,KAAKD,GAAL,CAAS,CAAT,CAAP;AACD;;AAEI,MAADE,CAAC,GAAG;AACN,WAAO,KAAKF,GAAL,CAAS,CAAT,CAAP;AACD;;AAX2E","sourcesContent":["import type { CanvasKit, Point } from \"canvaskit-wasm\";\n\nimport type { SkPoint } from \"../types\";\n\nimport { HostObject } from \"./Host\";\n\nexport class JsiSkPoint extends HostObject<Point, \"Point\"> implements SkPoint {\n  constructor(CanvasKit: CanvasKit, ref: Point) {\n    super(CanvasKit, ref, \"Point\");\n  }\n\n  get x() {\n    return this.ref[0];\n  }\n\n  get y() {\n    return this.ref[1];\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkPoint.ts"],"names":["BaseHostObject","JsiSkPoint","fromValue","point","ref","Float32Array","x","y","constructor","CanvasKit"],"mappings":"AAIA,SAASA,cAAT,QAA+B,QAA/B;AAEA,OAAO,MAAMC,UAAN,SACGD,cADH,CAGP;AACkB,SAATE,SAAS,CAACC,KAAD,EAAiB;AAC/B,QAAIA,KAAK,YAAYF,UAArB,EAAiC;AAC/B,aAAOE,KAAK,CAACC,GAAb;AACD;;AACD,WAAO,IAAIC,YAAJ,CAAiB,CAACF,KAAK,CAACG,CAAP,EAAUH,KAAK,CAACI,CAAhB,CAAjB,CAAP;AACD;;AAEDC,EAAAA,WAAW,CAACC,SAAD,EAAuBL,GAAvB,EAAmC;AAC5C,UAAMK,SAAN,EAAiBL,GAAjB,EAAsB,OAAtB;AACD;;AAEI,MAADE,CAAC,GAAG;AACN,WAAO,KAAKF,GAAL,CAAS,CAAT,CAAP;AACD;;AAEI,MAADG,CAAC,GAAG;AACN,WAAO,KAAKH,GAAL,CAAS,CAAT,CAAP;AACD;;AAlBH","sourcesContent":["import type { CanvasKit, Point } from \"canvaskit-wasm\";\n\nimport type { SkPoint } from \"../types\";\n\nimport { BaseHostObject } from \"./Host\";\n\nexport class JsiSkPoint\n  extends BaseHostObject<Point, \"Point\">\n  implements SkPoint\n{\n  static fromValue(point: SkPoint) {\n    if (point instanceof JsiSkPoint) {\n      return point.ref;\n    }\n    return new Float32Array([point.x, point.y]);\n  }\n\n  constructor(CanvasKit: CanvasKit, ref: Point) {\n    super(CanvasKit, ref, \"Point\");\n  }\n\n  get x() {\n    return this.ref[0];\n  }\n\n  get y() {\n    return this.ref[1];\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkRRect.js

@@ -1,6 +1,6 @@
-import { HostObject } from "./Host";
+import { BaseHostObject } from "./Host";
 import { JsiSkRect } from "./JsiSkRect";
-export class JsiSkRRect extends HostObject {
+export class JsiSkRRect extends BaseHostObject {
   static fromValue(CanvasKit, rect) {
     if (rect instanceof JsiSkRect) {
       return rect.ref;

package/lib/module/skia/web/JsiSkRRect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkRRect.ts"],"names":["HostObject","JsiSkRect","JsiSkRRect","fromValue","CanvasKit","rect","ref","RRectXY","rx","ry","constructor","Float32Array","of"],"mappings":"AAIA,SAASA,UAAT,QAA2B,QAA3B;AACA,SAASC,SAAT,QAA0B,aAA1B;AAEA,OAAO,MAAMC,UAAN,SAAyBF,UAAzB,CAAuE;AAC5D,SAATG,SAAS,CAACC,SAAD,EAAuBC,IAAvB,EAAsC;AACpD,QAAIA,IAAI,YAAYJ,SAApB,EAA+B;AAC7B,aAAOI,IAAI,CAACC,GAAZ;AACD;;AACD,WAAOF,SAAS,CAACG,OAAV,CACLN,SAAS,CAACE,SAAV,CAAoBC,SAApB,EAA+BC,IAAI,CAACA,IAApC,CADK,EAELA,IAAI,CAACG,EAFA,EAGLH,IAAI,CAACI,EAHA,CAAP;AAKD;;AAEDC,EAAAA,WAAW,CAACN,SAAD,EAAuBE,GAAvB,EAAmC;AAC5C,UAAMF,SAAN,EAAiBE,GAAjB,EAAsB,OAAtB;AACD;;AAEK,MAAFE,EAAE,GAAG;AACP,WAAO,KAAKF,GAAL,CAAS,CAAT,CAAP;AACD;;AAEK,MAAFG,EAAE,GAAG;AACP,WAAO,KAAKH,GAAL,CAAS,CAAT,CAAP;AACD;;AAEO,MAAJD,IAAI,GAAG;AACT,WAAO,IAAIJ,SAAJ,CACL,KAAKG,SADA,EAELO,YAAY,CAACC,EAAb,CAAgB,KAAKN,GAAL,CAAS,CAAT,CAAhB,EAA6B,KAAKA,GAAL,CAAS,CAAT,CAA7B,EAA0C,KAAKA,GAAL,CAAS,CAAT,CAA1C,EAAuD,KAAKA,GAAL,CAAS,CAAT,CAAvD,CAFK,CAAP;AAID;;AA7B2E","sourcesContent":["import type { CanvasKit, RRect } from \"canvaskit-wasm\";\n\nimport type { SkRRect } from \"../types\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkRRect extends HostObject<RRect, \"RRect\"> implements SkRRect {\n  static fromValue(CanvasKit: CanvasKit, rect: SkRRect) {\n    if (rect instanceof JsiSkRect) {\n      return rect.ref;\n    }\n    return CanvasKit.RRectXY(\n      JsiSkRect.fromValue(CanvasKit, rect.rect),\n      rect.rx,\n      rect.ry\n    );\n  }\n\n  constructor(CanvasKit: CanvasKit, ref: RRect) {\n    super(CanvasKit, ref, \"RRect\");\n  }\n\n  get rx() {\n    return this.ref[4];\n  }\n\n  get ry() {\n    return this.ref[5];\n  }\n\n  get rect() {\n    return new JsiSkRect(\n      this.CanvasKit,\n      Float32Array.of(this.ref[0], this.ref[1], this.ref[2], this.ref[3])\n    );\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkRRect.ts"],"names":["BaseHostObject","JsiSkRect","JsiSkRRect","fromValue","CanvasKit","rect","ref","RRectXY","rx","ry","constructor","Float32Array","of"],"mappings":"AAIA,SAASA,cAAT,QAA+B,QAA/B;AACA,SAASC,SAAT,QAA0B,aAA1B;AAEA,OAAO,MAAMC,UAAN,SACGF,cADH,CAGP;AACkB,SAATG,SAAS,CAACC,SAAD,EAAuBC,IAAvB,EAAsC;AACpD,QAAIA,IAAI,YAAYJ,SAApB,EAA+B;AAC7B,aAAOI,IAAI,CAACC,GAAZ;AACD;;AACD,WAAOF,SAAS,CAACG,OAAV,CACLN,SAAS,CAACE,SAAV,CAAoBC,SAApB,EAA+BC,IAAI,CAACA,IAApC,CADK,EAELA,IAAI,CAACG,EAFA,EAGLH,IAAI,CAACI,EAHA,CAAP;AAKD;;AAEDC,EAAAA,WAAW,CAACN,SAAD,EAAuBE,GAAvB,EAAmC;AAC5C,UAAMF,SAAN,EAAiBE,GAAjB,EAAsB,OAAtB;AACD;;AAEK,MAAFE,EAAE,GAAG;AACP,WAAO,KAAKF,GAAL,CAAS,CAAT,CAAP;AACD;;AAEK,MAAFG,EAAE,GAAG;AACP,WAAO,KAAKH,GAAL,CAAS,CAAT,CAAP;AACD;;AAEO,MAAJD,IAAI,GAAG;AACT,WAAO,IAAIJ,SAAJ,CACL,KAAKG,SADA,EAELO,YAAY,CAACC,EAAb,CAAgB,KAAKN,GAAL,CAAS,CAAT,CAAhB,EAA6B,KAAKA,GAAL,CAAS,CAAT,CAA7B,EAA0C,KAAKA,GAAL,CAAS,CAAT,CAA1C,EAAuD,KAAKA,GAAL,CAAS,CAAT,CAAvD,CAFK,CAAP;AAID;;AA7BH","sourcesContent":["import type { CanvasKit, RRect } from \"canvaskit-wasm\";\n\nimport type { SkRRect } from \"../types\";\n\nimport { BaseHostObject } from \"./Host\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkRRect\n  extends BaseHostObject<RRect, \"RRect\">\n  implements SkRRect\n{\n  static fromValue(CanvasKit: CanvasKit, rect: SkRRect) {\n    if (rect instanceof JsiSkRect) {\n      return rect.ref;\n    }\n    return CanvasKit.RRectXY(\n      JsiSkRect.fromValue(CanvasKit, rect.rect),\n      rect.rx,\n      rect.ry\n    );\n  }\n\n  constructor(CanvasKit: CanvasKit, ref: RRect) {\n    super(CanvasKit, ref, \"RRect\");\n  }\n\n  get rx() {\n    return this.ref[4];\n  }\n\n  get ry() {\n    return this.ref[5];\n  }\n\n  get rect() {\n    return new JsiSkRect(\n      this.CanvasKit,\n      Float32Array.of(this.ref[0], this.ref[1], this.ref[2], this.ref[3])\n    );\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkRSXform.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkRSXform.ts"],"names":["HostObject","JsiSkRSXform","constructor","CanvasKit","ref"],"mappings":"AAIA,SAASA,UAAT,QAA2B,QAA3B;AAIA,OAAO,MAAMC,YAAN,SACGD,UADH,CAGP;AACEE,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAAqC;AAC9C,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,SAAtB;AACD;;AAHH","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkRSXform } from \"../types\";\n\nimport { HostObject } from \"./Host\";\n\ntype RSXform = Float32Array;\n\nexport class JsiSkRSXform\n  extends HostObject<RSXform, \"RSXform\">\n  implements SkRSXform\n{\n  constructor(CanvasKit: CanvasKit, ref: RSXform) {\n    super(CanvasKit, ref, \"RSXform\");\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkRSXform.ts"],"names":["HostObject","JsiSkRSXform","constructor","CanvasKit","ref"],"mappings":"AAIA,SAASA,UAAT,QAA2B,QAA3B;AAIA,OAAO,MAAMC,YAAN,SACGD,UADH,CAGP;AACEE,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAAqC;AAC9C,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,SAAtB;AACD;;AAHH","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkRSXform } from \"../types\";\n\nimport { HostObject } from \"./Host\";\n\nexport type RSXform = Float32Array;\n\nexport class JsiSkRSXform\n  extends HostObject<RSXform, \"RSXform\">\n  implements SkRSXform\n{\n  constructor(CanvasKit: CanvasKit, ref: RSXform) {\n    super(CanvasKit, ref, \"RSXform\");\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkRect.js

@@ -1,5 +1,5 @@
-import { HostObject } from "./Host";
-export class JsiSkRect extends HostObject {
+import { BaseHostObject } from "./Host";
+export class JsiSkRect extends BaseHostObject {
   static fromValue(CanvasKit, rect) {
     if (rect instanceof JsiSkRect) {
       return rect.ref;

package/lib/module/skia/web/JsiSkRect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkRect.ts"],"names":["HostObject","JsiSkRect","fromValue","CanvasKit","rect","ref","XYWHRect","x","y","width","height","constructor"],"mappings":"AAIA,SAASA,UAAT,QAA2B,QAA3B;AAEA,OAAO,MAAMC,SAAN,SAAwBD,UAAxB,CAAmE;AACxD,SAATE,SAAS,CAACC,SAAD,EAAuBC,IAAvB,EAAqC;AACnD,QAAIA,IAAI,YAAYH,SAApB,EAA+B;AAC7B,aAAOG,IAAI,CAACC,GAAZ;AACD;;AACD,WAAOF,SAAS,CAACG,QAAV,CAAmBF,IAAI,CAACG,CAAxB,EAA2BH,IAAI,CAACI,CAAhC,EAAmCJ,IAAI,CAACK,KAAxC,EAA+CL,IAAI,CAACM,MAApD,CAAP;AACD;;AAEDC,EAAAA,WAAW,CAACR,SAAD,EAAuBE,GAAvB,EAAkC;AAC3C,UAAMF,SAAN,EAAiBE,GAAjB,EAAsB,MAAtB;AACD;;AAEI,MAADE,CAAC,GAAG;AACN,WAAO,KAAKF,GAAL,CAAS,CAAT,CAAP;AACD;;AAEI,MAADG,CAAC,GAAG;AACN,WAAO,KAAKH,GAAL,CAAS,CAAT,CAAP;AACD;;AAEQ,MAALI,KAAK,GAAG;AACV,WAAO,KAAKJ,GAAL,CAAS,CAAT,IAAc,KAAKA,GAAL,CAAS,CAAT,CAArB;AACD;;AAES,MAANK,MAAM,GAAG;AACX,WAAO,KAAKL,GAAL,CAAS,CAAT,IAAc,KAAKA,GAAL,CAAS,CAAT,CAArB;AACD;;AA1BuE","sourcesContent":["import type { CanvasKit, Rect } from \"canvaskit-wasm\";\n\nimport type { SkRect } from \"../types\";\n\nimport { HostObject } from \"./Host\";\n\nexport class JsiSkRect extends HostObject<Rect, \"Rect\"> implements SkRect {\n  static fromValue(CanvasKit: CanvasKit, rect: SkRect) {\n    if (rect instanceof JsiSkRect) {\n      return rect.ref;\n    }\n    return CanvasKit.XYWHRect(rect.x, rect.y, rect.width, rect.height);\n  }\n\n  constructor(CanvasKit: CanvasKit, ref: Rect) {\n    super(CanvasKit, ref, \"Rect\");\n  }\n\n  get x() {\n    return this.ref[0];\n  }\n\n  get y() {\n    return this.ref[1];\n  }\n\n  get width() {\n    return this.ref[2] - this.ref[0];\n  }\n\n  get height() {\n    return this.ref[3] - this.ref[1];\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkRect.ts"],"names":["BaseHostObject","JsiSkRect","fromValue","CanvasKit","rect","ref","XYWHRect","x","y","width","height","constructor"],"mappings":"AAIA,SAASA,cAAT,QAA+B,QAA/B;AAEA,OAAO,MAAMC,SAAN,SAAwBD,cAAxB,CAAuE;AAC5D,SAATE,SAAS,CAACC,SAAD,EAAuBC,IAAvB,EAAqC;AACnD,QAAIA,IAAI,YAAYH,SAApB,EAA+B;AAC7B,aAAOG,IAAI,CAACC,GAAZ;AACD;;AACD,WAAOF,SAAS,CAACG,QAAV,CAAmBF,IAAI,CAACG,CAAxB,EAA2BH,IAAI,CAACI,CAAhC,EAAmCJ,IAAI,CAACK,KAAxC,EAA+CL,IAAI,CAACM,MAApD,CAAP;AACD;;AAEDC,EAAAA,WAAW,CAACR,SAAD,EAAuBE,GAAvB,EAAkC;AAC3C,UAAMF,SAAN,EAAiBE,GAAjB,EAAsB,MAAtB;AACD;;AAEI,MAADE,CAAC,GAAG;AACN,WAAO,KAAKF,GAAL,CAAS,CAAT,CAAP;AACD;;AAEI,MAADG,CAAC,GAAG;AACN,WAAO,KAAKH,GAAL,CAAS,CAAT,CAAP;AACD;;AAEQ,MAALI,KAAK,GAAG;AACV,WAAO,KAAKJ,GAAL,CAAS,CAAT,IAAc,KAAKA,GAAL,CAAS,CAAT,CAArB;AACD;;AAES,MAANK,MAAM,GAAG;AACX,WAAO,KAAKL,GAAL,CAAS,CAAT,IAAc,KAAKA,GAAL,CAAS,CAAT,CAArB;AACD;;AA1B2E","sourcesContent":["import type { CanvasKit, Rect } from \"canvaskit-wasm\";\n\nimport type { SkRect } from \"../types\";\n\nimport { BaseHostObject } from \"./Host\";\n\nexport class JsiSkRect extends BaseHostObject<Rect, \"Rect\"> implements SkRect {\n  static fromValue(CanvasKit: CanvasKit, rect: SkRect) {\n    if (rect instanceof JsiSkRect) {\n      return rect.ref;\n    }\n    return CanvasKit.XYWHRect(rect.x, rect.y, rect.width, rect.height);\n  }\n\n  constructor(CanvasKit: CanvasKit, ref: Rect) {\n    super(CanvasKit, ref, \"Rect\");\n  }\n\n  get x() {\n    return this.ref[0];\n  }\n\n  get y() {\n    return this.ref[1];\n  }\n\n  get width() {\n    return this.ref[2] - this.ref[0];\n  }\n\n  get height() {\n    return this.ref[3] - this.ref[1];\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkRuntimeEffect.js

@@ -1,4 +1,5 @@
-import { HostObject, toValue } from "./Host";
+import { HostObject } from "./Host";
+import { JsiSkMatrix } from "./JsiSkMatrix";
 import { JsiSkShader } from "./JsiSkShader";
 export class JsiSkRuntimeEffect extends HostObject {
   constructor(CanvasKit, ref) {
@@ -6,11 +7,11 @@ export class JsiSkRuntimeEffect extends HostObject {
   }
 
   makeShader(uniforms, localMatrix) {
-    return new JsiSkShader(this.CanvasKit, this.ref.makeShader(uniforms, localMatrix !== undefined ? toValue(localMatrix) : localMatrix));
+    return new JsiSkShader(this.CanvasKit, this.ref.makeShader(uniforms, localMatrix !== undefined ? JsiSkMatrix.fromValue(localMatrix) : localMatrix));
   }
 
   makeShaderWithChildren(uniforms, children, localMatrix) {
-    return new JsiSkShader(this.CanvasKit, this.ref.makeShaderWithChildren(uniforms, children === null || children === void 0 ? void 0 : children.map(child => toValue(child)), localMatrix !== undefined ? toValue(localMatrix) : localMatrix));
+    return new JsiSkShader(this.CanvasKit, this.ref.makeShaderWithChildren(uniforms, children === null || children === void 0 ? void 0 : children.map(child => JsiSkShader.fromValue(child)), localMatrix !== undefined ? JsiSkMatrix.fromValue(localMatrix) : localMatrix));
   }
 
   getUniform(index) {

package/lib/module/skia/web/JsiSkRuntimeEffect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkRuntimeEffect.ts"],"names":["HostObject","toValue","JsiSkShader","JsiSkRuntimeEffect","constructor","CanvasKit","ref","makeShader","uniforms","localMatrix","undefined","makeShaderWithChildren","children","map","child","getUniform","index","getUniformCount","getUniformFloatCount","getUniformName"],"mappings":"AAKA,SAASA,UAAT,EAAqBC,OAArB,QAAoC,QAApC;AACA,SAASC,WAAT,QAA4B,eAA5B;AAEA,OAAO,MAAMC,kBAAN,SACGH,UADH,CAGP;AACEI,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAA2C;AACpD,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,eAAtB;AACD;;AAEDC,EAAAA,UAAU,CAACC,QAAD,EAAqBC,WAArB,EAA6C;AACrD,WAAO,IAAIP,WAAJ,CACL,KAAKG,SADA,EAEL,KAAKC,GAAL,CAASC,UAAT,CACEC,QADF,EAEEC,WAAW,KAAKC,SAAhB,GAA4BT,OAAO,CAACQ,WAAD,CAAnC,GAAmDA,WAFrD,CAFK,CAAP;AAOD;;AAEDE,EAAAA,sBAAsB,CACpBH,QADoB,EAEpBI,QAFoB,EAGpBH,WAHoB,EAIpB;AACA,WAAO,IAAIP,WAAJ,CACL,KAAKG,SADA,EAEL,KAAKC,GAAL,CAASK,sBAAT,CACEH,QADF,EAEEI,QAFF,aAEEA,QAFF,uBAEEA,QAAQ,CAAEC,GAAV,CAAeC,KAAD,IAAWb,OAAO,CAACa,KAAD,CAAhC,CAFF,EAGEL,WAAW,KAAKC,SAAhB,GAA4BT,OAAO,CAACQ,WAAD,CAAnC,GAAmDA,WAHrD,CAFK,CAAP;AAQD;;AAEDM,EAAAA,UAAU,CAACC,KAAD,EAAgB;AACxB,WAAO,KAAKV,GAAL,CAASS,UAAT,CAAoBC,KAApB,CAAP;AACD;;AAEDC,EAAAA,eAAe,GAAG;AAChB,WAAO,KAAKX,GAAL,CAASW,eAAT,EAAP;AACD;;AAEDC,EAAAA,oBAAoB,GAAG;AACrB,WAAO,KAAKZ,GAAL,CAASY,oBAAT,EAAP;AACD;;AAEDC,EAAAA,cAAc,CAACH,KAAD,EAAgB;AAC5B,WAAO,KAAKV,GAAL,CAASa,cAAT,CAAwBH,KAAxB,CAAP;AACD;;AA5CH","sourcesContent":["import type { CanvasKit, RuntimeEffect } from \"canvaskit-wasm\";\n\nimport type { SkMatrix, SkShader } from \"../types\";\nimport type { SkRuntimeEffect } from \"../types/RuntimeEffect/RuntimeEffect\";\n\nimport { HostObject, toValue } from \"./Host\";\nimport { JsiSkShader } from \"./JsiSkShader\";\n\nexport class JsiSkRuntimeEffect\n  extends HostObject<RuntimeEffect, \"RuntimeEffect\">\n  implements SkRuntimeEffect\n{\n  constructor(CanvasKit: CanvasKit, ref: RuntimeEffect) {\n    super(CanvasKit, ref, \"RuntimeEffect\");\n  }\n\n  makeShader(uniforms: number[], localMatrix?: SkMatrix) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.ref.makeShader(\n        uniforms,\n        localMatrix !== undefined ? toValue(localMatrix) : localMatrix\n      )\n    );\n  }\n\n  makeShaderWithChildren(\n    uniforms: number[],\n    children?: SkShader[],\n    localMatrix?: SkMatrix\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.ref.makeShaderWithChildren(\n        uniforms,\n        children?.map((child) => toValue(child)),\n        localMatrix !== undefined ? toValue(localMatrix) : localMatrix\n      )\n    );\n  }\n\n  getUniform(index: number) {\n    return this.ref.getUniform(index);\n  }\n\n  getUniformCount() {\n    return this.ref.getUniformCount();\n  }\n\n  getUniformFloatCount() {\n    return this.ref.getUniformFloatCount();\n  }\n\n  getUniformName(index: number) {\n    return this.ref.getUniformName(index);\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkRuntimeEffect.ts"],"names":["HostObject","JsiSkMatrix","JsiSkShader","JsiSkRuntimeEffect","constructor","CanvasKit","ref","makeShader","uniforms","localMatrix","undefined","fromValue","makeShaderWithChildren","children","map","child","getUniform","index","getUniformCount","getUniformFloatCount","getUniformName"],"mappings":"AAKA,SAASA,UAAT,QAA2B,QAA3B;AACA,SAASC,WAAT,QAA4B,eAA5B;AACA,SAASC,WAAT,QAA4B,eAA5B;AAEA,OAAO,MAAMC,kBAAN,SACGH,UADH,CAGP;AACEI,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAA2C;AACpD,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,eAAtB;AACD;;AAEDC,EAAAA,UAAU,CAACC,QAAD,EAAqBC,WAArB,EAA6C;AACrD,WAAO,IAAIP,WAAJ,CACL,KAAKG,SADA,EAEL,KAAKC,GAAL,CAASC,UAAT,CACEC,QADF,EAEEC,WAAW,KAAKC,SAAhB,GACIT,WAAW,CAACU,SAAZ,CAAsBF,WAAtB,CADJ,GAEIA,WAJN,CAFK,CAAP;AASD;;AAEDG,EAAAA,sBAAsB,CACpBJ,QADoB,EAEpBK,QAFoB,EAGpBJ,WAHoB,EAIpB;AACA,WAAO,IAAIP,WAAJ,CACL,KAAKG,SADA,EAEL,KAAKC,GAAL,CAASM,sBAAT,CACEJ,QADF,EAEEK,QAFF,aAEEA,QAFF,uBAEEA,QAAQ,CAAEC,GAAV,CAAeC,KAAD,IAAWb,WAAW,CAACS,SAAZ,CAAsBI,KAAtB,CAAzB,CAFF,EAGEN,WAAW,KAAKC,SAAhB,GACIT,WAAW,CAACU,SAAZ,CAAsBF,WAAtB,CADJ,GAEIA,WALN,CAFK,CAAP;AAUD;;AAEDO,EAAAA,UAAU,CAACC,KAAD,EAAgB;AACxB,WAAO,KAAKX,GAAL,CAASU,UAAT,CAAoBC,KAApB,CAAP;AACD;;AAEDC,EAAAA,eAAe,GAAG;AAChB,WAAO,KAAKZ,GAAL,CAASY,eAAT,EAAP;AACD;;AAEDC,EAAAA,oBAAoB,GAAG;AACrB,WAAO,KAAKb,GAAL,CAASa,oBAAT,EAAP;AACD;;AAEDC,EAAAA,cAAc,CAACH,KAAD,EAAgB;AAC5B,WAAO,KAAKX,GAAL,CAASc,cAAT,CAAwBH,KAAxB,CAAP;AACD;;AAhDH","sourcesContent":["import type { CanvasKit, RuntimeEffect } from \"canvaskit-wasm\";\n\nimport type { SkMatrix, SkShader } from \"../types\";\nimport type { SkRuntimeEffect } from \"../types/RuntimeEffect/RuntimeEffect\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkMatrix } from \"./JsiSkMatrix\";\nimport { JsiSkShader } from \"./JsiSkShader\";\n\nexport class JsiSkRuntimeEffect\n  extends HostObject<RuntimeEffect, \"RuntimeEffect\">\n  implements SkRuntimeEffect\n{\n  constructor(CanvasKit: CanvasKit, ref: RuntimeEffect) {\n    super(CanvasKit, ref, \"RuntimeEffect\");\n  }\n\n  makeShader(uniforms: number[], localMatrix?: SkMatrix) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.ref.makeShader(\n        uniforms,\n        localMatrix !== undefined\n          ? JsiSkMatrix.fromValue(localMatrix)\n          : localMatrix\n      )\n    );\n  }\n\n  makeShaderWithChildren(\n    uniforms: number[],\n    children?: SkShader[],\n    localMatrix?: SkMatrix\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.ref.makeShaderWithChildren(\n        uniforms,\n        children?.map((child) => JsiSkShader.fromValue(child)),\n        localMatrix !== undefined\n          ? JsiSkMatrix.fromValue(localMatrix)\n          : localMatrix\n      )\n    );\n  }\n\n  getUniform(index: number) {\n    return this.ref.getUniform(index);\n  }\n\n  getUniformCount() {\n    return this.ref.getUniformCount();\n  }\n\n  getUniformFloatCount() {\n    return this.ref.getUniformFloatCount();\n  }\n\n  getUniformName(index: number) {\n    return this.ref.getUniformName(index);\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkShaderFactory.js

@@ -1,4 +1,6 @@
-import { Host, toValue, ckEnum } from "./Host";
+import { Host, ckEnum } from "./Host";
+import { JsiSkMatrix } from "./JsiSkMatrix";
+import { JsiSkPoint } from "./JsiSkPoint";
 import { JsiSkShader } from "./JsiSkShader";
 export class JsiSkShaderFactory extends Host {
   constructor(CanvasKit) {
@@ -6,19 +8,19 @@ export class JsiSkShaderFactory extends Host {
   }
 
   MakeLinearGradient(start, end, colors, pos, mode, localMatrix, flags) {
-    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeLinearGradient(toValue(start), toValue(end), colors, pos, ckEnum(mode), localMatrix === undefined ? undefined : toValue(localMatrix), flags));
+    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeLinearGradient(JsiSkPoint.fromValue(start), JsiSkPoint.fromValue(end), colors, pos, ckEnum(mode), localMatrix === undefined ? undefined : JsiSkMatrix.fromValue(localMatrix), flags));
   }
 
   MakeRadialGradient(center, radius, colors, pos, mode, localMatrix, flags) {
-    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeRadialGradient(toValue(center), radius, colors, pos, ckEnum(mode), localMatrix === undefined ? undefined : toValue(localMatrix), flags));
+    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeRadialGradient(JsiSkPoint.fromValue(center), radius, colors, pos, ckEnum(mode), localMatrix === undefined ? undefined : JsiSkMatrix.fromValue(localMatrix), flags));
   }
 
   MakeTwoPointConicalGradient(start, startRadius, end, endRadius, colors, pos, mode, localMatrix, flags) {
-    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeTwoPointConicalGradient(toValue(start), startRadius, toValue(end), endRadius, colors, pos, ckEnum(mode), localMatrix === undefined ? undefined : toValue(localMatrix), flags));
+    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeTwoPointConicalGradient(JsiSkPoint.fromValue(start), startRadius, JsiSkPoint.fromValue(end), endRadius, colors, pos, ckEnum(mode), localMatrix === undefined ? undefined : JsiSkMatrix.fromValue(localMatrix), flags));
   }
 
   MakeSweepGradient(cx, cy, colors, pos, mode, localMatrix, flags, startAngleInDegrees, endAngleInDegrees) {
-    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeSweepGradient(cx, cy, colors, pos, ckEnum(mode), localMatrix === undefined || localMatrix === null ? undefined : toValue(localMatrix), flags, startAngleInDegrees, endAngleInDegrees));
+    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeSweepGradient(cx, cy, colors, pos, ckEnum(mode), localMatrix === undefined || localMatrix === null ? undefined : JsiSkMatrix.fromValue(localMatrix), flags, startAngleInDegrees, endAngleInDegrees));
   }
 
   MakeTurbulence(baseFreqX, baseFreqY, octaves, seed, tileW, tileH) {
@@ -30,11 +32,11 @@ export class JsiSkShaderFactory extends Host {
   }
 
   MakeBlend(mode, one, two) {
-    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeBlend(ckEnum(mode), toValue(one), toValue(two)));
+    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeBlend(ckEnum(mode), JsiSkShader.fromValue(one), JsiSkShader.fromValue(two)));
   }
 
   MakeColor(color) {
-    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeColor(toValue(color), this.CanvasKit.ColorSpace.SRGB));
+    return new JsiSkShader(this.CanvasKit, this.CanvasKit.Shader.MakeColor(color, this.CanvasKit.ColorSpace.SRGB));
   }
 
 }

package/lib/module/skia/web/JsiSkShaderFactory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkShaderFactory.ts"],"names":["Host","toValue","ckEnum","JsiSkShader","JsiSkShaderFactory","constructor","CanvasKit","MakeLinearGradient","start","end","colors","pos","mode","localMatrix","flags","Shader","undefined","MakeRadialGradient","center","radius","MakeTwoPointConicalGradient","startRadius","endRadius","MakeSweepGradient","cx","cy","startAngleInDegrees","endAngleInDegrees","MakeTurbulence","baseFreqX","baseFreqY","octaves","seed","tileW","tileH","MakeFractalNoise","MakeBlend","one","two","MakeColor","color","ColorSpace","SRGB"],"mappings":"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","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type {\n  BlendMode,\n  SkColor,\n  SkMatrix,\n  SkPoint,\n  SkShader,\n  TileMode,\n} from \"../types\";\nimport type { ShaderFactory } from \"../types/Shader/ShaderFactory\";\n\nimport { Host, toValue, ckEnum } from \"./Host\";\nimport { JsiSkShader } from \"./JsiSkShader\";\n\nexport class JsiSkShaderFactory extends Host implements ShaderFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  MakeLinearGradient(\n    start: SkPoint,\n    end: SkPoint,\n    colors: SkColor[],\n    pos: number[] | null,\n    mode: TileMode,\n    localMatrix?: SkMatrix,\n    flags?: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeLinearGradient(\n        toValue(start),\n        toValue(end),\n        colors,\n        pos,\n        ckEnum(mode),\n        localMatrix === undefined ? undefined : toValue(localMatrix),\n        flags\n      )\n    );\n  }\n\n  MakeRadialGradient(\n    center: SkPoint,\n    radius: number,\n    colors: SkColor[],\n    pos: number[] | null,\n    mode: TileMode,\n    localMatrix?: SkMatrix,\n    flags?: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeRadialGradient(\n        toValue(center),\n        radius,\n        colors,\n        pos,\n        ckEnum(mode),\n        localMatrix === undefined ? undefined : toValue(localMatrix),\n        flags\n      )\n    );\n  }\n\n  MakeTwoPointConicalGradient(\n    start: SkPoint,\n    startRadius: number,\n    end: SkPoint,\n    endRadius: number,\n    colors: SkColor[],\n    pos: number[] | null,\n    mode: TileMode,\n    localMatrix?: SkMatrix,\n    flags?: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeTwoPointConicalGradient(\n        toValue(start),\n        startRadius,\n        toValue(end),\n        endRadius,\n        colors,\n        pos,\n        ckEnum(mode),\n        localMatrix === undefined ? undefined : toValue(localMatrix),\n        flags\n      )\n    );\n  }\n\n  MakeSweepGradient(\n    cx: number,\n    cy: number,\n    colors: SkColor[],\n    pos: number[] | null,\n    mode: TileMode,\n    localMatrix?: SkMatrix | null,\n    flags?: number,\n    startAngleInDegrees?: number,\n    endAngleInDegrees?: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeSweepGradient(\n        cx,\n        cy,\n        colors,\n        pos,\n        ckEnum(mode),\n        localMatrix === undefined || localMatrix === null\n          ? undefined\n          : toValue(localMatrix),\n        flags,\n        startAngleInDegrees,\n        endAngleInDegrees\n      )\n    );\n  }\n\n  MakeTurbulence(\n    baseFreqX: number,\n    baseFreqY: number,\n    octaves: number,\n    seed: number,\n    tileW: number,\n    tileH: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeTurbulence(\n        baseFreqX,\n        baseFreqY,\n        octaves,\n        seed,\n        tileW,\n        tileH\n      )\n    );\n  }\n\n  MakeFractalNoise(\n    baseFreqX: number,\n    baseFreqY: number,\n    octaves: number,\n    seed: number,\n    tileW: number,\n    tileH: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeFractalNoise(\n        baseFreqX,\n        baseFreqY,\n        octaves,\n        seed,\n        tileW,\n        tileH\n      )\n    );\n  }\n\n  MakeBlend(mode: BlendMode, one: SkShader, two: SkShader) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeBlend(ckEnum(mode), toValue(one), toValue(two))\n    );\n  }\n\n  MakeColor(color: SkColor) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeColor(\n        toValue(color),\n        this.CanvasKit.ColorSpace.SRGB\n      )\n    );\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkShaderFactory.ts"],"names":["Host","ckEnum","JsiSkMatrix","JsiSkPoint","JsiSkShader","JsiSkShaderFactory","constructor","CanvasKit","MakeLinearGradient","start","end","colors","pos","mode","localMatrix","flags","Shader","fromValue","undefined","MakeRadialGradient","center","radius","MakeTwoPointConicalGradient","startRadius","endRadius","MakeSweepGradient","cx","cy","startAngleInDegrees","endAngleInDegrees","MakeTurbulence","baseFreqX","baseFreqY","octaves","seed","tileW","tileH","MakeFractalNoise","MakeBlend","one","two","MakeColor","color","ColorSpace","SRGB"],"mappings":"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","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type {\n  BlendMode,\n  SkColor,\n  SkMatrix,\n  SkPoint,\n  SkShader,\n  TileMode,\n} from \"../types\";\nimport type { ShaderFactory } from \"../types/Shader/ShaderFactory\";\n\nimport { Host, ckEnum } from \"./Host\";\nimport { JsiSkMatrix } from \"./JsiSkMatrix\";\nimport { JsiSkPoint } from \"./JsiSkPoint\";\nimport { JsiSkShader } from \"./JsiSkShader\";\n\nexport class JsiSkShaderFactory extends Host implements ShaderFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  MakeLinearGradient(\n    start: SkPoint,\n    end: SkPoint,\n    colors: SkColor[],\n    pos: number[] | null,\n    mode: TileMode,\n    localMatrix?: SkMatrix,\n    flags?: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeLinearGradient(\n        JsiSkPoint.fromValue(start),\n        JsiSkPoint.fromValue(end),\n        colors,\n        pos,\n        ckEnum(mode),\n        localMatrix === undefined\n          ? undefined\n          : JsiSkMatrix.fromValue(localMatrix),\n        flags\n      )\n    );\n  }\n\n  MakeRadialGradient(\n    center: SkPoint,\n    radius: number,\n    colors: SkColor[],\n    pos: number[] | null,\n    mode: TileMode,\n    localMatrix?: SkMatrix,\n    flags?: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeRadialGradient(\n        JsiSkPoint.fromValue(center),\n        radius,\n        colors,\n        pos,\n        ckEnum(mode),\n        localMatrix === undefined\n          ? undefined\n          : JsiSkMatrix.fromValue(localMatrix),\n        flags\n      )\n    );\n  }\n\n  MakeTwoPointConicalGradient(\n    start: SkPoint,\n    startRadius: number,\n    end: SkPoint,\n    endRadius: number,\n    colors: SkColor[],\n    pos: number[] | null,\n    mode: TileMode,\n    localMatrix?: SkMatrix,\n    flags?: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeTwoPointConicalGradient(\n        JsiSkPoint.fromValue(start),\n        startRadius,\n        JsiSkPoint.fromValue(end),\n        endRadius,\n        colors,\n        pos,\n        ckEnum(mode),\n        localMatrix === undefined\n          ? undefined\n          : JsiSkMatrix.fromValue(localMatrix),\n        flags\n      )\n    );\n  }\n\n  MakeSweepGradient(\n    cx: number,\n    cy: number,\n    colors: SkColor[],\n    pos: number[] | null,\n    mode: TileMode,\n    localMatrix?: SkMatrix | null,\n    flags?: number,\n    startAngleInDegrees?: number,\n    endAngleInDegrees?: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeSweepGradient(\n        cx,\n        cy,\n        colors,\n        pos,\n        ckEnum(mode),\n        localMatrix === undefined || localMatrix === null\n          ? undefined\n          : JsiSkMatrix.fromValue(localMatrix),\n        flags,\n        startAngleInDegrees,\n        endAngleInDegrees\n      )\n    );\n  }\n\n  MakeTurbulence(\n    baseFreqX: number,\n    baseFreqY: number,\n    octaves: number,\n    seed: number,\n    tileW: number,\n    tileH: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeTurbulence(\n        baseFreqX,\n        baseFreqY,\n        octaves,\n        seed,\n        tileW,\n        tileH\n      )\n    );\n  }\n\n  MakeFractalNoise(\n    baseFreqX: number,\n    baseFreqY: number,\n    octaves: number,\n    seed: number,\n    tileW: number,\n    tileH: number\n  ) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeFractalNoise(\n        baseFreqX,\n        baseFreqY,\n        octaves,\n        seed,\n        tileW,\n        tileH\n      )\n    );\n  }\n\n  MakeBlend(mode: BlendMode, one: SkShader, two: SkShader) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeBlend(\n        ckEnum(mode),\n        JsiSkShader.fromValue(one),\n        JsiSkShader.fromValue(two)\n      )\n    );\n  }\n\n  MakeColor(color: SkColor) {\n    return new JsiSkShader(\n      this.CanvasKit,\n      this.CanvasKit.Shader.MakeColor(color, this.CanvasKit.ColorSpace.SRGB)\n    );\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkSurface.js

@@ -1,6 +1,7 @@
-import { HostObject, toUndefinedableValue } from "./Host";
+import { HostObject } from "./Host";
 import { JsiSkCanvas } from "./JsiSkCanvas";
 import { JsiSkImage } from "./JsiSkImage";
+import { JsiSkRect } from "./JsiSkRect";
 export class JsiSkSurface extends HostObject {
   constructor(CanvasKit, ref) {
     super(CanvasKit, ref, "Surface");
@@ -11,7 +12,7 @@ export class JsiSkSurface extends HostObject {
   }
 
   makeImageSnapshot(bounds) {
-    const image = this.ref.makeImageSnapshot(toUndefinedableValue(bounds));
+    const image = this.ref.makeImageSnapshot(bounds ? Array.from(JsiSkRect.fromValue(this.CanvasKit, bounds)) : undefined);
     return new JsiSkImage(this.CanvasKit, image);
   }
 

package/lib/module/skia/web/JsiSkSurface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkSurface.ts"],"names":["HostObject","toUndefinedableValue","JsiSkCanvas","JsiSkImage","JsiSkSurface","constructor","CanvasKit","ref","getCanvas","makeImageSnapshot","bounds","image"],"mappings":"AAIA,SAASA,UAAT,EAAqBC,oBAArB,QAAiD,QAAjD;AACA,SAASC,WAAT,QAA4B,eAA5B;AACA,SAASC,UAAT,QAA2B,cAA3B;AAEA,OAAO,MAAMC,YAAN,SACGJ,UADH,CAGP;AACEK,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAAqC;AAC9C,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,SAAtB;AACD;;AAEDC,EAAAA,SAAS,GAAa;AACpB,WAAO,IAAIN,WAAJ,CAAgB,KAAKI,SAArB,EAAgC,KAAKC,GAAL,CAASC,SAAT,EAAhC,CAAP;AACD;;AAEDC,EAAAA,iBAAiB,CAACC,MAAD,EAA2B;AAC1C,UAAMC,KAAK,GAAG,KAAKJ,GAAL,CAASE,iBAAT,CAA2BR,oBAAoB,CAACS,MAAD,CAA/C,CAAd;AACA,WAAO,IAAIP,UAAJ,CAAe,KAAKG,SAApB,EAA+BK,KAA/B,CAAP;AACD;;AAZH","sourcesContent":["import type { CanvasKit, Surface } from \"canvaskit-wasm\";\n\nimport type { SkCanvas, SkImage, SkRect, SkSurface } from \"../types\";\n\nimport { HostObject, toUndefinedableValue } from \"./Host\";\nimport { JsiSkCanvas } from \"./JsiSkCanvas\";\nimport { JsiSkImage } from \"./JsiSkImage\";\n\nexport class JsiSkSurface\n  extends HostObject<Surface, \"Surface\">\n  implements SkSurface\n{\n  constructor(CanvasKit: CanvasKit, ref: Surface) {\n    super(CanvasKit, ref, \"Surface\");\n  }\n\n  getCanvas(): SkCanvas {\n    return new JsiSkCanvas(this.CanvasKit, this.ref.getCanvas());\n  }\n\n  makeImageSnapshot(bounds?: SkRect): SkImage {\n    const image = this.ref.makeImageSnapshot(toUndefinedableValue(bounds));\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkSurface.ts"],"names":["HostObject","JsiSkCanvas","JsiSkImage","JsiSkRect","JsiSkSurface","constructor","CanvasKit","ref","getCanvas","makeImageSnapshot","bounds","image","Array","from","fromValue","undefined"],"mappings":"AAIA,SAASA,UAAT,QAA2B,QAA3B;AACA,SAASC,WAAT,QAA4B,eAA5B;AACA,SAASC,UAAT,QAA2B,cAA3B;AACA,SAASC,SAAT,QAA0B,aAA1B;AAEA,OAAO,MAAMC,YAAN,SACGJ,UADH,CAGP;AACEK,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAAqC;AAC9C,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,SAAtB;AACD;;AAEDC,EAAAA,SAAS,GAAa;AACpB,WAAO,IAAIP,WAAJ,CAAgB,KAAKK,SAArB,EAAgC,KAAKC,GAAL,CAASC,SAAT,EAAhC,CAAP;AACD;;AAEDC,EAAAA,iBAAiB,CAACC,MAAD,EAA2B;AAC1C,UAAMC,KAAK,GAAG,KAAKJ,GAAL,CAASE,iBAAT,CACZC,MAAM,GACFE,KAAK,CAACC,IAAN,CAAWV,SAAS,CAACW,SAAV,CAAoB,KAAKR,SAAzB,EAAoCI,MAApC,CAAX,CADE,GAEFK,SAHQ,CAAd;AAKA,WAAO,IAAIb,UAAJ,CAAe,KAAKI,SAApB,EAA+BK,KAA/B,CAAP;AACD;;AAhBH","sourcesContent":["import type { CanvasKit, Surface } from \"canvaskit-wasm\";\n\nimport type { SkCanvas, SkImage, SkRect, SkSurface } from \"../types\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkCanvas } from \"./JsiSkCanvas\";\nimport { JsiSkImage } from \"./JsiSkImage\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkSurface\n  extends HostObject<Surface, \"Surface\">\n  implements SkSurface\n{\n  constructor(CanvasKit: CanvasKit, ref: Surface) {\n    super(CanvasKit, ref, \"Surface\");\n  }\n\n  getCanvas(): SkCanvas {\n    return new JsiSkCanvas(this.CanvasKit, this.ref.getCanvas());\n  }\n\n  makeImageSnapshot(bounds?: SkRect): SkImage {\n    const image = this.ref.makeImageSnapshot(\n      bounds\n        ? Array.from(JsiSkRect.fromValue(this.CanvasKit, bounds))\n        : undefined\n    );\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkTextBlobFactory.js

@@ -1,24 +1,26 @@
-import { Host, toValue } from "./Host";
+import { Host } from "./Host";
+import { JsiSkFont } from "./JsiSkFont";
 import { JsiSkTextBlob } from "./JsiSkTextBlob";
+import { JsiSkRSXform } from "./JsiSkRSXform";
 export class JsiSkTextBlobFactory extends Host {
   constructor(CanvasKit) {
     super(CanvasKit);
   }
 
   MakeFromText(str, font) {
-    return new JsiSkTextBlob(this.CanvasKit, this.CanvasKit.TextBlob.MakeFromText(str, toValue(font)));
+    return new JsiSkTextBlob(this.CanvasKit, this.CanvasKit.TextBlob.MakeFromText(str, JsiSkFont.fromValue(font)));
   }
 
   MakeFromGlyphs(glyphs, font) {
-    return new JsiSkTextBlob(this.CanvasKit, this.CanvasKit.TextBlob.MakeFromGlyphs(glyphs, toValue(font)));
+    return new JsiSkTextBlob(this.CanvasKit, this.CanvasKit.TextBlob.MakeFromGlyphs(glyphs, JsiSkFont.fromValue(font)));
   }
 
   MakeFromRSXform(str, rsxforms, font) {
-    return new JsiSkTextBlob(this.CanvasKit, this.CanvasKit.TextBlob.MakeFromRSXform(str, rsxforms.map(f => Array.from(toValue(f))).flat(), toValue(font)));
+    return new JsiSkTextBlob(this.CanvasKit, this.CanvasKit.TextBlob.MakeFromRSXform(str, rsxforms.map(f => Array.from(JsiSkRSXform.fromValue(f))).flat(), JsiSkFont.fromValue(font)));
   }
 
   MakeFromRSXformGlyphs(glyphs, rsxforms, font) {
-    return new JsiSkTextBlob(this.CanvasKit, this.CanvasKit.TextBlob.MakeFromRSXformGlyphs(glyphs, rsxforms.map(f => toValue(f)), toValue(font)));
+    return new JsiSkTextBlob(this.CanvasKit, this.CanvasKit.TextBlob.MakeFromRSXformGlyphs(glyphs, rsxforms.map(f => JsiSkRSXform.fromValue(f)), JsiSkFont.fromValue(font)));
   }
 
 }

package/lib/module/skia/web/JsiSkTextBlobFactory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkTextBlobFactory.ts"],"names":["Host","toValue","JsiSkTextBlob","JsiSkTextBlobFactory","constructor","CanvasKit","MakeFromText","str","font","TextBlob","MakeFromGlyphs","glyphs","MakeFromRSXform","rsxforms","map","f","Array","from","flat","MakeFromRSXformGlyphs"],"mappings":"AAKA,SAASA,IAAT,EAAeC,OAAf,QAA8B,QAA9B;AACA,SAASC,aAAT,QAA8B,iBAA9B;AAEA,OAAO,MAAMC,oBAAN,SAAmCH,IAAnC,CAAmE;AACxEI,EAAAA,WAAW,CAACC,SAAD,EAAuB;AAChC,UAAMA,SAAN;AACD;;AAEDC,EAAAA,YAAY,CAACC,GAAD,EAAcC,IAAd,EAA4B;AACtC,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBH,YAAxB,CAAqCC,GAArC,EAA0CN,OAAO,CAACO,IAAD,CAAjD,CAFK,CAAP;AAID;;AAEDE,EAAAA,cAAc,CAACC,MAAD,EAAmBH,IAAnB,EAAiC;AAC7C,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBC,cAAxB,CAAuCC,MAAvC,EAA+CV,OAAO,CAACO,IAAD,CAAtD,CAFK,CAAP;AAID;;AAEDI,EAAAA,eAAe,CAACL,GAAD,EAAcM,QAAd,EAAqCL,IAArC,EAAmD;AAChE,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBG,eAAxB,CACEL,GADF,EAEEM,QAAQ,CAACC,GAAT,CAAcC,CAAD,IAAOC,KAAK,CAACC,IAAN,CAAWhB,OAAO,CAAec,CAAf,CAAlB,CAApB,EAA0DG,IAA1D,EAFF,EAGEjB,OAAO,CAACO,IAAD,CAHT,CAFK,CAAP;AAQD;;AAEDW,EAAAA,qBAAqB,CAACR,MAAD,EAAmBE,QAAnB,EAA0CL,IAA1C,EAAwD;AAC3E,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBU,qBAAxB,CACER,MADF,EAEEE,QAAQ,CAACC,GAAT,CAAcC,CAAD,IAAOd,OAAO,CAACc,CAAD,CAA3B,CAFF,EAGEd,OAAO,CAACO,IAAD,CAHT,CAFK,CAAP;AAQD;;AAvCuE","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkFont, SkRSXform } from \"../types\";\nimport type { TextBlobFactory } from \"../types/TextBlob\";\n\nimport { Host, toValue } from \"./Host\";\nimport { JsiSkTextBlob } from \"./JsiSkTextBlob\";\n\nexport class JsiSkTextBlobFactory extends Host implements TextBlobFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  MakeFromText(str: string, font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromText(str, toValue(font))\n    );\n  }\n\n  MakeFromGlyphs(glyphs: number[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromGlyphs(glyphs, toValue(font))\n    );\n  }\n\n  MakeFromRSXform(str: string, rsxforms: SkRSXform[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromRSXform(\n        str,\n        rsxforms.map((f) => Array.from(toValue<Float32Array>(f))).flat(),\n        toValue(font)\n      )\n    );\n  }\n\n  MakeFromRSXformGlyphs(glyphs: number[], rsxforms: SkRSXform[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromRSXformGlyphs(\n        glyphs,\n        rsxforms.map((f) => toValue(f)),\n        toValue(font)\n      )\n    );\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkTextBlobFactory.ts"],"names":["Host","JsiSkFont","JsiSkTextBlob","JsiSkRSXform","JsiSkTextBlobFactory","constructor","CanvasKit","MakeFromText","str","font","TextBlob","fromValue","MakeFromGlyphs","glyphs","MakeFromRSXform","rsxforms","map","f","Array","from","flat","MakeFromRSXformGlyphs"],"mappings":"AAMA,SAASA,IAAT,QAAqB,QAArB;AACA,SAASC,SAAT,QAA0B,aAA1B;AACA,SAASC,aAAT,QAA8B,iBAA9B;AAEA,SAASC,YAAT,QAA6B,gBAA7B;AAEA,OAAO,MAAMC,oBAAN,SAAmCJ,IAAnC,CAAmE;AACxEK,EAAAA,WAAW,CAACC,SAAD,EAAuB;AAChC,UAAMA,SAAN;AACD;;AAEDC,EAAAA,YAAY,CAACC,GAAD,EAAcC,IAAd,EAA4B;AACtC,WAAO,IAAIP,aAAJ,CACL,KAAKI,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBH,YAAxB,CAAqCC,GAArC,EAA0CP,SAAS,CAACU,SAAV,CAAoBF,IAApB,CAA1C,CAFK,CAAP;AAID;;AAEDG,EAAAA,cAAc,CAACC,MAAD,EAAmBJ,IAAnB,EAAiC;AAC7C,WAAO,IAAIP,aAAJ,CACL,KAAKI,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBE,cAAxB,CAAuCC,MAAvC,EAA+CZ,SAAS,CAACU,SAAV,CAAoBF,IAApB,CAA/C,CAFK,CAAP;AAID;;AAEDK,EAAAA,eAAe,CAACN,GAAD,EAAcO,QAAd,EAAqCN,IAArC,EAAmD;AAChE,WAAO,IAAIP,aAAJ,CACL,KAAKI,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBI,eAAxB,CACEN,GADF,EAEEO,QAAQ,CACLC,GADH,CACQC,CAAD,IAAOC,KAAK,CAACC,IAAN,CAAWhB,YAAY,CAACQ,SAAb,CAAgCM,CAAhC,CAAX,CADd,EAEGG,IAFH,EAFF,EAKEnB,SAAS,CAACU,SAAV,CAAoBF,IAApB,CALF,CAFK,CAAP;AAUD;;AAEDY,EAAAA,qBAAqB,CAACR,MAAD,EAAmBE,QAAnB,EAA0CN,IAA1C,EAAwD;AAC3E,WAAO,IAAIP,aAAJ,CACL,KAAKI,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBW,qBAAxB,CACER,MADF,EAEEE,QAAQ,CAACC,GAAT,CAAcC,CAAD,IAAOd,YAAY,CAACQ,SAAb,CAAuBM,CAAvB,CAApB,CAFF,EAGEhB,SAAS,CAACU,SAAV,CAAoBF,IAApB,CAHF,CAFK,CAAP;AAQD;;AAzCuE","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkFont } from \"../types\";\nimport type { TextBlobFactory } from \"../types/TextBlob\";\nimport type { SkRSXform } from \"../types/RSXform\";\n\nimport { Host } from \"./Host\";\nimport { JsiSkFont } from \"./JsiSkFont\";\nimport { JsiSkTextBlob } from \"./JsiSkTextBlob\";\nimport type { RSXform } from \"./JsiSkRSXform\";\nimport { JsiSkRSXform } from \"./JsiSkRSXform\";\n\nexport class JsiSkTextBlobFactory extends Host implements TextBlobFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  MakeFromText(str: string, font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromText(str, JsiSkFont.fromValue(font))\n    );\n  }\n\n  MakeFromGlyphs(glyphs: number[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromGlyphs(glyphs, JsiSkFont.fromValue(font))\n    );\n  }\n\n  MakeFromRSXform(str: string, rsxforms: SkRSXform[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromRSXform(\n        str,\n        rsxforms\n          .map((f) => Array.from(JsiSkRSXform.fromValue<RSXform>(f)))\n          .flat(),\n        JsiSkFont.fromValue(font)\n      )\n    );\n  }\n\n  MakeFromRSXformGlyphs(glyphs: number[], rsxforms: SkRSXform[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromRSXformGlyphs(\n        glyphs,\n        rsxforms.map((f) => JsiSkRSXform.fromValue(f)),\n        JsiSkFont.fromValue(font)\n      )\n    );\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkTypefaceFactory.js

@@ -1,4 +1,4 @@
-import { Host, toValue } from "./Host";
+import { Host } from "./Host";
 import { JsiSkTypeface } from "./JsiSkTypeface";
 export class JsiSkTypefaceFactory extends Host {
   constructor(CanvasKit) {
@@ -6,7 +6,7 @@ export class JsiSkTypefaceFactory extends Host {
   }
 
   MakeFreeTypeFaceFromData(data) {
-    const tf = this.CanvasKit.Typeface.MakeFreeTypeFaceFromData(toValue(data));
+    const tf = this.CanvasKit.Typeface.MakeFreeTypeFaceFromData(JsiSkTypeface.fromValue(data));
 
     if (tf === null) {
       return null;

package/lib/module/skia/web/JsiSkTypefaceFactory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkTypefaceFactory.tsx"],"names":["Host","toValue","JsiSkTypeface","JsiSkTypefaceFactory","constructor","CanvasKit","MakeFreeTypeFaceFromData","data","tf","Typeface"],"mappings":"AAIA,SAASA,IAAT,EAAeC,OAAf,QAA8B,QAA9B;AACA,SAASC,aAAT,QAA8B,iBAA9B;AAEA,OAAO,MAAMC,oBAAN,SAAmCH,IAAnC,CAAmE;AACxEI,EAAAA,WAAW,CAACC,SAAD,EAAuB;AAChC,UAAMA,SAAN;AACD;;AAEDC,EAAAA,wBAAwB,CAACC,IAAD,EAAe;AACrC,UAAMC,EAAE,GAAG,KAAKH,SAAL,CAAeI,QAAf,CAAwBH,wBAAxB,CAAiDL,OAAO,CAACM,IAAD,CAAxD,CAAX;;AACA,QAAIC,EAAE,KAAK,IAAX,EAAiB;AACf,aAAO,IAAP;AACD;;AACD,WAAO,IAAIN,aAAJ,CAAkB,KAAKG,SAAvB,EAAkCG,EAAlC,CAAP;AACD;;AAXuE","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkData, TypefaceFactory } from \"../types\";\n\nimport { Host, toValue } from \"./Host\";\nimport { JsiSkTypeface } from \"./JsiSkTypeface\";\n\nexport class JsiSkTypefaceFactory extends Host implements TypefaceFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  MakeFreeTypeFaceFromData(data: SkData) {\n    const tf = this.CanvasKit.Typeface.MakeFreeTypeFaceFromData(toValue(data));\n    if (tf === null) {\n      return null;\n    }\n    return new JsiSkTypeface(this.CanvasKit, tf);\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkTypefaceFactory.tsx"],"names":["Host","JsiSkTypeface","JsiSkTypefaceFactory","constructor","CanvasKit","MakeFreeTypeFaceFromData","data","tf","Typeface","fromValue"],"mappings":"AAIA,SAASA,IAAT,QAAqB,QAArB;AACA,SAASC,aAAT,QAA8B,iBAA9B;AAEA,OAAO,MAAMC,oBAAN,SAAmCF,IAAnC,CAAmE;AACxEG,EAAAA,WAAW,CAACC,SAAD,EAAuB;AAChC,UAAMA,SAAN;AACD;;AAEDC,EAAAA,wBAAwB,CAACC,IAAD,EAAe;AACrC,UAAMC,EAAE,GAAG,KAAKH,SAAL,CAAeI,QAAf,CAAwBH,wBAAxB,CACTJ,aAAa,CAACQ,SAAd,CAAwBH,IAAxB,CADS,CAAX;;AAGA,QAAIC,EAAE,KAAK,IAAX,EAAiB;AACf,aAAO,IAAP;AACD;;AACD,WAAO,IAAIN,aAAJ,CAAkB,KAAKG,SAAvB,EAAkCG,EAAlC,CAAP;AACD;;AAbuE","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkData, TypefaceFactory } from \"../types\";\n\nimport { Host } from \"./Host\";\nimport { JsiSkTypeface } from \"./JsiSkTypeface\";\n\nexport class JsiSkTypefaceFactory extends Host implements TypefaceFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  MakeFreeTypeFaceFromData(data: SkData) {\n    const tf = this.CanvasKit.Typeface.MakeFreeTypeFaceFromData(\n      JsiSkTypeface.fromValue(data)\n    );\n    if (tf === null) {\n      return null;\n    }\n    return new JsiSkTypeface(this.CanvasKit, tf);\n  }\n}\n"]}

package/lib/module/skia/web/JsiSkia.js

@@ -5,7 +5,6 @@ import { Color } from "./JsiSkColor";
 import { JsiSkSurfaceFactory } from "./JsiSkSurfaceFactory";
 import { JsiSkRRect } from "./JsiSkRRect";
 import { JsiSkRSXform } from "./JsiSkRSXform";
-import { toValue } from "./Host";
 import { JsiSkContourMeasureIter } from "./JsiSkContourMeasureIter";
 import { JsiSkPictureRecorder } from "./JsiSkPictureRecorder";
 import { JsiSkPictureFactory } from "./JsiSkPictureFactory";
@@ -24,22 +23,28 @@ import { JsiSkSVGFactory } from "./JsiSkSVGFactory";
 import { JsiSkTextBlobFactory } from "./JsiSkTextBlobFactory";
 import { JsiSkFont } from "./JsiSkFont";
 import { MakeVertices } from "./JsiSkVerticesFactory";
+import { JsiSkPath } from "./JsiSkPath";
+import { JsiSkTypeface } from "./JsiSkTypeface";
 export const JsiSkApi = CanvasKit => ({
   Point: (x, y) => new JsiSkPoint(CanvasKit, Float32Array.of(x, y)),
   RuntimeShaderBuilder: _ => {
     throw new Error("Not implemented on React Native Web");
   },
-  RRectXY: (rect, rx, ry) => new JsiSkRRect(CanvasKit, CanvasKit.RRectXY(toValue(rect), rx, ry)),
+  RRectXY: (rect, rx, ry) => new JsiSkRRect(CanvasKit, CanvasKit.RRectXY(JsiSkRect.fromValue(CanvasKit, rect), rx, ry)),
   RSXform: (scos, ssin, tx, ty) => new JsiSkRSXform(CanvasKit, Float32Array.of(scos, ssin, tx, ty)),
   Color,
-  ContourMeasureIter: (path, forceClosed, resScale) => new JsiSkContourMeasureIter(CanvasKit, new CanvasKit.ContourMeasureIter(toValue(path), forceClosed, resScale)),
-  Paint: () => new JsiSkPaint(CanvasKit, new CanvasKit.Paint()),
+  ContourMeasureIter: (path, forceClosed, resScale) => new JsiSkContourMeasureIter(CanvasKit, new CanvasKit.ContourMeasureIter(JsiSkPath.fromValue(path), forceClosed, resScale)),
+  Paint: () => {
+    const paint = new JsiSkPaint(CanvasKit, new CanvasKit.Paint());
+    paint.setAntiAlias(true);
+    return paint;
+  },
   PictureRecorder: () => new JsiSkPictureRecorder(CanvasKit, new CanvasKit.PictureRecorder()),
   Picture: new JsiSkPictureFactory(CanvasKit),
   Path: new JsiSkPathFactory(CanvasKit),
   Matrix: matrix => new JsiSkMatrix(CanvasKit, matrix ? Float32Array.of(...matrix) : Float32Array.of(...CanvasKit.Matrix.identity())),
   ColorFilter: new JsiSkColorFilterFactory(CanvasKit),
-  Font: (typeface, size) => new JsiSkFont(CanvasKit, new CanvasKit.Font(typeface === undefined ? null : toValue(typeface), size)),
+  Font: (typeface, size) => new JsiSkFont(CanvasKit, new CanvasKit.Font(typeface === undefined ? null : JsiSkTypeface.fromValue(typeface), size)),
   Typeface: new JsiSkTypefaceFactory(CanvasKit),
   MaskFilter: new JsiSkMaskFilterFactory(CanvasKit),
   RuntimeEffect: new JsiSkRuntimeEffectFactory(CanvasKit),

package/lib/module/skia/web/JsiSkia.js.map

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkia.ts"],"names":["JsiSkPoint","JsiSkPaint","JsiSkRect","Color","JsiSkSurfaceFactory","JsiSkRRect","JsiSkRSXform","toValue","JsiSkContourMeasureIter","JsiSkPictureRecorder","JsiSkPictureFactory","JsiSkPathFactory","JsiSkMatrix","JsiSkColorFilterFactory","JsiSkTypefaceFactory","JsiSkMaskFilterFactory","JsiSkRuntimeEffectFactory","JsiSkImageFilterFactory","JsiSkShaderFactory","JsiSkPathEffectFactory","JsiSkDataFactory","JsiSkImageFactory","JsiSkSVGFactory","JsiSkTextBlobFactory","JsiSkFont","MakeVertices","JsiSkApi","CanvasKit","Point","x","y","Float32Array","of","RuntimeShaderBuilder","_","Error","RRectXY","rect","rx","ry","RSXform","scos","ssin","tx","ty","ContourMeasureIter","path","forceClosed","resScale","Paint","PictureRecorder","Picture","Path","Matrix","matrix","identity","ColorFilter","Font","typeface","size","undefined","Typeface","MaskFilter","RuntimeEffect","ImageFilter","Shader","PathEffect","bind","Data","Image","SVG","TextBlob","XYWHRect","width","height","Surface"],"mappings":"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","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type {\n  SkContourMeasureIter,\n  Skia,\n  SkPath,\n  SkRect,\n  SkRuntimeEffect,\n  SkRuntimeShaderBuilder,\n  SkTypeface,\n} from \"../types\";\n\nimport { JsiSkPoint } from \"./JsiSkPoint\";\nimport { JsiSkPaint } from \"./JsiSkPaint\";\nimport { JsiSkRect } from \"./JsiSkRect\";\nimport { Color } from \"./JsiSkColor\";\nimport { JsiSkSurfaceFactory } from \"./JsiSkSurfaceFactory\";\nimport { JsiSkRRect } from \"./JsiSkRRect\";\nimport { JsiSkRSXform } from \"./JsiSkRSXform\";\nimport { toValue } from \"./Host\";\nimport { JsiSkContourMeasureIter } from \"./JsiSkContourMeasureIter\";\nimport { JsiSkPictureRecorder } from \"./JsiSkPictureRecorder\";\nimport { JsiSkPictureFactory } from \"./JsiSkPictureFactory\";\nimport { JsiSkPathFactory } from \"./JsiSkPathFactory\";\nimport { JsiSkMatrix } from \"./JsiSkMatrix\";\nimport { JsiSkColorFilterFactory } from \"./JsiSkColorFilterFactory\";\nimport { JsiSkTypefaceFactory } from \"./JsiSkTypefaceFactory\";\nimport { JsiSkMaskFilterFactory } from \"./JsiSkMaskFilterFactory\";\nimport { JsiSkRuntimeEffectFactory } from \"./JsiSkRuntimeEffectFactory\";\nimport { JsiSkImageFilterFactory } from \"./JsiSkImageFilterFactory\";\nimport { JsiSkShaderFactory } from \"./JsiSkShaderFactory\";\nimport { JsiSkPathEffectFactory } from \"./JsiSkPathEffectFactory\";\nimport { JsiSkDataFactory } from \"./JsiSkDataFactory\";\nimport { JsiSkImageFactory } from \"./JsiSkImageFactory\";\nimport { JsiSkSVGFactory } from \"./JsiSkSVGFactory\";\nimport { JsiSkTextBlobFactory } from \"./JsiSkTextBlobFactory\";\nimport { JsiSkFont } from \"./JsiSkFont\";\nimport { MakeVertices } from \"./JsiSkVerticesFactory\";\n\nexport const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({\n  Point: (x: number, y: number) =>\n    new JsiSkPoint(CanvasKit, Float32Array.of(x, y)),\n  RuntimeShaderBuilder: (_: SkRuntimeEffect): SkRuntimeShaderBuilder => {\n    throw new Error(\"Not implemented on React Native Web\");\n  },\n  RRectXY: (rect: SkRect, rx: number, ry: number) =>\n    new JsiSkRRect(CanvasKit, CanvasKit.RRectXY(toValue(rect), rx, ry)),\n  RSXform: (scos: number, ssin: number, tx: number, ty: number) =>\n    new JsiSkRSXform(CanvasKit, Float32Array.of(scos, ssin, tx, ty)),\n  Color,\n  ContourMeasureIter: (\n    path: SkPath,\n    forceClosed: boolean,\n    resScale: number\n  ): SkContourMeasureIter =>\n    new JsiSkContourMeasureIter(\n      CanvasKit,\n      new CanvasKit.ContourMeasureIter(toValue(path), forceClosed, resScale)\n    ),\n  Paint: () => new JsiSkPaint(CanvasKit, new CanvasKit.Paint()),\n  PictureRecorder: () =>\n    new JsiSkPictureRecorder(CanvasKit, new CanvasKit.PictureRecorder()),\n  Picture: new JsiSkPictureFactory(CanvasKit),\n  Path: new JsiSkPathFactory(CanvasKit),\n  Matrix: (matrix?: readonly number[]) =>\n    new JsiSkMatrix(\n      CanvasKit,\n      matrix\n        ? Float32Array.of(...matrix)\n        : Float32Array.of(...CanvasKit.Matrix.identity())\n    ),\n  ColorFilter: new JsiSkColorFilterFactory(CanvasKit),\n  Font: (typeface?: SkTypeface, size?: number) =>\n    new JsiSkFont(\n      CanvasKit,\n      new CanvasKit.Font(\n        typeface === undefined ? null : toValue(typeface),\n        size\n      )\n    ),\n  Typeface: new JsiSkTypefaceFactory(CanvasKit),\n  MaskFilter: new JsiSkMaskFilterFactory(CanvasKit),\n  RuntimeEffect: new JsiSkRuntimeEffectFactory(CanvasKit),\n  ImageFilter: new JsiSkImageFilterFactory(CanvasKit),\n  Shader: new JsiSkShaderFactory(CanvasKit),\n  PathEffect: new JsiSkPathEffectFactory(CanvasKit),\n  MakeVertices: MakeVertices.bind(null, CanvasKit),\n  Data: new JsiSkDataFactory(CanvasKit),\n  Image: new JsiSkImageFactory(CanvasKit),\n  SVG: new JsiSkSVGFactory(CanvasKit),\n  TextBlob: new JsiSkTextBlobFactory(CanvasKit),\n  XYWHRect: (x: number, y: number, width: number, height: number) => {\n    return new JsiSkRect(CanvasKit, CanvasKit.XYWHRect(x, y, width, height));\n  },\n  Surface: new JsiSkSurfaceFactory(CanvasKit),\n});\n"]}
+{"version":3,"sources":["JsiSkia.ts"],"names":["JsiSkPoint","JsiSkPaint","JsiSkRect","Color","JsiSkSurfaceFactory","JsiSkRRect","JsiSkRSXform","JsiSkContourMeasureIter","JsiSkPictureRecorder","JsiSkPictureFactory","JsiSkPathFactory","JsiSkMatrix","JsiSkColorFilterFactory","JsiSkTypefaceFactory","JsiSkMaskFilterFactory","JsiSkRuntimeEffectFactory","JsiSkImageFilterFactory","JsiSkShaderFactory","JsiSkPathEffectFactory","JsiSkDataFactory","JsiSkImageFactory","JsiSkSVGFactory","JsiSkTextBlobFactory","JsiSkFont","MakeVertices","JsiSkPath","JsiSkTypeface","JsiSkApi","CanvasKit","Point","x","y","Float32Array","of","RuntimeShaderBuilder","_","Error","RRectXY","rect","rx","ry","fromValue","RSXform","scos","ssin","tx","ty","ContourMeasureIter","path","forceClosed","resScale","Paint","paint","setAntiAlias","PictureRecorder","Picture","Path","Matrix","matrix","identity","ColorFilter","Font","typeface","size","undefined","Typeface","MaskFilter","RuntimeEffect","ImageFilter","Shader","PathEffect","bind","Data","Image","SVG","TextBlob","XYWHRect","width","height","Surface"],"mappings":"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","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type {\n  SkContourMeasureIter,\n  Skia,\n  SkPath,\n  SkRect,\n  SkRuntimeEffect,\n  SkRuntimeShaderBuilder,\n  SkTypeface,\n} from \"../types\";\n\nimport { JsiSkPoint } from \"./JsiSkPoint\";\nimport { JsiSkPaint } from \"./JsiSkPaint\";\nimport { JsiSkRect } from \"./JsiSkRect\";\nimport { Color } from \"./JsiSkColor\";\nimport { JsiSkSurfaceFactory } from \"./JsiSkSurfaceFactory\";\nimport { JsiSkRRect } from \"./JsiSkRRect\";\nimport { JsiSkRSXform } from \"./JsiSkRSXform\";\nimport { JsiSkContourMeasureIter } from \"./JsiSkContourMeasureIter\";\nimport { JsiSkPictureRecorder } from \"./JsiSkPictureRecorder\";\nimport { JsiSkPictureFactory } from \"./JsiSkPictureFactory\";\nimport { JsiSkPathFactory } from \"./JsiSkPathFactory\";\nimport { JsiSkMatrix } from \"./JsiSkMatrix\";\nimport { JsiSkColorFilterFactory } from \"./JsiSkColorFilterFactory\";\nimport { JsiSkTypefaceFactory } from \"./JsiSkTypefaceFactory\";\nimport { JsiSkMaskFilterFactory } from \"./JsiSkMaskFilterFactory\";\nimport { JsiSkRuntimeEffectFactory } from \"./JsiSkRuntimeEffectFactory\";\nimport { JsiSkImageFilterFactory } from \"./JsiSkImageFilterFactory\";\nimport { JsiSkShaderFactory } from \"./JsiSkShaderFactory\";\nimport { JsiSkPathEffectFactory } from \"./JsiSkPathEffectFactory\";\nimport { JsiSkDataFactory } from \"./JsiSkDataFactory\";\nimport { JsiSkImageFactory } from \"./JsiSkImageFactory\";\nimport { JsiSkSVGFactory } from \"./JsiSkSVGFactory\";\nimport { JsiSkTextBlobFactory } from \"./JsiSkTextBlobFactory\";\nimport { JsiSkFont } from \"./JsiSkFont\";\nimport { MakeVertices } from \"./JsiSkVerticesFactory\";\nimport { JsiSkPath } from \"./JsiSkPath\";\nimport { JsiSkTypeface } from \"./JsiSkTypeface\";\n\nexport const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({\n  Point: (x: number, y: number) =>\n    new JsiSkPoint(CanvasKit, Float32Array.of(x, y)),\n  RuntimeShaderBuilder: (_: SkRuntimeEffect): SkRuntimeShaderBuilder => {\n    throw new Error(\"Not implemented on React Native Web\");\n  },\n  RRectXY: (rect: SkRect, rx: number, ry: number) =>\n    new JsiSkRRect(\n      CanvasKit,\n      CanvasKit.RRectXY(JsiSkRect.fromValue(CanvasKit, rect), rx, ry)\n    ),\n  RSXform: (scos: number, ssin: number, tx: number, ty: number) =>\n    new JsiSkRSXform(CanvasKit, Float32Array.of(scos, ssin, tx, ty)),\n  Color,\n  ContourMeasureIter: (\n    path: SkPath,\n    forceClosed: boolean,\n    resScale: number\n  ): SkContourMeasureIter =>\n    new JsiSkContourMeasureIter(\n      CanvasKit,\n      new CanvasKit.ContourMeasureIter(\n        JsiSkPath.fromValue(path),\n        forceClosed,\n        resScale\n      )\n    ),\n  Paint: () => {\n    const paint = new JsiSkPaint(CanvasKit, new CanvasKit.Paint());\n    paint.setAntiAlias(true);\n    return paint;\n  },\n  PictureRecorder: () =>\n    new JsiSkPictureRecorder(CanvasKit, new CanvasKit.PictureRecorder()),\n  Picture: new JsiSkPictureFactory(CanvasKit),\n  Path: new JsiSkPathFactory(CanvasKit),\n  Matrix: (matrix?: readonly number[]) =>\n    new JsiSkMatrix(\n      CanvasKit,\n      matrix\n        ? Float32Array.of(...matrix)\n        : Float32Array.of(...CanvasKit.Matrix.identity())\n    ),\n  ColorFilter: new JsiSkColorFilterFactory(CanvasKit),\n  Font: (typeface?: SkTypeface, size?: number) =>\n    new JsiSkFont(\n      CanvasKit,\n      new CanvasKit.Font(\n        typeface === undefined ? null : JsiSkTypeface.fromValue(typeface),\n        size\n      )\n    ),\n  Typeface: new JsiSkTypefaceFactory(CanvasKit),\n  MaskFilter: new JsiSkMaskFilterFactory(CanvasKit),\n  RuntimeEffect: new JsiSkRuntimeEffectFactory(CanvasKit),\n  ImageFilter: new JsiSkImageFilterFactory(CanvasKit),\n  Shader: new JsiSkShaderFactory(CanvasKit),\n  PathEffect: new JsiSkPathEffectFactory(CanvasKit),\n  MakeVertices: MakeVertices.bind(null, CanvasKit),\n  Data: new JsiSkDataFactory(CanvasKit),\n  Image: new JsiSkImageFactory(CanvasKit),\n  SVG: new JsiSkSVGFactory(CanvasKit),\n  TextBlob: new JsiSkTextBlobFactory(CanvasKit),\n  XYWHRect: (x: number, y: number, width: number, height: number) => {\n    return new JsiSkRect(CanvasKit, CanvasKit.XYWHRect(x, y, width, height));\n  },\n  Surface: new JsiSkSurfaceFactory(CanvasKit),\n});\n"]}

package/lib/typescript/src/skia/types/Picture/Picture.d.ts

@@ -3,7 +3,8 @@ import type { TileMode } from "../ImageFilter";
 import type { SkRect } from "../Rect";
 import type { SkShader } from "../Shader";
 import type { SkMatrix } from "../Matrix";
-export interface SkPicture {
+import type { SkJSIInstance } from "../JsiInstance";
+export interface SkPicture extends SkJSIInstance<"Picture"> {
     /**
      *  Returns a new shader that will draw with this picture.
      *

package/lib/typescript/src/skia/web/Host.d.ts

@@ -1,21 +1,19 @@
 import type { CanvasKit, EmbindEnumEntity } from "canvaskit-wasm";
 import type { SkJSIInstance } from "../types";
 export declare class NotImplementedOnRNWeb extends Error {
-    constructor();
+    constructor(msg?: string);
 }
 export declare abstract class Host {
     readonly CanvasKit: CanvasKit;
     constructor(CanvasKit: CanvasKit);
 }
-export declare abstract class HostObject<T, N extends string> extends Host implements SkJSIInstance<N> {
+export declare abstract class BaseHostObject<T, N extends string> extends Host implements SkJSIInstance<N> {
     readonly __typename__: N;
     readonly ref: T;
     constructor(CanvasKit: CanvasKit, ref: T, typename: N);
 }
-export declare type NonNullish = {};
-export declare const toOptionalValue: <T>(value: NonNullish | undefined | null) => T | null | undefined;
-export declare const toUndefinedableValue: <T>(value: NonNullish | undefined) => T | undefined;
-export declare const toNullableValue: <T>(value: NonNullish | null) => T | null;
-export declare const toValue: <T>(value: NonNullish) => T;
+export declare abstract class HostObject<T, N extends string> extends BaseHostObject<T, N> {
+    static fromValue<T>(value: SkJSIInstance<string>): T;
+}
 export declare const ckEnum: (value: number) => EmbindEnumEntity;
 export declare const optEnum: (value: number | undefined) => EmbindEnumEntity | undefined;

package/lib/typescript/src/skia/web/JsiSkImageFilterFactory.d.ts

@@ -4,16 +4,16 @@ import { Host } from "./Host";
 import { JsiSkImageFilter } from "./JsiSkImageFilter";
 export declare class JsiSkImageFilterFactory extends Host implements ImageFilterFactory {
     constructor(CanvasKit: CanvasKit);
-    MakeOffset(_dx: number, _dy: number, _input: SkImageFilter | null): SkImageFilter;
-    MakeDisplacementMap(_channelX: ColorChannel, _channelY: ColorChannel, _scale: number, _in1: SkImageFilter, _input: SkImageFilter | null): SkImageFilter;
-    MakeShader(_shader: SkShader, _input: SkImageFilter | null): SkImageFilter;
+    MakeOffset(dx: number, dy: number, input: SkImageFilter | null): JsiSkImageFilter;
+    MakeDisplacementMap(channelX: ColorChannel, channelY: ColorChannel, scale: number, in1: SkImageFilter, input: SkImageFilter | null): SkImageFilter;
+    MakeShader(shader: SkShader, _input: SkImageFilter | null): SkImageFilter;
     MakeBlur(sigmaX: number, sigmaY: number, mode: TileMode, input: SkImageFilter | null): JsiSkImageFilter;
     MakeColorFilter(cf: SkColorFilter, input: SkImageFilter | null): JsiSkImageFilter;
     MakeCompose(outer: SkImageFilter | null, inner: SkImageFilter | null): JsiSkImageFilter;
-    MakeDropShadow(_dx: number, _dy: number, _sigmaX: number, _sigmaY: number, _color: SkColor, _input: SkImageFilter | null, _cropRect?: SkRect): SkImageFilter;
-    MakeDropShadowOnly(_dx: number, _dy: number, _sigmaX: number, _sigmaY: number, _color: SkColor, _input: SkImageFilter | null, _cropRect?: SkRect): SkImageFilter;
-    MakeErode(_rx: number, _ry: number, _input: SkImageFilter | null, _cropRect?: SkRect): SkImageFilter;
-    MakeDilate(_rx: number, _ry: number, _input: SkImageFilter | null, _cropRect?: SkRect): SkImageFilter;
-    MakeBlend(_mode: BlendMode, _background: SkImageFilter, _foreground: SkImageFilter | null, _cropRect?: SkRect): SkImageFilter;
+    MakeDropShadow(dx: number, dy: number, sigmaX: number, sigmaY: number, color: SkColor, input: SkImageFilter | null, cropRect?: SkRect): SkImageFilter;
+    MakeDropShadowOnly(dx: number, dy: number, sigmaX: number, sigmaY: number, color: SkColor, input: SkImageFilter | null, cropRect?: SkRect): SkImageFilter;
+    MakeErode(rx: number, ry: number, input: SkImageFilter | null, cropRect?: SkRect): SkImageFilter;
+    MakeDilate(rx: number, ry: number, input: SkImageFilter | null, cropRect?: SkRect): SkImageFilter;
+    MakeBlend(mode: BlendMode, background: SkImageFilter, foreground: SkImageFilter | null, cropRect?: SkRect): SkImageFilter;
     MakeRuntimeShader(_builder: SkRuntimeShaderBuilder, _childShaderName: string | null, _input: SkImageFilter | null): SkImageFilter;
 }

package/lib/typescript/src/skia/web/JsiSkPoint.d.ts

@@ -1,7 +1,8 @@
 import type { CanvasKit, Point } from "canvaskit-wasm";
 import type { SkPoint } from "../types";
-import { HostObject } from "./Host";
-export declare class JsiSkPoint extends HostObject<Point, "Point"> implements SkPoint {
+import { BaseHostObject } from "./Host";
+export declare class JsiSkPoint extends BaseHostObject<Point, "Point"> implements SkPoint {
+    static fromValue(point: SkPoint): Float32Array;
     constructor(CanvasKit: CanvasKit, ref: Point);
     get x(): number;
     get y(): number;