@etsoo/appscript 1.4.98 → 1.5.0

package/.github/workflows/main.yml

@@ -22,13 +22,13 @@ jobs:
     steps:
       # https://github.com/actions/checkout, This action checks-out your repository under $GITHUB_WORKSPACE
       # so your workflow can access it.
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         
       # Set up your GitHub Actions workflow with a specific version of node.js
       # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
-          node-version: '18.x'
+          node-version: '20.x'
           registry-url: 'https://registry.npmjs.org'
 
       # Named after Continuous Integration, installs dependencies directly from package-lock.json

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2004-2024 ETSOO® (亿速思维 ®), https://www.etsoo.com
+Copyright (c) 2004-2024 ETSOO ® (亿速思维 ®), https://etsoo.com, https://etsoo.nz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/cjs/app/CoreApp.d.ts

@@ -92,6 +92,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get ipData(): IPData | undefined;
     protected set ipData(value: IPData | undefined);
+    /**
+     * Is debug mode
+     */
+    debug: boolean;
     private _userData?;
     /**
      * User data
@@ -146,6 +150,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param name Application name
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string);
+    private debugIt;
     private getDeviceId;
     private resetKeys;
     /**

package/lib/cjs/app/CoreApp.js

@@ -107,6 +107,10 @@ class CoreApp {
          * Pending actions
          */
         this.pendings = [];
+        /**
+         * Is debug mode
+         */
+        this.debug = false;
         this._authorized = false;
         this._isReady = false;
         this._isTryingLogin = false;
@@ -143,6 +147,8 @@ class CoreApp {
         this.fields = IApp_1.appFields.reduce((a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }), {});
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
+        // Debug
+        this.debugIt('constructor', this.fields, this._deviceId);
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         // Load resources
@@ -152,6 +158,11 @@ class CoreApp {
             this.setup();
         });
     }
+    debugIt(...args) {
+        if (this.debug) {
+            console.debug('CoreApp', ...args);
+        }
+    }
     getDeviceId() {
         return this.deviceId.substring(0, 15);
     }
