@etsoo/smarterp-core 1.0.0 → 1.0.2

package/__tests__/OrgApi.ts

@@ -3,10 +3,11 @@ import { isLocalTest, TestApp } from "./app/TestApp";
 import { EntityStatus } from "@etsoo/appscript";
 import { OrgApi } from "../src/OrgApi";
 import { OrgCreateRQ } from "../src/rq/org/OrgCreateRQ";
+import { OrgUpdateRQ } from "../src";
 
 if (isLocalTest) {
   const app = new TestApp();
-  app.changeCulture(app.settings.cultures[0]);
+  await app.changeCulture(app.settings.cultures[0]);
 
   // Simulate logined
   app.authorize(
@@ -22,12 +23,14 @@ if (isLocalTest) {
       ? {
           name: `青岛亿速思维网络科技有限公司`,
           brand: "亿速思维",
-          pin: guid
+          pin: guid,
+          region: "CN"
         }
       : {
           name: `上海亿商网络科技有限公司`,
           brand: "亿商",
-          pin: guid
+          pin: guid,
+          region: "CN"
         };
 
     const result = await api.create(rq);

package/__tests__/PublicApi.ts

@@ -2,9 +2,11 @@ import { isLocalTest, TestApp } from "./app/TestApp";
 import { PublicApi } from "../src/PublicApi";
 import { PinyinFormatType } from "../src/rq/public/PinyinRQ";
 import { ApiProvider } from "../src/rq/public/PlaceQueryRQ";
+import { act } from "react";
 
 const app = new TestApp();
-app.changeCulture(app.settings.cultures[0]);
+
+await app.changeCulture(app.settings.cultures[0]);
 
 const api = new PublicApi(app);
 

package/__tests__/UserApi.ts

@@ -3,7 +3,7 @@ import { UserApi } from "../src";
 
 if (isLocalTest) {
   const app = new TestApp();
-  app.changeCulture(app.settings.cultures[0]);
+  await app.changeCulture(app.settings.cultures[0]);
 
   // Simulate logined
   app.authorize(

package/__tests__/tsconfig.json

@@ -1,18 +1,20 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "ESNext",
-    "moduleResolution": "Node10",
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "bundler",
     "allowJs": false,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
+    "isolatedModules": true,
+    "outDir": "./lib",
+    "noEmit": false,
+    "declaration": true,
     "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": false,
+    "jsx": "react-jsx",
     "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "declaration": true
+    "types": ["vitest/globals"]
   },
   "include": [".."]
 }

package/lib/cjs/AppApi.d.ts

@@ -1,5 +1,5 @@
 import { IApi, IApiPayload } from "@etsoo/restclient";
-import { EntityApi, IApp } from "@etsoo/appscript";
+import { EntityApi, IApp, IdResultPayload, ResultPayload } from "@etsoo/appscript";
 import { AppGetMyRQ } from "./rq/app/AppGetMyRQ";
 import { AppQueryData } from "./dto/app/AppQueryData";
 import { AppListRQ } from "./rq/app/AppListRQ";
@@ -7,6 +7,15 @@ import { AppListDto } from "./dto/app/AppListDto";
 import { AppQueryRQ } from "./rq/app/AppQueryRQ";
 import { AppPurchasedQueryRQ } from "./rq/app/AppPurchasedQueryRQ";
 import { AppPurchasedQueryData } from "./dto/app/AppPurchasedQueryData";
+import { AppBuyNewRQ } from "./rq/app/AppBuyNewRQ";
+import { AppBuyRQ } from "./rq/app/AppBuyRQ";
+import { AppRenewRQ } from "./rq/app/AppRenewRQ";
+import { AppUpdateRQ } from "./rq/app/AppUpdateRQ";
+import { AppUpdateReadDto } from "./dto/app/AppUpdateReadDto";
+import { AppReadDto } from "./dto/app/AppReadDto";
+import { CreateApiKeyData } from "./dto/app/CreateApiKeyData";
+import { IActionResult } from "@etsoo/shared";
+import { AppCreateApiKeyRQ } from "./rq/app/AppCreateApiKeyRQ";
 /**
  * Application API
  */
@@ -17,6 +26,27 @@ export declare class AppApi extends EntityApi {
      * @param api API
      */
     constructor(app: IApp, api?: IApi);
+    /**
+     * Buy the application
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    buy(rq: AppBuyRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Buy and create new organization
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    buyNew(rq: AppBuyNewRQ, payload?: IdResultPayload): Promise<import("@etsoo/shared").IdActionResult | undefined>;
+    /**
+     * Create API key
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    createApiKey(rq: AppCreateApiKeyRQ, payload?: IApiPayload<IActionResult<CreateApiKeyData>>): Promise<IActionResult<CreateApiKeyData> | undefined>;
     /**
      * Get user's latest accessed applications
      * @param rq Request data
@@ -45,4 +75,32 @@ export declare class AppApi extends EntityApi {
      * @returns Result
      */
     queryPurchased(rq: AppPurchasedQueryRQ, payload?: IApiPayload<AppPurchasedQueryData[]>): Promise<AppPurchasedQueryData[] | undefined>;
+    /**
+     * Read
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    read(id: number, payload?: IApiPayload<AppReadDto>): Promise<AppReadDto | undefined>;
+    /**
+     * Renew the application
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    renew(rq: AppRenewRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Update the application
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    update(rq: AppUpdateRQ, payload?: ResultPayload): Promise<IActionResult<{}> | undefined>;
+    /**
+     * Update read
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    updateRead(id: number, payload?: IApiPayload<AppUpdateReadDto>): Promise<AppUpdateReadDto | undefined>;
 }

package/lib/cjs/AppApi.js

@@ -14,6 +14,33 @@ class AppApi extends appscript_1.EntityApi {
     constructor(app, api = app.api) {
         super("App", app, api);
     }
+    /**
+     * Buy the application
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    buy(rq, payload) {
+        return this.api.post(`${this.flag}/Buy`, rq, payload);
+    }
+    /**
+     * Buy and create new organization
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    buyNew(rq, payload) {
+        return this.api.post(`${this.flag}/BuyNew`, rq, payload);
+    }
+    /**
+     * Create API key
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    createApiKey(rq, payload) {
+        return this.api.put(`${this.flag}/CreateApiKey`, rq, payload);
+    }
     /**
      * Get user's latest accessed applications
      * @param rq Request data
@@ -48,7 +75,43 @@ class AppApi extends appscript_1.EntityApi {
      * @returns Result
      */
     queryPurchased(rq, payload) {
-        return this.queryBase(rq, payload);
+        return this.queryBase(rq, payload, "Purchased");
+    }
+    /**
+     * Read
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    read(id, payload) {
+        return this.readBase(id, payload);
+    }
+    /**
+     * Renew the application
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    renew(rq, payload) {
+        return this.api.put(`${this.flag}/Renew`, rq, payload);
+    }
+    /**
+     * Update the application
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    update(rq, payload) {
+        return this.api.put(`${this.flag}/Update`, rq, payload);
+    }
+    /**
+     * Update read
+     * @param id Id
+     * @param payload Payload
+     * @returns Result
+     */
+    updateRead(id, payload) {
+        return this.updateReadBase(id, payload);
     }
 }
 exports.AppApi = AppApi;

package/lib/cjs/AuthCodeApi.d.ts

@@ -0,0 +1,29 @@
+import { BaseApi, IApi, IApp, StringIdResultPayload } from "@etsoo/appscript";
+import { SendEmailInputRQ } from "./rq/authCode/SendEmailRQ";
+import { SendSMSInputRQ } from "./rq/authCode/SendSMSRQ";
+/**
+ * Auth Code API
+ * 验证码接口
+ */
+export declare class AuthCodeApi extends BaseApi {
+    /**
+     * Constructor
+     * @param app Application
+     * @param api API
+     */
+    constructor(app: IApp, api?: IApi);
+    /**
+     * Send email
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    sendEmail(rq: SendEmailInputRQ, payload?: StringIdResultPayload): Promise<import("@etsoo/shared").IdActionResult<string> | undefined>;
+    /**
+     * Send email
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    sendSMS(rq: SendSMSInputRQ, payload?: StringIdResultPayload): Promise<import("@etsoo/shared").IdActionResult<string> | undefined>;
+}

package/lib/cjs/AuthCodeApi.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthCodeApi = void 0;
+const appscript_1 = require("@etsoo/appscript");
+/**
+ * Auth Code API
+ * 验证码接口
+ */
+class AuthCodeApi extends appscript_1.BaseApi {
+    /**
+     * Constructor
+     * @param app Application
+     * @param api API
+     */
+    constructor(app, api = app.api) {
+        super(app, api);
+    }
+    /**
+     * Send email
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    sendEmail(rq, payload) {
+        const { deviceId, region } = this.app;
+        const data = {
+            ...rq,
+            deviceId,
+            region,
+            timezone: this.app.getTimeZone()
+        };
+        return this.api.put("AuthCode/SendEmail", data, payload);
+    }
+    /**
+     * Send email
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    sendSMS(rq, payload) {
+        const { deviceId, region } = this.app;
+        const data = {
+            ...rq,
+            deviceId,
+            region
+        };
+        return this.api.put("AuthCode/SendSMS", data, payload);
+    }
+}
+exports.AuthCodeApi = AuthCodeApi;

package/lib/cjs/CoreApp.d.ts

@@ -4,45 +4,118 @@ import { OrgApi } from "./OrgApi";
 import { AppApi } from "./AppApi";
 import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
-import { AuthApi, IApp } from "@etsoo/appscript";
+import { AuthApi, IApp, UserIdentifierType } from "@etsoo/appscript";
+import { IdentityType } from "./dto/IdentityType";
+import { AuthCodeApi } from "./AuthCodeApi";
+import { AppQueryData } from "./dto/app/AppQueryData";
+import { ListType } from "@etsoo/shared";
+/**
+ * Core application interface
+ * 核心应用程序接口
+ */
+export interface ICoreApp {
+    /**
+     * Application API
+     */
+    appApi: AppApi;
+    /**
+     * Authentication API
+     */
+    readonly authApi: AuthApi;
+    /**
+     * Auth code API
+     */
+    readonly authCodeApi: AuthCodeApi;
+    /**
+     * Member API
+     */
+    readonly memberApi: MemberApi;
+    /**
+     * Organization API
+     */
+    readonly orgApi: OrgApi;
+    /**
+     * Public API
+     */
+    readonly publicApi: PublicApi;
+    /**
+     * User API
+     */
+    readonly userApi: UserApi;
+    /**
+     * Get app name
+     * 获取应用名称
+     * @param data App data
+     * @returns Name
+     */
+    getAppName(data: AppQueryData): string;
+    /**
+     * Get user identifier type label
+     * 获取用户标识类型标签
+     * @param type Type
+     * @returns Label
+     */
+    getIdentifierTypeLabel(type: UserIdentifierType): string;
+    /**
+     * Get identity label
+     * 获取身份标签
+     * @param identity Identity value
+     * @param joinChar Join character
+     * @returns Label(s)
+     */
+    getIdentityLabel(identity: IdentityType | null | undefined, joinChar?: string): string;
+    /**
+     * Get identities
+     * 获取身份列表
+     * @param identity Identity value combined
+     * @returns List
+     */
+    getIdentities(identity?: number): ListType[];
+}
 /**
  * Core application
  * 核心应用程序
  */
-export declare class CoreApp {
-    protected app: IApp;
-    protected api: IApi;
-    _appApi?: AppApi;
+export declare class CoreApp implements ICoreApp {
+    readonly app: IApp;
+    readonly api: IApi;
+    private _appApi?;
     /**
      * Application API
      * 应用程序接口
      */
     get appApi(): AppApi;
-    _authApi?: AuthApi;
+    private _authApi?;
     /**
      * Authentication API
      * 认证接口
      */
     get authApi(): AuthApi;
-    _memberApi?: MemberApi;
+    private _authCodeApi?;
+    /**
+     * Authentication API
+     * 认证接口
+     */
+    get authCodeApi(): AuthCodeApi;
+    private _memberApi?;
     /**
      * Member API
      * 会员接口
      */
     get memberApi(): MemberApi;
-    _orgApi?: OrgApi;
+    private _orgApi?;
     /**
      * Organization API
      * 机构接口
      */
     get orgApi(): OrgApi;
-    _publicApi?: PublicApi;
+    private _publicApi?;
     /**
      * Public API
      * 公共接口
      */
     get publicApi(): PublicApi;
-    _userApi?: UserApi;
+    private _userApi?;
     /**
      * User API
      * 用户接口
@@ -55,4 +128,37 @@ export declare class CoreApp {
      * @param api API
      */
     constructor(app: IApp, api: IApi);
+    /**
+     * Get app name
+     * 获取应用名称
+     * @param data App data
+     * @returns Name
+     */
+    getAppName(data: {
+        id: number;
+        name: string;
+        localName?: string;
+    }): string;
+    /**
+     * Get user identifier type label
+     * 获取用户标识类型标签
+     * @param type Type
+     * @returns Label
+     */
+    getIdentifierTypeLabel(type: UserIdentifierType): string;
+    /**
+     * Get identity label
+     * 获取身份标签
+     * @param identity Identity value
+     * @param joinChar Join character
+     * @returns Label(s)
+     */
+    getIdentityLabel(identity: IdentityType | null | undefined, joinChar?: string): string;
+    /**
+     * Get identities
+     * 获取身份列表
+     * @param identity Identity value combined
+     * @returns List
+     */
+    getIdentities(identity?: number): ListType[];
 }

package/lib/cjs/CoreApp.js

@@ -7,52 +7,71 @@ const AppApi_1 = require("./AppApi");
 const PublicApi_1 = require("./PublicApi");
 const UserApi_1 = require("./UserApi");
 const appscript_1 = require("@etsoo/appscript");
+const IdentityType_1 = require("./dto/IdentityType");
+const AuthCodeApi_1 = require("./AuthCodeApi");
+const shared_1 = require("@etsoo/shared");
 /**
  * Core application
  * 核心应用程序
  */
 class CoreApp {
+    app;
+    api;
+    _appApi;
     /**
      * Application API
      * 应用程序接口
      */
     get appApi() {
-        return (this._appApi ?? (this._appApi = new AppApi_1.AppApi(this.app, this.api)));
+        return (this._appApi ??= new AppApi_1.AppApi(this.app, this.api));
     }
+    _authApi;
     /**
      * Authentication API
      * 认证接口
      */
     get authApi() {
-        return (this._authApi ?? (this._authApi = new appscript_1.AuthApi(this.app, this.api)));
+        return (this._authApi ??= new appscript_1.AuthApi(this.app, this.api));
     }
+    _authCodeApi;
+    /**
+     * Authentication API
+     * 认证接口
+     */
+    get authCodeApi() {
+        return (this._authCodeApi ??= new AuthCodeApi_1.AuthCodeApi(this.app, this.api));
+    }
+    _memberApi;
     /**
      * Member API
      * 会员接口
      */
     get memberApi() {
-        return (this._memberApi ?? (this._memberApi = new MemberApi_1.MemberApi(this.app, this.api)));
+        return (this._memberApi ??= new MemberApi_1.MemberApi(this.app, this.api));
     }
+    _orgApi;
     /**
      * Organization API
      * 机构接口
      */
     get orgApi() {
-        return (this._orgApi ?? (this._orgApi = new OrgApi_1.OrgApi(this.app, this.api)));
+        return (this._orgApi ??= new OrgApi_1.OrgApi(this.app, this.api));
     }
+    _publicApi;
     /**
      * Public API
      * 公共接口
      */
     get publicApi() {
-        return (this._publicApi ?? (this._publicApi = new PublicApi_1.PublicApi(this.app, this.api)));
+        return (this._publicApi ??= new PublicApi_1.PublicApi(this.app, this.api));
     }
+    _userApi;
     /**
      * User API
      * 用户接口
      */
     get userApi() {
-        return (this._userApi ?? (this._userApi = new UserApi_1.UserApi(this.app, this.api)));
+        return (this._userApi ??= new UserApi_1.UserApi(this.app, this.api));
     }
     /**
      * Constructor
@@ -64,5 +83,52 @@ class CoreApp {
         this.app = app;
         this.api = api;
     }
+    /**
+     * Get app name
+     * 获取应用名称
+     * @param data App data
+     * @returns Name
+     */
+    getAppName(data) {
+        return data.localName ?? this.app.get(`app${data.id}`) ?? data.name;
+    }
+    /**
+     * Get user identifier type label
+     * 获取用户标识类型标签
+     * @param type Type
+     * @returns Label
+     */
+    getIdentifierTypeLabel(type) {
+        const key = shared_1.DataTypes.getEnumKey(appscript_1.UserIdentifierType, type);
+        return this.app.get(`uiType${key}`) ?? key;
+    }
+    /**
+     * Get identity label
+     * 获取身份标签
+     * @param identity Identity value
+     * @param joinChar Join character
+     * @returns Label(s)
+     */
+    getIdentityLabel(identity, joinChar) {
+        if (identity == null)
+            return "";
+        joinChar ??= ", ";
+        const identities = this.getIdentities(identity);
+        return identities.map((r) => r.label).join(joinChar);
+    }
+    /**
+     * Get identities
+     * 获取身份列表
+     * @param identity Identity value combined
+     * @returns List
+     */
+    getIdentities(identity) {
+        if (identity == null)
+            return this.app.getEnumList(IdentityType_1.IdentityType, "id");
+        return this.app.getEnumList(IdentityType_1.IdentityType, "id", (id, _key) => {
+            if ((id & identity) > 0)
+                return id;
+        });
+    }
 }
 exports.CoreApp = CoreApp;

package/lib/cjs/CoreUtils.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Core utilities
+ */
+export declare namespace CoreUtils { }

package/lib/cjs/CoreUtils.js

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

package/lib/cjs/ICoreServiceApp.d.ts

@@ -0,0 +1,30 @@
+import { IServiceApp } from "@etsoo/materialui";
+import { ICoreApp } from "./CoreApp";
+import { DependencyList } from "react";
+/**
+ * Get core service application context hook
+ * @returns Application
+ */
+export declare function useRequiredAppContext(): ICoreServiceApp;
+/**
+ * Use page data
+ * @param app Application
+ * @param pageTitle Page title
+ * @param deps Dependencies
+ */
+export declare function usePageData(app: ICoreServiceApp, pageTitle?: string, deps?: DependencyList): void;
+/**
+ * Use page data empty
+ * @param app Application
+ */
+export declare function usePageDataEmpty(app: ICoreServiceApp): void;
+/**
+ * Core service application interface
+ * 核心服务应用程序接口
+ */
+export interface ICoreServiceApp extends IServiceApp {
+    /**
+     * Core application
+     */
+    readonly core: ICoreApp;
+}