@etsoo/appscript 1.3.43 → 1.3.47

package/__tests__/app/CoreApp.ts

@@ -10,17 +10,17 @@ import { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
 import { DataTypes, DomUtils, Utils, WindowStorage } from '@etsoo/shared';
 import {
     AddressApi,
-    enUS,
+    en,
     ExternalSettings,
     IUser,
     OrgApi,
     PublicApi,
-    UserRole
+    UserRole,
+    zhHans
 } from '../../src';
 import { AddressUtils } from '../../src/address/AddressUtils';
 import { IAppSettings } from '../../src/app/AppSettings';
 import { CoreApp } from '../../src/app/CoreApp';
-import { zhCN } from '../../src/i18n/zhCN';
 import { InitCallResultData } from '../../src/result/InitCallResult';
 
 // Detected country or region
@@ -30,7 +30,7 @@ const { detectedCountry } = DomUtils;
 const { detectedCulture } = DomUtils;
 
 // Supported cultures
-const supportedCultures: DataTypes.CultureDefinition[] = [zhCN({}), enUS({})];
+const supportedCultures: DataTypes.CultureDefinition[] = [zhHans({}), en({})];
 
 // Supported regions
 const supportedRegions = ['CN'];
@@ -112,7 +112,7 @@ class CoreAppTest extends CoreApp<
                 currentCulture: DomUtils.getCulture(
                     supportedCultures,
                     detectedCulture
-                )!
+                )![0]
             }),
             createClient(),
             container,

package/lib/cjs/app/CoreApp.js

