@etsoo/appscript 1.1.3 → 1.1.7

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

@@ -30,7 +30,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
     /**
      * Label delegate
      */
-    readonly labelDelegate: <T extends DataTypes.SimpleType = string>(key: string) => T | undefined;
+    readonly labelDelegate: <T = string>(key: string) => T | undefined;
     /**
      * Culture, like zh-CN
      */
@@ -43,6 +43,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Country or region, like CN
      */
     readonly region: string;
+    /**
+     * Is current authorized
+     */
+    readonly authorized: boolean;
     /**
      * IP data
      */
@@ -110,7 +114,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param key key
      * @returns Resource
      */
-    get<T extends DataTypes.SimpleType = string>(key: string): T | undefined;
+    get<T = string>(key: string): T | undefined;
     /**
      * Get multiple culture labels
      * @param keys Keys
@@ -149,6 +153,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Transformed url
      */
     transformUrl(url: string): string;
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin(): boolean;
     /**
      * User login
      * @param user User data
@@ -195,7 +203,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Label delegate
      */
-    get labelDelegate(): <T extends DataTypes.SimpleType = string>(key: string) => T | undefined;
+    get labelDelegate(): <T = string>(key: string) => T | undefined;
     /**
      * IP data
      */
@@ -213,6 +221,13 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Search input element
      */
     searchInput?: HTMLInputElement;
+    private _authorized;
+    /**
+     * Is current authorized
+     */
+    get authorized(): boolean;
+    private set authorized(value);
+    private _isTryingLogin;
     /**
      * Protected constructor
      * @param settings Settings
@@ -282,7 +297,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param key key
      * @returns Resource
      */
-    get<T extends DataTypes.SimpleType = string>(key: string): T | undefined;
+    get<T = string>(key: string): T | undefined;
     /**
      * Get multiple culture labels
      * @param keys Keys
@@ -326,9 +341,9 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     transformUrl(url: string): string;
     /**
-     * Try login
+     * Try login, returning false means is loading
      */
-    abstract tryLogin(): void;
+    tryLogin(): boolean;
     /**
      * User login
      * @param user User data

package/lib/mjs/app/CoreApp.js

@@ -16,6 +16,8 @@ export class CoreApp {
          * Response token header field name
          */
         this.headerTokenField = 'SmartERPRefreshToken';
