@nativescript/canvas 1.1.0 → 2.0.0-alpha.1

package/Canvas2D/Path2D/Path2D.android.d.ts

@@ -2,6 +2,8 @@ import { Path2DBase } from './common';
 import { DOMMatrix } from '../DOMMatrix';
 export declare class Path2D extends Path2DBase {
     constructor(instance?: any);
+    _methodCache: Map<any, any>;
+    _getMethod(name: string): any;
     addPath(path: Path2D, transform?: DOMMatrix): void;
     arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
@@ -12,6 +14,5 @@ export declare class Path2D extends Path2DBase {
     moveTo(x: number, y: number): void;
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
     rect(x: number, y: number, width: number, height: number): void;
-    roundRect(x: number, y: number, width: number, height: number, radii: number): void;
-    roundRect(x: number, y: number, width: number, height: number, radii: number[]): void;
+    __toSVG(): any;
 }

package/Canvas2D/Path2D/Path2D.android.js

@@ -1,63 +1,83 @@
 import { Path2DBase } from './common';
+import { Helpers } from '../../helpers';
+let ctor;
 export class Path2D extends Path2DBase {
     constructor(instance) {
+        super(null);
+        this._methodCache = new Map();
         let nativeInstance;
         if (typeof instance === 'string') {
-            nativeInstance = new org.nativescript.canvas.TNSPath2D(instance);
+            nativeInstance = ctor(instance);
         }
         else if (instance instanceof Path2D) {
-            nativeInstance = new org.nativescript.canvas.TNSPath2D(instance.native);
-        }
-        else if (instance instanceof org.nativescript.canvas.TNSPath2D) {
-            nativeInstance = new org.nativescript.canvas.TNSPath2D(instance);
+            nativeInstance = ctor(instance.native);
         }
         else {
-            nativeInstance = new org.nativescript.canvas.TNSPath2D();
+            nativeInstance = ctor();
+        }
+        this.nativeInstance = nativeInstance;
+    }
+    _getMethod(name) {
+        const cached = this._methodCache.get(name);
+        if (cached === undefined) {
+            const ret = this.nativeInstance[name];
+            this._methodCache.set(name, ret);
+            return ret;
         }
-        super(nativeInstance);
+        return cached;
     }
     addPath(path, transform) {
+        const addPath = this._getMethod('addPath');
         if (transform) {
-            this.nativeInstance.addPath(path.nativeInstance, transform.native);
+            addPath(path.nativeInstance, transform.native);
         }
         else {
-            this.nativeInstance.addPath(path.nativeInstance, null);
+            addPath(path.nativeInstance, null);
         }
     }
     arc(x, y, radius, startAngle, endAngle, anticlockwise = false) {
-        this.nativeInstance.arc(x, y, radius, startAngle, endAngle, anticlockwise);
+        const arc = this._getMethod('arc');
+        arc(x, y, radius, startAngle, endAngle, anticlockwise);
     }
     arcTo(x1, y1, x2, y2, radius) {
-        this.nativeInstance.arcTo(x1, y1, x2, y2, radius);
+        const arcTo = this._getMethod('arcTo');
+        arcTo(x1, y1, x2, y2, radius);
     }
     bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) {
-        this.nativeInstance.bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y);
+        const bezierCurveTo = this._getMethod('bezierCurveTo');
+        bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y);
     }
     closePath() {
-        this.nativeInstance.closePath();
+        const closePath = this._getMethod('closePath');
+        closePath();
     }
     ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise = false) {
-        this.nativeInstance.ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
+        const ellipse = this._getMethod('ellipse');
+        ellipse(x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise);
     }
     lineTo(x, y) {
-        this.nativeInstance.lineTo(x, y);
+        const lineTo = this._getMethod('lineTo');
+        lineTo(x, y);
     }
     moveTo(x, y) {
-        this.nativeInstance.moveTo(x, y);
+        const moveTo = this._getMethod('moveTo');
+        moveTo(x, y);
     }
     quadraticCurveTo(cpx, cpy, x, y) {
-        this.nativeInstance.quadraticCurveTo(cpx, cpy, x, y);
+        const quadraticCurveTo = this._getMethod('quadraticCurveTo');
+        quadraticCurveTo(cpx, cpy, x, y);
     }
     rect(x, y, width, height) {
-        this.nativeInstance.rect(x, y, width, height);
+        const rect = this._getMethod('rect');
+        rect(x, y, width, height);
     }
