@etsoo/smarterp-core 1.0.86 → 1.0.87

package/__tests__/CoreUtils.ts

@@ -0,0 +1,39 @@
+import { CoreUtils } from "../src";
+
+test("Test for validateJson with string schema", async () => {
+  const schema =
+    '{"type":"object","properties":{"cc":{"type":"array","format":"email","uniqueItems":true},"bcc":{"type":"array","format":"email","uniqueItems":true}}}';
+
+  let [valid, errors] = await CoreUtils.validateJson(schema, "{}");
+  expect(valid).toBeTruthy();
+
+  [valid, errors] = await CoreUtils.validateJson(schema, {
+    cc: ["a@b.com", "a@b.com"]
+  });
+  expect(valid).toBeFalsy();
+  expect(errors?.[0].keyword).toBe("uniqueItems");
+});
+
+test("Test for validateJson with object schema", async () => {
+  const schema = {
+    type: "object",
+    properties: {
+      cc: {
+        type: "array",
+        format: "email",
+        uniqueItems: true
+      },
+      bcc: {
+        type: "array",
+        format: "email",
+        uniqueItems: true
+      }
+    }
+  };
+
+  let [valid, errors] = await CoreUtils.validateJson(schema, {
+    cc: "abc"
+  });
+  expect(valid).toBeFalsy();
+  expect(errors?.[0].keyword).toBe("format");
+});

package/lib/cjs/CoreUtils.d.ts

@@ -1,4 +1,4 @@
-import { ErrorObject } from "ajv";
+import type { ErrorObject } from "ajv";
 /**
  * Core utilities
  */
@@ -17,7 +17,7 @@ export declare namespace CoreUtils {
      * @param input JSON input to validate
      * @returns Result
      */
-    function validateJson(schema: any, input: any): Promise<[
+    function validateJson(schema: string | object, input: string | object | null | undefined): Promise<[
         boolean,
         ErrorObject<string, Record<string, any>, unknown>[] | null | undefined
     ]>;

package/lib/cjs/CoreUtils.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreUtils = void 0;
-const ajv_1 = __importDefault(require("ajv"));
+const ajv_formats_1 = __importDefault(require("ajv-formats"));
 /**
  * Core utilities
  */
@@ -24,6 +24,7 @@ var CoreUtils;
         };
     }
     CoreUtils.avatarStyles = avatarStyles;
+    let ajv = null;
     /**
      * Validate JSON input against a schema
      * 验证 JSON 输入是否符合架构
@@ -32,9 +33,18 @@ var CoreUtils;
      * @returns Result
      */
     async function validateJson(schema, input) {
-        const ajv = new ajv_1.default();
-        const v = await ajv.compileAsync(schema);
-        return [v(input), v.errors];
+        if (ajv == null) {
+            const AjvClass = (await import("ajv")).Ajv;
+            ajv = new AjvClass({
+                allErrors: true,
+                strictTypes: false
+            });
+            (0, ajv_formats_1.default)(ajv);
+        }
+        return [
+            ajv.validate(typeof schema === "string" ? JSON.parse(schema) : schema, typeof input === "string" ? JSON.parse(input) : input),
+            ajv.errors
+        ];
     }
     CoreUtils.validateJson = validateJson;
 })(CoreUtils || (exports.CoreUtils = CoreUtils = {}));

package/lib/cjs/OrgApi.d.ts

@@ -141,7 +141,7 @@ export declare class OrgApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    readApiSchema(service: CoreApiService, payload?: IApiPayload<string>): Promise<string | undefined>;
+    readApiSchema(service: CoreApiService, payload?: IApiPayload<object>): Promise<object | undefined>;
     /**
      * Get Antiforgery request token
      * 获取反伪造请求令牌

package/lib/mjs/CoreUtils.d.ts

@@ -1,4 +1,4 @@
-import { ErrorObject } from "ajv";
+import type { ErrorObject } from "ajv";
 /**
  * Core utilities
  */
