@nativescript-community/ui-image 4.3.37 → 4.3.38

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.38](https://github.com/nativescript-community/ui-image/compare/v4.3.37...v4.3.38) (2024-03-29)
+
+**Note:** Version bump only for package @nativescript-community/ui-image
+
 ## [4.3.37](https://github.com/nativescript-community/ui-image/compare/v4.3.36...v4.3.37) (2024-03-29)
 
 **Note:** Version bump only for package @nativescript-community/ui-image

package/index-common.d.ts

@@ -39,6 +39,7 @@ export interface ImageError {
     getErrorType(): string;
     toString(): string;
 }
+export declare function wrapNativeException(ex: any, errorType?: "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"): any;
 export interface ImagePipelineConfigSetting {
     isDownsampleEnabled?: boolean;
     leakTracker?: any;

package/index-common.js

@@ -74,6 +74,29 @@ export var ScaleType;
     ScaleType["FitXY"] = "fitXY";
     ScaleType["FocusCrop"] = "focusCrop";
 })(ScaleType || (ScaleType = {}));
+export function wrapNativeException(ex, errorType = typeof ex) {
+    if (typeof ex === 'string') {
+        return new Error(ex);
+    }
+    if (!(ex instanceof Error)) {
+        if (__ANDROID__) {
+            const err = new Error(ex.toString());
+            err['nativeException'] = ex;
+            //@ts-ignore
+            err['stackTrace'] = com.tns.NativeScriptException.getStackTraceAsString(ex);
+            return err;
+        }
+        if (__IOS__) {
+            const err = new Error(ex.localizedDescription);
+            err['nativeException'] = ex;
+            err['code'] = ex.code;
+            err['domain'] = ex.domain;
+            // TODO: we loose native stack. see how to get it
+            return err;
+        }
+    }
+    return ex;
+}
 export class EventData {
     get eventName() {
         return this._eventName;

package/index.android.d.ts

@@ -57,11 +57,6 @@ export declare class IntermediateEventData extends EventData {
     get imageInfo(): ImageInfo;
     set imageInfo(value: ImageInfo);
 }
-export declare class FailureEventData extends EventData {
-    private _error;
-    get error(): ImageError;
-    set error(value: ImageError);
-}
 export declare const needUpdateHierarchy: (targetOrNeedsLayout: any, propertyKey?: string | Symbol, descriptor?: PropertyDescriptor) => any;
 export declare class Img extends ImageBase {
     nativeViewProtected: com.nativescript.image.DraweeView;

package/index.android.js

@@ -3,7 +3,7 @@ export * from './index-common';
 import { Application, ImageAsset, ImageSource, Trace, Utils, backgroundInternalProperty, knownFolders, path } from '@nativescript/core';
 import { isString } from '@nativescript/core/utils/types';
 import { layout } from '@nativescript/core/utils/layout-helper';
-import { CLog, CLogTypes, EventData, ImageBase, ScaleType, aspectRatioProperty, backgroundUriProperty, blurDownSamplingProperty, blurRadiusProperty, fadeDurationProperty, failureImageUriProperty, imageRotationProperty, lowerResSrcProperty, needRequestImage, placeholderImageUriProperty, progressBarColorProperty, roundAsCircleProperty, roundBottomLeftRadiusProperty, roundBottomRightRadiusProperty, roundTopLeftRadiusProperty, roundTopRightRadiusProperty, showProgressBarProperty, srcProperty, stretchProperty, tintColorProperty } from './index-common';
+import { CLog, CLogTypes, EventData, ImageBase, ScaleType, aspectRatioProperty, backgroundUriProperty, blurDownSamplingProperty, blurRadiusProperty, fadeDurationProperty, failureImageUriProperty, imageRotationProperty, lowerResSrcProperty, needRequestImage, placeholderImageUriProperty, progressBarColorProperty, roundAsCircleProperty, roundBottomLeftRadiusProperty, roundBottomRightRadiusProperty, roundTopLeftRadiusProperty, roundTopRightRadiusProperty, showProgressBarProperty, srcProperty, stretchProperty, tintColorProperty, wrapNativeException } from './index-common';
 let initialized = false;
 let initializeConfig;
 export function initialize(config) {
@@ -257,14 +257,6 @@ export class IntermediateEventData extends EventData {
         this._imageInfo = value;
     }
 }
-export class FailureEventData extends EventData {
-    get error() {
-        return this._error;
-    }
-    set error(value) {
-        this._error = value;
-    }
-}
 export const needUpdateHierarchy = function (targetOrNeedsLayout, propertyKey, descriptor) {
     if (typeof targetOrNeedsLayout === 'boolean') {
         return function (target2, propertyKey, descriptor) {
@@ -520,7 +512,7 @@ export class Img extends ImageBase {
                                     const imageError = new ImageError(throwable);
                                     nativeView.notify({
                                         eventName,
-                                        error: imageError
+                                        error: wrapNativeException(throwable)
                                     });
                                 }
                             }
@@ -533,10 +525,9 @@ export class Img extends ImageBase {
                             if (nativeView) {
                                 const eventName = ImageBase.intermediateImageFailedEvent;
                                 if (nativeView.hasListeners(eventName)) {
-                                    const imageError = new ImageError(throwable);
                                     nativeView.notify({
                                         eventName,
-                                        error: imageError
+                                        error: wrapNativeException(throwable)
                                     });
                                 }
                             }

package/index.d.ts

@@ -314,21 +314,11 @@ export class IntermediateEventData {
 /**
  * Instances of this class are provided to the handlers of the {@link failure} and {@link intermediateImageFailed}.
  */
-export class FailureEventData {
-    /**
-     * Returns the name of the event that has been fired.
-     */
-    eventName: string;
-
-    /**
-     * The object that fires the event.
-     */
-    object: any;
-
+export class FailureEventData extends EventData {
     /**
      * An object containing information about the status of the event.
      */
-    error: ImageError;
+    error: Error;
 }
 
 /**

package/index.ios.js

@@ -3,7 +3,7 @@ export * from './index-common';
 import { ImageAsset, ImageSource, Screen, Trace, Utils, knownFolders, path } from '@nativescript/core';
 import { layout } from '@nativescript/core/utils/layout-helper';
 import { isString } from '@nativescript/core/utils/types';
-import { CLog, CLogTypes, ImageBase, ScaleType, failureImageUriProperty, imageRotationProperty, placeholderImageUriProperty, srcProperty, stretchProperty } from './index-common';
+import { CLog, CLogTypes, ImageBase, ScaleType, failureImageUriProperty, imageRotationProperty, placeholderImageUriProperty, srcProperty, stretchProperty, wrapNativeException } from './index-common';
 export class ImageInfo {
     constructor(width, height) {
         this.width = width;
@@ -237,7 +237,7 @@ export class Img extends ImageBase {
             if (error) {
                 this.notify({
                     eventName: Img.failureEvent,
-                    error
+                    error: wrapNativeException(error)
                 });
                 if (this.failureImageUri) {
                     image = this.getUIImage(this.failureImageUri);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-image",
-    "version": "4.3.37",
+    "version": "4.3.38",
     "description": "Advanced and efficient image display plugin which uses Fresco (Android) and SDWebImage (iOS) to implement caching, placeholders, image effects, and much more.",
     "main": "./index",
     "sideEffects": false,
@@ -36,5 +36,5 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "gitHead": "a1f4614ab21fa8dea1cbe21fbd5525f83779b793"
+    "gitHead": "aa234b1ae9d262dca05972288e5a7fd2cb7d82eb"
 }