-    roundRect(x, y, width, height, radii) {
-        if (Array.isArray(radii)) {
-            this.nativeInstance.roundRect(x, y, width, height, radii);
-        }
-        else if (typeof radii === 'number') {
-            this.nativeInstance.roundRect(x, y, width, height, radii);
-        }
+    __toSVG() {
+        const __toSVG = this._getMethod('__toSVG');
+        return __toSVG();
     }
 }
+(() => {
+    Helpers.initialize();
+    ctor = global.CanvasJSIModule.Path2D;
+})();
 //# sourceMappingURL=Path2D.android.js.map

package/Canvas2D/Path2D/Path2D.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"Path2D.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/Path2D/Path2D.android.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Path2D.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/Path2D/Path2D.android.ts"],"names":[],"mappings":"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"}

package/Canvas2D/Path2D/Path2D.d.ts

@@ -23,8 +23,4 @@ export declare class Path2D extends Path2DBase {
 	quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
 
 	rect(x: number, y: number, width: number, height: number): void;
-
-	roundRect(x: number, y: number, width: number, height: number, radii: number): void;
-
-	roundRect(x: number, y: number, width: number, height: number, radii: number[]): void;
 }

package/Canvas2D/Path2D/Path2D.ios.d.ts

@@ -12,6 +12,4 @@ export declare class Path2D extends Path2DBase {
     moveTo(x: number, y: number): void;
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
     rect(x: number, y: number, width: number, height: number): void;
-    roundRect(x: number, y: number, width: number, height: number, radii: number): void;
-    roundRect(x: number, y: number, width: number, height: number, radii: number[]): void;
 }

package/Canvas2D/Path2D/Path2D.ios.js

@@ -31,7 +31,7 @@ export class Path2D extends Path2DBase {
         this.nativeInstance.arcTo(x1, y1, x2, y2, radius);
     }
     bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) {
-        this.nativeInstance.bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y);
+        this.nativeInstance.arcTo(cp1x, cp1y, cp2x, cp2y, x, y);
     }
     closePath() {
         this.nativeInstance.closePath();
@@ -51,13 +51,5 @@ export class Path2D extends Path2DBase {
     rect(x, y, width, height) {
         this.nativeInstance.rect(x, y, width, height);
     }
-    roundRect(x, y, width, height, radii) {
-        if (Array.isArray(radii)) {
-            this.nativeInstance.roundRectWithXYWidthHeightRadii(x, y, width, height, radii);
-        }
-        else if (typeof radii === 'number') {
-            this.nativeInstance.roundRectWithRadii(x, y, width, height, radii);
-        }
-    }
 }
 //# sourceMappingURL=Path2D.ios.js.map

package/Canvas2D/Path2D/Path2D.ios.js.map

@@ -1 +1 @@
-{"version":3,"file":"Path2D.ios.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/Path2D/Path2D.ios.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Path2D.ios.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/Path2D/Path2D.ios.ts"],"names":[],"mappings":"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"}

package/Canvas2D/Path2D/common.d.ts

@@ -3,8 +3,6 @@ export declare abstract class Path2DBase {
     protected nativeInstance: any;
     protected constructor(instance: any);
     get native(): any;
-    static [Symbol.hasInstance](obj: any): boolean;
-    get [Symbol.toStringTag](): string;
     abstract addPath(path: Path2DBase, transform?: DOMMatrixBase): void;
     abstract closePath(): void;
     abstract moveTo(x: number, y: number): void;
@@ -15,6 +13,5 @@ export declare abstract class Path2DBase {
     abstract arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
     abstract ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise: boolean): void;
     abstract rect(x: number, y: number, width: number, height: number): void;
-    abstract roundRect(x: number, y: number, width: number, height: number, radii: number): void;
-    abstract roundRect(x: number, y: number, width: number, height: number, radii: number[]): void;
+    __toSVG(): string;
 }

package/Canvas2D/Path2D/common.js

