@etsoo/appscript 1.4.77 → 1.4.78

package/lib/cjs/erp/PublicApi.js

@@ -42,22 +42,16 @@ class PublicApi extends BaseApi_1.BaseApi {
     }
     currencies(names) {
         if (typeof names === 'boolean' && names) {
-            return Currency_1.Currencies.map((name) => {
-                var _a;
-                return ({
-                    id: name,
-                    label: (_a = this.app.get(`currency${name}`)) !== null && _a !== void 0 ? _a : name
-                });
-            });
+            return Currency_1.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: [],
@@ -72,7 +66,7 @@ class PublicApi extends BaseApi_1.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
@@ -115,7 +109,7 @@ class PublicApi extends BaseApi_1.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);
     }
     /**
@@ -132,9 +126,8 @@ class PublicApi extends BaseApi_1.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
@@ -144,9 +137,8 @@ class PublicApi extends BaseApi_1.BaseApi {
      * @returns Label
      */
     getUnitLabel(unit, isJoined) {
-        var _a;
         const key = ProductUnit_1.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);
@@ -154,9 +146,8 @@ class PublicApi extends BaseApi_1.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;
@@ -177,9 +168,8 @@ class PublicApi extends BaseApi_1.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);
     }
     /**
@@ -201,7 +191,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      * @returns Units
      */
     repeatOptions(options, isJoined = true) {
-        options !== null && options !== void 0 ? options : (options = shared_1.DataTypes.getEnumKeys(RepeatOption_1.RepeatOption));
+        options ?? (options = shared_1.DataTypes.getEnumKeys(RepeatOption_1.RepeatOption));
         return this.units(options, isJoined);
     }
     /**
@@ -220,7 +210,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      * @returns Units
      */
     units(options, isJoined) {
-        options !== null && options !== void 0 ? options : (options = shared_1.DataTypes.getEnumKeys(ProductUnit_1.ProductUnit));
+        options ?? (options = shared_1.DataTypes.getEnumKeys(ProductUnit_1.ProductUnit));
         return options.map((key) => {
             const id = shared_1.DataTypes.getEnumByKey(ProductUnit_1.ProductUnit, key);
             return {

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

@@ -116,7 +116,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     get isReady(): boolean;
     private set isReady(value);
     private _isTryingLogin;
-    private CJ;
     /**
      * Last called with token refresh
      */

package/lib/mjs/app/CoreApp.js

@@ -8,6 +8,8 @@ import { EntityStatus } from '../business/EntityStatus';
 import { ActionResultError } from '../result/ActionResultError';
 import { appFields } from './IApp';
 import { UserRole } from './UserRole';
+let CJ;
+const loadCrypto = () => import('crypto-js');
 /**
  * Core application
  */
@@ -98,7 +100,6 @@ export class CoreApp {
      * @param name Application name
      */
     constructor(settings, api, notifier, storage, name) {
-        var _a;
         /**
          * Pending actions
          */
@@ -106,7 +107,6 @@ export class CoreApp {
         this._authorized = false;
         this._isReady = false;
         this._isTryingLogin = false;
-        this.CJ = null;
         /**
          * Last called with token refresh
          */
@@ -123,7 +123,7 @@ export class CoreApp {
          * Passphrase for encryption
          */
         this.passphrase = '';
-        if (((_a = settings === null || settings === void 0 ? void 0 : settings.regions) === null || _a === void 0 ? void 0 : _a.length) === 0) {
+        if (settings?.regions?.length === 0) {
             throw new Error('No regions defined');
         }
         this.settings = settings;
@@ -143,11 +143,8 @@ export class CoreApp {
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         // Load resources
-        Promise.all([
-            import('crypto-js'),
-            this.changeCulture(currentCulture)
-        ]).then(([cj, _resources]) => {
-            (this.CJ = cj), this.changeRegion(currentRegion);
+        Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
+            (CJ = cj), this.changeRegion(currentRegion);
             this.setup();
         });
     }
@@ -330,7 +327,7 @@ export class CoreApp {
      * @param action Custom action
      */
     setupLogging(action) {
-        action !== null && action !== void 0 ? action : (action = (data) => {
+        action ?? (action = (data) => {
             this.api.post('Auth/LogFrontendError', data, {
                 onError: (error) => {
                     // Use 'debug' to avoid infinite loop
@@ -376,7 +373,6 @@ export class CoreApp {
      * @returns Result
      */
     async initCall(callback, resetKeys) {
-        var _a;
         // Reset keys
         if (resetKeys) {
             this.clearDeviceId();
@@ -418,7 +414,7 @@ export class CoreApp {
             if (result.title === 'timeDifferenceInvalid' &&
                 seconds != null &&
                 validSeconds != null) {
-                const title = (_a = this.get('timeDifferenceInvalid')) === null || _a === void 0 ? void 0 : _a.format(seconds.toString(), validSeconds.toString());
+                const title = this.get('timeDifferenceInvalid')?.format(seconds.toString(), validSeconds.toString());
                 this.notifier.alert(title);
             }
             else {
@@ -518,7 +514,6 @@ export class CoreApp {
      * @param refreshToken Refresh token
      */
     authorize(token, refreshToken) {
-        var _a;
         // State, when token is null, means logout
         this.authorized = token != null;
         // Token
@@ -539,7 +534,7 @@ export class CoreApp {
             this.refreshCountdownClear();
         }
         // Host notice
-        (_a = BridgeUtils.host) === null || _a === void 0 ? void 0 : _a.userAuthorization(this.authorized);
+        BridgeUtils.host?.userAuthorization(this.authorized);
     }
     /**
      * Change country or region
@@ -647,12 +642,12 @@ export 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));
             const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
             const encrypted = messageEncrypted.substring(66);
-            const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
+            const key = PBKDF2(passphrase ?? this.passphrase, salt, {
                 keySize: 8, // 256 / 32
                 hasher: algo.SHA256,
                 iterations: 1000 * iterations
@@ -695,7 +690,7 @@ export class CoreApp {
                     return undefined;
             }
             const message = messageEncrypted.substring(pos + 1);
-            passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
+            passphrase = this.encryptionEnhance(passphrase ?? this.passphrase, timestamp);
             return this.decrypt(message, passphrase);
         }
         catch (e) {
@@ -733,8 +728,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());
     }
     /**
      * Download file
@@ -774,11 +768,11 @@ export class CoreApp {
      */
     encrypt(message, passphrase, iterations) {
         // Default 1 * 1000
-        iterations !== null && iterations !== void 0 ? iterations : (iterations = 1);
-        const { lib, PBKDF2, algo, enc, AES, pad, mode } = this.CJ;
+        iterations ?? (iterations = 1);
+        const { lib, PBKDF2, algo, enc, AES, pad, mode } = CJ;
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
-        const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
+        const key = PBKDF2(passphrase ?? this.passphrase, salt, {
             keySize: 8, // 256 / 32
             hasher: algo.SHA256,
             iterations: 1000 * iterations
@@ -804,7 +798,7 @@ export class CoreApp {
     encryptEnhanced(message, passphrase, iterations) {
         // Timestamp
         const timestamp = Utils.numberToChars(new Date().getTime());
-        passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
+        passphrase = this.encryptionEnhance(passphrase ?? this.passphrase, timestamp);
         const result = this.encrypt(message, passphrase, iterations);
         return timestamp + '!' + result;
     }
@@ -839,7 +833,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);
     }
     /**
@@ -888,11 +882,11 @@ export class CoreApp {
         if (typeof result === 'object' &&
             !(result instanceof ApiDataError) &&
             this.checkDeviceResult(result)) {
-            initCallCallback !== null && initCallCallback !== void 0 ? initCallCallback : (initCallCallback = (result) => {
-                var _a;
+            initCallCallback ?? (initCallCallback = (result) => {
                 if (!result)
                     return;
-                this.notifier.alert((_a = this.get('environmentChanged')) !== null && _a !== void 0 ? _a : 'Environment changed', () => {
+                this.notifier.alert(this.get('environmentChanged') ??
+                    'Environment changed', () => {
                     // Reload the page
                     history.go(0);
                 });
@@ -916,9 +910,9 @@ export class CoreApp {
      */
     formatFullName(familyName, givenName) {
         if (!familyName)
-            return givenName !== null && givenName !== void 0 ? givenName : '';
+            return givenName ?? '';
         if (!givenName)
-            return familyName !== null && familyName !== void 0 ? familyName : '';
+            return familyName ?? '';
         const wf = givenName + ' ' + familyName;
         if (wf.containChinese() || wf.containJapanese() || wf.containKorean()) {
             return familyName + givenName;
@@ -946,7 +940,6 @@ export class CoreApp {
      * @param forceToLocal Force to local labels
      */
     formatResult(result, forceToLocal) {
-        var _a;
         const title = result.title;
         if (title && /^\w+$/.test(title)) {
             const key = title.formatInitial(false);
@@ -964,7 +957,7 @@ export class CoreApp {
             result.title = this.get(key);
         }
         // When title contains {0}, replace with the field label
-        if (result.field && ((_a = result.title) === null || _a === void 0 ? void 0 : _a.includes('{0}'))) {
+        if (result.field && result.title?.includes('{0}')) {
             const fieldLabel = this.get(result.field.formatInitial(false));
             if (fieldLabel)
                 result.title = result.title.format(fieldLabel);
@@ -993,7 +986,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 bool items
@@ -1031,18 +1024,16 @@ export class CoreApp {
      * @returns List
      */
     getEnumList(em, prefix, filter) {
-        var _a;
         const list = [];
         const getKey = typeof prefix === 'function'
             ? prefix
             : (key) => prefix + key;
         if (Array.isArray(filter)) {
             filter.forEach((id) => {
-                var _a;
                 if (typeof id !== 'number')
                     return;
                 const key = DataTypes.getEnumKey(em, id);
-                const label = (_a = this.get(getKey(key))) !== null && _a !== void 0 ? _a : key;
+                const label = this.get(getKey(key)) ?? key;
                 list.push({ id, label });
             });
         }
@@ -1058,7 +1049,7 @@ export class CoreApp {
                 }
                 if (typeof id !== 'number')
                     continue;
-                const label = (_a = this.get(getKey(key))) !== null && _a !== void 0 ? _a : key;
+                const label = this.get(getKey(key)) ?? key;
                 list.push({ id, label });
             }
         }
@@ -1072,7 +1063,6 @@ export class CoreApp {
      * @returns List
      */
     getEnumStrList(em, prefix, filter) {
-        var _a;
         const list = [];
         const getKey = typeof prefix === 'function'
             ? prefix
@@ -1086,7 +1076,7 @@ export class CoreApp {
                     continue;
                 id = fid;
             }
-            var label = (_a = this.get(getKey(key))) !== null && _a !== void 0 ? _a : key;
+            var label = this.get(getKey(key)) ?? key;
             list.push({ id: id.toString(), label });
         }
         return list;
@@ -1097,8 +1087,7 @@ export class CoreApp {
      * @returns Label
      */
     getRegionLabel(id) {
-        var _a;
-        return (_a = this.get('region' + id)) !== null && _a !== void 0 ? _a : id;
+        return this.get('region' + id) ?? id;
     }
     /**
      * Get all regions
@@ -1132,11 +1121,10 @@ export class CoreApp {
      * @param status Status value
      */
     getStatusLabel(status) {
-        var _a;
         if (status == null)
             return '';
         const key = EntityStatus[status];
-        return (_a = this.get('status' + key)) !== null && _a !== void 0 ? _a : key;
+        return this.get('status' + key) ?? key;
     }
     /**
      * Get refresh token from response headers
@@ -1152,9 +1140,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;
     }
     /**
      * Hash message, SHA3 or HmacSHA512, 512 as Base64
@@ -1163,7 +1150,7 @@ export class CoreApp {
      * @param passphrase Secret passphrase
      */
     hash(message, passphrase) {
-        const { SHA3, enc, HmacSHA512 } = this.CJ;
+        const { SHA3, enc, HmacSHA512 } = CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Base64);
         else
@@ -1176,7 +1163,7 @@ export class CoreApp {
      * @param passphrase Secret passphrase
      */
     hashHex(message, passphrase) {
-        const { SHA3, enc, HmacSHA512 } = this.CJ;
+        const { SHA3, enc, HmacSHA512 } = CJ;
         if (passphrase == null)
             return SHA3(message, { outputLength: 512 }).toString(enc.Hex);
         else
@@ -1188,8 +1175,7 @@ export class CoreApp {
      * @returns Result
      */
     hasPermission(roles) {
-        var _a;
-        const userRole = (_a = this.userData) === null || _a === void 0 ? void 0 : _a.role;
+        const userRole = this.userData?.role;
         if (userRole == null)
             return false;
         if (Array.isArray(roles)) {
@@ -1231,7 +1217,7 @@ export class CoreApp {
             globalThis.history.go(to);
         }
         else {
-            const { state, replace = false } = options !== null && options !== void 0 ? options : {};
+            const { state, replace = false } = options ?? {};
             if (replace) {
                 if (state)
                     globalThis.history.replaceState(state, '', to);
@@ -1250,8 +1236,7 @@ export class CoreApp {
      * Callback where exit a page
      */
     pageExit() {
-        var _a;
-        (_a = this.lastWarning) === null || _a === void 0 ? void 0 : _a.dismiss();
+        this.lastWarning?.dismiss();
     }
     /**
      * Refresh countdown
@@ -1330,7 +1315,7 @@ export class CoreApp {
      * @param removeUrl Remove current URL for reuse
      */
     toLoginPage(tryLogin, removeUrl) {
-        const url = `/?tryLogin=${tryLogin !== null && tryLogin !== void 0 ? tryLogin : false}` +
+        const url = `/?tryLogin=${tryLogin ?? false}` +
             (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
         this.navigate(url);
     }
@@ -1384,12 +1369,11 @@ export class CoreApp {
      * @param align Align, default as TopRight
      */
     warning(message, align) {
-        var _a, _b;
         // Same message is open
-        if (((_a = this.lastWarning) === null || _a === void 0 ? void 0 : _a.open) && ((_b = this.lastWarning) === null || _b === void 0 ? void 0 : _b.content) === message)
+        if (this.lastWarning?.open && this.lastWarning?.content === message)
             return;
         this.lastWarning = this.notifier.message(NotificationMessageType.Warning, message, undefined, {
-            align: align !== null && align !== void 0 ? align : NotificationAlign.TopRight
+            align: align ?? NotificationAlign.TopRight
         });
     }
 }

package/lib/mjs/bridges/FlutterHost.js

@@ -51,7 +51,6 @@ export class FlutterHost {
             this.cacheCommand('exit');
     }
     async getLabels(...keys) {
-        var _a;
         // Try 500 miliseconds
         let count = 5;
         while (this.host.callHandler == null) {
@@ -63,14 +62,11 @@ export class FlutterHost {
         const init = {};
         if (this.host.callHandler == null)
             return init;
-        const result = (_a = (await this.host.callHandler('getLabels'))) !== null && _a !== void 0 ? _a : {};
-        return keys.reduce((a, v) => {
-            var _a;
-            return ({
-                ...a,
-                [v]: (_a = result[v]) !== null && _a !== void 0 ? _a : ''
-            });
-        }, init);
+        const result = (await this.host.callHandler('getLabels')) ?? {};
+        return keys.reduce((a, v) => ({
+            ...a,
+            [v]: result[v] ?? ''
+        }), init);
     }
     getStartUrl() {
         return this.startUrl;

package/lib/mjs/business/BusinessUtils.js

@@ -41,9 +41,8 @@ export var BusinessUtils;
      * @param data Data to format
      */
     function formatCultues(cultures, data) {
-        var _a;
         // Add the lost cultures
-        const allCultures = (_a = data.cultures) !== null && _a !== void 0 ? _a : [];
+        const allCultures = data.cultures ?? [];
         cultures.forEach((culture) => {
             if (!allCultures.some((a) => a.id === culture.id)) {
                 allCultures.push({ id: culture.id, title: '' });

package/lib/mjs/business/ShoppingCart.js

@@ -39,9 +39,9 @@ export class ShoppingCart {
      * @returns Result
      */
     static getCartData(storage, id) {
-        var _a;
         try {
-            return ((_a = storage.getPersistedObject(id)) !== null && _a !== void 0 ? _a : storage.getObject(id));
+            return (storage.getPersistedObject(id) ??
+                storage.getObject(id));
         }
         catch (error) {
             console.warn(`ShoppingCart getCartData ${id} error`, error);
@@ -174,11 +174,11 @@ export class ShoppingCart {
         }
     }
     getCartData() {
-        var _a;
-        return ((_a = this.storage.getPersistedObject(this.identifier)) !== null && _a !== void 0 ? _a : this.storage.getObject(this.identifier));
+        return (this.storage.getPersistedObject(this.identifier) ??
+            this.storage.getObject(this.identifier));
     }
     setCartData(state) {
-        const { owner, items = [], promotions = [], formData, cache } = state !== null && state !== void 0 ? state : {};
+        const { owner, items = [], promotions = [], formData, cache } = state ?? {};
         this.owner = owner;
         this.items = items;
         this.promotions = promotions;
@@ -369,7 +369,6 @@ export class ShoppingCart {
      * @returns Updated or not
      */
     updateAssetItem(id, assetQty, itemCreator) {
-        var _a;
         if (assetQty == null || assetQty <= 0)
             assetQty = 1;
         const index = this.items.findIndex((item) => item.id === id);
@@ -396,7 +395,7 @@ export class ShoppingCart {
             // Update
             const item = this.items[index];
             // Price may be cached first
-            const price = (_a = this.prices[id]) !== null && _a !== void 0 ? _a : item.price;
+            const price = this.prices[id] ?? item.price;
             const qty = item.qty;
             const newItem = {
                 ...item,
@@ -419,7 +418,6 @@ export class ShoppingCart {
      * @returns Updated or not
      */
     updateItem(id, qty, itemCreator) {
-        var _a;
         const index = this.items.findIndex((item) => item.id === id);
         if (qty == null) {
             // Remove the item
@@ -449,7 +447,7 @@ export class ShoppingCart {
             // Update
             const item = this.items[index];
             // Price may be cached first
-            const price = (_a = this.prices[id]) !== null && _a !== void 0 ? _a : item.price;
+            const price = this.prices[id] ?? item.price;
             const newItem = {
                 ...item,
                 qty,