@etsoo/appscript 1.4.77 → 1.4.78

package/lib/mjs/erp/AddressApi.js

@@ -14,10 +14,9 @@ export class AddressApi extends BaseApi {
      * @returns Result
      */
     autocomplete(rq, payload) {
-        var _a;
         if (rq.query === '')
             return Promise.resolve(undefined);
-        (_a = rq.language) !== null && _a !== void 0 ? _a : (rq.language = this.app.culture);
+        rq.language ?? (rq.language = this.app.culture);
         return this.api.post('Address/Autocomplete', rq, payload);
     }
     /**
@@ -42,8 +41,7 @@ export class AddressApi extends BaseApi {
      * @returns Label
      */
     getContinentLabel(id) {
-        var _a;
-        return (_a = this.app.get('continent' + id)) !== null && _a !== void 0 ? _a : id;
+        return this.app.get('continent' + id) ?? id;
     }
     /**
      * Get region by id
@@ -69,7 +67,7 @@ export class AddressApi extends BaseApi {
         if (label === id) {
             // Cache data, make sure called getRegions first
             const regions = cachedRegions[this.app.culture];
-            const region = regions === null || regions === void 0 ? void 0 : regions.find((region) => region.id === id);
+            const region = regions?.find((region) => region.id === id);
             if (region)
                 return region.label;
         }
@@ -80,8 +78,7 @@ export class AddressApi extends BaseApi {
      * @param rq Rquest data
      */
     async getRegions(rq) {
-        var _a;
-        const culture = (_a = rq === null || rq === void 0 ? void 0 : rq.culture) !== null && _a !== void 0 ? _a : this.app.culture;
+        const culture = rq?.culture ?? this.app.culture;
         let regions = cachedRegions[culture];
         if (regions == null) {
             regions = await this.api.get(`Address/RegionList?language=${culture}`, undefined, { defaultValue: [], showLoading: false });
@@ -89,19 +86,16 @@ export class AddressApi extends BaseApi {
                 return undefined;
             cachedRegions[culture] = regions;
         }
-        const { id, favoredIds = [], items = 8, keyword } = rq !== null && rq !== void 0 ? rq : {};
+        const { id, favoredIds = [], items = 8, keyword } = rq ?? {};
         // Id first
         if (id) {
             return regions.filter((region) => region.id === id);
         }
         // Keyword filter
         if (keyword)
-            regions = regions.filter((region) => {
-                var _a;
-                return region.label.includes(keyword) ||
-                    ((_a = region.py) === null || _a === void 0 ? void 0 : _a.includes(keyword.toUpperCase())) ||
-                    region.id === keyword.toUpperCase();
-            });
+            regions = regions.filter((region) => region.label.includes(keyword) ||
+                region.py?.includes(keyword.toUpperCase()) ||
+                region.id === keyword.toUpperCase());
         // Order by favoredIds
         if (favoredIds.length > 0) {
             regions = Utils.sortByFieldFavor([...regions], 'id', favoredIds);
@@ -115,10 +109,9 @@ export class AddressApi extends BaseApi {
      * @returns Result
      */
     regionCurrency(regionId) {
-        var _a;
-        const region = (_a = (regionId
+        const region = (regionId
             ? this.regions().find((region) => region.id === regionId)
-            : null)) !== null && _a !== void 0 ? _a : this.app.settings.currentRegion;
+            : null) ?? this.app.settings.currentRegion;
         return region.currency;
     }
     /**
@@ -151,8 +144,8 @@ export class AddressApi extends BaseApi {
     async states(regionId, favoredIds = [], payload, culture) {
         if (regionId === '')
             return Promise.resolve(undefined);
-        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
-        culture !== null && culture !== void 0 ? culture : (culture = this.app.culture);
+        payload ?? (payload = { defaultValue: [], showLoading: false });
+        culture ?? (culture = this.app.culture);
         var items = await this.api.get(`Address/StateList?regionId=${regionId}&language=${culture}`, undefined, payload);
         if (items == null || favoredIds.length === 0)
             return items;
@@ -170,8 +163,8 @@ export class AddressApi extends BaseApi {
     async cities(stateId, favoredIds = [], payload, culture) {
         if (stateId === '')
             return Promise.resolve(undefined);
-        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
-        culture !== null && culture !== void 0 ? culture : (culture = this.app.culture);
+        payload ?? (payload = { defaultValue: [], showLoading: false });
+        culture ?? (culture = this.app.culture);
         const items = await this.api.get(`Address/CityList?stateId=${stateId}&language=${culture}`, undefined, payload);
         if (items == null || favoredIds.length === 0)
             return items;
@@ -188,8 +181,8 @@ export class AddressApi extends BaseApi {
     async districts(cityId, favoredIds = [], payload, culture) {
         if (cityId < 1)
             return Promise.resolve(undefined);
-        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
-        culture !== null && culture !== void 0 ? culture : (culture = this.app.culture);
+        payload ?? (payload = { defaultValue: [], showLoading: false });
+        culture ?? (culture = this.app.culture);
         const items = await this.api.get(`Address/DistrictList?cityId=${cityId}&language=${culture}`, undefined, payload);
         if (items == null || favoredIds.length === 0)
             return items;
@@ -205,7 +198,7 @@ export class AddressApi extends BaseApi {
     GetPlaceDetails(placeId, language, payload) {
         if (placeId === '')
             return Promise.resolve(undefined);
-        language !== null && language !== void 0 ? language : (language = this.app.culture);
+        language ?? (language = this.app.culture);
         const url = `Address/GetPlaceDetails/${placeId}/${language}`;
         return this.api.get(url, undefined, payload);
     }
@@ -225,10 +218,9 @@ export class AddressApi extends BaseApi {
      * @returns Result
      */
     searchPlace(rq, payload) {
-        var _a;
         if (rq.query === '')
             return Promise.resolve(undefined);
-        (_a = rq.language) !== null && _a !== void 0 ? _a : (rq.language = this.app.culture);
+        rq.language ?? (rq.language = this.app.culture);
         return this.api.post('Address/SearchPlace', rq, payload);
     }
 }

package/lib/mjs/erp/AuthApi.js

@@ -10,9 +10,9 @@ export class AuthApi extends BaseApi {
      * @returns Result
      */
     async loginBase(rq, payload) {
-        payload !== null && payload !== void 0 ? payload : (payload = {});
+        payload ?? (payload = {});
         const result = await this.api.post('Auth/Login', rq, payload);
-        const refreshToken = (result === null || result === void 0 ? void 0 : result.ok)
+        const refreshToken = result?.ok
             ? this.app.getResponseToken(payload.response)
             : null;
         return [result, refreshToken];

package/lib/mjs/erp/EntityApi.js

@@ -70,7 +70,7 @@ export class EntityApi extends BaseApi {
      * @returns Result
      */
     async queryFavoredCountryIdsBase(api) {
-        api !== null && api !== void 0 ? api : (api = `${this.flag}/QueryFavoredCountryIds`);
+        api ?? (api = `${this.flag}/QueryFavoredCountryIds`);
         const result = await this.api.get(api, undefined, {
             showLoading: false
         });

package/lib/mjs/erp/OrgApi.js

@@ -18,7 +18,7 @@ export class OrgApi extends EntityApi {
      * @returns Result
      */
     checkApiService(api, payload) {
-        payload !== null && payload !== void 0 ? payload : (payload = { showLoading: false });
+        payload ?? (payload = { showLoading: false });
         return this.api.get(`${this.flag}/CheckApiService`, { api }, payload);
     }
     list(items, serviceId) {
@@ -66,7 +66,7 @@ export class OrgApi extends EntityApi {
      */
     sendActionMessage(rq, payload) {
         const appId = 'serviceId' in this.app.settings ? this.app.settings.serviceId : 0;
-        payload !== null && payload !== void 0 ? payload : (payload = { showLoading: false });
+        payload ?? (payload = { showLoading: false });
         return this.api.post('System/SendActionMessage', { ...rq, appId }, payload);
     }
     /**

package/lib/mjs/erp/PublicApi.js

@@ -39,22 +39,16 @@ export class PublicApi extends BaseApi {
     }
     currencies(names) {
         if (typeof names === 'boolean' && names) {
-            return Currencies.map((name) => {
-                var _a;
-                return ({
-                    id: name,
-                    label: (_a = this.app.get(`currency${name}`)) !== null && _a !== void 0 ? _a : name
-                });
-            });
+            return Currencies.map((name) => ({
+                id: name,
+                label: this.app.get(`currency${name}`) ?? name
+            }));
         }
         if (Array.isArray(names)) {
-            return names.map((name) => {
-                var _a;
-                return ({
-                    id: name,
-                    label: (_a = this.app.get(`currency${name}`)) !== null && _a !== void 0 ? _a : name
-                });
-            });
+            return names.map((name) => ({
+                id: name,
+                label: this.app.get(`currency${name}`) ?? name
+            }));
         }
         return this.api.get('Public/GetCurrencies', undefined, {
             defaultValue: [],
@@ -69,7 +63,7 @@ export class PublicApi extends BaseApi {
      * @returns Result
      */
     async exchangeAmount(amount, sourceCurrency, targetCurrency) {
-        targetCurrency !== null && targetCurrency !== void 0 ? targetCurrency : (targetCurrency = this.app.defaultRegion.currency);
+        targetCurrency ?? (targetCurrency = this.app.defaultRegion.currency);
         const [sourceRate, targetRate] = await Promise.all([
             this.exchangeRate(sourceCurrency, {
                 showLoading: false
@@ -112,7 +106,7 @@ export class PublicApi extends BaseApi {
      * @returns Result
      */
     exchangeRateHistory(currencies, months, payload) {
-        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [] });
+        payload ?? (payload = { defaultValue: [] });
         return this.api.post('Public/ExchangeRateHistory', { currencies, months }, payload);
     }
     /**
@@ -129,9 +123,8 @@ export class PublicApi extends BaseApi {
      * @returns Label
      */
     getCurrencyLabel(currency) {
-        var _a;
         const c = `currency${currency}`;
-        return (_a = this.app.get(c)) !== null && _a !== void 0 ? _a : c;
+        return this.app.get(c) ?? c;
     }
     /**
      * Get product unit's label
@@ -141,9 +134,8 @@ export class PublicApi extends BaseApi {
      * @returns Label
      */
     getUnitLabel(unit, isJoined) {
-        var _a;
         const key = ProductUnit[unit];
-        const label = (_a = this.app.get(unitPrefix + key)) !== null && _a !== void 0 ? _a : key;
+        const label = this.app.get(unitPrefix + key) ?? key;
         const join = this.getUnitJoin(isJoined);
         if (join) {
             return join.format(label);
@@ -151,9 +143,8 @@ export class PublicApi extends BaseApi {
         return label;
     }
     getUnitJoin(isJoined) {
-        var _a;
         return typeof isJoined === 'string'
-            ? (_a = this.app.get(isJoined)) !== null && _a !== void 0 ? _a : isJoined
+            ? this.app.get(isJoined) ?? isJoined
             : isJoined
                 ? this.app.get('unitJoin')
                 : undefined;
@@ -174,9 +165,8 @@ export class PublicApi extends BaseApi {
      * @returns Result
      */
     parsePin(input, payload) {
-        var _a;
         const rq = typeof input === 'string' ? { pin: input } : input;
-        (_a = rq.language) !== null && _a !== void 0 ? _a : (rq.language = this.app.culture);
+        rq.language ?? (rq.language = this.app.culture);
         return this.api.post('Public/ParsePin', rq, payload);
     }
     /**
@@ -198,7 +188,7 @@ export class PublicApi extends BaseApi {
      * @returns Units
      */
     repeatOptions(options, isJoined = true) {
-        options !== null && options !== void 0 ? options : (options = DataTypes.getEnumKeys(RepeatOption));
+        options ?? (options = DataTypes.getEnumKeys(RepeatOption));
         return this.units(options, isJoined);
     }
     /**
@@ -217,7 +207,7 @@ export class PublicApi extends BaseApi {
      * @returns Units
      */
     units(options, isJoined) {
-        options !== null && options !== void 0 ? options : (options = DataTypes.getEnumKeys(ProductUnit));
+        options ?? (options = DataTypes.getEnumKeys(ProductUnit));
         return options.map((key) => {
             const id = DataTypes.getEnumByKey(ProductUnit, key);
             return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.77",
+    "version": "1.4.78",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,9 +52,9 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.35",
-        "@etsoo/restclient": "^1.0.98",
-        "@etsoo/shared": "^1.2.26",
+        "@etsoo/notificationbase": "^1.1.39",
+        "@etsoo/restclient": "^1.0.99",
+        "@etsoo/shared": "^1.2.28",
         "crypto-js": "^4.2.0"
     },
     "devDependencies": {

package/src/app/CoreApp.ts

@@ -43,6 +43,9 @@ import type CryptoJS from 'crypto-js';
 import { Currency } from '../business/Currency';
 
 type CJType = typeof CryptoJS;
+let CJ: CJType;
+
+const loadCrypto = () => import('crypto-js');
 
 /**
  * Core application interface
@@ -214,8 +217,6 @@ export abstract class CoreApp<
 
     private _isTryingLogin = false;
 
-    private CJ: CJType | null = null;
-
     /**
      * Last called with token refresh
      */
@@ -295,13 +296,12 @@ export abstract class CoreApp<
         const { currentCulture, currentRegion } = settings;
 
         // Load resources
-        Promise.all([
-            import('crypto-js'),
-            this.changeCulture(currentCulture)
-        ]).then(([cj, _resources]) => {
-            (this.CJ = cj), this.changeRegion(currentRegion);
-            this.setup();
-        });
+        Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(
+            ([cj, _resources]) => {
+                (CJ = cj), this.changeRegion(currentRegion);
+                this.setup();
+            }
+        );
     }
 
     private getDeviceId() {
@@ -919,7 +919,7 @@ export abstract class CoreApp<
         const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
         if (isNaN(iterations)) return undefined;
 
-        const { PBKDF2, algo, enc, AES, pad, mode } = this.CJ!;
+        const { PBKDF2, algo, enc, AES, pad, mode } = CJ;
 
         try {
             const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
@@ -1087,7 +1087,7 @@ export abstract class CoreApp<
         // Default 1 * 1000
         iterations ??= 1;
 
-        const { lib, PBKDF2, algo, enc, AES, pad, mode } = this.CJ!;
+        const { lib, PBKDF2, algo, enc, AES, pad, mode } = CJ;
 
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
@@ -1553,7 +1553,7 @@ export abstract class CoreApp<
      * @param passphrase Secret passphrase
      */
     hash(message: string, passphrase?: string) {
-        const { SHA3, enc, HmacSHA512 } = this.CJ!;
+        const { SHA3, enc, HmacSHA512 } = CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Base64);
         else return HmacSHA512(message, passphrase).toString(enc.Base64);
@@ -1566,7 +1566,7 @@ export abstract class CoreApp<
      * @param passphrase Secret passphrase
      */
     hashHex(message: string, passphrase?: string) {
-        const { SHA3, enc, HmacSHA512 } = this.CJ!;
+        const { SHA3, enc, HmacSHA512 } = CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Hex);
         else return HmacSHA512(message, passphrase).toString(enc.Hex);

package/tsconfig.cjs.json

@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
         /* Visit https://aka.ms/tsconfig.json to read more about this file */
-        "target": "ES2019",
+        "target": "ES2020",
         "allowJs": false,
         "module": "commonjs",
         "moduleResolution": "node",

package/tsconfig.json

@@ -1,10 +1,10 @@
 {
     "compilerOptions": {
         /* Visit https://aka.ms/tsconfig.json to read more about this file */
-        "target": "ES2019",
+        "target": "ES2020",
         "allowJs": false,
         "module": "ESNext",
-        "moduleResolution": "node",
+        "moduleResolution": "Bundler",
         "resolveJsonModule": true,
         "isolatedModules": true,
         "outDir": "./lib/mjs",