@@ -276,6 +287,8 @@ class CoreApp {
      */
     setApiErrorHandler(api, handlerFor401) {
         api.onError = (error) => {
+            // Debug
+            this.debugIt('setApiErrorHandler', api, error, handlerFor401);
             // Error code
             const status = error.response
                 ? api.transformResponse(error.response).status
@@ -314,12 +327,16 @@ class CoreApp {
     setApiLoading(api) {
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
+            // Debug
+            this.debugIt('setApiLoading', 'onRequest', data);
             if (data.showLoading == null || data.showLoading) {
                 this.notifier.showLoading();
             }
         };
         // onComplete, hide loading, rewrite the property to override default action
         api.onComplete = (data) => {
+            // Debug
+            this.debugIt('setApiLoading', 'onComplete', data);
             if (data.showLoading == null || data.showLoading) {
                 this.notifier.hideLoading();
             }
@@ -1262,6 +1279,7 @@ class CoreApp {
      */
     pageExit() {
         this.lastWarning?.dismiss();
+        this.notifier.hideLoading(true);
     }
     /**
      * Refresh countdown

package/lib/cjs/app/IApp.d.ts

@@ -133,6 +133,10 @@ export interface IApp {
      * Pending actions
      */
     readonly pendings: (() => any)[];
+    /**
+     * Is debug mode
+     */
+    debug: boolean;
     /**
      * IP data
      */

package/lib/mjs/app/CoreApp.d.ts

@@ -92,6 +92,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get ipData(): IPData | undefined;
     protected set ipData(value: IPData | undefined);
+    /**
+     * Is debug mode
+     */
+    debug: boolean;
     private _userData?;
     /**
      * User data
@@ -146,6 +150,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param name Application name
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string);
+    private debugIt;
     private getDeviceId;
     private resetKeys;
     /**

package/lib/mjs/app/CoreApp.js

@@ -104,6 +104,10 @@ export class CoreApp {
          * Pending actions
          */
         this.pendings = [];
+        /**
+         * Is debug mode
+         */
+        this.debug = false;
         this._authorized = false;
         this._isReady = false;
         this._isTryingLogin = false;
@@ -140,6 +144,8 @@ export class CoreApp {
         this.fields = appFields.reduce((a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }), {});
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
+        // Debug
+        this.debugIt('constructor', this.fields, this._deviceId);
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         // Load resources
@@ -149,6 +155,11 @@ export class CoreApp {
             this.setup();
         });
     }
+    debugIt(...args) {
+        if (this.debug) {
+            console.debug('CoreApp', ...args);
+        }
+    }
     getDeviceId() {
         return this.deviceId.substring(0, 15);
     }
@@ -273,6 +284,8 @@ export class CoreApp {
      */
     setApiErrorHandler(api, handlerFor401) {
         api.onError = (error) => {
+            // Debug
+            this.debugIt('setApiErrorHandler', api, error, handlerFor401);
             // Error code
             const status = error.response
                 ? api.transformResponse(error.response).status
@@ -311,12 +324,16 @@ export class CoreApp {
     setApiLoading(api) {
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
+            // Debug
+            this.debugIt('setApiLoading', 'onRequest', data);
             if (data.showLoading == null || data.showLoading) {
                 this.notifier.showLoading();
             }
         };
         // onComplete, hide loading, rewrite the property to override default action
         api.onComplete = (data) => {
+            // Debug
+            this.debugIt('setApiLoading', 'onComplete', data);
             if (data.showLoading == null || data.showLoading) {
                 this.notifier.hideLoading();
             }
@@ -1259,6 +1276,7 @@ export class CoreApp {
      */
     pageExit() {
         this.lastWarning?.dismiss();
+        this.notifier.hideLoading(true);
     }
     /**
      * Refresh countdown

package/lib/mjs/app/IApp.d.ts

@@ -133,6 +133,10 @@ export interface IApp {
      * Pending actions
      */
     readonly pendings: (() => any)[];
+    /**
+     * Is debug mode
+     */
+    debug: boolean;
     /**
      * IP data
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.98",
+    "version": "1.5.0",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,22 +52,22 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.43",
-        "@etsoo/restclient": "^1.1.6",
-        "@etsoo/shared": "^1.2.42",
+        "@etsoo/notificationbase": "^1.1.45",
+        "@etsoo/restclient": "^1.1.8",
+        "@etsoo/shared": "^1.2.44",
         "crypto-js": "^4.2.0"
     },
     "devDependencies": {
-        "@babel/cli": "^7.24.7",
-        "@babel/core": "^7.24.7",
+        "@babel/cli": "^7.24.8",
+        "@babel/core": "^7.25.2",
         "@babel/plugin-transform-runtime": "^7.24.7",
-        "@babel/preset-env": "^7.24.7",
-        "@babel/runtime-corejs3": "^7.24.7",
+        "@babel/preset-env": "^7.25.3",
+        "@babel/runtime-corejs3": "^7.25.0",
         "@types/crypto-js": "^4.2.2",
         "@types/jest": "^29.5.12",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "ts-jest": "^29.1.4",
-        "typescript": "^5.4.5"
+        "ts-jest": "^29.2.4",
+        "typescript": "^5.5.4"
     }
 }

package/src/app/CoreApp.ts

@@ -174,6 +174,11 @@ export abstract class CoreApp<
         this._ipData = value;
     }
 
+    /**
+     * Is debug mode
+     */
+    debug: boolean = false;
+
     private _userData?: U;
     /**
      * User data
@@ -293,6 +298,9 @@ export abstract class CoreApp<
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
 
+        // Debug
+        this.debugIt('constructor', this.fields, this._deviceId);
+
         this.setApi(api);
 
         const { currentCulture, currentRegion } = settings;
@@ -307,6 +315,12 @@ export abstract class CoreApp<
         );
     }
 
+    private debugIt(...args: any[]) {
+        if (this.debug) {
+            console.debug('CoreApp', ...args);
+        }
+    }
+
     private getDeviceId() {
         return this.deviceId.substring(0, 15);
     }
@@ -468,6 +482,9 @@ export abstract class CoreApp<
         handlerFor401?: boolean | (() => Promise<void>)
     ) {
         api.onError = (error: ApiDataError) => {
+            // Debug
+            this.debugIt('setApiErrorHandler', api, error, handlerFor401);
+
             // Error code
             const status = error.response
                 ? api.transformResponse(error.response).status
@@ -507,6 +524,9 @@ export abstract class CoreApp<
     public setApiLoading(api: IApi) {
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
+            // Debug
+            this.debugIt('setApiLoading', 'onRequest', data);
+
             if (data.showLoading == null || data.showLoading) {
                 this.notifier.showLoading();
             }
@@ -514,6 +534,9 @@ export abstract class CoreApp<
 
         // onComplete, hide loading, rewrite the property to override default action
         api.onComplete = (data) => {
+            // Debug
+            this.debugIt('setApiLoading', 'onComplete', data);
+
             if (data.showLoading == null || data.showLoading) {
                 this.notifier.hideLoading();
             }
@@ -1699,6 +1722,7 @@ export abstract class CoreApp<
      */
     pageExit() {
         this.lastWarning?.dismiss();
+        this.notifier.hideLoading(true);
     }
 
     /**

package/src/app/IApp.ts

@@ -185,6 +185,11 @@ export interface IApp {
      */
     readonly pendings: (() => any)[];
 
+    /**
+     * Is debug mode
+     */
+    debug: boolean;
+
     /**
      * IP data
      */