@@ -534,9 +534,9 @@ class CoreApp {
      */
     checkLanguage(language) {
         if (language) {
-            const item = this.settings.cultures.find((c) => { var _a; return c.name === language || ((_a = c.compatibleName) === null || _a === void 0 ? void 0 : _a.includes(language)); });
-            if (item)
-                return item.name;
+            const [cultrue, match] = shared_1.DomUtils.getCulture(this.settings.cultures, language);
+            if (cultrue != null && match != shared_1.DomUtils.CultureMatch.Default)
+                return cultrue.name;
         }
         // Default language
         return this.culture;

package/lib/cjs/erp/dto/OrgViewDto.d.ts

@@ -52,6 +52,10 @@ export type OrgViewDto = {
      * Entity status
      */
     entityStatus: EntityStatus;
+    /**
+     * Parent organization id
+     */
+    parentId?: number;
     /**
      * Creation
      */

package/lib/cjs/i18n/{zhCN.d.ts → en.d.ts}

@@ -1,7 +1,7 @@
 import { DataTypes } from '@etsoo/shared';
 /**
- * Get zh-CN cultrue
+ * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const zhCN: (localResources: {}) => DataTypes.CultureDefinition;
+export declare const en: (localResources: object) => DataTypes.CultureDefinition;

package/lib/cjs/i18n/{enUS.js → en.js}

@@ -3,17 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enUS = void 0;
-const en_US_json_1 = __importDefault(require("./en-US.json"));
+exports.en = void 0;
+const en_json_1 = __importDefault(require("./en.json"));
 /**
- * Get en-US cultrue
+ * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-const enUS = (localResources) => ({
-    name: 'en-US',
+const en = (localResources) => ({
+    name: 'en',
     label: 'English',
-    resources: { ...en_US_json_1.default, ...localResources },
-    compatibleName: ['en-CA', 'en-AU', 'en-NZ', 'en-GB', 'en-IE']
+    resources: { ...en_json_1.default, ...localResources },
+    compatibleNames: []
 });
-exports.enUS = enUS;
+exports.en = en;

package/lib/cjs/i18n/{zhHK.d.ts → zhHans.d.ts}

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

package/lib/cjs/i18n/{zhCN.js → zhHans.js}

@@ -3,17 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zhCN = void 0;
-const zh_CN_json_1 = __importDefault(require("./zh-CN.json"));
+exports.zhHans = void 0;
+const zh_Hans_json_1 = __importDefault(require("./zh-Hans.json"));
 /**
- * Get zh-CN cultrue
+ * Get zh-Hans neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-const zhCN = (localResources) => ({
-    name: 'zh-CN',
+const zhHans = (localResources) => ({
+    name: 'zh-Hans',
     label: '简体中文',
-    resources: { ...zh_CN_json_1.default, ...localResources },
-    compatibleName: ['zh-SG']
+    resources: { ...zh_Hans_json_1.default, ...localResources },
+    compatibleNames: ['zh-CN', 'zh-SG']
 });
-exports.zhCN = zhCN;
+exports.zhHans = zhHans;

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

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

package/lib/cjs/i18n/{zhHK.js → zhHant.js}

@@ -3,17 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zhHK = void 0;
-const zh_HK_json_1 = __importDefault(require("./zh-HK.json"));
+exports.zhHant = void 0;
+const zh_Hant_json_1 = __importDefault(require("./zh-Hant.json"));
 /**
- * Get zh-HK cultrue
+ * Get zh-Hant neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-const zhHK = (localResources) => ({
-    name: 'zh-HK',
+const zhHant = (localResources) => ({
+    name: 'zh-Hant',
     label: '繁體中文',
-    resources: { ...zh_HK_json_1.default, ...localResources },
-    compatibleName: ['zh-TW', 'zh-MO']
+    resources: { ...zh_Hant_json_1.default, ...localResources },
+    compatibleNames: ['zh-HK', 'zh-TW', 'zh-MO']
 });
-exports.zhHK = zhHK;
+exports.zhHant = zhHant;

package/lib/cjs/index.d.ts

@@ -41,9 +41,9 @@ export * from './erp/EntityApi';
 export * from './erp/MemberApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
-export * from './i18n/enUS';
-export * from './i18n/zhCN';
-export * from './i18n/zhHK';
+export * from './i18n/en';
+export * from './i18n/zhHans';
+export * from './i18n/zhHant';
 export { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
 export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';

package/lib/cjs/index.js

@@ -67,9 +67,9 @@ __exportStar(require("./erp/MemberApi"), exports);
 __exportStar(require("./erp/OrgApi"), exports);
 __exportStar(require("./erp/PublicApi"), exports);
 // i18n
-__exportStar(require("./i18n/enUS"), exports);
-__exportStar(require("./i18n/zhCN"), exports);
-__exportStar(require("./i18n/zhHK"), exports);
+__exportStar(require("./i18n/en"), exports);
+__exportStar(require("./i18n/zhHans"), exports);
+__exportStar(require("./i18n/zhHant"), exports);
 // @etsoo/restclient
 var restclient_1 = require("@etsoo/restclient");
 Object.defineProperty(exports, "ApiAuthorizationScheme", { enumerable: true, get: function () { return restclient_1.ApiAuthorizationScheme; } });

package/lib/mjs/app/CoreApp.js

@@ -531,9 +531,9 @@ export class CoreApp {
      */
     checkLanguage(language) {
         if (language) {
-            const item = this.settings.cultures.find((c) => { var _a; return c.name === language || ((_a = c.compatibleName) === null || _a === void 0 ? void 0 : _a.includes(language)); });
-            if (item)
-                return item.name;
+            const [cultrue, match] = DomUtils.getCulture(this.settings.cultures, language);
+            if (cultrue != null && match != DomUtils.CultureMatch.Default)
+                return cultrue.name;
         }
         // Default language
         return this.culture;

package/lib/mjs/erp/dto/OrgViewDto.d.ts

@@ -52,6 +52,10 @@ export type OrgViewDto = {
      * Entity status
      */
     entityStatus: EntityStatus;
+    /**
+     * Parent organization id
+     */
+    parentId?: number;
     /**
      * Creation
      */

package/lib/{cjs/i18n/enUS.d.ts → mjs/i18n/en.d.ts}

@@ -1,7 +1,7 @@
 import { DataTypes } from '@etsoo/shared';
 /**
- * Get en-US cultrue
+ * Get en neutral culture
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const enUS: (localResources: object) => DataTypes.CultureDefinition;
+export declare const en: (localResources: object) => DataTypes.CultureDefinition;

package/lib/mjs/i18n/en.js

@@ -0,0 +1,12 @@
+import enUSResources from './en.json';
+/**
+ * Get en neutral culture
+ * @param localResources Local resources
+ * @returns Full culture
+ */
+export const en = (localResources) => ({
+    name: 'en',
+    label: 'English',
+    resources: { ...enUSResources, ...localResources },
+    compatibleNames: []
+});

package/lib/mjs/i18n/{enUS.d.ts → zhHans.d.ts}

@@ -1,7 +1,7 @@
 import { DataTypes } from '@etsoo/shared';
 /**
- * Get en-US cultrue
+ * Get zh-Hans neutral cultrue
  * @param localResources Local resources
  * @returns Full culture
  */
-export declare const enUS: (localResources: object) => DataTypes.CultureDefinition;
+export declare const zhHans: (localResources: {}) => DataTypes.CultureDefinition;

package/lib/mjs/i18n/zhHans.js

@@ -0,0 +1,12 @@
+import zhCNResources from './zh-Hans.json';
+/**
+ * Get zh-Hans neutral cultrue
+ * @param localResources Local resources
+ * @returns Full culture
+ */
+export const zhHans = (localResources) => ({
+    name: 'zh-Hans',
+    label: '简体中文',
+    resources: { ...zhCNResources, ...localResources },
+    compatibleNames: ['zh-CN', 'zh-SG']
+});

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

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

package/lib/mjs/i18n/zhHant.js

@@ -0,0 +1,12 @@
+import zhHKResources from './zh-Hant.json';
+/**
+ * Get zh-Hant neutral cultrue
+ * @param localResources Local resources
+ * @returns Full culture
+ */
+export const zhHant = (localResources) => ({
+    name: 'zh-Hant',
+    label: '繁體中文',
+    resources: { ...zhHKResources, ...localResources },
+    compatibleNames: ['zh-HK', 'zh-TW', 'zh-MO']
+});

package/lib/mjs/index.d.ts

@@ -41,9 +41,9 @@ export * from './erp/EntityApi';
 export * from './erp/MemberApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
-export * from './i18n/enUS';
-export * from './i18n/zhCN';
-export * from './i18n/zhHK';
+export * from './i18n/en';
+export * from './i18n/zhHans';
+export * from './i18n/zhHant';
 export { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
 export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';

package/lib/mjs/index.js

@@ -50,9 +50,9 @@ export * from './erp/MemberApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 // i18n
-export * from './i18n/enUS';
-export * from './i18n/zhCN';
-export * from './i18n/zhHK';
+export * from './i18n/en';
+export * from './i18n/zhHans';
+export * from './i18n/zhHant';
 // @etsoo/restclient
 export { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
 // result

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.43",
+    "version": "1.3.47",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.18",
         "@etsoo/restclient": "^1.0.79",
-        "@etsoo/shared": "^1.1.78",
+        "@etsoo/shared": "^1.1.81",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
@@ -67,7 +67,7 @@
         "@types/jest": "^29.2.3",
         "@typescript-eslint/eslint-plugin": "^5.45.0",
         "@typescript-eslint/parser": "^5.45.0",
-        "eslint": "^8.28.0",
+        "eslint": "^8.29.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^29.3.1",

package/src/app/CoreApp.ts

@@ -783,11 +783,12 @@ export abstract class CoreApp<
      */
     checkLanguage(language?: string) {
         if (language) {
-            const item = this.settings.cultures.find(
-                (c) =>
-                    c.name === language || c.compatibleName?.includes(language)
+            const [cultrue, match] = DomUtils.getCulture(
+                this.settings.cultures,
+                language
             );
-            if (item) return item.name;
+            if (cultrue != null && match != DomUtils.CultureMatch.Default)
+                return cultrue.name;
         }
 
         // Default language

package/src/erp/dto/OrgViewDto.ts

@@ -66,6 +66,11 @@ export type OrgViewDto = {
      */
     entityStatus: EntityStatus;
 
+    /**
+     * Parent organization id
+     */
+    parentId?: number;
+
     /**
      * Creation
      */

package/src/i18n/en.ts

@@ -0,0 +1,14 @@
+import { DataTypes } from '@etsoo/shared';
+import enUSResources from './en.json';
+
+/**
+ * Get en neutral culture
+ * @param localResources Local resources
+ * @returns Full culture
+ */
+export const en = (localResources: object): DataTypes.CultureDefinition => ({
+    name: 'en',
+    label: 'English',
+    resources: { ...enUSResources, ...localResources },
+    compatibleNames: []
+});

package/src/i18n/zhHans.ts

@@ -0,0 +1,14 @@
+import { DataTypes } from '@etsoo/shared';
+import zhCNResources from './zh-Hans.json';
+
+/**
+ * Get zh-Hans neutral cultrue
+ * @param localResources Local resources
+ * @returns Full culture
+ */
+export const zhHans = (localResources: {}): DataTypes.CultureDefinition => ({
+    name: 'zh-Hans',
+    label: '简体中文',
+    resources: { ...zhCNResources, ...localResources },
+    compatibleNames: ['zh-CN', 'zh-SG']
+});

package/src/i18n/zhHant.ts

@@ -0,0 +1,16 @@
+import { DataTypes } from '@etsoo/shared';
+import zhHKResources from './zh-Hant.json';
+
+/**
+ * Get zh-Hant neutral cultrue
+ * @param localResources Local resources
+ * @returns Full culture
+ */
+export const zhHant = (
+    localResources: object
+): DataTypes.CultureDefinition => ({
+    name: 'zh-Hant',
+    label: '繁體中文',
+    resources: { ...zhHKResources, ...localResources },
+    compatibleNames: ['zh-HK', 'zh-TW', 'zh-MO']
+});

package/src/index.ts

@@ -58,9 +58,9 @@ export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 
 // i18n
-export * from './i18n/enUS';
-export * from './i18n/zhCN';
-export * from './i18n/zhHK';
+export * from './i18n/en';
+export * from './i18n/zhHans';
+export * from './i18n/zhHant';
 
 // @etsoo/restclient
 export { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';

package/lib/mjs/i18n/enUS.js

@@ -1,12 +0,0 @@
-import enUSResources from './en-US.json';
-/**
- * Get en-US cultrue
- * @param localResources Local resources
- * @returns Full culture
- */
-export const enUS = (localResources) => ({
-    name: 'en-US',
-    label: 'English',
-    resources: { ...enUSResources, ...localResources },
-    compatibleName: ['en-CA', 'en-AU', 'en-NZ', 'en-GB', 'en-IE']
-});

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

@@ -1,7 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-/**
- * Get zh-CN cultrue
- * @param localResources Local resources
- * @returns Full culture
- */
-export declare const zhCN: (localResources: {}) => DataTypes.CultureDefinition;

package/lib/mjs/i18n/zhCN.js

@@ -1,12 +0,0 @@
-import zhCNResources from './zh-CN.json';
-/**
- * Get zh-CN cultrue
- * @param localResources Local resources
- * @returns Full culture
- */
-export const zhCN = (localResources) => ({
-    name: 'zh-CN',
-    label: '简体中文',
-    resources: { ...zhCNResources, ...localResources },
-    compatibleName: ['zh-SG']
-});

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

@@ -1,7 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-/**
- * Get zh-HK cultrue
- * @param localResources Local resources
- * @returns Full culture
- */
-export declare const zhHK: (localResources: object) => DataTypes.CultureDefinition;

package/lib/mjs/i18n/zhHK.js

@@ -1,12 +0,0 @@
-import zhHKResources from './zh-HK.json';
-/**
- * Get zh-HK cultrue
- * @param localResources Local resources
- * @returns Full culture
- */
-export const zhHK = (localResources) => ({
-    name: 'zh-HK',
-    label: '繁體中文',
-    resources: { ...zhHKResources, ...localResources },
-    compatibleName: ['zh-TW', 'zh-MO']
-});

package/src/i18n/enUS.ts

@@ -1,14 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-import enUSResources from './en-US.json';
-
-/**
- * Get en-US cultrue
- * @param localResources Local resources
- * @returns Full culture
- */
-export const enUS = (localResources: object): DataTypes.CultureDefinition => ({
-    name: 'en-US',
-    label: 'English',
-    resources: { ...enUSResources, ...localResources },
-    compatibleName: ['en-CA', 'en-AU', 'en-NZ', 'en-GB', 'en-IE']
-});

package/src/i18n/zhCN.ts

@@ -1,14 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-import zhCNResources from './zh-CN.json';
-
-/**
- * Get zh-CN cultrue
- * @param localResources Local resources
- * @returns Full culture
- */
-export const zhCN = (localResources: {}): DataTypes.CultureDefinition => ({
-    name: 'zh-CN',
-    label: '简体中文',
-    resources: { ...zhCNResources, ...localResources },
-    compatibleName: ['zh-SG']
-});

package/src/i18n/zhHK.ts

@@ -1,14 +0,0 @@
-import { DataTypes } from '@etsoo/shared';
-import zhHKResources from './zh-HK.json';
-
-/**
- * Get zh-HK cultrue
- * @param localResources Local resources
- * @returns Full culture
- */
-export const zhHK = (localResources: object): DataTypes.CultureDefinition => ({
-    name: 'zh-HK',
-    label: '繁體中文',
-    resources: { ...zhHKResources, ...localResources },
-    compatibleName: ['zh-TW', 'zh-MO']
-});