@etsoo/appscript 1.3.18 → 1.3.20

package/__tests__/app/CoreApp.ts

@@ -219,9 +219,13 @@ test('Tests for publicApi', async () => {
     const options = app.publicApi.repeatOptions(['MONTH', 'QUATER', 'YEAR']);
     expect(options[2]).toStrictEqual({ id: 12, label: '每年' });
 
-    const currencies = await app.publicApi.currencies(['NZD', 'AUD', 'USD']);
+    const currencies = app.publicApi.currencies(['NZD', 'AUD', 'USD']);
+    expect(currencies.length).toBe(3);
     expect(currencies[1].id).toBe('AUD');
 
+    const currencies1 = app.publicApi.currencies(true);
+    expect(currencies1.length >= 10).toBeTruthy();
+
     /*
     const orgs = await app.orgApi.list();
     console.log(orgs);

package/lib/cjs/erp/OrgApi.js

@@ -20,7 +20,7 @@ class OrgApi extends EntityApi_1.EntityApi {
             return this.listBase(items, serviceId);
         }
         else {
-            if (typeof serviceId !== 'number')
+            if (typeof serviceId === 'object')
                 return undefined;
             return this.listBase({ items, serviceId }, { defaultValue: [], showLoading: false });
         }

package/lib/cjs/erp/PublicApi.d.ts

@@ -16,7 +16,8 @@ export declare class PublicApi extends BaseApi {
      * @param currencyNames Limited currency names for local data, undefined will try to retrive remoately
      * @returns Result
      */
-    currencies<T extends string[] | Currency[] | undefined>(currencyNames?: T): Promise<T extends undefined ? CurrencyDto[] | undefined : ListType1[]>;
+    currencies(): Promise<CurrencyDto[] | undefined>;
+    currencies(names: string[] | Currency[] | boolean): ListType1[];
     /**
      * Get exchange rate
      * @param currency Currency
@@ -55,7 +56,7 @@ export declare class PublicApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    product<T extends number | string>(id: T, culture?: string, payload?: IApiPayload<PublicProductDto>): Promise<(T extends number ? PublicProductDto : PublicOrgProductDto) | undefined>;
+    product<T extends number | string>(id: T, culture?: string, payload?: IApiPayload<T extends number ? PublicProductDto : PublicOrgProductDto>): Promise<(T extends number ? PublicProductDto : PublicOrgProductDto) | undefined>;
     /**
      *
      * Get all repeat options

package/lib/cjs/erp/PublicApi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PublicApi = void 0;
 const shared_1 = require("@etsoo/shared");
+const Currency_1 = require("../business/Currency");
 const ProductUnit_1 = require("../business/ProductUnit");
 const RepeatOption_1 = require("../business/RepeatOption");
 const BaseApi_1 = require("./BaseApi");
@@ -9,22 +10,29 @@ const BaseApi_1 = require("./BaseApi");
  * Public API
  */
 class PublicApi extends BaseApi_1.BaseApi {
-    /**
-     * Get currencies
-     * @param currencyNames Limited currency names for local data, undefined will try to retrive remoately
-     * @returns Result
-     */
-    async currencies(currencyNames) {
-        if (currencyNames == null)
-            return (await this.api.get('Public/GetCurrencies', undefined, { defaultValue: [], showLoading: false }));
-        else
-            return currencyNames.map((name) => {
+    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
+                });
+            });
+        }
+        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 this.api.get('Public/GetCurrencies', undefined, {
+            defaultValue: [],
+            showLoading: false
+        });
     }
     /**
      * Get exchange rate
@@ -80,6 +88,7 @@ class PublicApi extends BaseApi_1.BaseApi {
     mobileQRCode(id, host, payload) {
         return this.api.post('Public/MobileQRCode', { id, host }, payload);
     }
+    //product(id: number, culture?: string, ): Promise<PublicProductDto | undefined>;
     /**
      * Get public and valid product data
      * @param id Product/Service Id or Uid

package/lib/mjs/erp/OrgApi.js

@@ -17,7 +17,7 @@ export class OrgApi extends EntityApi {
             return this.listBase(items, serviceId);
         }
         else {
-            if (typeof serviceId !== 'number')
+            if (typeof serviceId === 'object')
                 return undefined;
             return this.listBase({ items, serviceId }, { defaultValue: [], showLoading: false });
         }

package/lib/mjs/erp/PublicApi.d.ts

@@ -16,7 +16,8 @@ export declare class PublicApi extends BaseApi {
      * @param currencyNames Limited currency names for local data, undefined will try to retrive remoately
      * @returns Result
      */
-    currencies<T extends string[] | Currency[] | undefined>(currencyNames?: T): Promise<T extends undefined ? CurrencyDto[] | undefined : ListType1[]>;
+    currencies(): Promise<CurrencyDto[] | undefined>;
+    currencies(names: string[] | Currency[] | boolean): ListType1[];
     /**
      * Get exchange rate
      * @param currency Currency
@@ -55,7 +56,7 @@ export declare class PublicApi extends BaseApi {
      * @param payload Payload
      * @returns Result
      */