@@ -5,12 +5,8 @@ export class Path2DBase {
     get native() {
         return this.nativeInstance;
     }
-    static [Symbol.hasInstance](obj) {
-        if (obj?.native && obj.constructor.name === 'Path2D')
-            return true;
-    }
-    get [Symbol.toStringTag]() {
-        return 'Path2D';
+    __toSVG() {
+        return '';
     }
 }
 //# sourceMappingURL=common.js.map

package/Canvas2D/Path2D/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/Path2D/common.ts"],"names":[],"mappings":"AAEA,MAAM,OAAgB,UAAU;IAG/B,YAAsB,QAAa;QAClC,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;IAChC,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG;QAC9B,IAAI,GAAG,EAAE,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;IACnE,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QACvB,OAAO,QAAQ,CAAC;IACjB,CAAC;CAyBD"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/Path2D/common.ts"],"names":[],"mappings":"AAEA,MAAM,OAAgB,UAAU;IAG/B,YAAsB,QAAa;QAClC,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;IAChC,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAsBD,OAAO;QACN,OAAO,EAAE,CAAC;IACX,CAAC;CACD"}

package/Canvas2D/TextMetrics/TextMetrics.android.js

@@ -4,40 +4,40 @@ export class TextMetrics extends TextMetricsBase {
         super(nativeInstance);
     }
     get width() {
-        return this.nativeInstance.getWidth();
+        return this.nativeInstance.width;
     }
     get actualBoundingBoxLeft() {
-        return this.nativeInstance.getActualBoundingBoxLeft();
+        return this.nativeInstance.actualBoundingBoxLeft;
     }
     get actualBoundingBoxRight() {
-        return this.nativeInstance.getActualBoundingBoxRight();
+        return this.nativeInstance.actualBoundingBoxRight;
     }
     get actualBoundingBoxAscent() {
-        return this.nativeInstance.getActualBoundingBoxAscent();
+        return this.nativeInstance.actualBoundingBoxAscent;
     }
     get actualBoundingBoxDescent() {
-        return this.nativeInstance.getActualBoundingBoxDescent();
+        return this.nativeInstance.actualBoundingBoxDescent;
     }
     get fontBoundingBoxAscent() {
-        return this.nativeInstance.getFontBoundingBoxAscent();
+        return this.nativeInstance.fontBoundingBoxAscent;
     }
     get fontBoundingBoxDescent() {
-        return this.nativeInstance.getFontBoundingBoxDescent();
+        return this.nativeInstance.fontBoundingBoxDescent;
     }
     get emHeightAscent() {
-        return this.nativeInstance.getEmHeightAscent();
+        return this.nativeInstance.emHeightAscent;
     }
     get emHeightDescent() {
-        return this.nativeInstance.getEmHeightDescent();
+        return this.nativeInstance.emHeightDescent;
     }
     get hangingBaseline() {
-        return this.nativeInstance.getHangingBaseline();
+        return this.nativeInstance.hangingBaseline;
     }
     get alphabeticBaseline() {
-        return this.nativeInstance.getAlphabeticBaseline();
+        return this.nativeInstance.alphabeticBaseline;
     }
     get ideographicBaseline() {
-        return this.nativeInstance.getIdeographicBaseline();
+        return this.nativeInstance.ideographicBaseline;
     }
 }
 //# sourceMappingURL=TextMetrics.android.js.map

package/Canvas2D/TextMetrics/TextMetrics.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"TextMetrics.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/TextMetrics/TextMetrics.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,OAAO,WAAY,SAAQ,eAAe;IAC/C,YAAY,cAAmB;QAC9B,KAAK,CAAC,cAAc,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,qBAAqB;QACxB,OAAO,IAAI,CAAC,cAAc,CAAC,wBAAwB,EAAE,CAAC;IACvD,CAAC;IAED,IAAI,sBAAsB;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,yBAAyB,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,uBAAuB;QAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,0BAA0B,EAAE,CAAC;IACzD,CAAC;IAED,IAAI,wBAAwB;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,2BAA2B,EAAE,CAAC;IAC1D,CAAC;IAED,IAAI,qBAAqB;QACxB,OAAO,IAAI,CAAC,cAAc,CAAC,wBAAwB,EAAE,CAAC;IACvD,CAAC;IAED,IAAI,sBAAsB;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,yBAAyB,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,cAAc;QACjB,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC;IAChD,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC;IACjD,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC;IACjD,CAAC;IAED,IAAI,kBAAkB;QACrB,OAAO,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE,CAAC;IACpD,CAAC;IAED,IAAI,mBAAmB;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC,sBAAsB,EAAE,CAAC;IACrD,CAAC;CACD"}
+{"version":3,"file":"TextMetrics.android.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/TextMetrics/TextMetrics.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,MAAM,OAAO,WAAY,SAAQ,eAAe;IAC/C,YAAY,cAAmB;QAC9B,KAAK,CAAC,cAAc,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;IAClC,CAAC;IAED,IAAI,qBAAqB;QACxB,OAAO,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC;IAClD,CAAC;IAED,IAAI,sBAAsB;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC;IACnD,CAAC;IAED,IAAI,uBAAuB;QAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC;IACpD,CAAC;IAED,IAAI,wBAAwB;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC;IACrD,CAAC;IAED,IAAI,qBAAqB;QACxB,OAAO,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC;IAClD,CAAC;IAED,IAAI,sBAAsB;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC;IACnD,CAAC;IAED,IAAI,cAAc;QACjB,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;IAC3C,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;IAC5C,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;IAC5C,CAAC;IAED,IAAI,kBAAkB;QACrB,OAAO,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;IAC/C,CAAC;IAED,IAAI,mBAAmB;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC;IAChD,CAAC;CACD"}

