@rive-app/canvas 2.27.4 → 2.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rive-app/canvas",
-  "version": "2.27.4",
+  "version": "2.28.0",
   "description": "Rive's canvas based web api.",
   "main": "rive.js",
   "homepage": "https://rive.app",

package/rive.d.ts

@@ -1,6 +1,6 @@
 import * as rc from "./rive_advanced.mjs";
-import { ImageWrapper, AssetLoadCallbackWrapper } from "./utils";
-export type { FileAssetWrapper as FileAsset, ImageAssetWrapper as ImageAsset, AudioAssetWrapper as AudioAsset, FontAssetWrapper as FontAsset, AssetLoadCallbackWrapper as AssetLoadCallback, } from "./utils";
+export type AssetLoadCallback = (asset: rc.FileAsset, bytes: Uint8Array) => Boolean;
+export type { FileAsset, AudioAsset, FontAsset, ImageAsset, } from "./rive_advanced.mjs";
 /**
  * Generic type for a parameterless void callback
  */
@@ -245,7 +245,7 @@ export interface RiveParameters {
     onLoop?: EventCallback;
     onStateChange?: EventCallback;
     onAdvance?: EventCallback;
-    assetLoader?: AssetLoadCallbackWrapper;
+    assetLoader?: AssetLoadCallback;
     /**
      * @deprecated Use `onLoad()` instead
      */
@@ -297,7 +297,7 @@ export interface RiveResetParameters {
 export interface RiveFileParameters {
     src?: string;
     buffer?: ArrayBuffer;
-    assetLoader?: AssetLoadCallbackWrapper;
+    assetLoader?: AssetLoadCallback;
     enableRiveAssetCDN?: boolean;
     onLoad?: EventCallback;
     onLoadError?: EventCallback;
@@ -317,6 +317,7 @@ export declare class RiveFile {
     constructor(params: RiveFileParameters);
     private initData;
     init(): Promise<void>;
+    private fireLoadError;
     /**
      * Subscribe to Rive-generated events
      * @param type the type of event to subscribe to
@@ -897,7 +898,7 @@ export declare class ViewModelInstanceColor extends ViewModelInstanceValue {
 }
 export declare class ViewModelInstanceAssetImage extends ViewModelInstanceValue {
     constructor(instance: rc.ViewModelInstanceAssetImage, root: ViewModelInstance);
-    set value(image: ImageWrapper);
+    set value(image: rc.Image);
     internalHandleCallback(callback: Function): void;
 }
 /**
@@ -946,7 +947,7 @@ export declare const decodeAudio: (bytes: Uint8Array) => Promise<rc.Audio>;
  * Be sure to call `.unref()` on the image once it is no longer needed. This
  * allows the engine to clean it up when it is not used by any more animations.
  */
-export declare const decodeImage: (bytes: Uint8Array) => Promise<ImageWrapper>;
+export declare const decodeImage: (bytes: Uint8Array) => Promise<rc.Image>;
 /**
  * Decodes bytes into a font.
  *

package/rive.js

@@ -3369,7 +3369,7 @@ $d();
 /* 2 */
 /***/ ((module) => {
 
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@rive-app/canvas","version":"2.27.4","description":"Rive\'s canvas based web api.","main":"rive.js","homepage":"https://rive.app","repository":{"type":"git","url":"https://github.com/rive-app/rive-wasm/tree/master/js"},"keywords":["rive","animation"],"author":"Rive","contributors":["Luigi Rosso <luigi@rive.app> (https://rive.app)","Maxwell Talbot <max@rive.app> (https://rive.app)","Arthur Vivian <arthur@rive.app> (https://rive.app)","Umberto Sonnino <umberto@rive.app> (https://rive.app)","Matthew Sullivan <matt.j.sullivan@gmail.com> (mailto:matt.j.sullivan@gmail.com)"],"license":"MIT","files":["rive.js","rive.js.map","rive.wasm","rive_fallback.wasm","rive.d.ts","rive_advanced.mjs.d.ts"],"typings":"rive.d.ts","dependencies":{},"browser":{"fs":false,"path":false}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@rive-app/canvas","version":"2.28.0","description":"Rive\'s canvas based web api.","main":"rive.js","homepage":"https://rive.app","repository":{"type":"git","url":"https://github.com/rive-app/rive-wasm/tree/master/js"},"keywords":["rive","animation"],"author":"Rive","contributors":["Luigi Rosso <luigi@rive.app> (https://rive.app)","Maxwell Talbot <max@rive.app> (https://rive.app)","Arthur Vivian <arthur@rive.app> (https://rive.app)","Umberto Sonnino <umberto@rive.app> (https://rive.app)","Matthew Sullivan <matt.j.sullivan@gmail.com> (mailto:matt.j.sullivan@gmail.com)"],"license":"MIT","files":["rive.js","rive.js.map","rive.wasm","rive_fallback.wasm","rive.d.ts","rive_advanced.mjs.d.ts"],"typings":"rive.d.ts","dependencies":{},"browser":{"fs":false,"path":false}}');
 
 /***/ }),
 /* 3 */
@@ -3975,8 +3975,8 @@ var FileAssetWrapper = /** @class */ (function () {
  */
 var ImageAssetWrapper = /** @class */ (function (_super) {
     __extends(ImageAssetWrapper, _super);
-    function ImageAssetWrapper(nativeAsset) {
-        return _super.call(this, nativeAsset) || this;
+    function ImageAssetWrapper() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     ImageAssetWrapper.prototype.setRenderImage = function (image) {
         this._nativeFileAsset.setRenderImage(image.nativeImage);
@@ -3989,8 +3989,8 @@ var ImageAssetWrapper = /** @class */ (function (_super) {
  */
 var AudioAssetWrapper = /** @class */ (function (_super) {
     __extends(AudioAssetWrapper, _super);
-    function AudioAssetWrapper(nativeAsset) {
-        return _super.call(this, nativeAsset) || this;
+    function AudioAssetWrapper() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     AudioAssetWrapper.prototype.setAudioSource = function (audio) {
         this._nativeFileAsset.setAudioSource(audio.nativeAudio);
@@ -5366,11 +5366,7 @@ var RiveFile = /** @class */ (function () {
                             });
                         }
                         else {
-                            this.eventManager.fire({
-                                type: EventType.LoadError,
-                                data: null,
-                            });
-                            throw new Error(RiveFile.fileLoadErrorMessage);
+                            this.fireLoadError(RiveFile.fileLoadErrorMessage);
                         }
                         return [2 /*return*/];
                 }
@@ -5379,29 +5375,45 @@ var RiveFile = /** @class */ (function () {
     };
     RiveFile.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a;
+            var _a, error_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         // If no source file url specified, it's a bust
                         if (!this.src && !this.buffer) {
-                            throw new Error(RiveFile.missingErrorMessage);
+                            this.fireLoadError(RiveFile.missingErrorMessage);
+                            return [2 /*return*/];
                         }
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 4, , 5]);
                         _a = this;
                         return [4 /*yield*/, RuntimeLoader.awaitInstance()];
-                    case 1:
+                    case 2:
                         _a.runtime = _b.sent();
                         if (this.destroyed) {
                             return [2 /*return*/];
                         }
                         return [4 /*yield*/, this.initData()];
-                    case 2:
+                    case 3:
                         _b.sent();
-                        return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 4:
+                        error_1 = _b.sent();
+                        this.fireLoadError(error_1 instanceof Error ? error_1.message : RiveFile.fileLoadErrorMessage);
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
     };
+    RiveFile.prototype.fireLoadError = function (message) {
+        this.eventManager.fire({
+            type: EventType.LoadError,
+            data: message,
+        });
+        throw new Error(message);
+    };
     /**
      * Subscribe to Rive-generated events
      * @param type the type of event to subscribe to
@@ -5728,11 +5740,11 @@ var Rive = /** @class */ (function () {
         this._artboardHeight = this.artboard.height =
             this._artboardHeight || this.artboard.height;
     };
-    // Initializes runtime with Rive data and preps for playing. 
+    // Initializes runtime with Rive data and preps for playing.
     // Returns true for successful initialization.
     Rive.prototype.initData = function (artboardName, animationNames, stateMachineNames, autoplay, autoBind) {
         return __awaiter(this, void 0, void 0, function () {
-            var error_1, msg;
+            var error_2, msg;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -5774,8 +5786,8 @@ var Rive = /** @class */ (function () {
                         this.drawFrame();
                         return [2 /*return*/, true];
                     case 3:
-                        error_1 = _b.sent();
-                        msg = resolveErrorMessage(error_1);
+                        error_2 = _b.sent();
+                        msg = resolveErrorMessage(error_2);
                         console.warn(msg);
                         this.eventManager.fire({ type: EventType.LoadError, data: msg });
                         return [2 /*return*/, Promise.reject(msg)];
@@ -7621,8 +7633,7 @@ var ViewModelInstanceAssetImage = /** @class */ (function (_super) {
     }
     Object.defineProperty(ViewModelInstanceAssetImage.prototype, "value", {
         set: function (image) {
-            this._viewModelInstanceValue.value =
-                image.nativeImage;
+            this._viewModelInstanceValue.value(image.nativeImage);
         },
         enumerable: false,
         configurable: true