-    product<T extends number | string>(id: T, culture?: string, payload?: IApiPayload<PublicProductDto>): Promise<(T extends number ? PublicProductDto : PublicOrgProductDto) | undefined>;
+    product<T extends number | string>(id: T, culture?: string, payload?: IApiPayload<T extends number ? PublicProductDto : PublicOrgProductDto>): Promise<(T extends number ? PublicProductDto : PublicOrgProductDto) | undefined>;
     /**
      *
      * Get all repeat options

package/lib/mjs/erp/PublicApi.js

@@ -1,4 +1,5 @@
 import { DataTypes } from '@etsoo/shared';
+import { Currencies } from '../business/Currency';
 import { ProductUnit } from '../business/ProductUnit';
 import { RepeatOption } from '../business/RepeatOption';
 import { BaseApi } from './BaseApi';
@@ -6,22 +7,29 @@ import { BaseApi } from './BaseApi';
  * Public API
  */
 export class PublicApi extends BaseApi {
-    /**
-     * Get currencies
-     * @param currencyNames Limited currency names for local data, undefined will try to retrive remoately
-     * @returns Result
-     */
-    async currencies(currencyNames) {
-        if (currencyNames == null)
-            return (await this.api.get('Public/GetCurrencies', undefined, { defaultValue: [], showLoading: false }));
-        else
-            return currencyNames.map((name) => {
+    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
+                });
+            });
+        }
+        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 this.api.get('Public/GetCurrencies', undefined, {
+            defaultValue: [],
+            showLoading: false
+        });
     }
     /**
      * Get exchange rate
@@ -77,6 +85,7 @@ export class PublicApi extends BaseApi {
     mobileQRCode(id, host, payload) {
         return this.api.post('Public/MobileQRCode', { id, host }, payload);
     }
+    //product(id: number, culture?: string, ): Promise<PublicProductDto | undefined>;
     /**
      * Get public and valid product data
      * @param id Product/Service Id or Uid

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.18",
+    "version": "1.3.20",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,20 +54,20 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.13",
         "@etsoo/restclient": "^1.0.75",
-        "@etsoo/shared": "^1.1.65",
+        "@etsoo/shared": "^1.1.66",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.19.3",
-        "@babel/core": "^7.19.3",
-        "@babel/plugin-transform-runtime": "^7.19.1",
+        "@babel/core": "^7.19.6",
+        "@babel/plugin-transform-runtime": "^7.19.6",
         "@babel/preset-env": "^7.19.4",
-        "@babel/runtime-corejs3": "^7.19.4",
+        "@babel/runtime-corejs3": "^7.19.6",
         "@types/jest": "^29.2.0",
         "@typescript-eslint/eslint-plugin": "^5.40.1",
         "@typescript-eslint/parser": "^5.40.1",
-        "eslint": "^8.25.0",
+        "eslint": "^8.26.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^29.2.1",

package/src/erp/OrgApi.ts

@@ -40,7 +40,7 @@ export class OrgApi extends EntityApi {
             if (typeof serviceId === 'number') return undefined;
             return this.listBase(items, serviceId);
         } else {
-            if (typeof serviceId !== 'number') return undefined;
+            if (typeof serviceId === 'object') return undefined;
             return this.listBase<OrgListRQ, ListType>(
                 { items, serviceId },
                 { defaultValue: [], showLoading: false }

package/src/erp/PublicApi.ts

@@ -1,6 +1,6 @@
 import { IApiPayload } from '@etsoo/restclient';
 import { DataTypes, ListType, ListType1 } from '@etsoo/shared';
-import { Currency } from '../business/Currency';
+import { Currencies, Currency } from '../business/Currency';
 import { ProductUnit } from '../business/ProductUnit';
 import { RepeatOption } from '../business/RepeatOption';
 import { BaseApi } from './BaseApi';
@@ -18,20 +18,27 @@ export class PublicApi extends BaseApi {
      * @param currencyNames Limited currency names for local data, undefined will try to retrive remoately
      * @returns Result
      */
-    async currencies<T extends string[] | Currency[] | undefined>(
-        currencyNames?: T
-    ): Promise<T extends undefined ? CurrencyDto[] | undefined : ListType1[]> {
-        if (currencyNames == null)
-            return (await this.api.get<CurrencyDto[]>(
-                'Public/GetCurrencies',
-                undefined,
-                { defaultValue: [], showLoading: false }
-            )) as any;
-        else
-            return currencyNames.map((name) => ({
+    currencies(): Promise<CurrencyDto[] | undefined>;
+    currencies(names: string[] | Currency[] | boolean): ListType1[];
+    currencies(names?: string[] | Currency[] | boolean) {
+        if (typeof names === 'boolean' && names) {
+            return Currencies.map((name) => ({
                 id: name,
                 label: this.app.get(`currency${name}`) ?? name
-            })) as any;
+            }));
+        }
+
+        if (Array.isArray(names)) {
+            return names.map((name) => ({
+                id: name,
+                label: this.app.get(`currency${name}`) ?? name
+            }));
+        }
+
+        return this.api.get<CurrencyDto[]>('Public/GetCurrencies', undefined, {
+            defaultValue: [],
+            showLoading: false
+        });
     }
 
     /**
@@ -106,6 +113,8 @@ export class PublicApi extends BaseApi {
         return this.api.post('Public/MobileQRCode', { id, host }, payload);
     }
 
+    //product(id: number, culture?: string, ): Promise<PublicProductDto | undefined>;
+
     /**
      * Get public and valid product data
      * @param id Product/Service Id or Uid
@@ -116,16 +125,16 @@ export class PublicApi extends BaseApi {
     product<T extends number | string>(
         id: T,
         culture?: string,
-        payload?: IApiPayload<PublicProductDto>
-    ): Promise<
-        (T extends number ? PublicProductDto : PublicOrgProductDto) | undefined
-    > {
+        payload?: IApiPayload<
+            T extends number ? PublicProductDto : PublicOrgProductDto
+        >
+    ) {
         culture = this.app.checkLanguage(culture);
         return this.api.get(
             `Public/Product/${id}/${culture}`,
             undefined,
             payload
-        ) as any;
+        );
     }
 
     /**