package/Canvas2D/TextMetrics/common.d.ts

@@ -3,7 +3,6 @@ export declare abstract class TextMetricsBase {
     constructor(nativeInstance: any);
     get native(): any;
     static [Symbol.hasInstance](obj: any): boolean;
-    get [Symbol.toStringTag](): string;
     abstract readonly width: number;
     abstract readonly actualBoundingBoxLeft: number;
     abstract readonly actualBoundingBoxRight: number;

package/Canvas2D/TextMetrics/common.js

@@ -6,11 +6,8 @@ export class TextMetricsBase {
         return this.nativeInstance;
     }
     static [Symbol.hasInstance](obj) {
-        if (obj?.native && obj.constructor.name === 'TextMetrics')
+        if ((obj === null || obj === void 0 ? void 0 : obj.native) && obj.constructor.name === 'TextMetrics')
             return true;
     }
-    get [Symbol.toStringTag]() {
-        return 'TextMetrics';
-    }
 }
 //# sourceMappingURL=common.js.map

package/Canvas2D/TextMetrics/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/TextMetrics/common.ts"],"names":[],"mappings":"AAAA,MAAM,OAAgB,eAAe;IAGpC,YAAY,cAAmB;QAC9B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACtC,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG;QAC9B,IAAI,GAAG,EAAE,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,aAAa;YAAE,OAAO,IAAI,CAAC;IACxE,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QACvB,OAAO,aAAa,CAAC;IACtB,CAAC;CAiBD"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/TextMetrics/common.ts"],"names":[],"mappings":"AAAA,MAAM,OAAgB,eAAe;IAGpC,YAAY,cAAmB;QAC9B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACtC,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG;QAC9B,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,KAAI,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,aAAa;YAAE,OAAO,IAAI,CAAC;IACxE,CAAC;CAiBD"}

package/ImageAsset/ImageAsset.android.d.ts

@@ -1,21 +1,20 @@
 import { ImageAssetBase, ImageAssetSaveFormat } from './common';
 export declare class ImageAsset extends ImageAssetBase {
-    constructor(native?: org.nativescript.canvas.TNSImageAsset);
+    constructor(native: any);
     get width(): any;
     get height(): any;
     get error(): string;
-    static toPrimitive(value: any): any;
-    loadFromUrl(url: string): boolean;
-    loadFromUrlAsync(path: string): Promise<unknown>;
-    loadFile(path: string): boolean;
-    loadFileAsync(path: string): Promise<unknown>;
-    loadFromNative(image: any): boolean;
-    loadFromNativeAsync(image: any): Promise<unknown>;
-    loadFromBytes(bytes: Uint8Array | Uint8ClampedArray): any;
-    loadFromBytesAsync(bytes: Uint8Array | Uint8ClampedArray): Promise<unknown>;
+    _methodCache: Map<any, any>;
+    _getMethod(name: string): any;
+    fromUrlSync(url: string): boolean;
+    fromUrl(url: string): Promise<unknown>;
+    fromFileSync(path: string): boolean;
+    fromFile(path: string): Promise<unknown>;
+    loadFromBytesSync(bytes: Uint8Array | Uint8ClampedArray): any;
+    loadFromBytes(bytes: Uint8Array | Uint8ClampedArray): Promise<unknown>;
     scale(x: number, y: number): void;
-    save(path: string, format: ImageAssetSaveFormat): boolean;
-    saveAsync(path: string, format: ImageAssetSaveFormat): Promise<boolean>;
+    saveSync(path: string, format: ImageAssetSaveFormat): boolean;
+    save(path: string, format: ImageAssetSaveFormat): Promise<boolean>;
     flipX(): void;
     flipY(): void;
 }

