@etsoo/appscript 1.1.45 → 1.1.49

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

@@ -22,10 +22,6 @@ export interface IAppSettings extends IExternalSettings {
      * Detected culture
      */
     readonly detectedCulture: string;
-    /**
-     * Service id
-     */
-    readonly serviceId?: string;
     /**
      * Time zone
      */

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

@@ -182,7 +182,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not
@@ -415,7 +415,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

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

@@ -24,12 +24,11 @@ export interface IExternalSettings {
     readonly coreApi?: string;
 }
 /**
- * External settings host
- * Usually passed by window global settings property
+ * External settings namespace
  */
-export interface IExternalSettingsHost {
+export declare namespace ExternalSettings {
     /**
-     * Configurable API settings
+     * Create instance
      */
-    readonly settings: IExternalSettings;
+    function Create(): IExternalSettings | undefined;
 }

package/lib/cjs/app/ExternalSettings.js

@@ -1,2 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExternalSettings = void 0;
+/**
+ * External settings namespace
+ */
+var ExternalSettings;
+(function (ExternalSettings) {
+    /**
+     * Create instance
+     */
+    function Create() {
+        if ('settings' in globalThis) {
+            const settings = Reflect.get(globalThis, 'settings');
+            if (typeof settings === 'object') {
+                if (typeof window !== 'undefined') {
+                    const hostname = window.location.hostname;
+                    // replace {hostname}
+                    for (const key in settings) {
+                        const value = settings[key];
+                        if (typeof value === 'string') {
+                            settings[key] = value.replace('{hostname}', hostname);
+                        }
+                    }
+                }
+                return settings;
+            }
+        }
+        return undefined;
+    }
+    ExternalSettings.Create = Create;
+})(ExternalSettings = exports.ExternalSettings || (exports.ExternalSettings = {}));

package/lib/cjs/i18n/en-US.json

@@ -31,6 +31,7 @@
     "name": "Name",
     "no": "No",
     "noChanges": "No changes yet",
+    "noData": "No valid data",
     "noOptions": "No options",
     "ok": "OK",
     "open": "Open",

package/lib/cjs/i18n/zh-CN.json

@@ -31,6 +31,7 @@
     "name": "姓名",
     "no": "否",
     "noChanges": "还没有任何修改",
+    "noData": "没有有效数据",
     "noOptions": "没有选项",
     "ok": "确定",
     "open": "打开",

package/lib/cjs/i18n/zh-HK.json

@@ -31,6 +31,7 @@
     "name": "姓名",
     "no": "否",
     "noChanges": "還沒有任何修改",
+    "noData": "沒有有效數據",
     "noOptions": "沒有選項",
     "ok": "確定",
     "open": "打開",

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

@@ -22,10 +22,6 @@ export interface IAppSettings extends IExternalSettings {
      * Detected culture
      */
     readonly detectedCulture: string;
-    /**
-     * Service id
-     */
-    readonly serviceId?: string;
     /**
      * Time zone
      */

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

@@ -182,7 +182,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not
@@ -415,7 +415,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

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

@@ -24,12 +24,11 @@ export interface IExternalSettings {
     readonly coreApi?: string;
 }
 /**
- * External settings host
- * Usually passed by window global settings property
+ * External settings namespace
  */
-export interface IExternalSettingsHost {
+export declare namespace ExternalSettings {
     /**
-     * Configurable API settings
+     * Create instance
      */
-    readonly settings: IExternalSettings;
+    function Create(): IExternalSettings | undefined;
 }

package/lib/mjs/app/ExternalSettings.js

@@ -1 +1,29 @@
-export {};
+/**
+ * External settings namespace
+ */
+export var ExternalSettings;
+(function (ExternalSettings) {
+    /**
+     * Create instance
+     */
+    function Create() {
+        if ('settings' in globalThis) {
+            const settings = Reflect.get(globalThis, 'settings');
+            if (typeof settings === 'object') {
+                if (typeof window !== 'undefined') {
+                    const hostname = window.location.hostname;
+                    // replace {hostname}
+                    for (const key in settings) {
+                        const value = settings[key];
+                        if (typeof value === 'string') {
+                            settings[key] = value.replace('{hostname}', hostname);
+                        }
+                    }
+                }
+                return settings;
+            }
+        }
+        return undefined;
+    }
+    ExternalSettings.Create = Create;
+})(ExternalSettings || (ExternalSettings = {}));

package/lib/mjs/i18n/en-US.json

@@ -31,6 +31,7 @@
     "name": "Name",
     "no": "No",
     "noChanges": "No changes yet",
+    "noData": "No valid data",
     "noOptions": "No options",
     "ok": "OK",
     "open": "Open",

package/lib/mjs/i18n/zh-CN.json

@@ -31,6 +31,7 @@
     "name": "姓名",
     "no": "否",
     "noChanges": "还没有任何修改",
+    "noData": "没有有效数据",
     "noOptions": "没有选项",
     "ok": "确定",
     "open": "打开",

package/lib/mjs/i18n/zh-HK.json

@@ -31,6 +31,7 @@
     "name": "姓名",
     "no": "否",
     "noChanges": "還沒有任何修改",
+    "noData": "沒有有效數據",
     "noOptions": "沒有選項",
     "ok": "確定",
     "open": "打開",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.45",
+    "version": "1.1.49",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.0.93",
         "@etsoo/restclient": "^1.0.62",
-        "@etsoo/shared": "^1.0.73"
+        "@etsoo/shared": "^1.0.75"
     },
     "devDependencies": {
         "@babel/cli": "^7.16.0",
@@ -62,14 +62,14 @@
         "@babel/plugin-transform-runtime": "^7.16.4",
         "@babel/preset-env": "^7.16.4",
         "@babel/runtime-corejs3": "^7.16.3",
-        "@types/jest": "^27.0.2",
+        "@types/jest": "^27.0.3",
         "@typescript-eslint/eslint-plugin": "^5.4.0",
         "@typescript-eslint/parser": "^5.4.0",
-        "eslint": "^8.2.0",
+        "eslint": "^8.3.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
         "jest": "^27.3.1",
         "ts-jest": "^27.0.7",
-        "typescript": "^4.4.4"
+        "typescript": "^4.5.2"
     }
 }

package/src/app/AppSettings.ts

@@ -27,11 +27,6 @@ export interface IAppSettings extends IExternalSettings {
      */
     readonly detectedCulture: string;
 
-    /**
-     * Service id
-     */
-    readonly serviceId?: string;
-
     /**
      * Time zone
      */

package/src/app/CoreApp.ts

@@ -244,7 +244,7 @@ export interface ICoreApp<
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
 
     /**
      * User logout
@@ -829,7 +829,7 @@ export abstract class CoreApp<
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken?: string, keep: boolean = false) {
+    userLogin(user: IUserData, refreshToken: string, keep: boolean = false) {
         this.userData = user;
         this.authorize(user.token, refreshToken, keep);
     }

package/src/app/ExternalSettings.ts

@@ -29,12 +29,33 @@ export interface IExternalSettings {
 }
 
 /**
- * External settings host
- * Usually passed by window global settings property
+ * External settings namespace
  */
-export interface IExternalSettingsHost {
+export namespace ExternalSettings {
     /**
-     * Configurable API settings
+     * Create instance
      */
-    readonly settings: IExternalSettings;
+    export function Create(): IExternalSettings | undefined {
+        if ('settings' in globalThis) {
+            const settings = Reflect.get(globalThis, 'settings');
+            if (typeof settings === 'object') {
+                if (typeof window !== 'undefined') {
+                    const hostname = window.location.hostname;
+                    // replace {hostname}
+                    for (const key in settings) {
+                        const value = settings[key];
+                        if (typeof value === 'string') {
+                            settings[key] = value.replace(
+                                '{hostname}',
+                                hostname
+                            );
+                        }
+                    }
+                }
+
+                return settings as IExternalSettings;
+            }
+        }
+        return undefined;
+    }
 }

package/src/i18n/en-US.json

@@ -31,6 +31,7 @@
     "name": "Name",
     "no": "No",
     "noChanges": "No changes yet",
+    "noData": "No valid data",
     "noOptions": "No options",
     "ok": "OK",
     "open": "Open",

package/src/i18n/zh-CN.json

@@ -31,6 +31,7 @@
     "name": "姓名",
     "no": "否",
     "noChanges": "还没有任何修改",
+    "noData": "没有有效数据",
     "noOptions": "没有选项",
     "ok": "确定",
     "open": "打开",

package/src/i18n/zh-HK.json

@@ -31,6 +31,7 @@
     "name": "姓名",
     "no": "否",
     "noChanges": "還沒有任何修改",
+    "noData": "沒有有效數據",
     "noOptions": "沒有選項",
     "ok": "確定",
     "open": "打開",