@wener/common 2.0.2 → 2.0.3

package/lib/schema/SchemaRegistry.js

@@ -1,45 +1,45 @@
-function _type_of(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
 import { getGlobalStates } from "@wener/utils";
 import { toJsonSchema } from "./index.js";
-var types = getGlobalStates("@wener/common/resource/schema/SchemaRegistry", function () {
-    return new Map();
-});
-export function get(needle) {
-    var key = getKey(needle);
-    var found = types.get(key);
-    if (found) {
-        return found;
-    }
-    else {
-        if (needle && typeof needle !== "string") {
-            return toJsonSchema(needle);
+(function (SchemaRegistry) {
+    const types = getGlobalStates("@wener/common/resource/schema/SchemaRegistry", () => new Map());
+    function get(needle) {
+        let key = getKey(needle);
+        let found = types.get(key);
+        if (found) {
+            return found;
         }
+        else {
+            if (needle && typeof needle !== "string") {
+                return toJsonSchema(needle);
+            }
+        }
+        throw new Error(`Schema not found: ${key}`);
     }
-    throw new Error("Schema not found: ".concat(key));
-}
-function getKey(s) {
-    var key;
-    if (typeof s === "string") {
-        key = s;
-    }
-    else {
-        var js = toJsonSchema(s);
-        key = js.$id || js.title;
-    }
-    if (!key) {
-        throw new Error("Schema must have $id or title");
+    SchemaRegistry.get = get;
+    function getKey(s) {
+        let key;
+        if (typeof s === "string") {
+            key = s;
+        }
+        else {
+            let js = toJsonSchema(s);
+            key = js.$id || js.title;
+        }
+        if (!key) {
+            throw new Error(`Schema must have $id or title`);
+        }
+        return key;
     }
-    return key;
-}
-export function set(key, def) {
-    if (!def) {
-        def = key;
-        if (!def || (typeof def === "undefined" ? "undefined" : _type_of(def)) !== "object") {
-            throw new Error("Invalid schema definition for: ".concat(getKey(key)));
+    function set(key, def) {
+        if (!def) {
+            def = key;
+            if (!def || typeof def !== "object") {
+                throw new Error(`Invalid schema definition for: ${getKey(key)}`);
+            }
         }
+        types.set(getKey(key), toJsonSchema(def));
     }
-    types.set(getKey(key), toJsonSchema(def));
-}
+    SchemaRegistry.set = set;
+})(SchemaRegistry || (SchemaRegistry = {}));
+export var SchemaRegistry;
+//# sourceMappingURL=SchemaRegistry.js.map

package/lib/schema/SchemaRegistry.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/schema/SchemaRegistry.ts"],"sourcesContent":["import { getGlobalStates } from '@wener/utils';\nimport type { JsonSchemaDef } from '../jsonschema';\nimport { toJsonSchema, type SchemaOutput, type TypeSchema } from './index';\n\nexport namespace SchemaRegistry {\n\tconst types = getGlobalStates('@wener/common/resource/schema/SchemaRegistry', () => new Map<string, JsonSchemaDef>());\n\n\texport function get(name: string): JsonSchemaDef;\n\texport function get<S extends TypeSchema>(schema: S): JsonSchemaDef<SchemaOutput<S>>;\n\texport function get(needle: TypeSchema | string) {\n\t\tlet key = getKey(needle);\n\t\tlet found = types.get(key);\n\t\tif (found) {\n\t\t\treturn found;\n\t\t} else {\n\t\t\tif (needle && typeof needle !== 'string') {\n\t\t\t\treturn toJsonSchema(needle);\n\t\t\t}\n\t\t}\n\t\tthrow new Error(`Schema not found: ${key}`);\n\t}\n\n\tfunction getKey(s: TypeSchema | string) {\n\t\tlet key;\n\t\tif (typeof s === 'string') {\n\t\t\tkey = s;\n\t\t} else {\n\t\t\tlet js = toJsonSchema(s);\n\t\t\tkey = js.$id || js.title;\n\t\t}\n\t\tif (!key) {\n\t\t\tthrow new Error(`Schema must have $id or title`);\n\t\t}\n\t\treturn key;\n\t}\n\n\texport function set(key: TypeSchema | string, def: TypeSchema): void;\n\texport function set(key: TypeSchema, def?: TypeSchema): void;\n\texport function set(key: TypeSchema | string, def?: TypeSchema) {\n\t\tif (!def) {\n\t\t\tdef = key as TypeSchema;\n\t\t\tif (!def || typeof def !== 'object') {\n\t\t\t\tthrow new Error(`Invalid schema definition for: ${getKey(key)}`);\n\t\t\t}\n\t\t}\n\t\ttypes.set(getKey(key), toJsonSchema(def));\n\t}\n}\n"],"names":["getGlobalStates","toJsonSchema","SchemaRegistry","types","Map","get","needle","key","getKey","found","Error","s","js","$id","title","set","def"],"mappings":"AAAA,SAASA,eAAe,QAAQ,eAAe;AAE/C,SAASC,YAAY,QAA4C,UAAU;UAE1DC;IAChB,MAAMC,QAAQH,gBAAgB,gDAAgD,IAAM,IAAII;IAIjF,SAASC,IAAIC,MAA2B;QAC9C,IAAIC,MAAMC,OAAOF;QACjB,IAAIG,QAAQN,MAAME,GAAG,CAACE;QACtB,IAAIE,OAAO;YACV,OAAOA;QACR,OAAO;YACN,IAAIH,UAAU,OAAOA,WAAW,UAAU;gBACzC,OAAOL,aAAaK;YACrB;QACD;QACA,MAAM,IAAII,MAAM,CAAC,kBAAkB,EAAEH,KAAK;IAC3C;mBAXgBF,MAAAA;IAahB,SAASG,OAAOG,CAAsB;QACrC,IAAIJ;QACJ,IAAI,OAAOI,MAAM,UAAU;YAC1BJ,MAAMI;QACP,OAAO;YACN,IAAIC,KAAKX,aAAaU;YACtBJ,MAAMK,GAAGC,GAAG,IAAID,GAAGE,KAAK;QACzB;QACA,IAAI,CAACP,KAAK;YACT,MAAM,IAAIG,MAAM,CAAC,6BAA6B,CAAC;QAChD;QACA,OAAOH;IACR;IAIO,SAASQ,IAAIR,GAAwB,EAAES,GAAgB;QAC7D,IAAI,CAACA,KAAK;YACTA,MAAMT;YACN,IAAI,CAACS,OAAO,OAAOA,QAAQ,UAAU;gBACpC,MAAM,IAAIN,MAAM,CAAC,+BAA+B,EAAEF,OAAOD,MAAM;YAChE;QACD;QACAJ,MAAMY,GAAG,CAACP,OAAOD,MAAMN,aAAae;IACrC;mBARgBD,MAAAA;AASjB,GA3CiBb,mBAAAA"}

package/lib/schema/TypeSchema.d.js

@@ -1 +1,3 @@
 export { };
+
+//# sourceMappingURL=TypeSchema.d.js.map

package/lib/schema/TypeSchema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/schema/TypeSchema.d.ts"],"sourcesContent":["import type {\n\tTSchema,\n\tStaticDecode as TypeBoxStaticDecode,\n\tStaticEncode as TypeBoxStaticEncode,\n} from '@sinclair/typebox';\nimport type { StandardSchemaV1 } from '@standard-schema/spec';\nimport type { z } from 'zod/v4';\nimport type { JsonSchemaDef } from '../jsonschema';\n\nexport type TypeSchema<I = unknown, O = I> = TSchema | z.ZodSchema<O, I> | JsonSchemaDef | StandardSchemaV1<I, O>;\n\nexport type SchemaOutput<S extends TypeSchema> =\n\tS extends StandardSchemaV1<infer I, infer O>\n\t\t? O\n\t\t: S extends z.ZodSchema<infer O, infer I>\n\t\t\t? O\n\t\t\t: S extends TSchema\n\t\t\t\t? TypeBoxStaticEncode<S>\n\t\t\t\t: S extends JsonSchemaDef<infer I, infer O>\n\t\t\t\t\t? O\n\t\t\t\t\t: never;\n\nexport type SchemaInput<S extends TypeSchema> =\n\tS extends StandardSchemaV1<infer I, infer O>\n\t\t? I\n\t\t: S extends z.ZodSchema<infer O, infer I>\n\t\t\t? I\n\t\t\t: S extends TSchema\n\t\t\t\t? TypeBoxStaticDecode<S>\n\t\t\t\t: S extends JsonSchemaDef<infer I, infer O>\n\t\t\t\t\t? I\n\t\t\t\t\t: never;\n"],"names":[],"mappings":"AAsBA,WASa"}

package/lib/schema/createSchemaData.js

@@ -1,91 +1,25 @@
-function _array_like_to_array(arr, len) {
-    if (len == null || len > arr.length)
-        len = arr.length;
-    for (var i = 0, arr2 = new Array(len); i < len; i++)
-        arr2[i] = arr[i];
-    return arr2;
-}
-function _array_with_holes(arr) {
-    if (Array.isArray(arr))
-        return arr;
-}
-function _iterable_to_array_limit(arr, i) {
-    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
-    if (_i == null)
-        return;
-    var _arr = [];
-    var _n = true;
-    var _d = false;
-    var _s, _e;
-    try {
-        for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
-            _arr.push(_s.value);
-            if (i && _arr.length === i)
-                break;
-        }
-    }
-    catch (err) {
-        _d = true;
-        _e = err;
-    }
-    finally {
-        try {
-            if (!_n && _i["return"] != null)
-                _i["return"]();
-        }
-        finally {
-            if (_d)
-                throw _e;
-        }
-    }
-    return _arr;
-}
-function _non_iterable_rest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _sliced_to_array(arr, i) {
-    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o)
-        return;
-    if (typeof o === "string")
-        return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor)
-        n = o.constructor.name;
-    if (n === "Map" || n === "Set")
-        return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
-        return _array_like_to_array(o, minLen);
-}
 import { match, P } from "ts-pattern";
 import { toJsonSchema } from "./toJsonSchema.js";
-export function createSchemaData(ts) {
-    var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    var schema = toJsonSchema(ts);
+export function createSchemaData(ts, options = {}) {
+    const schema = toJsonSchema(ts);
     return createJsonSchemaData(schema, options);
 }
 function createJsonSchemaData(schema, options) {
-    var skip = function (s, ctx) {
-        return Boolean(!ctx.required && s.nullable);
-    };
+    let skip = (s, ctx) => Boolean(!ctx.required && s.nullable);
     if (options.all) {
-        skip = function () {
-            return false;
-        };
+        skip = () => false;
     }
     if (options.skip) {
         skip = options.skip;
     }
     return _create(schema, {
-        skip: skip
+        skip
     }, {
         required: false
     });
 }
 function _create(schema, options, ctx) {
-    var skip = options.skip;
+    const { skip } = options;
     if (skip(schema, ctx)) {
         return schema.default;
     }
@@ -94,80 +28,47 @@ function _create(schema, options, ctx) {
     }
     return match(schema).returnType().with({
         default: P.select()
-    }, function (v) {
-        return v;
-    }).with({
+    }, (v) => v).with({
         const: P.nonNullable
-    }, function (v) {
-        return v.const;
-    }).with({
+    }, (v) => v.const).with({
         anyOf: P.nonNullable
-    }, function (schema) {
+    }, (schema) => {
         return _create(schema.anyOf[0], options, {
             required: false
         });
     }).with({
         oneOf: P.nonNullable
-    }, function (schema) {
+    }, (schema) => {
         return _create(schema.oneOf[0], options, {
             required: false
         });
     }).with({
         type: "string"
-    }, function (schema) {
-        return "";
-    }).with({
+    }, (schema) => "").with({
         type: P.union("number", "integer")
-    }, function (schema) {
-        return 0;
-    }).with({
+    }, (schema) => 0).with({
         type: "object"
-    }, function () {
-        var out = {};
-        var required = Array.isArray(schema.required) ? schema.required : [];
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            for (var _iterator = Object.entries(schema.properties || {})[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-                var _step_value = _sliced_to_array(_step.value, 2), k = _step_value[0], v = _step_value[1];
-                var value = _create(v, options, {
-                    required: required.includes(k)
-                });
-                if (value === undefined) {
-                    continue;
-                }
-                out[k] = value;
-            }
-        }
-        catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        }
-        finally {
-            try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
-                }
-            }
-            finally {
-                if (_didIteratorError) {
-                    throw _iteratorError;
-                }
+    }, () => {
+        const out = {};
+        let required = Array.isArray(schema.required) ? schema.required : [];
+        for (const [k, v] of Object.entries(schema.properties || {})) {
+            const value = _create(v, options, {
+                required: required.includes(k)
+            });
+            if (value === undefined) {
+                continue;
             }
+            out[k] = value;
         }
         return out;
     }).with({
         type: "null"
-    }, function () {
-        return null;
-    }).with({
+    }, () => null).with({
         type: "boolean"
-    }, function (schema) {
-        return false;
-    }).with({
+    }, (schema) => false).with({
         type: "array"
-    }, function (schema) {
-        return [];
-    }).otherwise(function () {
+    }, (schema) => []).otherwise(() => {
         return undefined;
     });
 }
+//# sourceMappingURL=createSchemaData.js.map

package/lib/schema/createSchemaData.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/schema/createSchemaData.ts"],"sourcesContent":["import { match, P } from 'ts-pattern';\nimport type { JsonSchemaDef } from '../jsonschema';\nimport { toJsonSchema } from './toJsonSchema';\nimport type { SchemaOutput, TypeSchema } from './TypeSchema';\n\nexport function createSchemaData<S extends TypeSchema>(\n\tts: S,\n\toptions: CreateSchemaDataOptions = {},\n): Partial<SchemaOutput<S>> {\n\tconst schema = toJsonSchema(ts);\n\treturn createJsonSchemaData(schema, options);\n}\n\ntype CreateSchemaDataOptions = Partial<CreateOptions> & {\n\tall?: boolean;\n};\n\nfunction createJsonSchemaData(schema: JsonSchemaDef, options: CreateSchemaDataOptions): any {\n\tlet skip: CreateOptions['skip'] = (s, ctx) => Boolean(!ctx.required && s.nullable);\n\tif (options.all) {\n\t\tskip = () => false;\n\t}\n\tif (options.skip) {\n\t\tskip = options.skip;\n\t}\n\treturn _create(\n\t\tschema,\n\t\t{\n\t\t\tskip,\n\t\t},\n\t\t{ required: false },\n\t);\n}\n\ntype CreateOptions = {\n\tskip: (schema: JsonSchemaDef, ctx: { required: boolean }) => boolean;\n};\n\nfunction _create(schema: JsonSchemaDef, options: CreateOptions, ctx: { required: boolean }): any {\n\tconst { skip } = options;\n\tif (skip(schema, ctx)) {\n\t\treturn schema.default;\n\t}\n\tif (schema.default !== undefined) {\n\t\treturn schema.default;\n\t}\n\treturn match(schema as JsonSchemaDef)\n\t\t.returnType<any>()\n\t\t.with({ default: P.select() }, (v) => v)\n\t\t.with({ const: P.nonNullable }, (v) => v.const)\n\t\t.with({ anyOf: P.nonNullable }, (schema) => {\n\t\t\treturn _create(schema.anyOf[0], options, { required: false });\n\t\t})\n\t\t.with({ oneOf: P.nonNullable }, (schema) => {\n\t\t\treturn _create(schema.oneOf[0], options, { required: false });\n\t\t})\n\t\t.with({ type: 'string' }, (schema) => '')\n\t\t.with({ type: P.union('number', 'integer') }, (schema) => 0)\n\t\t.with({ type: 'object' }, () => {\n\t\t\tconst out: Record<string, any> = {};\n\n\t\t\tlet required = Array.isArray(schema.required) ? schema.required : [];\n\t\t\tfor (const [k, v] of Object.entries(schema.properties || {}) as [string, JsonSchemaDef][]) {\n\t\t\t\tconst value = _create(v, options, {\n\t\t\t\t\trequired: required.includes(k),\n\t\t\t\t});\n\t\t\t\tif (value === undefined) {\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t\tout[k] = value;\n\t\t\t}\n\n\t\t\treturn out;\n\t\t})\n\t\t.with({ type: 'null' }, () => null)\n\t\t.with({ type: 'boolean' }, (schema) => false)\n\t\t.with({ type: 'array' }, (schema) => [])\n\t\t.otherwise(() => {\n\t\t\treturn undefined;\n\t\t});\n}\n"],"names":["match","P","toJsonSchema","createSchemaData","ts","options","schema","createJsonSchemaData","skip","s","ctx","Boolean","required","nullable","all","_create","default","undefined","returnType","with","select","v","const","nonNullable","anyOf","oneOf","type","union","out","Array","isArray","k","Object","entries","properties","value","includes","otherwise"],"mappings":"AAAA,SAASA,KAAK,EAAEC,CAAC,QAAQ,aAAa;AAEtC,SAASC,YAAY,QAAQ,iBAAiB;AAG9C,OAAO,SAASC,iBACfC,EAAK,EACLC,UAAmC,CAAC,CAAC;IAErC,MAAMC,SAASJ,aAAaE;IAC5B,OAAOG,qBAAqBD,QAAQD;AACrC;AAMA,SAASE,qBAAqBD,MAAqB,EAAED,OAAgC;IACpF,IAAIG,OAA8B,CAACC,GAAGC,MAAQC,QAAQ,CAACD,IAAIE,QAAQ,IAAIH,EAAEI,QAAQ;IACjF,IAAIR,QAAQS,GAAG,EAAE;QAChBN,OAAO,IAAM;IACd;IACA,IAAIH,QAAQG,IAAI,EAAE;QACjBA,OAAOH,QAAQG,IAAI;IACpB;IACA,OAAOO,QACNT,QACA;QACCE;IACD,GACA;QAAEI,UAAU;IAAM;AAEpB;AAMA,SAASG,QAAQT,MAAqB,EAAED,OAAsB,EAAEK,GAA0B;IACzF,MAAM,EAAEF,IAAI,EAAE,GAAGH;IACjB,IAAIG,KAAKF,QAAQI,MAAM;QACtB,OAAOJ,OAAOU,OAAO;IACtB;IACA,IAAIV,OAAOU,OAAO,KAAKC,WAAW;QACjC,OAAOX,OAAOU,OAAO;IACtB;IACA,OAAOhB,MAAMM,QACXY,UAAU,GACVC,IAAI,CAAC;QAAEH,SAASf,EAAEmB,MAAM;IAAG,GAAG,CAACC,IAAMA,GACrCF,IAAI,CAAC;QAAEG,OAAOrB,EAAEsB,WAAW;IAAC,GAAG,CAACF,IAAMA,EAAEC,KAAK,EAC7CH,IAAI,CAAC;QAAEK,OAAOvB,EAAEsB,WAAW;IAAC,GAAG,CAACjB;QAChC,OAAOS,QAAQT,OAAOkB,KAAK,CAAC,EAAE,EAAEnB,SAAS;YAAEO,UAAU;QAAM;IAC5D,GACCO,IAAI,CAAC;QAAEM,OAAOxB,EAAEsB,WAAW;IAAC,GAAG,CAACjB;QAChC,OAAOS,QAAQT,OAAOmB,KAAK,CAAC,EAAE,EAAEpB,SAAS;YAAEO,UAAU;QAAM;IAC5D,GACCO,IAAI,CAAC;QAAEO,MAAM;IAAS,GAAG,CAACpB,SAAW,IACrCa,IAAI,CAAC;QAAEO,MAAMzB,EAAE0B,KAAK,CAAC,UAAU;IAAW,GAAG,CAACrB,SAAW,GACzDa,IAAI,CAAC;QAAEO,MAAM;IAAS,GAAG;QACzB,MAAME,MAA2B,CAAC;QAElC,IAAIhB,WAAWiB,MAAMC,OAAO,CAACxB,OAAOM,QAAQ,IAAIN,OAAOM,QAAQ,GAAG,EAAE;QACpE,KAAK,MAAM,CAACmB,GAAGV,EAAE,IAAIW,OAAOC,OAAO,CAAC3B,OAAO4B,UAAU,IAAI,CAAC,GAAiC;YAC1F,MAAMC,QAAQpB,QAAQM,GAAGhB,SAAS;gBACjCO,UAAUA,SAASwB,QAAQ,CAACL;YAC7B;YACA,IAAII,UAAUlB,WAAW;gBACxB;YACD;YACAW,GAAG,CAACG,EAAE,GAAGI;QACV;QAEA,OAAOP;IACR,GACCT,IAAI,CAAC;QAAEO,MAAM;IAAO,GAAG,IAAM,MAC7BP,IAAI,CAAC;QAAEO,MAAM;IAAU,GAAG,CAACpB,SAAW,OACtCa,IAAI,CAAC;QAAEO,MAAM;IAAQ,GAAG,CAACpB,SAAW,EAAE,EACtC+B,SAAS,CAAC;QACV,OAAOpB;IACR;AACF"}

package/lib/schema/findJsonSchemaByPath.js

@@ -1,7 +1,3 @@
-function _type_of(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
 import { firstOfMaybeArray } from "@wener/utils";
 import { toJsonSchema } from "./toJsonSchema.js";
 export function findJsonSchemaByPath(schema, objectPath) {
@@ -9,41 +5,22 @@ export function findJsonSchemaByPath(schema, objectPath) {
     if (!objectPath || !schema) {
         return undefined;
     }
-    var segments = objectPath.split(".");
-    var currentSchema = schema;
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for (var _iterator = segments[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-            var segment = _step.value;
-            // 检查当前 schema 是否是对象类型且有 properties
-            if (currentSchema && (typeof currentSchema === "undefined" ? "undefined" : _type_of(currentSchema)) === "object" && currentSchema.properties && currentSchema.properties[segment]) {
-                currentSchema = currentSchema.properties[segment];
-                continue;
-            }
-            if (/^\d$/.test(segment) || segment === "[]") {
-                if (currentSchema.items) {
-                    currentSchema = firstOfMaybeArray(currentSchema.items);
-                    continue;
-                }
-            }
-            return undefined;
-        }
-    }
-    catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    }
-    finally {
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
+    const segments = objectPath.split(".");
+    let currentSchema = schema;
+    for (const segment of segments) {
+        // 检查当前 schema 是否是对象类型且有 properties
+        if (currentSchema && typeof currentSchema === "object" && currentSchema.properties && currentSchema.properties[segment]) {
+            currentSchema = currentSchema.properties[segment];
+            continue;
         }
-        finally {
-            if (_didIteratorError) {
-                throw _iteratorError;
+        if (/^\d$/.test(segment) || segment === "[]") {
+            if (currentSchema.items) {
+                currentSchema = firstOfMaybeArray(currentSchema.items);
+                continue;
             }
         }
+        return undefined;
     }
     return currentSchema;
 }
+//# sourceMappingURL=findJsonSchemaByPath.js.map

package/lib/schema/findJsonSchemaByPath.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/schema/findJsonSchemaByPath.ts"],"sourcesContent":["import { firstOfMaybeArray } from '@wener/utils';\nimport { toJsonSchema } from './toJsonSchema';\nimport type { TypeSchema } from './TypeSchema';\n\nexport function findJsonSchemaByPath(schema: TypeSchema, objectPath: string) {\n\tschema = toJsonSchema(schema);\n\tif (!objectPath || !schema) {\n\t\treturn undefined;\n\t}\n\n\tconst segments = objectPath.split('.');\n\tlet currentSchema = schema;\n\n\tfor (const segment of segments) {\n\t\t// 检查当前 schema 是否是对象类型且有 properties\n\t\tif (\n\t\t\tcurrentSchema\n\t\t\t&& typeof currentSchema === 'object'\n\t\t\t&& currentSchema.properties\n\t\t\t&& currentSchema.properties[segment]\n\t\t) {\n\t\t\tcurrentSchema = currentSchema.properties[segment];\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (/^\\d$/.test(segment) || segment === '[]') {\n\t\t\tif (currentSchema.items) {\n\t\t\t\tcurrentSchema = firstOfMaybeArray(currentSchema.items);\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t}\n\n\t\treturn undefined;\n\t}\n\n\treturn currentSchema;\n}\n"],"names":["firstOfMaybeArray","toJsonSchema","findJsonSchemaByPath","schema","objectPath","undefined","segments","split","currentSchema","segment","properties","test","items"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,eAAe;AACjD,SAASC,YAAY,QAAQ,iBAAiB;AAG9C,OAAO,SAASC,qBAAqBC,MAAkB,EAAEC,UAAkB;IAC1ED,SAASF,aAAaE;IACtB,IAAI,CAACC,cAAc,CAACD,QAAQ;QAC3B,OAAOE;IACR;IAEA,MAAMC,WAAWF,WAAWG,KAAK,CAAC;IAClC,IAAIC,gBAAgBL;IAEpB,KAAK,MAAMM,WAAWH,SAAU;QAC/B,mCAAmC;QACnC,IACCE,iBACG,OAAOA,kBAAkB,YACzBA,cAAcE,UAAU,IACxBF,cAAcE,UAAU,CAACD,QAAQ,EACnC;YACDD,gBAAgBA,cAAcE,UAAU,CAACD,QAAQ;YACjD;QACD;QAEA,IAAI,OAAOE,IAAI,CAACF,YAAYA,YAAY,MAAM;YAC7C,IAAID,cAAcI,KAAK,EAAE;gBACxBJ,gBAAgBR,kBAAkBQ,cAAcI,KAAK;gBACrD;YACD;QACD;QAEA,OAAOP;IACR;IAEA,OAAOG;AACR"}

package/lib/schema/formatZodError.js

@@ -0,0 +1,140 @@
+import { findJsonSchemaByPath } from "./findJsonSchemaByPath.js";
+export function formatZodError(error, schema) {
+    if (!error.issues || error.issues.length === 0) {
+        return error.message || "\u9A8C\u8BC1\u5931\u8D25";
+    }
+    const messages = [];
+    // Iterate through issues and format each one
+    // We use manual iteration instead of error.format() to have better control
+    // over field name formatting with schema descriptions
+    for (const issue of error.issues) {
+        const formatted = formatIssueMessage(issue, schema);
+        if (formatted) {
+            const path = issue.path.map((p) => typeof p === "symbol" ? String(p) : p);
+            let fieldName = formatPath(path);
+            // Try to get field description from schema
+            if (schema && path.length > 0) {
+                const fieldPath = path.map(String).join(".");
+                const fieldSchema = findJsonSchemaByPath(schema, fieldPath);
+                if (fieldSchema?.description) {
+                    fieldName = fieldSchema.description;
+                }
+            }
+            messages.push(`${fieldName}: ${formatted}`);
+        }
+    }
+    return messages.join("\uFF1B");
+}
+function formatIssueMessage(issue, schema) {
+    let message = issue.message;
+    // 处理常见的错误类型，生成更友好的消息
+    // Use string comparison to avoid TypeScript narrowing issues with Zod v4
+    const code = issue.code;
+    switch (code) {
+        case "invalid_type":
+            {
+                const invalidTypeIssue = issue;
+                if (invalidTypeIssue.received === "undefined") {
+                    message = "\u5FC5\u586B";
+                }
+                else if (invalidTypeIssue.received === "null") {
+                    message = "\u4E0D\u80FD\u4E3A\u7A7A";
+                }
+                else {
+                    message = issue.message || `期望类型 ${invalidTypeIssue.expected}，但收到 ${invalidTypeIssue.received}`;
+                }
+                break;
+            }
+        case "invalid_string":
+            {
+                const invalidStringIssue = issue;
+                if (invalidStringIssue.validation === "email") {
+                    message = "\u8BF7\u8F93\u5165\u6709\u6548\u7684\u90AE\u7BB1\u5730\u5740";
+                }
+                else if (invalidStringIssue.validation === "url") {
+                    message = "\u8BF7\u8F93\u5165\u6709\u6548\u7684 URL";
+                }
+                else if (invalidStringIssue.validation === "uuid") {
+                    message = "\u8BF7\u8F93\u5165\u6709\u6548\u7684 UUID";
+                }
+                else if (invalidStringIssue.validation === "date") {
+                    message = "\u8BF7\u8F93\u5165\u6709\u6548\u7684\u65E5\u671F";
+                }
+                break;
+            }
+        case "too_small":
+            {
+                const tooSmallIssue = issue;
+                if (tooSmallIssue.type === "string" && tooSmallIssue.minimum === 1) {
+                    message = "\u4E0D\u80FD\u4E3A\u7A7A";
+                }
+                else if (tooSmallIssue.type === "number") {
+                    message = `至少需要 ${tooSmallIssue.minimum}`;
+                }
+                else if (tooSmallIssue.type === "array") {
+                    message = `至少需要 ${tooSmallIssue.minimum} 项`;
+                }
+                break;
+            }
+        case "too_big":
+            {
+                const tooBigIssue = issue;
+                if (tooBigIssue.type === "string") {
+                    message = `最多 ${tooBigIssue.maximum} 个字符`;
+                }
+                else if (tooBigIssue.type === "number") {
+                    message = `最多 ${tooBigIssue.maximum}`;
+                }
+                else if (tooBigIssue.type === "array") {
+                    message = `最多 ${tooBigIssue.maximum} 项`;
+                }
+                break;
+            }
+        case "invalid_enum_value":
+            {
+                const enumIssue = issue;
+                message = `必须是以下值之一: ${enumIssue.options?.map(String).join(", ") || "\u672A\u77E5\u9009\u9879"}`;
+                break;
+            }
+        case "unrecognized_keys":
+            {
+                const unrecognizedIssue = issue;
+                message = `不支持的字段: ${unrecognizedIssue.keys?.join(", ") || "\u672A\u77E5\u5B57\u6BB5"}`;
+                break;
+            }
+        case "invalid_union":
+            {
+                message = "\u4E0D\u7B26\u5408\u4EFB\u4F55\u5141\u8BB8\u7684\u7C7B\u578B";
+                break;
+            }
+        case "invalid_union_discriminator":
+            {
+                const discriminatorIssue = issue;
+                message = `必须是以下值之一: ${discriminatorIssue.options?.map(String).join(", ") || "\u672A\u77E5\u9009\u9879"}`;
+                break;
+            }
+        case "invalid_literal":
+            {
+                const literalIssue = issue;
+                message = `必须是 ${String(literalIssue.expected)}`;
+                break;
+            }
+        case "custom":
+            {
+                // 保留自定义错误消息
+                message = issue.message;
+                break;
+            }
+        default:
+            // 保留原始消息
+            message = issue.message;
+    }
+    return message;
+}
+function formatPath(path) {
+    if (path.length === 0) {
+        return "\u8868\u5355";
+    }
+    return path.map(String).join(".");
+}
+//# sourceMappingURL=formatZodError.js.map

package/lib/schema/formatZodError.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/schema/formatZodError.ts"],"sourcesContent":["import { ZodError } from 'zod/v4';\nimport { findJsonSchemaByPath } from './findJsonSchemaByPath';\nimport type { TypeSchema } from './TypeSchema';\n\nexport function formatZodError(error: ZodError, schema?: TypeSchema): string {\n\tif (!error.issues || error.issues.length === 0) {\n\t\treturn error.message || '验证失败';\n\t}\n\n\tconst messages: string[] = [];\n\n\t// Iterate through issues and format each one\n\t// We use manual iteration instead of error.format() to have better control\n\t// over field name formatting with schema descriptions\n\tfor (const issue of error.issues) {\n\t\tconst formatted = formatIssueMessage(issue, schema);\n\t\tif (formatted) {\n\t\t\tconst path = issue.path.map((p) => (typeof p === 'symbol' ? String(p) : p)) as (string | number)[];\n\t\t\tlet fieldName = formatPath(path);\n\n\t\t\t// Try to get field description from schema\n\t\t\tif (schema && path.length > 0) {\n\t\t\t\tconst fieldPath = path.map(String).join('.');\n\t\t\t\tconst fieldSchema = findJsonSchemaByPath(schema, fieldPath);\n\t\t\t\tif (fieldSchema?.description) {\n\t\t\t\t\tfieldName = fieldSchema.description;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tmessages.push(`${fieldName}: ${formatted}`);\n\t\t}\n\t}\n\n\treturn messages.join('；');\n}\n\nfunction formatIssueMessage(issue: ZodError['issues'][number], schema?: TypeSchema): string {\n\tlet message = issue.message;\n\n\t// 处理常见的错误类型，生成更友好的消息\n\t// Use string comparison to avoid TypeScript narrowing issues with Zod v4\n\tconst code = issue.code as string;\n\tswitch (code) {\n\t\tcase 'invalid_type': {\n\t\t\tconst invalidTypeIssue = issue as typeof issue & {\n\t\t\t\texpected: string;\n\t\t\t\treceived: string;\n\t\t\t};\n\t\t\tif (invalidTypeIssue.received === 'undefined') {\n\t\t\t\tmessage = '必填';\n\t\t\t} else if (invalidTypeIssue.received === 'null') {\n\t\t\t\tmessage = '不能为空';\n\t\t\t} else {\n\t\t\t\tmessage = issue.message || `期望类型 ${invalidTypeIssue.expected}，但收到 ${invalidTypeIssue.received}`;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase 'invalid_string': {\n\t\t\tconst invalidStringIssue = issue as typeof issue & {\n\t\t\t\tvalidation?: string;\n\t\t\t};\n\t\t\tif (invalidStringIssue.validation === 'email') {\n\t\t\t\tmessage = '请输入有效的邮箱地址';\n\t\t\t} else if (invalidStringIssue.validation === 'url') {\n\t\t\t\tmessage = '请输入有效的 URL';\n\t\t\t} else if (invalidStringIssue.validation === 'uuid') {\n\t\t\t\tmessage = '请输入有效的 UUID';\n\t\t\t} else if (invalidStringIssue.validation === 'date') {\n\t\t\t\tmessage = '请输入有效的日期';\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase 'too_small': {\n\t\t\tconst tooSmallIssue = issue as typeof issue & {\n\t\t\t\ttype: string;\n\t\t\t\tminimum: number;\n\t\t\t};\n\t\t\tif (tooSmallIssue.type === 'string' && tooSmallIssue.minimum === 1) {\n\t\t\t\tmessage = '不能为空';\n\t\t\t} else if (tooSmallIssue.type === 'number') {\n\t\t\t\tmessage = `至少需要 ${tooSmallIssue.minimum}`;\n\t\t\t} else if (tooSmallIssue.type === 'array') {\n\t\t\t\tmessage = `至少需要 ${tooSmallIssue.minimum} 项`;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase 'too_big': {\n\t\t\tconst tooBigIssue = issue as typeof issue & {\n\t\t\t\ttype: string;\n\t\t\t\tmaximum: number;\n\t\t\t};\n\t\t\tif (tooBigIssue.type === 'string') {\n\t\t\t\tmessage = `最多 ${tooBigIssue.maximum} 个字符`;\n\t\t\t} else if (tooBigIssue.type === 'number') {\n\t\t\t\tmessage = `最多 ${tooBigIssue.maximum}`;\n\t\t\t} else if (tooBigIssue.type === 'array') {\n\t\t\t\tmessage = `最多 ${tooBigIssue.maximum} 项`;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase 'invalid_enum_value': {\n\t\t\tconst enumIssue = issue as typeof issue & {\n\t\t\t\toptions: readonly unknown[];\n\t\t\t};\n\t\t\tmessage = `必须是以下值之一: ${enumIssue.options?.map(String).join(', ') || '未知选项'}`;\n\t\t\tbreak;\n\t\t}\n\t\tcase 'unrecognized_keys': {\n\t\t\tconst unrecognizedIssue = issue as typeof issue & {\n\t\t\t\tkeys: readonly string[];\n\t\t\t};\n\t\t\tmessage = `不支持的字段: ${unrecognizedIssue.keys?.join(', ') || '未知字段'}`;\n\t\t\tbreak;\n\t\t}\n\t\tcase 'invalid_union': {\n\t\t\tmessage = '不符合任何允许的类型';\n\t\t\tbreak;\n\t\t}\n\t\tcase 'invalid_union_discriminator': {\n\t\t\tconst discriminatorIssue = issue as typeof issue & {\n\t\t\t\toptions: readonly unknown[];\n\t\t\t};\n\t\t\tmessage = `必须是以下值之一: ${discriminatorIssue.options?.map(String).join(', ') || '未知选项'}`;\n\t\t\tbreak;\n\t\t}\n\t\tcase 'invalid_literal': {\n\t\t\tconst literalIssue = issue as typeof issue & {\n\t\t\t\texpected: unknown;\n\t\t\t};\n\t\t\tmessage = `必须是 ${String(literalIssue.expected)}`;\n\t\t\tbreak;\n\t\t}\n\t\tcase 'custom': {\n\t\t\t// 保留自定义错误消息\n\t\t\tmessage = issue.message;\n\t\t\tbreak;\n\t\t}\n\t\tdefault:\n\t\t\t// 保留原始消息\n\t\t\tmessage = issue.message;\n\t}\n\n\treturn message;\n}\n\nfunction formatPath(path: (string | number)[]): string {\n\tif (path.length === 0) {\n\t\treturn '表单';\n\t}\n\treturn path.map(String).join('.');\n}\n"],"names":["findJsonSchemaByPath","formatZodError","error","schema","issues","length","message","messages","issue","formatted","formatIssueMessage","path","map","p","String","fieldName","formatPath","fieldPath","join","fieldSchema","description","push","code","invalidTypeIssue","received","expected","invalidStringIssue","validation","tooSmallIssue","type","minimum","tooBigIssue","maximum","enumIssue","options","unrecognizedIssue","keys","discriminatorIssue","literalIssue"],"mappings":"AACA,SAASA,oBAAoB,QAAQ,yBAAyB;AAG9D,OAAO,SAASC,eAAeC,KAAe,EAAEC,MAAmB;IAClE,IAAI,CAACD,MAAME,MAAM,IAAIF,MAAME,MAAM,CAACC,MAAM,KAAK,GAAG;QAC/C,OAAOH,MAAMI,OAAO,IAAI;IACzB;IAEA,MAAMC,WAAqB,EAAE;IAE7B,6CAA6C;IAC7C,2EAA2E;IAC3E,sDAAsD;IACtD,KAAK,MAAMC,SAASN,MAAME,MAAM,CAAE;QACjC,MAAMK,YAAYC,mBAAmBF,OAAOL;QAC5C,IAAIM,WAAW;YACd,MAAME,OAAOH,MAAMG,IAAI,CAACC,GAAG,CAAC,CAACC,IAAO,OAAOA,MAAM,WAAWC,OAAOD,KAAKA;YACxE,IAAIE,YAAYC,WAAWL;YAE3B,2CAA2C;YAC3C,IAAIR,UAAUQ,KAAKN,MAAM,GAAG,GAAG;gBAC9B,MAAMY,YAAYN,KAAKC,GAAG,CAACE,QAAQI,IAAI,CAAC;gBACxC,MAAMC,cAAcnB,qBAAqBG,QAAQc;gBACjD,IAAIE,aAAaC,aAAa;oBAC7BL,YAAYI,YAAYC,WAAW;gBACpC;YACD;YAEAb,SAASc,IAAI,CAAC,GAAGN,UAAU,EAAE,EAAEN,WAAW;QAC3C;IACD;IAEA,OAAOF,SAASW,IAAI,CAAC;AACtB;AAEA,SAASR,mBAAmBF,KAAiC,EAAEL,MAAmB;IACjF,IAAIG,UAAUE,MAAMF,OAAO;IAE3B,qBAAqB;IACrB,yEAAyE;IACzE,MAAMgB,OAAOd,MAAMc,IAAI;IACvB,OAAQA;QACP,KAAK;YAAgB;gBACpB,MAAMC,mBAAmBf;gBAIzB,IAAIe,iBAAiBC,QAAQ,KAAK,aAAa;oBAC9ClB,UAAU;gBACX,OAAO,IAAIiB,iBAAiBC,QAAQ,KAAK,QAAQ;oBAChDlB,UAAU;gBACX,OAAO;oBACNA,UAAUE,MAAMF,OAAO,IAAI,CAAC,KAAK,EAAEiB,iBAAiBE,QAAQ,CAAC,KAAK,EAAEF,iBAAiBC,QAAQ,EAAE;gBAChG;gBACA;YACD;QACA,KAAK;YAAkB;gBACtB,MAAME,qBAAqBlB;gBAG3B,IAAIkB,mBAAmBC,UAAU,KAAK,SAAS;oBAC9CrB,UAAU;gBACX,OAAO,IAAIoB,mBAAmBC,UAAU,KAAK,OAAO;oBACnDrB,UAAU;gBACX,OAAO,IAAIoB,mBAAmBC,UAAU,KAAK,QAAQ;oBACpDrB,UAAU;gBACX,OAAO,IAAIoB,mBAAmBC,UAAU,KAAK,QAAQ;oBACpDrB,UAAU;gBACX;gBACA;YACD;QACA,KAAK;YAAa;gBACjB,MAAMsB,gBAAgBpB;gBAItB,IAAIoB,cAAcC,IAAI,KAAK,YAAYD,cAAcE,OAAO,KAAK,GAAG;oBACnExB,UAAU;gBACX,OAAO,IAAIsB,cAAcC,IAAI,KAAK,UAAU;oBAC3CvB,UAAU,CAAC,KAAK,EAAEsB,cAAcE,OAAO,EAAE;gBAC1C,OAAO,IAAIF,cAAcC,IAAI,KAAK,SAAS;oBAC1CvB,UAAU,CAAC,KAAK,EAAEsB,cAAcE,OAAO,CAAC,EAAE,CAAC;gBAC5C;gBACA;YACD;QACA,KAAK;YAAW;gBACf,MAAMC,cAAcvB;gBAIpB,IAAIuB,YAAYF,IAAI,KAAK,UAAU;oBAClCvB,UAAU,CAAC,GAAG,EAAEyB,YAAYC,OAAO,CAAC,IAAI,CAAC;gBAC1C,OAAO,IAAID,YAAYF,IAAI,KAAK,UAAU;oBACzCvB,UAAU,CAAC,GAAG,EAAEyB,YAAYC,OAAO,EAAE;gBACtC,OAAO,IAAID,YAAYF,IAAI,KAAK,SAAS;oBACxCvB,UAAU,CAAC,GAAG,EAAEyB,YAAYC,OAAO,CAAC,EAAE,CAAC;gBACxC;gBACA;YACD;QACA,KAAK;YAAsB;gBAC1B,MAAMC,YAAYzB;gBAGlBF,UAAU,CAAC,UAAU,EAAE2B,UAAUC,OAAO,EAAEtB,IAAIE,QAAQI,KAAK,SAAS,QAAQ;gBAC5E;YACD;QACA,KAAK;YAAqB;gBACzB,MAAMiB,oBAAoB3B;gBAG1BF,UAAU,CAAC,QAAQ,EAAE6B,kBAAkBC,IAAI,EAAElB,KAAK,SAAS,QAAQ;gBACnE;YACD;QACA,KAAK;YAAiB;gBACrBZ,UAAU;gBACV;YACD;QACA,KAAK;YAA+B;gBACnC,MAAM+B,qBAAqB7B;gBAG3BF,UAAU,CAAC,UAAU,EAAE+B,mBAAmBH,OAAO,EAAEtB,IAAIE,QAAQI,KAAK,SAAS,QAAQ;gBACrF;YACD;QACA,KAAK;YAAmB;gBACvB,MAAMoB,eAAe9B;gBAGrBF,UAAU,CAAC,IAAI,EAAEQ,OAAOwB,aAAab,QAAQ,GAAG;gBAChD;YACD;QACA,KAAK;YAAU;gBACd,YAAY;gBACZnB,UAAUE,MAAMF,OAAO;gBACvB;YACD;QACA;YACC,SAAS;YACTA,UAAUE,MAAMF,OAAO;IACzB;IAEA,OAAOA;AACR;AAEA,SAASU,WAAWL,IAAyB;IAC5C,IAAIA,KAAKN,MAAM,KAAK,GAAG;QACtB,OAAO;IACR;IACA,OAAOM,KAAKC,GAAG,CAACE,QAAQI,IAAI,CAAC;AAC9B"}