@etsoo/appscript 1.3.15 → 1.3.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/cjs/erp/OrgApi.d.ts +1 -1
  2. package/lib/cjs/erp/OrgApi.js +11 -4
  3. package/lib/mjs/erp/OrgApi.d.ts +1 -1
  4. package/lib/mjs/erp/OrgApi.js +11 -4
  5. package/package.json +1 -1
  6. package/src/erp/OrgApi.ts +15 -6
package/lib/cjs/erp/OrgApi.d.ts CHANGED
@@ -24,7 +24,7 @@ export declare class OrgApi extends EntityApi {
24
24
  * @returns Result
25
25
  */
26
26
  list(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
27
- list(rq: OrgListRQ): Promise<ListType[] | undefined>;
27
+ list(rq: OrgListRQ, payload?: IApiPayload<ListType[]>): Promise<ListType[] | undefined>;
28
28
  /**
29
29
  * Query
30
30
  * @param rq Request data
package/lib/cjs/erp/OrgApi.js CHANGED
@@ -13,10 +13,17 @@ class OrgApi extends EntityApi_1.EntityApi {
13
13
  constructor(app) {
14
14
  super('Organization', app);
15
15
  }
16
- list(items, serviceId, payload) {
17
- payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
18
- const rq = typeof items === 'object' ? items : { items, serviceId };
19
- return this.listBase(rq, payload);
16
+ list(items, serviceId) {
17
+ if (typeof items === 'object') {
18
+ if (typeof serviceId === 'number')
19
+ return undefined;
20
+ return this.listBase(items, serviceId);
21
+ }
22
+ else {
23
+ if (typeof serviceId !== 'number')
24
+ return undefined;
25
+ return this.listBase({ items, serviceId }, { defaultValue: [], showLoading: false });
26
+ }
20
27
  }
21
28
  /**
22
29
  * Query
package/lib/mjs/erp/OrgApi.d.ts CHANGED
@@ -24,7 +24,7 @@ export declare class OrgApi extends EntityApi {
24
24
  * @returns Result
25
25
  */
26
26
  list(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
27
- list(rq: OrgListRQ): Promise<ListType[] | undefined>;
27
+ list(rq: OrgListRQ, payload?: IApiPayload<ListType[]>): Promise<ListType[] | undefined>;
28
28
  /**
29
29
  * Query
30
30
  * @param rq Request data
package/lib/mjs/erp/OrgApi.js CHANGED
@@ -10,10 +10,17 @@ export class OrgApi extends EntityApi {
10
10
  constructor(app) {
11
11
  super('Organization', app);
12
12
  }
13
- list(items, serviceId, payload) {
14
- payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
15
- const rq = typeof items === 'object' ? items : { items, serviceId };
16
- return this.listBase(rq, payload);
13
+ list(items, serviceId) {
14
+ if (typeof items === 'object') {
15
+ if (typeof serviceId === 'number')
16
+ return undefined;
17
+ return this.listBase(items, serviceId);
18
+ }
19
+ else {
20
+ if (typeof serviceId !== 'number')
21
+ return undefined;
22
+ return this.listBase({ items, serviceId }, { defaultValue: [], showLoading: false });
23
+ }
17
24
  }
18
25
  /**
19
26
  * Query
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/appscript",
3
- "version": "1.3.15",
3
+ "version": "1.3.16",
4
4
  "description": "Applications shared TypeScript framework",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
package/src/erp/OrgApi.ts CHANGED
@@ -28,15 +28,24 @@ export class OrgApi extends EntityApi {
28
28
  * @returns Result
29
29
  */
30
30
  list(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
31
- list(rq: OrgListRQ): Promise<ListType[] | undefined>;
32
31
  list(
33
- items?: number | OrgListRQ,
34
- serviceId?: number,
32
+ rq: OrgListRQ,
35
33
  payload?: IApiPayload<ListType[]>
34
+ ): Promise<ListType[] | undefined>;
35
+ list<T extends number | OrgListRQ>(
36
+ items?: T,
37
+ serviceId?: T extends number ? number : IApiPayload<ListType[]>
36
38
  ) {
37
- payload ??= { defaultValue: [], showLoading: false };
38
- const rq = typeof items === 'object' ? items : { items, serviceId };
39
- return this.listBase(rq, payload);
39
+ if (typeof items === 'object') {
40
+ if (typeof serviceId === 'number') return undefined;
41
+ return this.listBase(items, serviceId);
42
+ } else {
43
+ if (typeof serviceId !== 'number') return undefined;
44
+ return this.listBase<OrgListRQ, ListType>(
45
+ { items, serviceId },
46
+ { defaultValue: [], showLoading: false }
47
+ );
48
+ }
40
49
  }
41
50
 
42
51
  /**