@etsoo/appscript 1.3.20 → 1.3.22

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

@@ -37,14 +37,14 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
+    protected listBase<T extends DataTypes.IdType, RQ extends TiplistRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Query
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
+    protected queryBase<T extends DataTypes.IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Read
      * @param id Id

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

@@ -0,0 +1,22 @@
+import { IApiPayload } from '@etsoo/restclient';
+import { ListType1 } from '@etsoo/shared';
+import { IApp } from '../app/IApp';
+import { EntityApi } from './EntityApi';
+import { MemberListRQ } from './rq/MemberListRQ';
+/**
+ * Member API
+ */
+export declare class MemberApi extends EntityApi {
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(app: IApp);
+    /**
+     * List
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    list(rq: MemberListRQ, payload: IApiPayload<ListType1[]>): Promise<ListType1[] | undefined>;
+}

package/lib/cjs/erp/MemberApi.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MemberApi = void 0;
+const EntityApi_1 = require("./EntityApi");
+/**
+ * Member API
+ */
+class MemberApi extends EntityApi_1.EntityApi {
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(app) {
+        super('Member', app);
+    }
+    /**
+     * List
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    list(rq, payload) {
+        return this.listBase(rq, payload);
+    }
+}
+exports.MemberApi = MemberApi;

package/lib/cjs/erp/rq/MemberListRQ.d.ts

@@ -0,0 +1,5 @@
+import { TiplistRQ } from './TiplistRQ';
+/**
+ * Member list request data
+ */
+export declare type MemberListRQ = TiplistRQ<string> & {};

package/lib/cjs/erp/rq/MemberListRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/erp/rq/QueryRQ.d.ts

@@ -1,16 +1,17 @@
+import { DataTypes } from '@etsoo/shared';
 /**
  * Query request data
  * com.etsoo.CoreFramework.Models.QueryRQ
  */
-export declare type QueryRQ = {
+export declare type QueryRQ<T extends DataTypes.IdType = number> = {
     /**
      * Number id
      */
-    id?: number;
+    id?: T;
     /**
      * String id
      */
-    sid?: number;
+    sid?: string;
     /**
      * Current page
      */

package/lib/cjs/erp/rq/TiplistRQ.d.ts

@@ -3,11 +3,11 @@ import { DataTypes } from '@etsoo/shared';
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
  */
-export declare type TiplistRQ = {
+export declare type TiplistRQ<T extends DataTypes.IdType = number> = {
     /**
      * number id
      */
-    id?: number;
+    id?: T;
     /**
      * String id
      */
@@ -15,7 +15,7 @@ export declare type TiplistRQ = {
     /**
      * Excluded ids
      */
-    excludedIds?: DataTypes.IdType[];
+    excludedIds?: T[];
     /**
      * Filter keyword
      */

package/lib/cjs/index.d.ts

@@ -26,6 +26,7 @@ export * from './erp/dto/OrgDto';
 export * from './erp/dto/OrgQueryDto';
 export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResultPayload';
+export * from './erp/rq/MemberListRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/QueryRQ';
@@ -34,6 +35,7 @@ export * from './erp/rq/TiplistRQ';
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
 export * from './erp/EntityApi';
+export * from './erp/MemberApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 export * from './i18n/enUS';

package/lib/cjs/index.js

@@ -50,6 +50,7 @@ __exportStar(require("./erp/dto/OrgQueryDto"), exports);
 __exportStar(require("./erp/dto/PublicProductDto"), exports);
 __exportStar(require("./erp/dto/ResultPayload"), exports);
 // erp rq
+__exportStar(require("./erp/rq/MemberListRQ"), exports);
 __exportStar(require("./erp/rq/OrgListRQ"), exports);
 __exportStar(require("./erp/rq/OrgQueryRQ"), exports);
 __exportStar(require("./erp/rq/QueryRQ"), exports);
@@ -59,6 +60,7 @@ __exportStar(require("./erp/rq/TiplistRQ"), exports);
 __exportStar(require("./erp/AddressApi"), exports);
 __exportStar(require("./erp/BaseApi"), exports);
 __exportStar(require("./erp/EntityApi"), exports);
+__exportStar(require("./erp/MemberApi"), exports);
 __exportStar(require("./erp/OrgApi"), exports);
 __exportStar(require("./erp/PublicApi"), exports);
 // i18n

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

@@ -37,14 +37,14 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
+    protected listBase<T extends DataTypes.IdType, RQ extends TiplistRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Query
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
+    protected queryBase<T extends DataTypes.IdType, RQ extends QueryRQ<T>, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Read
      * @param id Id

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

@@ -0,0 +1,22 @@
+import { IApiPayload } from '@etsoo/restclient';
+import { ListType1 } from '@etsoo/shared';
+import { IApp } from '../app/IApp';
+import { EntityApi } from './EntityApi';
+import { MemberListRQ } from './rq/MemberListRQ';
+/**
+ * Member API
+ */
+export declare class MemberApi extends EntityApi {
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(app: IApp);
+    /**
+     * List
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    list(rq: MemberListRQ, payload: IApiPayload<ListType1[]>): Promise<ListType1[] | undefined>;
+}

package/lib/mjs/erp/MemberApi.js

@@ -0,0 +1,22 @@
+import { EntityApi } from './EntityApi';
+/**
+ * Member API
+ */
+export class MemberApi extends EntityApi {
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(app) {
+        super('Member', app);
+    }
+    /**
+     * List
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    list(rq, payload) {
+        return this.listBase(rq, payload);
+    }
+}

package/lib/mjs/erp/rq/MemberListRQ.d.ts

@@ -0,0 +1,5 @@
+import { TiplistRQ } from './TiplistRQ';
+/**
+ * Member list request data
+ */
+export declare type MemberListRQ = TiplistRQ<string> & {};

package/lib/mjs/erp/rq/MemberListRQ.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/erp/rq/QueryRQ.d.ts

@@ -1,16 +1,17 @@
+import { DataTypes } from '@etsoo/shared';
 /**
  * Query request data
  * com.etsoo.CoreFramework.Models.QueryRQ
  */
-export declare type QueryRQ = {
+export declare type QueryRQ<T extends DataTypes.IdType = number> = {
     /**
      * Number id
      */
-    id?: number;
+    id?: T;
     /**
      * String id
      */
-    sid?: number;
+    sid?: string;
     /**
      * Current page
      */

package/lib/mjs/erp/rq/TiplistRQ.d.ts

@@ -3,11 +3,11 @@ import { DataTypes } from '@etsoo/shared';
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
  */
-export declare type TiplistRQ = {
+export declare type TiplistRQ<T extends DataTypes.IdType = number> = {
     /**
      * number id
      */
-    id?: number;
+    id?: T;
     /**
      * String id
      */
@@ -15,7 +15,7 @@ export declare type TiplistRQ = {
     /**
      * Excluded ids
      */
-    excludedIds?: DataTypes.IdType[];
+    excludedIds?: T[];
     /**
      * Filter keyword
      */

package/lib/mjs/index.d.ts

@@ -26,6 +26,7 @@ export * from './erp/dto/OrgDto';
 export * from './erp/dto/OrgQueryDto';
 export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResultPayload';
+export * from './erp/rq/MemberListRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/QueryRQ';
@@ -34,6 +35,7 @@ export * from './erp/rq/TiplistRQ';
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
 export * from './erp/EntityApi';
+export * from './erp/MemberApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 export * from './i18n/enUS';

package/lib/mjs/index.js

@@ -33,6 +33,7 @@ export * from './erp/dto/OrgQueryDto';
 export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResultPayload';
 // erp rq
+export * from './erp/rq/MemberListRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/QueryRQ';
@@ -42,6 +43,7 @@ export * from './erp/rq/TiplistRQ';
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
 export * from './erp/EntityApi';
+export * from './erp/MemberApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 // i18n

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.20",
+    "version": "1.3.22",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -65,13 +65,13 @@
         "@babel/preset-env": "^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",
+        "@typescript-eslint/eslint-plugin": "^5.41.0",
+        "@typescript-eslint/parser": "^5.41.0",
         "eslint": "^8.26.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
-        "jest": "^29.2.1",
-        "jest-environment-jsdom": "^29.2.1",
+        "jest": "^29.2.2",
+        "jest-environment-jsdom": "^29.2.2",
         "ts-jest": "^29.0.3",
         "typescript": "^4.8.4"
     }

package/src/erp/EntityApi.ts

@@ -66,10 +66,11 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected listBase<RQ extends TiplistRQ, R extends object>(
-        rq: RQ,
-        payload?: IApiPayload<R[]>
-    ) {
+    protected listBase<
+        T extends DataTypes.IdType,
+        RQ extends TiplistRQ<T>,
+        R extends object
+    >(rq: RQ, payload?: IApiPayload<R[]>) {
         return this.api.post(`${this.flag}/List`, rq, payload);
     }
 
@@ -79,10 +80,11 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected queryBase<RQ extends QueryRQ, R extends object>(
-        rq: RQ,
-        payload?: IApiPayload<R[]>
-    ) {
+    protected queryBase<
+        T extends DataTypes.IdType,
+        RQ extends QueryRQ<T>,
+        R extends object
+    >(rq: RQ, payload?: IApiPayload<R[]>) {
         return this.api.post(`${this.flag}/Query`, rq, payload);
     }
 

package/src/erp/MemberApi.ts

@@ -0,0 +1,28 @@
+import { IApiPayload } from '@etsoo/restclient';
+import { ListType1 } from '@etsoo/shared';
+import { IApp } from '../app/IApp';
+import { EntityApi } from './EntityApi';
+import { MemberListRQ } from './rq/MemberListRQ';
+
+/**
+ * Member API
+ */
+export class MemberApi extends EntityApi {
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(app: IApp) {
+        super('Member', app);
+    }
+
+    /**
+     * List
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    list(rq: MemberListRQ, payload: IApiPayload<ListType1[]>) {
+        return this.listBase(rq, payload);
+    }
+}

package/src/erp/OrgApi.ts

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

package/src/erp/rq/MemberListRQ.ts

@@ -0,0 +1,6 @@
+import { TiplistRQ } from './TiplistRQ';
+
+/**
+ * Member list request data
+ */
+export type MemberListRQ = TiplistRQ<string> & {};

package/src/erp/rq/QueryRQ.ts

@@ -1,17 +1,19 @@
+import { DataTypes } from '@etsoo/shared';
+
 /**
  * Query request data
  * com.etsoo.CoreFramework.Models.QueryRQ
  */
-export type QueryRQ = {
+export type QueryRQ<T extends DataTypes.IdType = number> = {
     /**
      * Number id
      */
-    id?: number;
+    id?: T;
 
     /**
      * String id
      */
-    sid?: number;
+    sid?: string;
 
     /**
      * Current page

package/src/erp/rq/TiplistRQ.ts

@@ -4,11 +4,11 @@ import { DataTypes } from '@etsoo/shared';
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
  */
-export type TiplistRQ = {
+export type TiplistRQ<T extends DataTypes.IdType = number> = {
     /**
      * number id
      */
-    id?: number;
+    id?: T;
 
     /**
      * String id
@@ -18,7 +18,7 @@ export type TiplistRQ = {
     /**
      * Excluded ids
      */
-    excludedIds?: DataTypes.IdType[];
+    excludedIds?: T[];
 
     /**
      * Filter keyword

package/src/index.ts

@@ -39,6 +39,7 @@ export * from './erp/dto/PublicProductDto';
 export * from './erp/dto/ResultPayload';
 
 // erp rq
+export * from './erp/rq/MemberListRQ';
 export * from './erp/rq/OrgListRQ';
 export * from './erp/rq/OrgQueryRQ';
 export * from './erp/rq/QueryRQ';
@@ -49,6 +50,7 @@ export * from './erp/rq/TiplistRQ';
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
 export * from './erp/EntityApi';
+export * from './erp/MemberApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';