package/ImageAsset/ImageAsset.android.js

@@ -1,184 +1,149 @@
-import { ImageAssetBase, ImageAssetSaveFormat } from './common';
+import { ImageAssetBase } from './common';
 import { knownFolders, path as filePath } from '@nativescript/core';
+import { Helpers } from '../helpers';
+let ctor;
 export class ImageAsset extends ImageAssetBase {
     constructor(native) {
-        super(native || new org.nativescript.canvas.TNSImageAsset());
+        super(native || ctor());
+        this._methodCache = new Map();
     }
     get width() {
-        return this.native.getWidth();
+        return this.native.width;
     }
     get height() {
-        return this.native.getHeight();
+        return this.native.height;
     }
     get error() {
-        return this.native.getError();
-    }
-    static toPrimitive(value) {
-        if (value instanceof java.lang.Integer) {
-            return value.intValue();
-        }
-        else if (value instanceof java.lang.Long) {
-            return value.longValue();
-        }
-        else if (value instanceof java.lang.Short) {
-            return value.shortValue();
-        }
-        else if (value instanceof java.lang.Byte) {
-            return value.byteValue();
-        }
-        else if (value instanceof java.lang.Boolean) {
-            return value.booleanValue();
-        }
-        else if (value instanceof java.lang.String) {
-            return value.toString();
-        }
-        else if (value instanceof java.lang.Float) {
-            return value.floatValue();
+        return this.native.error;
+    }
+    _getMethod(name) {
+        const cached = this._methodCache.get(name);
+        if (cached === undefined) {
+            const ret = this.native[name];
+            this._methodCache.set(name, ret);
+            return ret;
         }
-        else if (value instanceof java.lang.Double) {
-            return value.doubleValue();
-        }
-        return value;
+        return cached;
     }
-    loadFromUrl(url) {
-        return this.native.loadImageFromUrl(url);
+    fromUrlSync(url) {
+        const fromUrlSync = this._getMethod('fromUrlSync');
+        return fromUrlSync(url);
     }
-    loadFromUrlAsync(path) {
+    fromUrl(url) {
+        const fromUrlCb = this._getMethod('fromUrlCb');
         return new Promise((resolve, reject) => {
-            this.native.loadImageFromUrlAsync(path, new org.nativescript.canvas.TNSImageAsset.Callback({
-                onError(error) {
+            fromUrlCb(url, (success, error) => {
+                if (error) {
                     reject(error);
-                },
-                onSuccess(success) {
-                    resolve(ImageAsset.toPrimitive(success));
-                },
-            }));
+                }
+                else {
+                    resolve(success);
+                }
+            });
         });
     }
-    loadFile(path) {
+    fromFileSync(path) {
+        const fromFileSync = this._getMethod('fromFileSync');
         let realPath = path;
         if (typeof realPath === 'string') {
             if (realPath.startsWith('~/')) {
                 realPath = filePath.join(knownFolders.currentApp().path, realPath.replace('~/', ''));
             }
         }
-        return this.native.loadImageFromPath(realPath);
+        return fromFileSync(realPath);
     }
-    loadFileAsync(path) {
+    fromFile(path) {
+        const fromFileCb = this._getMethod('fromFileCb');
         return new Promise((resolve, reject) => {
             if (typeof path === 'string') {
                 if (path.startsWith('~/')) {
                     path = filePath.join(knownFolders.currentApp().path, path.replace('~/', ''));
                 }
             }
-            this.native.loadImageFromPathAsync(path, new org.nativescript.canvas.TNSImageAsset.Callback({
-                onError(error) {
+            fromFileCb(path, (success, error) => {
+                if (error) {
                     reject(error);
-                },
-                onSuccess(success) {
-                    resolve(ImageAsset.toPrimitive(success));
-                },
-            }));
+                }
+                else {
+                    resolve(success);
+                }
+            });
         });
     }
-    loadFromNative(image) {
+    /*
+
+    loadFromNative(image: any): boolean {
         return this.native.loadImageFromImage(image);
     }
-    loadFromNativeAsync(image) {
+
+    loadFromNative(image: any) {
         return new Promise((resolve, reject) => {
-            this.native.loadImageFromImageAsync(image, new org.nativescript.canvas.TNSImageAsset.Callback({
-                onError(error) {
-                    reject(error);
-                },
-                onSuccess(success) {
-                    resolve(ImageAsset.toPrimitive(success));
-                },
-            }));
+            this.native.loadImageFromImage(
+                image,
+                new org.nativescript.canvas.TNSImageAsset.Callback({
+                    onError(error) {
+                        reject(error);
+                    },
+                    onSuccess(success) {
+                        resolve(success);
+                    },
+                })
+            );
         });
     }
-    loadFromBytes(bytes) {
-        if (bytes instanceof Uint8Array || bytes instanceof Uint8ClampedArray) {
-            return this.native.loadImageFromBuffer(bytes);
-        }
-        return this.native.loadImageFromBuffer(bytes);
+
+    */
+    loadFromBytesSync(bytes) {
+        const fromBytesSync = this._getMethod('fromBytesSync');
+        return fromBytesSync(bytes);
     }
-    loadFromBytesAsync(bytes) {
+    loadFromBytes(bytes) {
+        const fromBytesCb = this._getMethod('fromBytesCb');
         return new Promise((resolve, reject) => {
             const callback = new org.nativescript.canvas.TNSImageAsset.Callback({
                 onError(error) {
                     reject(error);
                 },
                 onSuccess(success) {
-                    resolve(ImageAsset.toPrimitive(success));
+                    resolve(success);
                 },
             });
-            if (bytes instanceof Uint8Array || bytes instanceof Uint8ClampedArray) {
-                this.native.loadImageFromBuffer(bytes, callback);
-            }
-            else {
-                this.native.loadImageFromBuffer(bytes, callback);
-            }
+            fromBytesCb(bytes, (success, error) => {
+                if (error) {
+                    reject(error);
+                }
+                else {
+                    resolve(success);
+                }
+            });
         });
     }
     scale(x, y) {
-        this.native.scale(x, y);
+        const scale = this._getMethod('scale');
+        scale(x, y);
     }
-    save(path, format) {
-        let realFormat;
-        switch (format) {
-            case ImageAssetSaveFormat.PNG:
-                realFormat = org.nativescript.canvas.TNSImageAssetFormat.PNG;
-                break;
-            case ImageAssetSaveFormat.ICO:
-                realFormat = org.nativescript.canvas.TNSImageAssetFormat.ICO;
-                break;
-            case ImageAssetSaveFormat.BMP:
-                realFormat = org.nativescript.canvas.TNSImageAssetFormat.BMP;
-                break;
-            case ImageAssetSaveFormat.TIFF:
-                realFormat = org.nativescript.canvas.TNSImageAssetFormat.TIFF;
-                break;
-            default:
-                realFormat = org.nativescript.canvas.TNSImageAssetFormat.JPG;
-                break;
-        }
-        return this.native.save(path, realFormat);
+    saveSync(path, format) {
+        const saveSync = this._getMethod('saveSync');
+        return saveSync(path, format);
     }
-    saveAsync(path, format) {
+    save(path, format) {
+        const saveCb = this._getMethod('saveCb');
         return new Promise((resolve, reject) => {
-            let realFormat;
-            switch (format) {
-                case ImageAssetSaveFormat.PNG:
-                    realFormat = org.nativescript.canvas.TNSImageAssetFormat.PNG;
-                    break;
-                case ImageAssetSaveFormat.ICO:
-                    realFormat = org.nativescript.canvas.TNSImageAssetFormat.ICO;
-                    break;
-                case ImageAssetSaveFormat.BMP:
-                    realFormat = org.nativescript.canvas.TNSImageAssetFormat.BMP;
-                    break;
-                case ImageAssetSaveFormat.TIFF:
-                    realFormat = org.nativescript.canvas.TNSImageAssetFormat.TIFF;
-                    break;
-                default:
-                    realFormat = org.nativescript.canvas.TNSImageAssetFormat.JPG;
-                    break;
-            }
-            this.native.saveAsync(path, realFormat, new org.nativescript.canvas.TNSImageAsset.Callback({
-                onError(error) {
+            saveCb(path, format, (success, error) => {
+                if (error) {
                     reject(error);
-                },
-                onSuccess(success) {
-                    resolve(ImageAsset.toPrimitive(success));
-                },
-            }));
+                }
+                else {
+                    resolve(success);
+                }
+            });
         });
     }
-    flipX() {
-        this.native.flipX();
-    }
-    flipY() {
-        this.native.flipY();
-    }
+    flipX() { }
+    flipY() { }
 }
+(() => {
+    Helpers.initialize();
+    ctor = global.CanvasJSIModule.ImageAsset;
+})();
 //# sourceMappingURL=ImageAsset.android.js.map