@etsoo/appscript 1.6.32 → 1.6.33

package/lib/cjs/app/CoreApp.js

@@ -229,7 +229,7 @@ class CoreApp {
         this._embedded =
             this.storage.getData(this.fields.embedded) ?? false;
         // Load resources
-        Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
+        Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj]) => {
             CJ = cj.default;
             // Debug
             if (this.debug) {
@@ -810,9 +810,8 @@ class CoreApp {
      */
     async changeCulture(culture) {
         // Name
-        const { name } = culture;
+        const { name, resources } = culture;
         // Same?
-        let resources = culture.resources;
         if (this._culture === name && typeof resources === "object")
             return resources;
         // Save the cultrue to local storage
@@ -822,17 +821,24 @@ class CoreApp {
         this.api.setContentLanguage(name);
         // Set the culture
         this._culture = name;
-        // Hold the current resources
-        this.settings.currentCulture = culture;
+        let loadedResources;
         if (typeof resources !== "object") {
-            resources = await resources();
+            // Load resources
+            loadedResources = await resources();
+            // Load system custom resources
+            await this.loadCustomResources(loadedResources, name);
             // Set static resources back
-            culture.resources = resources;
+            culture.resources = loadedResources;
+        }
+        else {
+            loadedResources = resources;
+            // Load system custom resources
+            await this.loadCustomResources(loadedResources, name);
         }
-        // Load system custom resources
-        await this.loadCustomResources(resources, name);
+        // Hold the current resources
+        this.settings.currentCulture = culture;
         this.updateRegionLabel();
-        return resources;
+        return loadedResources;
     }
     /**
      * Load custom resources, override to implement custom resources

package/lib/cjs/business/BusinessUtils.d.ts

@@ -32,5 +32,9 @@ export declare namespace BusinessUtils {
      * @param resources New resources to merge
      */
     function mergeCustomResources(target: DataTypes.StringRecord, resources: CustomCultureData[]): void;
+    /**
+     * Restore resources to target collection
+     * @param target Target collection to restore resources to, null to clear cache
+     */
     function restoreResources(target?: DataTypes.StringRecord): void;
 }

package/lib/cjs/business/BusinessUtils.js

@@ -94,6 +94,10 @@ var BusinessUtils;
         }
     }
     BusinessUtils.mergeCustomResources = mergeCustomResources;
+    /**
+     * Restore resources to target collection
+     * @param target Target collection to restore resources to, null to clear cache
+     */
     function restoreResources(target) {
         // Clear cache if no target
         if (target == null) {

package/lib/mjs/app/CoreApp.js

@@ -226,7 +226,7 @@ export class CoreApp {
         this._embedded =
             this.storage.getData(this.fields.embedded) ?? false;
         // Load resources
-        Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
+        Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj]) => {
             CJ = cj.default;
             // Debug
             if (this.debug) {
@@ -807,9 +807,8 @@ export class CoreApp {
      */
     async changeCulture(culture) {
         // Name
-        const { name } = culture;
+        const { name, resources } = culture;
         // Same?
-        let resources = culture.resources;
         if (this._culture === name && typeof resources === "object")
             return resources;
         // Save the cultrue to local storage
@@ -819,17 +818,24 @@ export class CoreApp {
         this.api.setContentLanguage(name);
         // Set the culture
         this._culture = name;
-        // Hold the current resources
-        this.settings.currentCulture = culture;
+        let loadedResources;
         if (typeof resources !== "object") {
-            resources = await resources();
+            // Load resources
+            loadedResources = await resources();
+            // Load system custom resources
+            await this.loadCustomResources(loadedResources, name);
             // Set static resources back
-            culture.resources = resources;
+            culture.resources = loadedResources;
+        }
+        else {
+            loadedResources = resources;
+            // Load system custom resources
+            await this.loadCustomResources(loadedResources, name);
         }
-        // Load system custom resources
-        await this.loadCustomResources(resources, name);
+        // Hold the current resources
+        this.settings.currentCulture = culture;
         this.updateRegionLabel();
-        return resources;
+        return loadedResources;
     }
     /**
      * Load custom resources, override to implement custom resources

package/lib/mjs/business/BusinessUtils.d.ts

@@ -32,5 +32,9 @@ export declare namespace BusinessUtils {
      * @param resources New resources to merge
      */
     function mergeCustomResources(target: DataTypes.StringRecord, resources: CustomCultureData[]): void;
+    /**
+     * Restore resources to target collection
+     * @param target Target collection to restore resources to, null to clear cache
+     */
     function restoreResources(target?: DataTypes.StringRecord): void;
 }

package/lib/mjs/business/BusinessUtils.js

@@ -91,6 +91,10 @@ export var BusinessUtils;
         }
     }
     BusinessUtils.mergeCustomResources = mergeCustomResources;
+    /**
+     * Restore resources to target collection
+     * @param target Target collection to restore resources to, null to clear cache
+     */
     function restoreResources(target) {
         // Clear cache if no target
         if (target == null) {

package/package.json

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

package/src/app/CoreApp.ts

@@ -420,7 +420,7 @@ export abstract class CoreApp<
 
     // Load resources
     Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(
-      ([cj, _resources]) => {
+      ([cj]) => {
         CJ = cj.default;
 
         // Debug
@@ -1203,10 +1203,9 @@ export abstract class CoreApp<
    */
   async changeCulture(culture: DataTypes.CultureDefinition) {
     // Name
-    const { name } = culture;
+    const { name, resources } = culture;
 
     // Same?
-    let resources = culture.resources;
     if (this._culture === name && typeof resources === "object")
       return resources;
 
@@ -1220,22 +1219,29 @@ export abstract class CoreApp<
     // Set the culture
     this._culture = name;
 
-    // Hold the current resources
-    this.settings.currentCulture = culture;
-
+    let loadedResources: DataTypes.StringRecord;
     if (typeof resources !== "object") {
-      resources = await resources();
+      // Load resources
+      loadedResources = await resources();
+
+      // Load system custom resources
+      await this.loadCustomResources(loadedResources, name);
 
       // Set static resources back
-      culture.resources = resources;
+      culture.resources = loadedResources;
+    } else {
+      loadedResources = resources;
+
+      // Load system custom resources
+      await this.loadCustomResources(loadedResources, name);
     }
 
-    // Load system custom resources
-    await this.loadCustomResources(resources, name);
+    // Hold the current resources
+    this.settings.currentCulture = culture;
 
     this.updateRegionLabel();
 
-    return resources;
+    return loadedResources;
   }
 
   /**

package/src/business/BusinessUtils.ts

@@ -112,6 +112,10 @@ export namespace BusinessUtils {
     }
   }
 
+  /**
+   * Restore resources to target collection
+   * @param target Target collection to restore resources to, null to clear cache
+   */
   export function restoreResources(target?: DataTypes.StringRecord) {
     // Clear cache if no target
     if (target == null) {