@@ -17,7 +17,7 @@ export declare namespace CoreUtils {
      * @param input JSON input to validate
      * @returns Result
      */
-    function validateJson(schema: any, input: any): Promise<[
+    function validateJson(schema: string | object, input: string | object | null | undefined): Promise<[
         boolean,
         ErrorObject<string, Record<string, any>, unknown>[] | null | undefined
     ]>;

package/lib/mjs/CoreUtils.js

@@ -1,4 +1,4 @@
-import Ajv from "ajv";
+import addFormats from "ajv-formats";
 /**
  * Core utilities
  */
@@ -18,6 +18,7 @@ export var CoreUtils;
         };
     }
     CoreUtils.avatarStyles = avatarStyles;
+    let ajv = null;
     /**
      * Validate JSON input against a schema
      * 验证 JSON 输入是否符合架构
@@ -26,9 +27,18 @@ export var CoreUtils;
      * @returns Result
      */
     async function validateJson(schema, input) {
-        const ajv = new Ajv();
-        const v = await ajv.compileAsync(schema);
-        return [v(input), v.errors];
+        if (ajv == null) {
+            const AjvClass = (await import("ajv")).Ajv;
+            ajv = new AjvClass({
+                allErrors: true,
+                strictTypes: false
+            });
+            addFormats(ajv);
+        }
+        return [
+            ajv.validate(typeof schema === "string" ? JSON.parse(schema) : schema, typeof input === "string" ? JSON.parse(input) : input),
+            ajv.errors
+        ];
     }
     CoreUtils.validateJson = validateJson;
 })(CoreUtils || (CoreUtils = {}));

package/lib/mjs/OrgApi.d.ts

@@ -141,7 +141,7 @@ export declare class OrgApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    readApiSchema(service: CoreApiService, payload?: IApiPayload<string>): Promise<string | undefined>;
+    readApiSchema(service: CoreApiService, payload?: IApiPayload<object>): Promise<object | undefined>;
     /**
      * Get Antiforgery request token
      * 获取反伪造请求令牌

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.0.86",
+  "version": "1.0.87",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -60,6 +60,7 @@
     "@etsoo/toolpad": "^1.0.40",
     "@mui/material": "^7.2.0",
     "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

package/src/CoreUtils.ts

@@ -1,4 +1,6 @@
-import Ajv, { ErrorObject } from "ajv";
+import type Ajv from "ajv";
+import type { ErrorObject } from "ajv";
+import addFormats from "ajv-formats";
 
 /**
  * Core utilities
@@ -18,6 +20,8 @@ export namespace CoreUtils {
     };
   }
 
+  let ajv: Ajv | null = null;
+
   /**
    * Validate JSON input against a schema
    * 验证 JSON 输入是否符合架构
@@ -26,16 +30,31 @@ export namespace CoreUtils {
    * @returns Result
    */
   export async function validateJson(
-    schema: any,
-    input: any
+    schema: string | object,
+    input: string | object | null | undefined
   ): Promise<
     [
       boolean,
       ErrorObject<string, Record<string, any>, unknown>[] | null | undefined
     ]
   > {
-    const ajv = new Ajv();
-    const v = await ajv.compileAsync(schema);
-    return [v(input), v.errors];
+    if (ajv == null) {
+      const AjvClass = (await import("ajv")).Ajv;
+
+      ajv = new AjvClass({
+        allErrors: true,
+        strictTypes: false
+      });
+
+      addFormats(ajv);
+    }
+
+    return [
+      ajv!.validate(
+        typeof schema === "string" ? JSON.parse(schema) : schema,
+        typeof input === "string" ? JSON.parse(input) : input
+      ),
+      ajv!.errors
+    ];
   }
 }

package/src/OrgApi.ts

@@ -221,7 +221,7 @@ export class OrgApi extends EntityApi {
    * @param payload Payload
    * @returns Result
    */
-  readApiSchema(service: CoreApiService, payload?: IApiPayload<string>) {
+  readApiSchema(service: CoreApiService, payload?: IApiPayload<object>) {
     return this.api.get(
       `${this.flag}/ReadApiSchema/${service}`,
       undefined,