@etsoo/appscript 1.4.76 → 1.4.78

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.76",
+    "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

@@ -45,6 +45,8 @@ import { Currency } from '../business/Currency';
 type CJType = typeof CryptoJS;
 let CJ: CJType;
 
+const loadCrypto = () => import('crypto-js');
+
 /**
  * Core application interface
  */
@@ -294,13 +296,12 @@ export abstract class CoreApp<
         const { currentCulture, currentRegion } = settings;
 
         // Load resources
-        Promise.all([
-            import('crypto-js'),
-            this.changeCulture(currentCulture)
-        ]).then(([cj, _resources]) => {
-            (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() {

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",