+        this._authorized = false;
+        this._isTryingLogin = false;
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
             if (data.showLoading == null || data.showLoading) {
@@ -76,6 +78,15 @@ export class CoreApp {
     get labelDelegate() {
         return this.get.bind(this);
     }
+    /**
+     * Is current authorized
+     */
+    get authorized() {
+        return this._authorized;
+    }
+    set authorized(value) {
+        this._authorized = value;
+    }
     /**
      * Alert action result
      * @param result Action result
@@ -90,10 +101,15 @@ export class CoreApp {
      * @param keep Keep in local storage or not
      */
     authorize(token, refreshToken, keep = false) {
+        // State, when token is null, means logout
+        this.authorized = token != null;
+        // Token
         this.api.authorize(this.settings.authScheme, token);
         // Cover the current value
         StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
         StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        // Reset tryLogin state
+        this._isTryingLogin = false;
     }
     /**
      * Change country or region
@@ -175,8 +191,7 @@ export class CoreApp {
     }
     // Detect IP callbacks
     detectIPCallbacks() {
-        var _a;
-        (_a = this.ipDetectCallbacks) === null || _a === void 0 ? void 0 : _a.forEach((f) => f());
+        this.ipDetectCallbacks?.forEach((f) => f());
     }
     /**
      * Format date to string
@@ -187,7 +202,7 @@ export class CoreApp {
      */
     formatDate(input, options, timeZone) {
         const { currentCulture, timeZone: defaultTimeZone } = this.settings;
-        timeZone !== null && timeZone !== void 0 ? timeZone : (timeZone = defaultTimeZone);
+        timeZone ?? (timeZone = defaultTimeZone);
         return DateUtils.format(input, currentCulture.name, options, timeZone);
     }
     /**
@@ -226,6 +241,9 @@ export class CoreApp {
         const value = this.settings.currentCulture.resources[key];
         if (value == null)
             return undefined;
+        // No strict type convertion here
+        // Make sure the type is strictly match
+        // Otherwise even request number, may still return the source string type
         return value;
     }
     /**
@@ -234,7 +252,7 @@ export class CoreApp {
      */
     getLabels(...keys) {
         const init = {};
-        return keys.reduce((a, v) => { var _a; return ({ ...a, [v]: (_a = this.get(v)) !== null && _a !== void 0 ? _a : '' }); }, init);
+        return keys.reduce((a, v) => ({ ...a, [v]: this.get(v) ?? '' }), init);
     }
     /**
      * Get cached token
@@ -275,9 +293,8 @@ export class CoreApp {
      * @returns Time zone
      */
     getTimeZone() {
-        var _a, _b;
         // settings.timeZone = Utils.getTimeZone()
-        return (_a = this.settings.timeZone) !== null && _a !== void 0 ? _a : (_b = this.ipData) === null || _b === void 0 ? void 0 : _b.timezone;
+        return this.settings.timeZone ?? this.ipData?.timezone;
     }
     /**
      * Callback where exit a page
@@ -309,6 +326,15 @@ export class CoreApp {
         // To /a/b/../ => /a
         return pathname.endsWith('/') ? pathname + url : pathname + '/' + url;
     }
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin() {
+        if (this._isTryingLogin)
+            return false;
+        this._isTryingLogin = true;
+        return true;
+    }
     /**
      * User login
      * @param user User data

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

@@ -1,5 +1,5 @@
 /**
- * External settings
+ * External settings items
  */
 export interface IExternalSettings {
     /**

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

@@ -0,0 +1,66 @@
+/**
+ * Business tax interface
+ */
+export interface IBusinessTax {
+    /**
+     * Id
+     */
+    readonly id: string;
+    /**
+     * Name
+     */
+    readonly name: string;
+    /**
+     * Mask
+     */
+    readonly mask: string;
+    /**
+     * Get label key
+     */
+    readonly labelKey: string;
+}
+/**
+ * Business tax
+ * https://imask.js.org/
+ */
+export declare class BusinessTax implements IBusinessTax {
+    id: string;
+    name: string;
+    mask: string;
+    /**
+     * CN
+     * Unified Social Credit Code (USCC) / 统一信用代码
+     * https://zh.wikisource.org/wiki/GB_32100-2015_%E6%B3%95%E4%BA%BA%E5%92%8C%E5%85%B6%E4%BB%96%E7%BB%84%E7%BB%87%E7%BB%9F%E4%B8%80%E7%A4%BE%E4%BC%9A%E4%BF%A1%E7%94%A8%E4%BB%A3%E7%A0%81%E7%BC%96%E7%A0%81%E8%A7%84%E5%88%99
+     */
+    static CN: BusinessTax;
+    /**
+     * NZ, Inland Revenue (IRD)
+     */
+    static NZ: BusinessTax;
+    /**
+     * US, Employer Identification Number (EIN)
+     */
+    static US: BusinessTax;
+    /**
+     * CA, tax ID number (Business Number, BN)
+     */
+    static CA: BusinessTax;
+    /**
+     * HK, Business Registration Number (BRN)
+     */
+    static HK: BusinessTax;
+    /**
+     * All countries and regions
+     */
+    static all: BusinessTax[];
+    /**
+     * Get country or region by id
+     * @param id Country id
+     */
+    static getById(id: string): BusinessTax | undefined;
+    constructor(id: string, name: string, mask: string);
+    /**
+     * Get label key
+     */
+    get labelKey(): string;
+}

package/lib/mjs/business/BusinessTax.js

@@ -0,0 +1,57 @@
+/**
+ * Business tax
+ * https://imask.js.org/
+ */
+export class BusinessTax {
+    // Typescript constructor shorthand
+    constructor(id, name, mask) {
+        this.id = id;
+        this.name = name;
+        this.mask = mask;
+    }
+    /**
+     * Get country or region by id
+     * @param id Country id
+     */
+    static getById(id) {
+        return BusinessTax.all.find((c) => c.id === id);
+    }
+    /**
+     * Get label key
+     */
+    get labelKey() {
+        return 'tax' + this.id + this.name;
+    }
+}
+/**
+ * CN
+ * Unified Social Credit Code (USCC) / 统一信用代码
+ * https://zh.wikisource.org/wiki/GB_32100-2015_%E6%B3%95%E4%BA%BA%E5%92%8C%E5%85%B6%E4%BB%96%E7%BB%84%E7%BB%87%E7%BB%9F%E4%B8%80%E7%A4%BE%E4%BC%9A%E4%BF%A1%E7%94%A8%E4%BB%A3%E7%A0%81%E7%BC%96%E7%A0%81%E8%A7%84%E5%88%99
+ */
+BusinessTax.CN = new BusinessTax('CN', 'USCC', '*0-000000-**********');
+/**
+ * NZ, Inland Revenue (IRD)
+ */
+BusinessTax.NZ = new BusinessTax('NZ', 'IRD', '00[0]-000-000');
+/**
+ * US, Employer Identification Number (EIN)
+ */
+BusinessTax.US = new BusinessTax('US', 'EIN', '00-0000000');
+/**
+ * CA, tax ID number (Business Number, BN)
+ */
+BusinessTax.CA = new BusinessTax('CA', 'BN', '000000000');
+/**
+ * HK, Business Registration Number (BRN)
+ */
+BusinessTax.HK = new BusinessTax('HK', 'BRN', '00000000');
+/**
+ * All countries and regions
+ */
+BusinessTax.all = [
+    BusinessTax.CN,
+    BusinessTax.NZ,
+    BusinessTax.US,
+    BusinessTax.CA,
+    BusinessTax.HK
+];

package/lib/mjs/business/BusinessUtils.js

@@ -1,4 +1,4 @@
-import { Utils } from '@etsoo/shared';
+import { DataTypes } from '@etsoo/shared';
 import { ProductUnit } from './ProductUnit';
 /**
  * Business utils
@@ -21,8 +21,7 @@ export var BusinessUtils;
     BusinessUtils.addIdLabelBlankItem = addIdLabelBlankItem;
     // Get unit label by key
     function getUnitLabelByKey(func, key) {
-        var _a;
-        return (_a = func('unit' + key)) !== null && _a !== void 0 ? _a : key;
+        return func('unit' + key) ?? key;
     }
     /**
      * Get product unit's label
@@ -42,7 +41,7 @@ export var BusinessUtils;
      * @returns Units
      */
     function getUnits(func) {
-        return Utils.getEnumKeys(ProductUnit).map((key) => ({
+        return DataTypes.getEnumKeys(ProductUnit).map((key) => ({
             id: ProductUnit[key],
             label: getUnitLabelByKey(func, key)
         }));

package/lib/mjs/dto/IdDto.d.ts

@@ -1,5 +1,5 @@
 /**
- * Id Dto
+ * Dto with id field
  */
 export declare type IdDto<T = number> = {
     /**

package/lib/mjs/dto/IdLabelDto.d.ts

@@ -1,6 +1,6 @@
 import { DataTypes } from '@etsoo/shared';
 /**
- * Id & label data
+ * Dto with id and label field
  */
 export declare type IdLabelDto = {
     /**

package/lib/mjs/dto/UpdateDto.d.ts

@@ -1,6 +1,6 @@
 import { IdDto } from './IdDto';
 /**
- * Update Dto
+ * Dto with id and changedFields
  */
 export declare type UpdateDto<T = number> = IdDto<T> & {
     /**

package/lib/mjs/index.d.ts

@@ -7,6 +7,7 @@ export * from './app/ExternalSettings';
 export * from './bridges/ElectronBridge';
 export * from './bridges/IAppData';
 export * from './bridges/IBridge';
+export * from './business/BusinessTax';
 export * from './business/BusinessUtils';
 export * from './business/ProductUnit';
 export * from './dto/IdDto';

package/lib/mjs/index.js

@@ -11,6 +11,7 @@ export * from './bridges/ElectronBridge';
 export * from './bridges/IAppData';
 export * from './bridges/IBridge';
 // business
+export * from './business/BusinessTax';
 export * from './business/BusinessUtils';
 export * from './business/ProductUnit';
 // dto

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.3",
+    "version": "1.1.7",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -47,24 +47,24 @@
     },
     "homepage": "https://github.com/ETSOO/NotificationBase#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.0.79",
-        "@etsoo/restclient": "^1.0.51",
-        "@etsoo/shared": "^1.0.46"
+        "@etsoo/notificationbase": "^1.0.82",
+        "@etsoo/restclient": "^1.0.52",
+        "@etsoo/shared": "^1.0.49"
     },
     "devDependencies": {
         "@babel/cli": "^7.15.7",
-        "@babel/core": "^7.15.5",
-        "@babel/plugin-transform-runtime": "^7.15.0",
-        "@babel/preset-env": "^7.15.6",
+        "@babel/core": "^7.15.8",
+        "@babel/plugin-transform-runtime": "^7.15.8",
+        "@babel/preset-env": "^7.15.8",
         "@babel/runtime-corejs3": "^7.15.4",
         "@types/jest": "^27.0.2",
-        "@typescript-eslint/eslint-plugin": "^4.32.0",
-        "@typescript-eslint/parser": "^4.32.0",
-        "eslint": "^7.32.0",
+        "@typescript-eslint/eslint-plugin": "^5.0.0",
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^8.0.1",
         "eslint-config-airbnb-base": "^14.2.1",
-        "eslint-plugin-import": "^2.24.2",
-        "jest": "^27.2.4",
-        "ts-jest": "^27.0.5",
-        "typescript": "^4.4.3"
+        "eslint-plugin-import": "^2.25.2",
+        "jest": "^27.2.5",
+        "ts-jest": "^27.0.6",
+        "typescript": "^4.4.4"
     }
 }

package/src/address/AddressUtils.ts

@@ -1,4 +1,4 @@
-import { Utils } from '@etsoo/shared';
+import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from '..';
 import { IdLabelDto } from '../dto/IdLabelDto';
 import { ICultureGet } from '../state/Culture';
@@ -18,7 +18,7 @@ export namespace AddressUtils {
         func: ICultureGet,
         isNumberKey: boolean = false
     ): IdLabelDto[] {
-        return Utils.getEnumKeys(AddressContinent).map((key) => ({
+        return DataTypes.getEnumKeys(AddressContinent).map((key) => ({
             id: isNumberKey
                 ? AddressContinent[key as keyof typeof AddressContinent]
                 : key,
@@ -27,7 +27,7 @@ export namespace AddressUtils {
     }
 
     /**
-     * Get region
+     * Get region from regions and detected region and language
      * @param regions Supported regions
      * @param detectedRegion Detected region
      * @param detectedLanguage Detected language

package/src/app/AppSettings.ts

@@ -4,7 +4,7 @@ import { AddressRegion } from '../address/AddressRegion';
 import { IExternalSettings } from './ExternalSettings';
 
 /**
- * API settings interface
+ * App settings interface
  */
 export interface IAppSettings extends IExternalSettings {
     /**

package/src/app/CoreApp.ts

@@ -46,9 +46,7 @@ export interface ICoreApp<
     /**
      * Label delegate
      */
-    readonly labelDelegate: <T extends DataTypes.SimpleType = string>(
-        key: string
-    ) => T | undefined;
+    readonly labelDelegate: <T = string>(key: string) => T | undefined;
 
     /**
      * Culture, like zh-CN
@@ -65,6 +63,11 @@ export interface ICoreApp<
      */
     readonly region: string;
 
+    /**
+     * Is current authorized
+     */
+    readonly authorized: boolean;
+
     /**
      * IP data
      */
@@ -154,7 +157,7 @@ export interface ICoreApp<
      * @param key key
      * @returns Resource
      */
-    get<T extends DataTypes.SimpleType = string>(key: string): T | undefined;
+    get<T = string>(key: string): T | undefined;
 
     /**
      * Get multiple culture labels
@@ -199,6 +202,11 @@ export interface ICoreApp<
      */
     transformUrl(url: string): string;
 
+    /**
+     * Try login, returning false means is loading
+     */
+    tryLogin(): boolean;
+
     /**
      * User login
      * @param user User data
@@ -291,6 +299,20 @@ export abstract class CoreApp<
      */
     searchInput?: HTMLInputElement;
 
+    private _authorized: boolean = false;
+    /**
+     * Is current authorized
+     */
+    get authorized() {
+        return this._authorized;
+    }
+
+    private set authorized(value: boolean) {
+        this._authorized = value;
+    }
+
+    private _isTryingLogin = false;
+
     /**
      * Protected constructor
      * @param settings Settings
@@ -355,6 +377,10 @@ export abstract class CoreApp<
      * @param keep Keep in local storage or not
      */
     authorize(token?: string, refreshToken?: string, keep: boolean = false) {
+        // State, when token is null, means logout
+        this.authorized = token != null;
+
+        // Token
         this.api.authorize(this.settings.authScheme, token);
 
         // Cover the current value
@@ -366,6 +392,9 @@ export abstract class CoreApp<
             this.headerTokenField,
             keep ? undefined : refreshToken
         );
+
+        // Reset tryLogin state
+        this._isTryingLogin = false;
     }
 
     /**
@@ -529,9 +558,13 @@ export abstract class CoreApp<
      * @param key key
      * @returns Resource
      */
-    get<T extends DataTypes.SimpleType = string>(key: string): T | undefined {
+    get<T = string>(key: string): T | undefined {
         const value = this.settings.currentCulture.resources[key];
         if (value == null) return undefined;
+
+        // No strict type convertion here
+        // Make sure the type is strictly match
+        // Otherwise even request number, may still return the source string type
         return value as T;
     }
 
@@ -632,9 +665,13 @@ export abstract class CoreApp<
     }
 
     /**
-     * Try login
+     * Try login, returning false means is loading
      */
-    abstract tryLogin(): void;
+    tryLogin() {
+        if (this._isTryingLogin) return false;
+        this._isTryingLogin = true;
+        return true;
+    }
 
     /**
      * User login

package/src/app/ExternalSettings.ts

@@ -1,5 +1,5 @@
 /**
- * External settings
+ * External settings items
  */
 export interface IExternalSettings {
     /**

package/src/business/BusinessTax.ts

@@ -0,0 +1,86 @@
+/**
+ * Business tax interface
+ */
+export interface IBusinessTax {
+    /**
+     * Id
+     */
+    readonly id: string;
+
+    /**
+     * Name
+     */
+    readonly name: string;
+
+    /**
+     * Mask
+     */
+    readonly mask: string;
+
+    /**
+     * Get label key
+     */
+    readonly labelKey: string;
+}
+
+/**
+ * Business tax
+ * https://imask.js.org/
+ */
+export class BusinessTax implements IBusinessTax {
+    /**
+     * CN
+     * Unified Social Credit Code (USCC) / 统一信用代码
+     * https://zh.wikisource.org/wiki/GB_32100-2015_%E6%B3%95%E4%BA%BA%E5%92%8C%E5%85%B6%E4%BB%96%E7%BB%84%E7%BB%87%E7%BB%9F%E4%B8%80%E7%A4%BE%E4%BC%9A%E4%BF%A1%E7%94%A8%E4%BB%A3%E7%A0%81%E7%BC%96%E7%A0%81%E8%A7%84%E5%88%99
+     */
+    static CN = new BusinessTax('CN', 'USCC', '*0-000000-**********');
+
+    /**
+     * NZ, Inland Revenue (IRD)
+     */
+    static NZ = new BusinessTax('NZ', 'IRD', '00[0]-000-000');
+
+    /**
+     * US, Employer Identification Number (EIN)
+     */
+    static US = new BusinessTax('US', 'EIN', '00-0000000');
+
+    /**
+     * CA, tax ID number (Business Number, BN)
+     */
+    static CA = new BusinessTax('CA', 'BN', '000000000');
+
+    /**
+     * HK, Business Registration Number (BRN)
+     */
+    static HK = new BusinessTax('HK', 'BRN', '00000000');
+
+    /**
+     * All countries and regions
+     */
+    static all = [
+        BusinessTax.CN,
+        BusinessTax.NZ,
+        BusinessTax.US,
+        BusinessTax.CA,
+        BusinessTax.HK
+    ];
+
+    /**
+     * Get country or region by id
+     * @param id Country id
+     */
+    static getById(id: string) {
+        return BusinessTax.all.find((c) => c.id === id);
+    }
+
+    // Typescript constructor shorthand
+    constructor(public id: string, public name: string, public mask: string) {}
+
+    /**
+     * Get label key
+     */
+    get labelKey() {
+        return 'tax' + this.id + this.name;
+    }
+}