@etsoo/appscript 1.4.5 → 1.4.6

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

@@ -221,7 +221,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param culture New culture definition
      * @param onReady On ready callback
      */
-    changeCulture(culture: DataTypes.CultureDefinition, onReady?: (resources: DataTypes.StringRecord) => void): void;
+    changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
     /**
      * Update current region label
      */

package/lib/cjs/app/CoreApp.js

@@ -35,7 +35,6 @@ const ActionResultError_1 = require("../result/ActionResultError");
 const IApp_1 = require("./IApp");
 const UserRole_1 = require("./UserRole");
 let CJ;
-Promise.resolve().then(() => __importStar(require('crypto-js'))).then((result) => (CJ = result));
 /**
  * Core application
  */
@@ -153,12 +152,16 @@ class CoreApp {
         this.fields = IApp_1.appFields.reduce((a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }), {});
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
-        // Restore
-        this.restore();
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
-        this.changeCulture(currentCulture, () => this.setup());
-        this.changeRegion(currentRegion);
+        // Load resources
+        Promise.all([
+            Promise.resolve().then(() => __importStar(require('crypto-js'))),
+            this.changeCulture(currentCulture)
+        ]).then(([cj, _resources]) => {
+            (CJ = cj), this.changeRegion(currentRegion);
+            this.setup();
+        });
     }
     getDeviceId() {
         return this.deviceId.substring(0, 15);
@@ -527,12 +530,13 @@ class CoreApp {
      * @param culture New culture definition
      * @param onReady On ready callback
      */
-    changeCulture(culture, onReady) {
+    async changeCulture(culture) {
         // Name
         const { name } = culture;
         // Same?
-        if (this._culture === name)
-            return;
+        let resources = culture.resources;
+        if (this._culture === name && typeof resources === 'object')
+            return resources;
         // Save the cultrue to local storage
         this.storage.setPersistedData(shared_1.DomUtils.CultureField, name);
         // Change the API's Content-Language header
@@ -542,19 +546,13 @@ class CoreApp {
         this._culture = name;
         // Hold the current resources
         this.settings.currentCulture = culture;
-        if (typeof culture.resources !== 'object') {
-            culture.resources().then((result) => {
-                culture.resources = result;
-                this.updateRegionLabel();
-                if (onReady)
-                    onReady(result);
-            });
-        }
-        else {
-            this.updateRegionLabel();
-            if (onReady)
-                onReady(culture.resources);
+        if (typeof resources !== 'object') {
+            resources = await resources();
+            // Set static resources back
+            culture.resources = resources;
         }
+        this.updateRegionLabel();
+        return resources;
     }
     /**
      * Update current region label
@@ -1208,7 +1206,10 @@ class CoreApp {
     /**
      * Setup callback
      */
-    setup() { }
+    setup() {
+        // Restore
+        this.restore();
+    }
     /**
      * Signout
      * @param apiUrl Signout API URL

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

@@ -159,9 +159,8 @@ export interface IApp {
     /**
      * Change culture
      * @param culture New culture definition
-     * @param onReady On ready callback
      */
-    changeCulture(culture: DataTypes.CultureDefinition, onReady?: (resources: DataTypes.StringRecord) => void): void;
+    changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
     /**
      * Check the action result is about device invalid
      * @param result Action result

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

@@ -221,7 +221,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param culture New culture definition
      * @param onReady On ready callback
      */
-    changeCulture(culture: DataTypes.CultureDefinition, onReady?: (resources: DataTypes.StringRecord) => void): void;
+    changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
     /**
      * Update current region label
      */

package/lib/mjs/app/CoreApp.js

@@ -9,7 +9,6 @@ import { ActionResultError } from '../result/ActionResultError';
 import { appFields } from './IApp';
 import { UserRole } from './UserRole';
 let CJ;
-import('crypto-js').then((result) => (CJ = result));
 /**
  * Core application
  */
@@ -127,12 +126,16 @@ export class CoreApp {
         this.fields = appFields.reduce((a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }), {});
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
-        // Restore
-        this.restore();
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
-        this.changeCulture(currentCulture, () => this.setup());
-        this.changeRegion(currentRegion);
+        // Load resources
+        Promise.all([
+            import('crypto-js'),
+            this.changeCulture(currentCulture)
+        ]).then(([cj, _resources]) => {
+            (CJ = cj), this.changeRegion(currentRegion);
+            this.setup();
+        });
     }
     getDeviceId() {
         return this.deviceId.substring(0, 15);
@@ -501,12 +504,13 @@ export class CoreApp {
      * @param culture New culture definition
      * @param onReady On ready callback
      */
-    changeCulture(culture, onReady) {
+    async changeCulture(culture) {
         // Name
         const { name } = culture;
         // Same?
-        if (this._culture === name)
-            return;
+        let resources = culture.resources;
+        if (this._culture === name && typeof resources === 'object')
+            return resources;
         // Save the cultrue to local storage
         this.storage.setPersistedData(DomUtils.CultureField, name);
         // Change the API's Content-Language header
@@ -516,19 +520,13 @@ export class CoreApp {
         this._culture = name;
         // Hold the current resources
         this.settings.currentCulture = culture;
-        if (typeof culture.resources !== 'object') {
-            culture.resources().then((result) => {
-                culture.resources = result;
-                this.updateRegionLabel();
-                if (onReady)
-                    onReady(result);
-            });
-        }
-        else {
-            this.updateRegionLabel();
-            if (onReady)
-                onReady(culture.resources);
+        if (typeof resources !== 'object') {
+            resources = await resources();
+            // Set static resources back
+            culture.resources = resources;
         }
+        this.updateRegionLabel();
+        return resources;
     }
     /**
      * Update current region label
@@ -1182,7 +1180,10 @@ export class CoreApp {
     /**
      * Setup callback
      */
-    setup() { }
+    setup() {
+        // Restore
+        this.restore();
+    }
     /**
      * Signout
      * @param apiUrl Signout API URL

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

@@ -159,9 +159,8 @@ export interface IApp {
     /**
      * Change culture
      * @param culture New culture definition
-     * @param onReady On ready callback
      */
-    changeCulture(culture: DataTypes.CultureDefinition, onReady?: (resources: DataTypes.StringRecord) => void): void;
+    changeCulture(culture: DataTypes.CultureDefinition): Promise<DataTypes.StringRecord>;
     /**
      * Check the action result is about device invalid
      * @param result Action result

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.5",
+    "version": "1.4.6",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -42,7 +42,6 @@ import type CryptoJS from 'crypto-js';
 
 type CJType = typeof CryptoJS;
 let CJ: CJType;
-import('crypto-js').then((result) => (CJ = result));
 
 /**
  * Core application interface
@@ -271,15 +270,18 @@ export abstract class CoreApp<
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
 
-        // Restore
-        this.restore();
-
         this.setApi(api);
 
         const { currentCulture, currentRegion } = settings;
-        this.changeCulture(currentCulture, () => this.setup());
 
-        this.changeRegion(currentRegion);
+        // Load resources
+        Promise.all([
+            import('crypto-js'),
+            this.changeCulture(currentCulture)
+        ]).then(([cj, _resources]) => {
+            (CJ = cj), this.changeRegion(currentRegion);
+            this.setup();
+        });
     }
 
     private getDeviceId() {
@@ -744,15 +746,14 @@ export abstract class CoreApp<
      * @param culture New culture definition
      * @param onReady On ready callback
      */
-    changeCulture(
-        culture: DataTypes.CultureDefinition,
-        onReady?: (resources: DataTypes.StringRecord) => void
-    ) {
+    async changeCulture(culture: DataTypes.CultureDefinition) {
         // Name
         const { name } = culture;
 
         // Same?
-        if (this._culture === name) return;
+        let resources = culture.resources;
+        if (this._culture === name && typeof resources === 'object')
+            return resources;
 
         // Save the cultrue to local storage
         this.storage.setPersistedData(DomUtils.CultureField, name);
@@ -767,16 +768,15 @@ export abstract class CoreApp<
         // Hold the current resources
         this.settings.currentCulture = culture;
 
-        if (typeof culture.resources !== 'object') {
-            culture.resources().then((result) => {
-                culture.resources = result;
-                this.updateRegionLabel();
-                if (onReady) onReady(result);
-            });
-        } else {
-            this.updateRegionLabel();
-            if (onReady) onReady(culture.resources);
+        if (typeof resources !== 'object') {
+            resources = await resources();
+
+            // Set static resources back
+            culture.resources = resources;
         }
+        this.updateRegionLabel();
+
+        return resources;
     }
 
     /**
@@ -1544,7 +1544,10 @@ export abstract class CoreApp<
     /**
      * Setup callback
      */
-    setup() {}
+    setup() {
+        // Restore
+        this.restore();
+    }
 
     /**
      * Signout

package/src/app/IApp.ts

@@ -214,12 +214,10 @@ export interface IApp {
     /**
      * Change culture
      * @param culture New culture definition
-     * @param onReady On ready callback
      */
     changeCulture(
-        culture: DataTypes.CultureDefinition,
-        onReady?: (resources: DataTypes.StringRecord) => void
-    ): void;
+        culture: DataTypes.CultureDefinition
+    ): Promise<DataTypes.StringRecord>;
 
     /**
      * Check the action result is about device invalid