@etsoo/appscript 1.4.76 → 1.4.78

package/__tests__/tsconfig.json

@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "ES2019",
+        "target": "ES2020",
         "module": "ESNext",
         "allowJs": true,
         "skipLibCheck": true,
@@ -8,7 +8,7 @@
         "allowSyntheticDefaultImports": true,
         "strict": true,
         "forceConsistentCasingInFileNames": true,
-        "moduleResolution": "node",
+        "moduleResolution": "Bundler",
         "resolveJsonModule": true,
         "isolatedModules": true,
         "noEmit": true,

package/lib/cjs/app/CoreApp.js

@@ -35,6 +35,7 @@ const ActionResultError_1 = require("../result/ActionResultError");
 const IApp_1 = require("./IApp");
 const UserRole_1 = require("./UserRole");
 let CJ;
+const loadCrypto = () => Promise.resolve().then(() => __importStar(require('crypto-js')));
 /**
  * Core application
  */
@@ -125,7 +126,6 @@ class CoreApp {
      * @param name Application name
      */
     constructor(settings, api, notifier, storage, name) {
-        var _a;
         /**
          * Pending actions
          */
@@ -149,7 +149,7 @@ 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;
@@ -169,10 +169,7 @@ class CoreApp {
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         // Load resources
-        Promise.all([
-            Promise.resolve().then(() => __importStar(require('crypto-js'))),
-            this.changeCulture(currentCulture)
-        ]).then(([cj, _resources]) => {
+        Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
             (CJ = cj), this.changeRegion(currentRegion);
             this.setup();
         });
@@ -356,7 +353,7 @@ 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
@@ -402,7 +399,6 @@ class CoreApp {
      * @returns Result
      */
     async initCall(callback, resetKeys) {
-        var _a;
         // Reset keys
         if (resetKeys) {
             this.clearDeviceId();
@@ -444,7 +440,7 @@ 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 {
@@ -544,7 +540,6 @@ class CoreApp {
      * @param refreshToken Refresh token
      */
     authorize(token, refreshToken) {
-        var _a;
         // State, when token is null, means logout
         this.authorized = token != null;
         // Token
@@ -565,7 +560,7 @@ class CoreApp {
             this.refreshCountdownClear();
         }
         // Host notice
-        (_a = BridgeUtils_1.BridgeUtils.host) === null || _a === void 0 ? void 0 : _a.userAuthorization(this.authorized);
+        BridgeUtils_1.BridgeUtils.host?.userAuthorization(this.authorized);
     }
     /**
      * Change country or region
@@ -678,7 +673,7 @@ class CoreApp {
             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
@@ -721,7 +716,7 @@ 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) {
@@ -759,8 +754,7 @@ 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
@@ -800,11 +794,11 @@ class CoreApp {
      */
     encrypt(message, passphrase, iterations) {
         // Default 1 * 1000
-        iterations !== null && iterations !== void 0 ? iterations : (iterations = 1);
+        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
@@ -830,7 +824,7 @@ class CoreApp {
     encryptEnhanced(message, passphrase, iterations) {
         // Timestamp
         const timestamp = shared_1.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;
     }
@@ -865,7 +859,7 @@ class CoreApp {
      */
     formatDate(input, options, timeZone) {
         const { currentCulture, timeZone: defaultTimeZone } = this.settings;
-        timeZone !== null && timeZone !== void 0 ? timeZone : (timeZone = defaultTimeZone);
+        timeZone ?? (timeZone = defaultTimeZone);
         return shared_1.DateUtils.format(input, currentCulture.name, options, timeZone);
     }
     /**
@@ -914,11 +908,11 @@ class CoreApp {
         if (typeof result === 'object' &&
             !(result instanceof restclient_1.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);
                 });
@@ -942,9 +936,9 @@ 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;
@@ -972,7 +966,6 @@ 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);
@@ -990,7 +983,7 @@ 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);
@@ -1019,7 +1012,7 @@ 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
@@ -1057,18 +1050,16 @@ 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 = shared_1.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 });
             });
         }
@@ -1084,7 +1075,7 @@ 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 });
             }
         }
@@ -1098,7 +1089,6 @@ class CoreApp {
      * @returns List
      */
     getEnumStrList(em, prefix, filter) {
-        var _a;
         const list = [];
         const getKey = typeof prefix === 'function'
             ? prefix
@@ -1112,7 +1102,7 @@ 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;
@@ -1123,8 +1113,7 @@ 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
@@ -1158,11 +1147,10 @@ class CoreApp {
      * @param status Status value
      */
     getStatusLabel(status) {
-        var _a;
         if (status == null)
             return '';
         const key = EntityStatus_1.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
@@ -1178,9 +1166,8 @@ 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
@@ -1214,8 +1201,7 @@ 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)) {
@@ -1257,7 +1243,7 @@ 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);
@@ -1276,8 +1262,7 @@ 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
@@ -1356,7 +1341,7 @@ 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);
     }
@@ -1410,12 +1395,11 @@ 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(notificationbase_1.NotificationMessageType.Warning, message, undefined, {
-            align: align !== null && align !== void 0 ? align : notificationbase_1.NotificationAlign.TopRight
+            align: align ?? notificationbase_1.NotificationAlign.TopRight
         });
     }
 }

package/lib/cjs/bridges/FlutterHost.js

@@ -54,7 +54,6 @@ class FlutterHost {
             this.cacheCommand('exit');
     }
     async getLabels(...keys) {
-        var _a;
         // Try 500 miliseconds
         let count = 5;
         while (this.host.callHandler == null) {
@@ -66,14 +65,11 @@ 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/cjs/business/BusinessUtils.js

@@ -44,9 +44,8 @@ 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/cjs/business/ShoppingCart.js

@@ -42,9 +42,9 @@ 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);
@@ -177,11 +177,11 @@ 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;
@@ -372,7 +372,6 @@ 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);
@@ -399,7 +398,7 @@ 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,
@@ -422,7 +421,6 @@ 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
@@ -452,7 +450,7 @@ 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,

package/lib/cjs/erp/AddressApi.js

@@ -17,10 +17,9 @@ class AddressApi extends BaseApi_1.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);
     }
     /**
@@ -45,8 +44,7 @@ class AddressApi extends BaseApi_1.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
@@ -72,7 +70,7 @@ class AddressApi extends BaseApi_1.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;
         }
@@ -83,8 +81,7 @@ class AddressApi extends BaseApi_1.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 });
@@ -92,19 +89,16 @@ class AddressApi extends BaseApi_1.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 = shared_1.Utils.sortByFieldFavor([...regions], 'id', favoredIds);
@@ -118,10 +112,9 @@ class AddressApi extends BaseApi_1.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;
     }
     /**
@@ -154,8 +147,8 @@ class AddressApi extends BaseApi_1.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;
@@ -173,8 +166,8 @@ class AddressApi extends BaseApi_1.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;
@@ -191,8 +184,8 @@ class AddressApi extends BaseApi_1.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;
@@ -208,7 +201,7 @@ class AddressApi extends BaseApi_1.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);
     }
@@ -228,10 +221,9 @@ class AddressApi extends BaseApi_1.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/cjs/erp/AuthApi.js

@@ -13,9 +13,9 @@ class AuthApi extends BaseApi_1.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/cjs/erp/EntityApi.js

@@ -73,7 +73,7 @@ class EntityApi extends BaseApi_1.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/cjs/erp/OrgApi.js

@@ -21,7 +21,7 @@ class OrgApi extends EntityApi_1.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) {
@@ -69,7 +69,7 @@ class OrgApi extends EntityApi_1.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);
     }
     /**