@etsoo/appscript 1.5.36 → 1.5.38

package/__tests__/app/Culture.ts

@@ -0,0 +1,14 @@
+import { zhHans } from '../../src';
+
+test('Tests for zhHans', async () => {
+    const zh = zhHans(
+        { nameB: '名称覆盖' },
+        new Promise((resolve) => resolve({ no: 'No override' }))
+    );
+    const resources =
+        typeof zh.resources === 'object' ? zh.resources : await zh.resources();
+
+    expect(resources.name).toBe('姓名');
+    expect(resources.nameB).toBe('名称覆盖');
+    expect(resources.no).toBe('No override');
+});

package/lib/cjs/app/CoreApp.js

@@ -1610,7 +1610,7 @@ class CoreApp {
         }
         // Is web way?
         // Pass the true embedded status from parent to child (Both conditions are true)
-        if (isWeb && embedded && globalThis.self !== globalThis.parent) {
+        if (isWeb && embedded && globalThis.self === globalThis.parent) {
             embedded = false;
         }
         // Ignore the same value

package/lib/cjs/i18n/CultureUtils.d.ts

@@ -0,0 +1,12 @@
+import { DataTypes } from '@etsoo/shared';
+/**
+ * Culture utilities
+ */
+export declare namespace CultureUtils {
+    /**
+     * Make culture
+     * @param resources Resources
+     * @returns Culture
+     */
+    function make(...resources: (object | (() => Promise<object>))[]): DataTypes.CultureDefinition<DataTypes.StringRecord>;
+}

package/lib/cjs/i18n/CultureUtils.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CultureUtils = void 0;
+const shared_1 = require("@etsoo/shared");
+/**
+ * Culture utilities
+ */
+var CultureUtils;
+(function (CultureUtils) {
+    /**
+     * Make culture
+     * @param resources Resources
+     * @returns Culture
+     */
+    function make(...resources) {
+        return shared_1.DomUtils.zhHans(async () => {
+            const rs = await Promise.all([
+                ...resources.map((resource) => new Promise((resolve) => {
+                    if (typeof resource === 'object') {
+                        resolve(resource);
+                    }
+                    else {
+                        resource().then((result) => resolve(result));
+                    }
+                }))
+            ]);
+            return rs.reduce((prev, curr) => ({
+                ...prev,
+                ...curr
+            }));
+        });
+    }
+    CultureUtils.make = make;
+})(CultureUtils || (exports.CultureUtils = CultureUtils = {}));

package/lib/cjs/i18n/en.d.ts

@@ -1,7 +1,6 @@
-import { DataTypes } from '@etsoo/shared';
 /**
  * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const en: (resources: object | (() => Promise<object>)) => DataTypes.CultureDefinition<DataTypes.StringRecord>;
+export declare const en: (...resources: (object | (() => Promise<object>))[]) => import("@etsoo/shared").DataTypes.CultureDefinition<import("@etsoo/shared").DataTypes.StringRecord>;

package/lib/cjs/i18n/en.js

@@ -1,24 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.en = void 0;
-const shared_1 = require("@etsoo/shared");
+const CultureUtils_1 = require("./CultureUtils");
 /**
  * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-const en = (resources) => shared_1.DomUtils.en(async () => {
-    const [r1, r2] = await Promise.all([
-        import('./en.json'),
-        new Promise((resolve) => {
-            if (typeof resources === 'object') {
-                resolve(resources);
-            }
-            else {
-                resources().then((result) => resolve(result));
-            }
-        })
-    ]);
-    return { ...r1, ...r2 };
-});
+const en = (...resources) => CultureUtils_1.CultureUtils.make(import('./en.json'), ...resources);
 exports.en = en;

package/lib/cjs/i18n/zhHans.d.ts

@@ -1,7 +1,6 @@
-import { DataTypes } from '@etsoo/shared';
 /**
  * Get zh-Hans neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const zhHans: (resources: object | (() => Promise<object>)) => DataTypes.CultureDefinition<DataTypes.StringRecord>;
+export declare const zhHans: (...resources: (object | (() => Promise<object>))[]) => import("@etsoo/shared").DataTypes.CultureDefinition<import("@etsoo/shared").DataTypes.StringRecord>;

package/lib/cjs/i18n/zhHans.js

@@ -1,24 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zhHans = void 0;
-const shared_1 = require("@etsoo/shared");
+const CultureUtils_1 = require("./CultureUtils");
 /**
  * Get zh-Hans neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-const zhHans = (resources) => shared_1.DomUtils.zhHans(async () => {
-    const [r1, r2] = await Promise.all([
-        import('./zh-Hans.json'),
-        new Promise((resolve) => {
-            if (typeof resources === 'object') {
-                resolve(resources);
-            }
-            else {
-                resources().then((result) => resolve(result));
-            }
-        })
-    ]);
-    return { ...r1, ...r2 };
-});
+const zhHans = (...resources) => CultureUtils_1.CultureUtils.make(import('./zh-Hans.json'), ...resources);
 exports.zhHans = zhHans;

package/lib/cjs/i18n/zhHant.d.ts

@@ -1,7 +1,6 @@
-import { DataTypes } from '@etsoo/shared';
 /**
  * Get zh-Hant neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const zhHant: (resources: object | (() => Promise<object>)) => DataTypes.CultureDefinition<DataTypes.StringRecord>;
+export declare const zhHant: (...resources: (object | (() => Promise<object>))[]) => import("@etsoo/shared").DataTypes.CultureDefinition<import("@etsoo/shared").DataTypes.StringRecord>;

package/lib/cjs/i18n/zhHant.js

@@ -1,24 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zhHant = void 0;
-const shared_1 = require("@etsoo/shared");
+const CultureUtils_1 = require("./CultureUtils");
 /**
  * Get zh-Hant neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-const zhHant = (resources) => shared_1.DomUtils.zhHant(async () => {
-    const [r1, r2] = await Promise.all([
-        import('./zh-Hant.json'),
-        new Promise((resolve) => {
-            if (typeof resources === 'object') {
-                resolve(resources);
-            }
-            else {
-                resources().then((result) => resolve(result));
-            }
-        })
-    ]);
-    return { ...r1, ...r2 };
-});
+const zhHant = (...resources) => CultureUtils_1.CultureUtils.make(import('./zh-Hant.json'), ...resources);
 exports.zhHant = zhHant;

package/lib/cjs/index.d.ts

@@ -71,6 +71,7 @@ export * from './erp/EntityApi';
 export * from './erp/MemberApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
+export * from './i18n/CultureUtils';
 export * from './i18n/en';
 export * from './i18n/zhHans';
 export * from './i18n/zhHant';

package/lib/cjs/index.js

@@ -98,6 +98,7 @@ __exportStar(require("./erp/MemberApi"), exports);
 __exportStar(require("./erp/OrgApi"), exports);
 __exportStar(require("./erp/PublicApi"), exports);
 // i18n
+__exportStar(require("./i18n/CultureUtils"), exports);
 __exportStar(require("./i18n/en"), exports);
 __exportStar(require("./i18n/zhHans"), exports);
 __exportStar(require("./i18n/zhHant"), exports);

package/lib/mjs/app/CoreApp.js

@@ -1607,7 +1607,7 @@ export class CoreApp {
         }
         // Is web way?
         // Pass the true embedded status from parent to child (Both conditions are true)
-        if (isWeb && embedded && globalThis.self !== globalThis.parent) {
+        if (isWeb && embedded && globalThis.self === globalThis.parent) {
             embedded = false;
         }
         // Ignore the same value

package/lib/mjs/i18n/CultureUtils.d.ts

@@ -0,0 +1,12 @@
+import { DataTypes } from '@etsoo/shared';
+/**
+ * Culture utilities
+ */
+export declare namespace CultureUtils {
+    /**
+     * Make culture
+     * @param resources Resources
+     * @returns Culture
+     */
+    function make(...resources: (object | (() => Promise<object>))[]): DataTypes.CultureDefinition<DataTypes.StringRecord>;
+}

package/lib/mjs/i18n/CultureUtils.js

@@ -0,0 +1,31 @@
+import { DomUtils } from '@etsoo/shared';
+/**
+ * Culture utilities
+ */
+export var CultureUtils;
+(function (CultureUtils) {
+    /**
+     * Make culture
+     * @param resources Resources
+     * @returns Culture
+     */
+    function make(...resources) {
+        return DomUtils.zhHans(async () => {
+            const rs = await Promise.all([
+                ...resources.map((resource) => new Promise((resolve) => {
+                    if (typeof resource === 'object') {
+                        resolve(resource);
+                    }
+                    else {
+                        resource().then((result) => resolve(result));
+                    }
+                }))
+            ]);
+            return rs.reduce((prev, curr) => ({
+                ...prev,
+                ...curr
+            }));
+        });
+    }
+    CultureUtils.make = make;
+})(CultureUtils || (CultureUtils = {}));

package/lib/mjs/i18n/en.d.ts

@@ -1,7 +1,6 @@
-import { DataTypes } from '@etsoo/shared';
 /**
  * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const en: (resources: object | (() => Promise<object>)) => DataTypes.CultureDefinition<DataTypes.StringRecord>;
+export declare const en: (...resources: (object | (() => Promise<object>))[]) => import("@etsoo/shared").DataTypes.CultureDefinition<import("@etsoo/shared").DataTypes.StringRecord>;

package/lib/mjs/i18n/en.js

@@ -1,20 +1,7 @@
-import { DomUtils } from '@etsoo/shared';
+import { CultureUtils } from './CultureUtils';
 /**
  * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-export const en = (resources) => DomUtils.en(async () => {
-    const [r1, r2] = await Promise.all([
-        import('./en.json'),
-        new Promise((resolve) => {
-            if (typeof resources === 'object') {
-                resolve(resources);
-            }
-            else {
-                resources().then((result) => resolve(result));
-            }
-        })
-    ]);
-    return { ...r1, ...r2 };
-});
+export const en = (...resources) => CultureUtils.make(import('./en.json'), ...resources);

package/lib/mjs/i18n/zhHans.d.ts

@@ -1,7 +1,6 @@
-import { DataTypes } from '@etsoo/shared';
 /**
  * Get zh-Hans neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const zhHans: (resources: object | (() => Promise<object>)) => DataTypes.CultureDefinition<DataTypes.StringRecord>;
+export declare const zhHans: (...resources: (object | (() => Promise<object>))[]) => import("@etsoo/shared").DataTypes.CultureDefinition<import("@etsoo/shared").DataTypes.StringRecord>;

package/lib/mjs/i18n/zhHans.js

@@ -1,20 +1,7 @@
-import { DomUtils } from '@etsoo/shared';
+import { CultureUtils } from './CultureUtils';
 /**
  * Get zh-Hans neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHans = (resources) => DomUtils.zhHans(async () => {
-    const [r1, r2] = await Promise.all([
-        import('./zh-Hans.json'),
-        new Promise((resolve) => {
-            if (typeof resources === 'object') {
-                resolve(resources);
-            }
-            else {
-                resources().then((result) => resolve(result));
-            }
-        })
-    ]);
-    return { ...r1, ...r2 };
-});
+export const zhHans = (...resources) => CultureUtils.make(import('./zh-Hans.json'), ...resources);

package/lib/mjs/i18n/zhHant.d.ts

@@ -1,7 +1,6 @@
-import { DataTypes } from '@etsoo/shared';
 /**
  * Get zh-Hant neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const zhHant: (resources: object | (() => Promise<object>)) => DataTypes.CultureDefinition<DataTypes.StringRecord>;
+export declare const zhHant: (...resources: (object | (() => Promise<object>))[]) => import("@etsoo/shared").DataTypes.CultureDefinition<import("@etsoo/shared").DataTypes.StringRecord>;

package/lib/mjs/i18n/zhHant.js

@@ -1,20 +1,7 @@
-import { DomUtils } from '@etsoo/shared';
+import { CultureUtils } from './CultureUtils';
 /**
  * Get zh-Hant neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHant = (resources) => DomUtils.zhHant(async () => {
-    const [r1, r2] = await Promise.all([
-        import('./zh-Hant.json'),
-        new Promise((resolve) => {
-            if (typeof resources === 'object') {
-                resolve(resources);
-            }
-            else {
-                resources().then((result) => resolve(result));
-            }
-        })
-    ]);
-    return { ...r1, ...r2 };
-});
+export const zhHant = (...resources) => CultureUtils.make(import('./zh-Hant.json'), ...resources);

package/lib/mjs/index.d.ts

@@ -71,6 +71,7 @@ export * from './erp/EntityApi';
 export * from './erp/MemberApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
+export * from './i18n/CultureUtils';
 export * from './i18n/en';
 export * from './i18n/zhHans';
 export * from './i18n/zhHant';

package/lib/mjs/index.js

@@ -81,6 +81,7 @@ export * from './erp/MemberApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 // i18n
+export * from './i18n/CultureUtils';
 export * from './i18n/en';
 export * from './i18n/zhHans';
 export * from './i18n/zhHant';

package/package.json

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

package/src/app/CoreApp.ts

@@ -2198,7 +2198,7 @@ export abstract class CoreApp<
 
         // Is web way?
         // Pass the true embedded status from parent to child (Both conditions are true)
-        if (isWeb && embedded && globalThis.self !== globalThis.parent) {
+        if (isWeb && embedded && globalThis.self === globalThis.parent) {
             embedded = false;
         }
 

package/src/i18n/CultureUtils.ts

@@ -0,0 +1,32 @@
+import { DataTypes, DomUtils } from '@etsoo/shared';
+
+/**
+ * Culture utilities
+ */
+export namespace CultureUtils {
+    /**
+     * Make culture
+     * @param resources Resources
+     * @returns Culture
+     */
+    export function make(...resources: (object | (() => Promise<object>))[]) {
+        return DomUtils.zhHans(async () => {
+            const rs = await Promise.all([
+                ...resources.map(
+                    (resource) =>
+                        new Promise<object>((resolve) => {
+                            if (typeof resource === 'object') {
+                                resolve(resource);
+                            } else {
+                                resource().then((result) => resolve(result));
+                            }
+                        })
+                )
+            ]);
+            return rs.reduce((prev, curr) => ({
+                ...prev,
+                ...curr
+            })) as DataTypes.StringRecord;
+        });
+    }
+}

package/src/i18n/en.ts

@@ -1,21 +1,9 @@
-import { DataTypes, DomUtils } from '@etsoo/shared';
+import { CultureUtils } from './CultureUtils';
 
 /**
  * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-export const en = (resources: object | (() => Promise<object>)) =>
-    DomUtils.en(async () => {
-        const [r1, r2] = await Promise.all([
-            import('./en.json'),
-            new Promise<object>((resolve) => {
-                if (typeof resources === 'object') {
-                    resolve(resources);
-                } else {
-                    resources().then((result) => resolve(result));
-                }
-            })
-        ]);
-        return { ...r1, ...r2 } as DataTypes.StringRecord;
-    });
+export const en = (...resources: (object | (() => Promise<object>))[]) =>
+    CultureUtils.make(import('./en.json'), ...resources);

package/src/i18n/zhHans.ts

@@ -1,21 +1,9 @@
-import { DataTypes, DomUtils } from '@etsoo/shared';
+import { CultureUtils } from './CultureUtils';
 
 /**
  * Get zh-Hans neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHans = (resources: object | (() => Promise<object>)) =>
-    DomUtils.zhHans(async () => {
-        const [r1, r2] = await Promise.all([
-            import('./zh-Hans.json'),
-            new Promise<object>((resolve) => {
-                if (typeof resources === 'object') {
-                    resolve(resources);
-                } else {
-                    resources().then((result) => resolve(result));
-                }
-            })
-        ]);
-        return { ...r1, ...r2 } as DataTypes.StringRecord;
-    });
+export const zhHans = (...resources: (object | (() => Promise<object>))[]) =>
+    CultureUtils.make(import('./zh-Hans.json'), ...resources);

package/src/i18n/zhHant.ts

@@ -1,21 +1,9 @@
-import { DataTypes, DomUtils } from '@etsoo/shared';
+import { CultureUtils } from './CultureUtils';
 
 /**
  * Get zh-Hant neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export const zhHant = (resources: object | (() => Promise<object>)) =>
-    DomUtils.zhHant(async () => {
-        const [r1, r2] = await Promise.all([
-            import('./zh-Hant.json'),
-            new Promise<object>((resolve) => {
-                if (typeof resources === 'object') {
-                    resolve(resources);
-                } else {
-                    resources().then((result) => resolve(result));
-                }
-            })
-        ]);
-        return { ...r1, ...r2 } as DataTypes.StringRecord;
-    });
+export const zhHant = (...resources: (object | (() => Promise<object>))[]) =>
+    CultureUtils.make(import('./zh-Hant.json'), ...resources);

package/src/index.ts

@@ -90,6 +90,7 @@ export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 
 // i18n
+export * from './i18n/CultureUtils';
 export * from './i18n/en';
 export * from './i18n/zhHans';
 export * from './i18n/zhHant';