@wener/common 2.0.3 → 2.0.5

package/lib/schema/formatZodError.js.map

@@ -1 +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":"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"}
+{"version":3,"sources":["../../src/schema/formatZodError.ts"],"sourcesContent":["import type { core, ZodError } from 'zod/v4';\nimport { findJsonSchemaByPath } from './findJsonSchemaByPath';\nimport type { TypeSchema } from './TypeSchema';\n\n// Zod 4 issue types with proper typing\ntype ZodIssue = core.$ZodIssue;\ntype ZodIssueInvalidType = core.$ZodIssueInvalidType;\ntype ZodIssueTooSmall = core.$ZodIssueTooSmall;\ntype ZodIssueTooBig = core.$ZodIssueTooBig;\ntype ZodIssueInvalidStringFormat = core.$ZodIssueInvalidStringFormat;\ntype ZodIssueInvalidValue = core.$ZodIssueInvalidValue;\ntype ZodIssueUnrecognizedKeys = core.$ZodIssueUnrecognizedKeys;\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: ZodIssue, _schema?: TypeSchema): string {\n\tlet message = issue.message;\n\n\t// 处理常见的错误类型，生成更友好的消息\n\tswitch (issue.code) {\n\t\tcase 'invalid_type': {\n\t\t\tconst i = issue as ZodIssueInvalidType;\n\t\t\t// Zod v4 doesn't have 'received' field directly, extract from message\n\t\t\tconst match = issue.message.match(/received (\\w+)/);\n\t\t\tconst received = match?.[1];\n\t\t\tif (received === 'undefined') {\n\t\t\t\tmessage = '必填';\n\t\t\t} else if (received === 'null') {\n\t\t\t\tmessage = '不能为空';\n\t\t\t} else {\n\t\t\t\tmessage = issue.message || `期望类型 ${i.expected}，但收到 ${received}`;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase 'invalid_format': {\n\t\t\tconst i = issue as ZodIssueInvalidStringFormat;\n\t\t\tif (i.format === 'email') {\n\t\t\t\tmessage = '请输入有效的邮箱地址';\n\t\t\t} else if (i.format === 'url') {\n\t\t\t\tmessage = '请输入有效的 URL';\n\t\t\t} else if (i.format === 'uuid') {\n\t\t\t\tmessage = '请输入有效的 UUID';\n\t\t\t} else if (i.format === '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 i = issue as ZodIssueTooSmall;\n\t\t\tif (i.origin === 'string' && i.minimum === 1) {\n\t\t\t\tmessage = '不能为空';\n\t\t\t} else if (i.origin === 'string') {\n\t\t\t\tmessage = `至少需要 ${i.minimum} 个字符`;\n\t\t\t} else if (i.origin === 'number' || i.origin === 'int') {\n\t\t\t\tmessage = `至少需要 ${i.minimum}`;\n\t\t\t} else if (i.origin === 'array') {\n\t\t\t\tmessage = `至少需要 ${i.minimum} 项`;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase 'too_big': {\n\t\t\tconst i = issue as ZodIssueTooBig;\n\t\t\tif (i.origin === 'string') {\n\t\t\t\tmessage = `最多 ${i.maximum} 个字符`;\n\t\t\t} else if (i.origin === 'number' || i.origin === 'int') {\n\t\t\t\tmessage = `最多 ${i.maximum}`;\n\t\t\t} else if (i.origin === 'array') {\n\t\t\t\tmessage = `最多 ${i.maximum} 项`;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase 'invalid_value': {\n\t\t\tconst i = issue as ZodIssueInvalidValue;\n\t\t\tif (i.values.length === 1) {\n\t\t\t\t// Single value means it's a literal check\n\t\t\t\tmessage = `必须是 ${String(i.values[0])}`;\n\t\t\t} else {\n\t\t\t\tmessage = `必须是以下值之一: ${i.values.map(String).join(', ')}`;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tcase 'unrecognized_keys': {\n\t\t\tconst i = issue as ZodIssueUnrecognizedKeys;\n\t\t\tmessage = `不支持的字段: ${i.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 '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","_schema","code","i","match","received","expected","format","origin","minimum","maximum","values","keys"],"mappings":"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"}

package/lib/schema/toJsonSchema.js

@@ -36,7 +36,7 @@ export function toJsonSchema(schema) {
                                     }
                                 ]
                             }, (select) => {
-                                delete js["anyOf"];
+                                delete js.anyOf;
                                 Object.assign(js, select);
                                 js.nullable = true;
                             }).otherwise((js) => {
@@ -65,7 +65,7 @@ export function toJsonSchema(schema) {
     return schema;
 }
 function visit(js, f) {
-    const _visit = (js, f, parent, path, k) => {
+    const _visit = (js, f, _parent, path, _k) => {
         if (!js) {
             return;
         }
@@ -105,7 +105,7 @@ function visit(js, f) {
     };
     _visit(js, f, undefined, []);
 }
-function resolveJsonSchemaDef(js, ctx) {
+function _resolveJsonSchemaDef(js, _ctx) {
     return match(js).with({
         anyOf: [
             P.select(),
@@ -127,7 +127,7 @@ function resolveJsonSchemaDef(js, ctx) {
         for (const key in schema.properties) {
             const prop = schema.properties[key];
             if (prop) {
-                schema.properties[key] = resolveJsonSchemaDef(prop, {
+                schema.properties[key] = _resolveJsonSchemaDef(prop, {
                     parent: schema,
                     key
                 });

package/lib/schema/toJsonSchema.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/schema/toJsonSchema.ts"],"sourcesContent":["import { omit, remove } from 'es-toolkit';\nimport { match, P } from 'ts-pattern';\nimport { z } from 'zod/v4';\nimport type { JsonSchemaDef } from '../jsonschema';\nimport { getSchemaCache } from './getSchemaCache';\nimport type { TypeSchema } from './TypeSchema';\nimport { isTypeBoxSchema, isZodSchema } from './validate';\n\nexport function toJsonSchema(schema: TypeSchema): JsonSchemaDef {\n\tif (isZodSchema(schema)) {\n\t\treturn getSchemaCache(schema, 'jsonschema', () => {\n\t\t\t// zod v4\n\t\t\tlet js = z.toJSONSchema(schema, {\n\t\t\t\tunrepresentable: 'any',\n\t\t\t\toverride: ({ zodSchema, jsonSchema: js }) => {\n\t\t\t\t\tconst def = zodSchema._zod.def;\n\t\t\t\t\tconst meta = z.globalRegistry.get(zodSchema);\n\t\t\t\t\tif (meta) {\n\t\t\t\t\t\tObject.assign(js, meta);\n\t\t\t\t\t}\n\t\t\t\t\tswitch (def.type) {\n\t\t\t\t\t\tcase 'union':\n\t\t\t\t\t\t\tif (zodSchema._zod.traits.has('ZodDiscriminatedUnion')) {\n\t\t\t\t\t\t\t\tresolveDiscriminator(js as JsonSchemaDef);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\tcase 'nonoptional':\n\t\t\t\t\t\t\t// js._ref maybe true\n\t\t\t\t\t\t\tjs.nullable = false;\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\tcase 'nullable':\n\t\t\t\t\t\tcase 'optional':\n\t\t\t\t\t\t\t// prefer nullable\n\t\t\t\t\t\t\tmatch(js)\n\t\t\t\t\t\t\t\t.with({ anyOf: [P.select(), { type: 'null' }] }, (select) => {\n\t\t\t\t\t\t\t\t\tdelete js['anyOf'];\n\t\t\t\t\t\t\t\t\tObject.assign(js, select);\n\t\t\t\t\t\t\t\t\tjs.nullable = true;\n\t\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\t\t.otherwise((js) => {\n\t\t\t\t\t\t\t\t\tjs.nullable = true;\n\t\t\t\t\t\t\t\t});\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t}) as JsonSchemaDef;\n\n\t\t\t// remove redundant nullable, ensure required is sorted\n\t\t\tvisit(js, (v) => {\n\t\t\t\tif (v.nullable === false) {\n\t\t\t\t\tdelete v.nullable;\n\t\t\t\t}\n\t\t\t\tif (v.required) {\n\t\t\t\t\tv.required.sort();\n\t\t\t\t}\n\t\t\t});\n\t\t\t// maybe freeze\n\t\t\treturn js;\n\t\t});\n\t}\n\n\tif (isTypeBoxSchema(schema)) {\n\t\treturn schema as JsonSchemaDef;\n\t}\n\n\treturn schema as JsonSchemaDef;\n}\n\nfunction visit(js: JsonSchemaDef, f: (js: JsonSchemaDef) => void) {\n\tconst _visit = (\n\t\tjs: JsonSchemaDef,\n\t\tf: (js: JsonSchemaDef) => void,\n\t\tparent: JsonSchemaDef | undefined,\n\t\tpath: string[],\n\t\tk?: string,\n\t) => {\n\t\tif (!js) {\n\t\t\treturn;\n\t\t}\n\t\tf(js);\n\t\tif (js.properties) {\n\t\t\tfor (const [k, v] of Object.entries(js.properties)) {\n\t\t\t\tif (v) {\n\t\t\t\t\t_visit(v, f, js, path.concat(k), 'properties');\n\t\t\t\t}\n\t\t\t}\n\t\t} else if (js.items) {\n\t\t\tif (Array.isArray(js.items)) {\n\t\t\t\tfor (const v of js.items) {\n\t\t\t\t\t_visit(v, f, js, path, 'items');\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\t_visit(js.items, f, js, path, 'items');\n\t\t\t}\n\t\t} else if (js.anyOf) {\n\t\t\tfor (const v of js.anyOf) {\n\t\t\t\t_visit(v, f, js, path, 'anyOf');\n\t\t\t}\n\t\t} else if (js.oneOf) {\n\t\t\tfor (const v of js.oneOf) {\n\t\t\t\t_visit(v, f, js, path, 'oneOf');\n\t\t\t}\n\t\t} else if (js.allOf) {\n\t\t\tfor (const v of js.allOf) {\n\t\t\t\t_visit(v, f, js, path, 'allOf');\n\t\t\t}\n\t\t}\n\t};\n\t_visit(js, f, undefined, []);\n}\n\nfunction resolveJsonSchemaDef(\n\tjs: JsonSchemaDef,\n\tctx?: {\n\t\tparent: JsonSchemaDef;\n\t\tkey: string;\n\t},\n) {\n\treturn match(js)\n\t\t.with(\n\t\t\t{\n\t\t\t\tanyOf: [P.select(), { type: 'null' }],\n\t\t\t},\n\t\t\t(select) => {\n\t\t\t\treturn { ...omit(js, ['anyOf']), ...select, nullable: true };\n\t\t\t},\n\t\t)\n\t\t.with({ properties: P.nonNullable }, (schema: JsonSchemaDef) => {\n\t\t\tfor (const key in schema.properties) {\n\t\t\t\tconst prop = schema.properties[key];\n\t\t\t\tif (prop) {\n\t\t\t\t\tschema.properties[key] = resolveJsonSchemaDef(prop, { parent: schema, key });\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn schema;\n\t\t})\n\t\t.otherwise(() => {\n\t\t\treturn js;\n\t\t});\n}\n\nfunction resolveDiscriminator(jsd: JsonSchemaDef) {\n\tif (!(jsd.anyOf && jsd.anyOf.length > 1)) {\n\t\treturn;\n\t}\n\tif (jsd.discriminator) {\n\t\treturn;\n\t}\n\n\tlet names: string[] = [];\n\t{\n\t\t// candidate for discriminator\n\t\tconst v = jsd.anyOf[0];\n\t\tif (v && v.type === 'object' && v.properties) {\n\t\t\tif (Array.isArray(v.required)) {\n\t\t\t\tfor (const k of v.required) {\n\t\t\t\t\tif (v.properties[k].const !== undefined) {\n\t\t\t\t\t\tnames.push(k);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\tif (names.length >= 1) {\n\t\tfor (let i = 0; i < jsd.anyOf.length; i++) {\n\t\t\tif (i === 0) {\n\t\t\t\t// skip first\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (!names.length) {\n\t\t\t\tbreak;\n\t\t\t}\n\n\t\t\tconst v = jsd.anyOf[i];\n\t\t\tif (v && v.type === 'object' && v.properties) {\n\t\t\t\tconst props = v.properties;\n\t\t\t\tremove(names, (k) => {\n\t\t\t\t\t// dont care the mapping\n\t\t\t\t\tlet p = props[k];\n\t\t\t\t\tswitch (typeof p.const) {\n\t\t\t\t\t\tcase 'string':\n\t\t\t\t\t\tcase 'number':\n\t\t\t\t\t\tcase 'boolean':\n\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\tdefault:\n\t\t\t\t\t\t\treturn true;\n\t\t\t\t\t}\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\tnames = [];\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n\tif (names.length === 1) {\n\t\tjsd.discriminator = {\n\t\t\tpropertyName: names[0],\n\t\t};\n\t}\n}\n"],"names":["omit","remove","match","P","z","getSchemaCache","isTypeBoxSchema","isZodSchema","toJsonSchema","schema","js","toJSONSchema","unrepresentable","override","zodSchema","jsonSchema","def","_zod","meta","globalRegistry","get","Object","assign","type","traits","has","resolveDiscriminator","nullable","with","anyOf","select","otherwise","visit","v","required","sort","f","_visit","parent","path","k","properties","entries","concat","items","Array","isArray","oneOf","allOf","undefined","resolveJsonSchemaDef","ctx","nonNullable","key","prop","jsd","length","discriminator","names","const","push","i","props","p","propertyName"],"mappings":"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"}
+{"version":3,"sources":["../../src/schema/toJsonSchema.ts"],"sourcesContent":["import { omit, remove } from 'es-toolkit';\nimport { match, P } from 'ts-pattern';\nimport { z } from 'zod/v4';\nimport type { JsonSchemaDef } from '../jsonschema';\nimport { getSchemaCache } from './getSchemaCache';\nimport type { TypeSchema } from './TypeSchema';\nimport { isTypeBoxSchema, isZodSchema } from './validate';\n\nexport function toJsonSchema(schema: TypeSchema): JsonSchemaDef {\n\tif (isZodSchema(schema)) {\n\t\treturn getSchemaCache(schema, 'jsonschema', () => {\n\t\t\t// zod v4\n\t\t\tlet js = z.toJSONSchema(schema, {\n\t\t\t\tunrepresentable: 'any',\n\t\t\t\toverride: ({ zodSchema, jsonSchema: js }) => {\n\t\t\t\t\tconst def = zodSchema._zod.def;\n\t\t\t\t\tconst meta = z.globalRegistry.get(zodSchema);\n\t\t\t\t\tif (meta) {\n\t\t\t\t\t\tObject.assign(js, meta);\n\t\t\t\t\t}\n\t\t\t\t\tswitch (def.type) {\n\t\t\t\t\t\tcase 'union':\n\t\t\t\t\t\t\tif (zodSchema._zod.traits.has('ZodDiscriminatedUnion')) {\n\t\t\t\t\t\t\t\tresolveDiscriminator(js as JsonSchemaDef);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\tcase 'nonoptional':\n\t\t\t\t\t\t\t// js._ref maybe true\n\t\t\t\t\t\t\tjs.nullable = false;\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\tcase 'nullable':\n\t\t\t\t\t\tcase 'optional':\n\t\t\t\t\t\t\t// prefer nullable\n\t\t\t\t\t\t\tmatch(js)\n\t\t\t\t\t\t\t\t.with({ anyOf: [P.select(), { type: 'null' }] }, (select) => {\n\t\t\t\t\t\t\t\t\tdelete js.anyOf;\n\t\t\t\t\t\t\t\t\tObject.assign(js, select);\n\t\t\t\t\t\t\t\t\tjs.nullable = true;\n\t\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\t\t.otherwise((js) => {\n\t\t\t\t\t\t\t\t\tjs.nullable = true;\n\t\t\t\t\t\t\t\t});\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t}) as JsonSchemaDef;\n\n\t\t\t// remove redundant nullable, ensure required is sorted\n\t\t\tvisit(js, (v) => {\n\t\t\t\tif (v.nullable === false) {\n\t\t\t\t\tdelete v.nullable;\n\t\t\t\t}\n\t\t\t\tif (v.required) {\n\t\t\t\t\tv.required.sort();\n\t\t\t\t}\n\t\t\t});\n\t\t\t// maybe freeze\n\t\t\treturn js;\n\t\t});\n\t}\n\n\tif (isTypeBoxSchema(schema)) {\n\t\treturn schema as JsonSchemaDef;\n\t}\n\n\treturn schema as JsonSchemaDef;\n}\n\nfunction visit(js: JsonSchemaDef, f: (js: JsonSchemaDef) => void) {\n\tconst _visit = (\n\t\tjs: JsonSchemaDef,\n\t\tf: (js: JsonSchemaDef) => void,\n\t\t_parent: JsonSchemaDef | undefined,\n\t\tpath: string[],\n\t\t_k?: string,\n\t) => {\n\t\tif (!js) {\n\t\t\treturn;\n\t\t}\n\t\tf(js);\n\t\tif (js.properties) {\n\t\t\tfor (const [k, v] of Object.entries(js.properties)) {\n\t\t\t\tif (v) {\n\t\t\t\t\t_visit(v, f, js, path.concat(k), 'properties');\n\t\t\t\t}\n\t\t\t}\n\t\t} else if (js.items) {\n\t\t\tif (Array.isArray(js.items)) {\n\t\t\t\tfor (const v of js.items) {\n\t\t\t\t\t_visit(v, f, js, path, 'items');\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\t_visit(js.items, f, js, path, 'items');\n\t\t\t}\n\t\t} else if (js.anyOf) {\n\t\t\tfor (const v of js.anyOf) {\n\t\t\t\t_visit(v, f, js, path, 'anyOf');\n\t\t\t}\n\t\t} else if (js.oneOf) {\n\t\t\tfor (const v of js.oneOf) {\n\t\t\t\t_visit(v, f, js, path, 'oneOf');\n\t\t\t}\n\t\t} else if (js.allOf) {\n\t\t\tfor (const v of js.allOf) {\n\t\t\t\t_visit(v, f, js, path, 'allOf');\n\t\t\t}\n\t\t}\n\t};\n\t_visit(js, f, undefined, []);\n}\n\nfunction _resolveJsonSchemaDef(\n\tjs: JsonSchemaDef,\n\t_ctx?: {\n\t\tparent: JsonSchemaDef;\n\t\tkey: string;\n\t},\n) {\n\treturn match(js)\n\t\t.with(\n\t\t\t{\n\t\t\t\tanyOf: [P.select(), { type: 'null' }],\n\t\t\t},\n\t\t\t(select) => {\n\t\t\t\treturn { ...omit(js, ['anyOf']), ...select, nullable: true };\n\t\t\t},\n\t\t)\n\t\t.with({ properties: P.nonNullable }, (schema: JsonSchemaDef) => {\n\t\t\tfor (const key in schema.properties) {\n\t\t\t\tconst prop = schema.properties[key];\n\t\t\t\tif (prop) {\n\t\t\t\t\tschema.properties[key] = _resolveJsonSchemaDef(prop, { parent: schema, key });\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn schema;\n\t\t})\n\t\t.otherwise(() => {\n\t\t\treturn js;\n\t\t});\n}\n\nfunction resolveDiscriminator(jsd: JsonSchemaDef) {\n\tif (!(jsd.anyOf && jsd.anyOf.length > 1)) {\n\t\treturn;\n\t}\n\tif (jsd.discriminator) {\n\t\treturn;\n\t}\n\n\tlet names: string[] = [];\n\t{\n\t\t// candidate for discriminator\n\t\tconst v = jsd.anyOf[0];\n\t\tif (v && v.type === 'object' && v.properties) {\n\t\t\tif (Array.isArray(v.required)) {\n\t\t\t\tfor (const k of v.required) {\n\t\t\t\t\tif (v.properties[k].const !== undefined) {\n\t\t\t\t\t\tnames.push(k);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\tif (names.length >= 1) {\n\t\tfor (let i = 0; i < jsd.anyOf.length; i++) {\n\t\t\tif (i === 0) {\n\t\t\t\t// skip first\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (!names.length) {\n\t\t\t\tbreak;\n\t\t\t}\n\n\t\t\tconst v = jsd.anyOf[i];\n\t\t\tif (v && v.type === 'object' && v.properties) {\n\t\t\t\tconst props = v.properties;\n\t\t\t\tremove(names, (k) => {\n\t\t\t\t\t// dont care the mapping\n\t\t\t\t\tlet p = props[k];\n\t\t\t\t\tswitch (typeof p.const) {\n\t\t\t\t\t\tcase 'string':\n\t\t\t\t\t\tcase 'number':\n\t\t\t\t\t\tcase 'boolean':\n\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\tdefault:\n\t\t\t\t\t\t\treturn true;\n\t\t\t\t\t}\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\tnames = [];\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n\tif (names.length === 1) {\n\t\tjsd.discriminator = {\n\t\t\tpropertyName: names[0],\n\t\t};\n\t}\n}\n"],"names":["omit","remove","match","P","z","getSchemaCache","isTypeBoxSchema","isZodSchema","toJsonSchema","schema","js","toJSONSchema","unrepresentable","override","zodSchema","jsonSchema","def","_zod","meta","globalRegistry","get","Object","assign","type","traits","has","resolveDiscriminator","nullable","with","anyOf","select","otherwise","visit","v","required","sort","f","_visit","_parent","path","_k","properties","k","entries","concat","items","Array","isArray","oneOf","allOf","undefined","_resolveJsonSchemaDef","_ctx","nonNullable","key","prop","parent","jsd","length","discriminator","names","const","push","i","props","p","propertyName"],"mappings":"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"}

package/lib/schema/validate.js

@@ -95,7 +95,7 @@ export function parseData(schema, data) {
         issues: result.issues
     });
 }
-function formatIssues(schema, issues) {
+function _formatIssues(_schema, _issues) {
     return '';
 }
 export function isZodSchema(schema) {

package/lib/schema/validate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/schema/validate.ts"],"sourcesContent":["import { Kind as TypeBoxKind, type TSchema } from '@sinclair/typebox';\nimport '@sinclair/typebox';\nimport { TypeCompiler } from '@sinclair/typebox/compiler';\nimport { ifPresent } from '@wener/utils';\nimport { Ajv } from 'ajv';\nimport addFormats from 'ajv-formats';\nimport type { ZodType } from 'zod/v4';\nimport type { JsonSchemaDef } from '../jsonschema';\nimport type { SchemaOutput, TypeSchema } from './TypeSchema';\n\n/*\nhttps://github.com/react-hook-form/resolvers\nhttps://github.com/decs/typeschema/tree/main/packages\n*/\n\nexport function validate<S extends TypeSchema>(schema: S, data: unknown): ValidationResult<SchemaOutput<S>> {\n\tif (isZodSchema(schema)) {\n\t\tconst result = schema.safeParse(data);\n\t\tif (result.success) {\n\t\t\treturn {\n\t\t\t\tsuccess: true,\n\t\t\t\tdata: result.data as any,\n\t\t\t};\n\t\t}\n\n\t\treturn {\n\t\t\tissues: result.error.issues.map(({ message, path, code }) => ({ message, path, code })),\n\t\t\t// message: z.prettifyError(result.error),\n\t\t\tsuccess: false,\n\t\t};\n\t}\n\n\tif (isTypeBoxSchema(schema)) {\n\t\tconst checker = TypeCompiler.Compile(schema);\n\t\tif (checker.Check(data)) {\n\t\t\treturn {\n\t\t\t\tsuccess: true,\n\t\t\t\tdata: data as any,\n\t\t\t};\n\t\t}\n\t\treturn {\n\t\t\tissues: Array.from(checker.Errors(data)).map(({ message, path }) => {\n\t\t\t\treturn { message, path: [path] };\n\t\t\t}),\n\t\t\t// message: '',\n\t\t\tsuccess: false,\n\t\t};\n\t}\n\n\tif (isJsonSchema(schema)) {\n\t\tconst ajv = new Ajv({\n\t\t\tallErrors: true,\n\t\t\tvalidateSchema: true,\n\t\t});\n\t\taddFormats(ajv);\n\t\tconst validator = ajv.compile(schema);\n\t\tif (validator(data)) {\n\t\t\treturn {\n\t\t\t\tdata: data as any,\n\t\t\t\tsuccess: true,\n\t\t\t};\n\t\t}\n\n\t\tconst issues =\n\t\t\tvalidator.errors?.map((error) => {\n\t\t\t\tconst message = error.message || 'Unknown error';\n\t\t\t\tconst path = error.instancePath\n\t\t\t\t\t.split('/')\n\t\t\t\t\t.filter(Boolean)\n\t\t\t\t\t.map((p) => p as PropertyKey);\n\t\t\t\treturn { message, path };\n\t\t\t}) || [];\n\t\treturn {\n\t\t\tsuccess: false,\n\t\t\t// message: 'Invalid data',\n\t\t\tissues,\n\t\t};\n\t}\n\n\treturn {\n\t\tsuccess: false,\n\t\t// message: 'Invalid schema',\n\t\tissues: [\n\t\t\t{\n\t\t\t\tmessage: 'Unknown schema type',\n\t\t\t},\n\t\t],\n\t};\n}\n\nexport function parseData<S extends TypeSchema>(schema: S, data: unknown): SchemaOutput<S> {\n\tlet result = validate(schema, data);\n\tif (result.success) {\n\t\treturn result.data;\n\t}\n\tthrow Object.assign(\n\t\tnew Error(\n\t\t\tresult.issues\n\t\t\t\t.map((v) => {\n\t\t\t\t\treturn `${ifPresent(v.path?.join(), (v) => `[${v}]`)}: ${v.message}`;\n\t\t\t\t})\n\t\t\t\t.join('; '),\n\t\t),\n\t\t{\n\t\t\tissues: result.issues,\n\t\t},\n\t);\n}\n\nfunction formatIssues(schema: TypeSchema, issues: Array<ValidationIssue>): string {\n\treturn '';\n}\n\nexport function isZodSchema<I = any, O = any>(schema: any | TypeSchema<I, O>): schema is ZodType<O, I> {\n\treturn typeof schema === 'object' && 'parse' in schema;\n}\n\nexport function isTypeBoxSchema(schema: any): schema is TSchema {\n\treturn typeof schema === 'object' && TypeBoxKind in schema;\n}\n\nexport function isJsonSchema(schema: any): schema is JsonSchemaDef {\n\tlet sc: JsonSchemaDef = schema;\n\treturn typeof schema === 'object' && Boolean(sc.type || sc.properties || sc.anyOf || sc.oneOf || sc.$ref || sc.items);\n}\n\nexport type ValidationIssue = {\n\tmessage: string;\n\tpath?: Array<PropertyKey>;\n\tcode?: string;\n};\n\nexport type ValidationResult<TOutput> =\n\t| { success: true; data: TOutput }\n\t| { success: false; issues: Array<ValidationIssue> };\n"],"names":["Kind","TypeBoxKind","TypeCompiler","ifPresent","Ajv","addFormats","validate","schema","data","isZodSchema","result","safeParse","success","issues","error","map","message","path","code","isTypeBoxSchema","checker","Compile","Check","Array","from","Errors","isJsonSchema","ajv","allErrors","validateSchema","validator","compile","errors","instancePath","split","filter","Boolean","p","parseData","Object","assign","Error","v","join","formatIssues","sc","type","properties","anyOf","oneOf","$ref","items"],"mappings":"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"}
+{"version":3,"sources":["../../src/schema/validate.ts"],"sourcesContent":["import { Kind as TypeBoxKind, type TSchema } from '@sinclair/typebox';\nimport '@sinclair/typebox';\nimport { TypeCompiler } from '@sinclair/typebox/compiler';\nimport { ifPresent } from '@wener/utils';\nimport { Ajv } from 'ajv';\nimport addFormats from 'ajv-formats';\nimport type { ZodType } from 'zod/v4';\nimport type { JsonSchemaDef } from '../jsonschema';\nimport type { SchemaOutput, TypeSchema } from './TypeSchema';\n\n/*\nhttps://github.com/react-hook-form/resolvers\nhttps://github.com/decs/typeschema/tree/main/packages\n*/\n\nexport function validate<S extends TypeSchema>(schema: S, data: unknown): ValidationResult<SchemaOutput<S>> {\n\tif (isZodSchema(schema)) {\n\t\tconst result = schema.safeParse(data);\n\t\tif (result.success) {\n\t\t\treturn {\n\t\t\t\tsuccess: true,\n\t\t\t\tdata: result.data as any,\n\t\t\t};\n\t\t}\n\n\t\treturn {\n\t\t\tissues: result.error.issues.map(({ message, path, code }) => ({ message, path, code })),\n\t\t\t// message: z.prettifyError(result.error),\n\t\t\tsuccess: false,\n\t\t};\n\t}\n\n\tif (isTypeBoxSchema(schema)) {\n\t\tconst checker = TypeCompiler.Compile(schema);\n\t\tif (checker.Check(data)) {\n\t\t\treturn {\n\t\t\t\tsuccess: true,\n\t\t\t\tdata: data as any,\n\t\t\t};\n\t\t}\n\t\treturn {\n\t\t\tissues: Array.from(checker.Errors(data)).map(({ message, path }) => {\n\t\t\t\treturn { message, path: [path] };\n\t\t\t}),\n\t\t\t// message: '',\n\t\t\tsuccess: false,\n\t\t};\n\t}\n\n\tif (isJsonSchema(schema)) {\n\t\tconst ajv = new Ajv({\n\t\t\tallErrors: true,\n\t\t\tvalidateSchema: true,\n\t\t});\n\t\taddFormats(ajv);\n\t\tconst validator = ajv.compile(schema);\n\t\tif (validator(data)) {\n\t\t\treturn {\n\t\t\t\tdata: data as any,\n\t\t\t\tsuccess: true,\n\t\t\t};\n\t\t}\n\n\t\tconst issues =\n\t\t\tvalidator.errors?.map((error) => {\n\t\t\t\tconst message = error.message || 'Unknown error';\n\t\t\t\tconst path = error.instancePath\n\t\t\t\t\t.split('/')\n\t\t\t\t\t.filter(Boolean)\n\t\t\t\t\t.map((p) => p as PropertyKey);\n\t\t\t\treturn { message, path };\n\t\t\t}) || [];\n\t\treturn {\n\t\t\tsuccess: false,\n\t\t\t// message: 'Invalid data',\n\t\t\tissues,\n\t\t};\n\t}\n\n\treturn {\n\t\tsuccess: false,\n\t\t// message: 'Invalid schema',\n\t\tissues: [\n\t\t\t{\n\t\t\t\tmessage: 'Unknown schema type',\n\t\t\t},\n\t\t],\n\t};\n}\n\nexport function parseData<S extends TypeSchema>(schema: S, data: unknown): SchemaOutput<S> {\n\tlet result = validate(schema, data);\n\tif (result.success) {\n\t\treturn result.data;\n\t}\n\tthrow Object.assign(\n\t\tnew Error(\n\t\t\tresult.issues\n\t\t\t\t.map((v) => {\n\t\t\t\t\treturn `${ifPresent(v.path?.join(), (v) => `[${v}]`)}: ${v.message}`;\n\t\t\t\t})\n\t\t\t\t.join('; '),\n\t\t),\n\t\t{\n\t\t\tissues: result.issues,\n\t\t},\n\t);\n}\n\nfunction _formatIssues(_schema: TypeSchema, _issues: Array<ValidationIssue>): string {\n\treturn '';\n}\n\nexport function isZodSchema<I = any, O = any>(schema: any | TypeSchema<I, O>): schema is ZodType<O, I> {\n\treturn typeof schema === 'object' && 'parse' in schema;\n}\n\nexport function isTypeBoxSchema(schema: any): schema is TSchema {\n\treturn typeof schema === 'object' && TypeBoxKind in schema;\n}\n\nexport function isJsonSchema(schema: any): schema is JsonSchemaDef {\n\tlet sc: JsonSchemaDef = schema;\n\treturn typeof schema === 'object' && Boolean(sc.type || sc.properties || sc.anyOf || sc.oneOf || sc.$ref || sc.items);\n}\n\nexport type ValidationIssue = {\n\tmessage: string;\n\tpath?: Array<PropertyKey>;\n\tcode?: string;\n};\n\nexport type ValidationResult<TOutput> =\n\t| { success: true; data: TOutput }\n\t| { success: false; issues: Array<ValidationIssue> };\n"],"names":["Kind","TypeBoxKind","TypeCompiler","ifPresent","Ajv","addFormats","validate","schema","data","isZodSchema","result","safeParse","success","issues","error","map","message","path","code","isTypeBoxSchema","checker","Compile","Check","Array","from","Errors","isJsonSchema","ajv","allErrors","validateSchema","validator","compile","errors","instancePath","split","filter","Boolean","p","parseData","Object","assign","Error","v","join","_formatIssues","_schema","_issues","sc","type","properties","anyOf","oneOf","$ref","items"],"mappings":"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"}

package/lib/utils/buildRedactorFormSchema.js

@@ -44,7 +44,7 @@ export function buildRedactorFormSchema(ts, { shouldRedact = (schema) => schema[
         return root;
     };
 }
-function buildReversibleRedactText({ id, type, key, timestamp } = {}) {
+function _buildReversibleRedactText({ id, type: _type, key: _key, timestamp } = {}) {
     if (!id) {
         return RedactedText;
     }

package/lib/utils/buildRedactorFormSchema.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/buildRedactorFormSchema.ts"],"sourcesContent":["import { forEachJsonSchema, type JsonSchemaDef } from '../jsonschema';\nimport { toJsonSchema, type TypeSchema } from '../schema';\n\nexport const RedactedText = '[redacted]';\n\nexport function buildRedactorFormSchema(\n\tts: TypeSchema,\n\t{\n\t\tshouldRedact = (schema) => schema['x-sensitive'] === true,\n\t\treplacer = () => RedactedText,\n\t}: {\n\t\tshouldRedact?: (schema: JsonSchemaDef) => boolean;\n\t\treplacer?: (key: string, value: any) => any;\n\t},\n) {\n\tlet js = toJsonSchema(ts);\n\n\tlet paths: string[][] = [];\n\n\tforEachJsonSchema(js, (js, { path }) => {\n\t\tif (shouldRedact(js)) {\n\t\t\tpaths.push(path);\n\t\t}\n\t});\n\tconst vis = (root: any, path: string[]) => {\n\t\tswitch (root) {\n\t\t\tcase null:\n\t\t\tcase undefined:\n\t\t\t\treturn;\n\t\t}\n\n\t\tlet c = root;\n\t\tfor (let i = 0; i < path.length; i++) {\n\t\t\tlet k = path[i];\n\t\t\tif (c && typeof c === 'object' && k in c) {\n\t\t\t\tlet v = c[k];\n\t\t\t\tif (path.length === 1) {\n\t\t\t\t\tc[k] = replacer(k, v);\n\t\t\t\t} else if (Array.isArray(v)) {\n\t\t\t\t\tfor (let vv of v) {\n\t\t\t\t\t\tvis(vv, path.slice(i + 1));\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tvis(v, path.slice(i + 1));\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t};\n\n\treturn (root: any) => {\n\t\tif (!paths.length) {\n\t\t\treturn root;\n\t\t}\n\n\t\tpaths.forEach((path) => {\n\t\t\tvis(root, path);\n\t\t});\n\n\t\treturn root;\n\t};\n}\n\nfunction buildReversibleRedactText({\n\tid,\n\ttype,\n\tkey,\n\ttimestamp,\n}: {\n\tid?: string | number;\n\ttype?: string;\n\tkey?: string;\n\ttimestamp?: number | boolean;\n} = {}) {\n\tif (!id) {\n\t\treturn RedactedText;\n\t}\n\tif (timestamp === true) {\n\t\ttimestamp = Date.now();\n\t}\n\treturn `[redacted ${id}]`;\n}\n\nexport function isRedactedText(v: any) {\n\treturn v === RedactedText || (typeof v === 'string' && v.startsWith('[redacted ') && v.endsWith(']'));\n}\n"],"names":["forEachJsonSchema","toJsonSchema","RedactedText","buildRedactorFormSchema","ts","shouldRedact","schema","replacer","js","paths","path","push","vis","root","undefined","c","i","length","k","v","Array","isArray","vv","slice","forEach","buildReversibleRedactText","id","type","key","timestamp","Date","now","isRedactedText","startsWith","endsWith"],"mappings":"AAAA,SAASA,iBAAiB,QAA4B,gBAAgB;AACtE,SAASC,YAAY,QAAyB,YAAY;AAE1D,OAAO,MAAMC,eAAe,aAAa;AAEzC,OAAO,SAASC,wBACfC,EAAc,EACd,EACCC,eAAe,CAACC,SAAWA,MAAM,CAAC,cAAc,KAAK,IAAI,EACzDC,WAAW,IAAML,YAAY,EAI7B;IAED,IAAIM,KAAKP,aAAaG;IAEtB,IAAIK,QAAoB,EAAE;IAE1BT,kBAAkBQ,IAAI,CAACA,IAAI,EAAEE,IAAI,EAAE;QAClC,IAAIL,aAAaG,KAAK;YACrBC,MAAME,IAAI,CAACD;QACZ;IACD;IACA,MAAME,MAAM,CAACC,MAAWH;QACvB,OAAQG;YACP,KAAK;YACL,KAAKC;gBACJ;QACF;QAEA,IAAIC,IAAIF;QACR,IAAK,IAAIG,IAAI,GAAGA,IAAIN,KAAKO,MAAM,EAAED,IAAK;YACrC,IAAIE,IAAIR,IAAI,CAACM,EAAE;YACf,IAAID,KAAK,OAAOA,MAAM,YAAYG,KAAKH,GAAG;gBACzC,IAAII,IAAIJ,CAAC,CAACG,EAAE;gBACZ,IAAIR,KAAKO,MAAM,KAAK,GAAG;oBACtBF,CAAC,CAACG,EAAE,GAAGX,SAASW,GAAGC;gBACpB,OAAO,IAAIC,MAAMC,OAAO,CAACF,IAAI;oBAC5B,KAAK,IAAIG,MAAMH,EAAG;wBACjBP,IAAIU,IAAIZ,KAAKa,KAAK,CAACP,IAAI;oBACxB;gBACD,OAAO;oBACNJ,IAAIO,GAAGT,KAAKa,KAAK,CAACP,IAAI;gBACvB;YACD;QACD;IACD;IAEA,OAAO,CAACH;QACP,IAAI,CAACJ,MAAMQ,MAAM,EAAE;YAClB,OAAOJ;QACR;QAEAJ,MAAMe,OAAO,CAAC,CAACd;YACdE,IAAIC,MAAMH;QACX;QAEA,OAAOG;IACR;AACD;AAEA,SAASY,0BAA0B,EAClCC,EAAE,EACFC,IAAI,EACJC,GAAG,EACHC,SAAS,EAMT,GAAG,CAAC,CAAC;IACL,IAAI,CAACH,IAAI;QACR,OAAOxB;IACR;IACA,IAAI2B,cAAc,MAAM;QACvBA,YAAYC,KAAKC,GAAG;IACrB;IACA,OAAO,CAAC,UAAU,EAAEL,GAAG,CAAC,CAAC;AAC1B;AAEA,OAAO,SAASM,eAAeb,CAAM;IACpC,OAAOA,MAAMjB,gBAAiB,OAAOiB,MAAM,YAAYA,EAAEc,UAAU,CAAC,iBAAiBd,EAAEe,QAAQ,CAAC;AACjG"}
+{"version":3,"sources":["../../src/utils/buildRedactorFormSchema.ts"],"sourcesContent":["import { forEachJsonSchema, type JsonSchemaDef } from '../jsonschema';\nimport { toJsonSchema, type TypeSchema } from '../schema';\n\nexport const RedactedText = '[redacted]';\n\nexport function buildRedactorFormSchema(\n\tts: TypeSchema,\n\t{\n\t\tshouldRedact = (schema) => schema['x-sensitive'] === true,\n\t\treplacer = () => RedactedText,\n\t}: {\n\t\tshouldRedact?: (schema: JsonSchemaDef) => boolean;\n\t\treplacer?: (key: string, value: any) => any;\n\t},\n) {\n\tlet js = toJsonSchema(ts);\n\n\tlet paths: string[][] = [];\n\n\tforEachJsonSchema(js, (js, { path }) => {\n\t\tif (shouldRedact(js)) {\n\t\t\tpaths.push(path);\n\t\t}\n\t});\n\tconst vis = (root: any, path: string[]) => {\n\t\tswitch (root) {\n\t\t\tcase null:\n\t\t\tcase undefined:\n\t\t\t\treturn;\n\t\t}\n\n\t\tlet c = root;\n\t\tfor (let i = 0; i < path.length; i++) {\n\t\t\tlet k = path[i];\n\t\t\tif (c && typeof c === 'object' && k in c) {\n\t\t\t\tlet v = c[k];\n\t\t\t\tif (path.length === 1) {\n\t\t\t\t\tc[k] = replacer(k, v);\n\t\t\t\t} else if (Array.isArray(v)) {\n\t\t\t\t\tfor (let vv of v) {\n\t\t\t\t\t\tvis(vv, path.slice(i + 1));\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tvis(v, path.slice(i + 1));\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t};\n\n\treturn (root: any) => {\n\t\tif (!paths.length) {\n\t\t\treturn root;\n\t\t}\n\n\t\tpaths.forEach((path) => {\n\t\t\tvis(root, path);\n\t\t});\n\n\t\treturn root;\n\t};\n}\n\nfunction _buildReversibleRedactText({\n\tid,\n\ttype: _type,\n\tkey: _key,\n\ttimestamp,\n}: {\n\tid?: string | number;\n\ttype?: string;\n\tkey?: string;\n\ttimestamp?: number | boolean;\n} = {}) {\n\tif (!id) {\n\t\treturn RedactedText;\n\t}\n\tif (timestamp === true) {\n\t\ttimestamp = Date.now();\n\t}\n\treturn `[redacted ${id}]`;\n}\n\nexport function isRedactedText(v: any) {\n\treturn v === RedactedText || (typeof v === 'string' && v.startsWith('[redacted ') && v.endsWith(']'));\n}\n"],"names":["forEachJsonSchema","toJsonSchema","RedactedText","buildRedactorFormSchema","ts","shouldRedact","schema","replacer","js","paths","path","push","vis","root","undefined","c","i","length","k","v","Array","isArray","vv","slice","forEach","_buildReversibleRedactText","id","type","_type","key","_key","timestamp","Date","now","isRedactedText","startsWith","endsWith"],"mappings":"AAAA,SAASA,iBAAiB,QAA4B,gBAAgB;AACtE,SAASC,YAAY,QAAyB,YAAY;AAE1D,OAAO,MAAMC,eAAe,aAAa;AAEzC,OAAO,SAASC,wBACfC,EAAc,EACd,EACCC,eAAe,CAACC,SAAWA,MAAM,CAAC,cAAc,KAAK,IAAI,EACzDC,WAAW,IAAML,YAAY,EAI7B;IAED,IAAIM,KAAKP,aAAaG;IAEtB,IAAIK,QAAoB,EAAE;IAE1BT,kBAAkBQ,IAAI,CAACA,IAAI,EAAEE,IAAI,EAAE;QAClC,IAAIL,aAAaG,KAAK;YACrBC,MAAME,IAAI,CAACD;QACZ;IACD;IACA,MAAME,MAAM,CAACC,MAAWH;QACvB,OAAQG;YACP,KAAK;YACL,KAAKC;gBACJ;QACF;QAEA,IAAIC,IAAIF;QACR,IAAK,IAAIG,IAAI,GAAGA,IAAIN,KAAKO,MAAM,EAAED,IAAK;YACrC,IAAIE,IAAIR,IAAI,CAACM,EAAE;YACf,IAAID,KAAK,OAAOA,MAAM,YAAYG,KAAKH,GAAG;gBACzC,IAAII,IAAIJ,CAAC,CAACG,EAAE;gBACZ,IAAIR,KAAKO,MAAM,KAAK,GAAG;oBACtBF,CAAC,CAACG,EAAE,GAAGX,SAASW,GAAGC;gBACpB,OAAO,IAAIC,MAAMC,OAAO,CAACF,IAAI;oBAC5B,KAAK,IAAIG,MAAMH,EAAG;wBACjBP,IAAIU,IAAIZ,KAAKa,KAAK,CAACP,IAAI;oBACxB;gBACD,OAAO;oBACNJ,IAAIO,GAAGT,KAAKa,KAAK,CAACP,IAAI;gBACvB;YACD;QACD;IACD;IAEA,OAAO,CAACH;QACP,IAAI,CAACJ,MAAMQ,MAAM,EAAE;YAClB,OAAOJ;QACR;QAEAJ,MAAMe,OAAO,CAAC,CAACd;YACdE,IAAIC,MAAMH;QACX;QAEA,OAAOG;IACR;AACD;AAEA,SAASY,2BAA2B,EACnCC,EAAE,EACFC,MAAMC,KAAK,EACXC,KAAKC,IAAI,EACTC,SAAS,EAMT,GAAG,CAAC,CAAC;IACL,IAAI,CAACL,IAAI;QACR,OAAOxB;IACR;IACA,IAAI6B,cAAc,MAAM;QACvBA,YAAYC,KAAKC,GAAG;IACrB;IACA,OAAO,CAAC,UAAU,EAAEP,GAAG,CAAC,CAAC;AAC1B;AAEA,OAAO,SAASQ,eAAef,CAAM;IACpC,OAAOA,MAAMjB,gBAAiB,OAAOiB,MAAM,YAAYA,EAAEgB,UAAU,CAAC,iBAAiBhB,EAAEiB,QAAQ,CAAC;AACjG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wener/common",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "type": "module",
   "description": "Common utils for console & server",
   "repository": {
@@ -36,26 +36,38 @@
       "types": "./src/decimal/index.ts",
       "default": "./lib/decimal/index.js"
     },
+    "./drain3": {
+      "types": "./src/drain3/index.ts",
+      "default": "./lib/drain3/index.js"
+    },
     "./fs": {
       "types": "./src/fs/index.ts",
       "default": "./lib/fs/index.js"
     },
-    "./fs/orpc": {
-      "types": "./src/fs/orpc/index.ts",
-      "default": "./lib/fs/orpc/index.js"
+    "./fs/webdav": {
+      "types": "./src/fs/webdav/index.ts",
+      "default": "./lib/fs/webdav/index.js"
     },
-    "./fs/orpc/server": {
-      "types": "./src/fs/orpc/server/index.ts",
-      "default": "./lib/fs/orpc/server/index.js"
-    },
-    "./fs/s3": {
+    "./fs/s3mini": {
       "types": "./src/fs/s3/index.ts",
       "default": "./lib/fs/s3/index.js"
     },
+    "./fs/minio": {
+      "types": "./src/fs/minio/index.ts",
+      "default": "./lib/fs/minio/index.js"
+    },
     "./fs/server": {
       "types": "./src/fs/server/index.ts",
       "default": "./lib/fs/server/index.js"
     },
+    "./fs/orpc": {
+      "types": "./src/fs/orpc/index.ts",
+      "default": "./lib/fs/orpc/index.js"
+    },
+    "./fs/orpc/server": {
+      "types": "./src/fs/orpc/server/index.ts",
+      "default": "./lib/fs/orpc/server/index.js"
+    },
     "./jsonschema": {
       "types": "./src/jsonschema/index.ts",
       "default": "./lib/jsonschema/index.js"
@@ -109,18 +121,23 @@
     "@standard-schema/spec": "^1.1.0",
     "@wener/utils": "^1.1.58",
     "date-fns": "^4.1.0",
-    "es-toolkit": "^1.43.0",
+    "es-toolkit": "^1.44.0",
     "std-env": "^3.10.0",
     "ts-pattern": "^5.9.0"
   },
   "devDependencies": {
+    "@mikro-orm/better-sqlite": "^6.6.6",
+    "@mikro-orm/core": "^6.6.6",
+    "@mikro-orm/knex": "^6.6.6",
     "@orpc/client": "^1.13.4",
     "@orpc/contract": "^1.13.4",
     "@orpc/openapi-client": "^1.13.4",
-    "@sinclair/typebox": "^0.34.47",
+    "@orpc/server": "^1.13.4",
+    "@sinclair/typebox": "^0.34.48",
     "@sinclair/typebox-codegen": "^0.11.1",
     "@types/argon2-browser": "^1.18.4",
     "@types/bcrypt": "^6.0.0",
+    "@types/better-sqlite3": "^7.6.13",
     "@types/micromatch": "^4.0.10",
     "@types/mime-types": "^3.0.1",
     "ajv-formats": "^3.0.1",
@@ -137,9 +154,11 @@
     "emittery": "^1.2.0",
     "micromatch": "^4.0.8",
     "mime-types": "^3.0.2",
+    "minio": "^8.0.6",
     "pathe": "^2.0.3",
-    "s3mini": "^0.8.1",
-    "zod": "^4.3.5"
+    "s3mini": "^0.9.1",
+    "webdav": "^5.8.0",
+    "zod": "^4.3.6"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/ai/qwen3vl/utils.ts

@@ -2,7 +2,7 @@
 type Bbox2d = [number, number, number, number];
 type Dimensions = { width: number; height: number };
 // x_center, y_center, z_center, x_size, y_size, z_size, roll, pitch, yaw
-type Bbox3d = [number, number, number, number, number, number, number, number, number];
+type _Bbox3d = [number, number, number, number, number, number, number, number, number];
 /**
  * Convert Qwen3V format bbox (0-1000 range) to absolute pixel coordinates
  * @param dimensions Image dimensions {width, height}

package/src/cn/ChineseResidentIdNo.ts

@@ -32,7 +32,7 @@ export function parseChineseResidentIdNo(idNo: string): ParsedChineseResidentIdN
 		addressCode: division,
 		birthDate: `${year}-${month}-${day}`,
 		sequence: seq,
-		checkDigit: checkDigit.toUpperCase() === 'X' ? 10 : parseInt(checkDigit),
+		checkDigit: checkDigit.toUpperCase() === 'X' ? 10 : parseInt(checkDigit, 10),
 		sex: seq % 2 === 0 ? SexType.Male : SexType.Female,
 		age: new Date().getFullYear() - parseInt(year, 10),
 		valid: Mod11.validate(idNo),

package/src/cn/Mod11.ts

@@ -12,7 +12,7 @@ export class Mod11Checksum {
 		const { weights } = this;
 		let sum = 0;
 		for (let i = 0; i < s.length; i++) {
-			sum += parseInt(s[i]) * weights[i];
+			sum += parseInt(s[i], 10) * weights[i];
 		}
 		const num = (12 - (sum % 11)) % 11;
 		if (num < 10) {

package/src/cn/__snapshots__/ChineseResidentIdNo.test.ts.snap

@@ -3,7 +3,7 @@
 exports[`ChineseResidentIdNo > should parse 1`] = `
 {
   "addressCode": "110105",
-  "age": 76,
+  "age": 77,
   "birthDate": "1949-12-31",
   "checkDigit": 10,
   "raw": "11010519491231002X",

package/src/cn/__snapshots__/UnifiedSocialCreditCode.test.ts.snap

@@ -45,26 +45,3 @@ exports[`UnifiedSocialCreditCode > should parse 2`] = `
   "valid": true,
 }
 `;
-
-exports[`UnifiedSocialCreditCode > should parse 3`] = `
-{
-  "adminDivisionCode": "310120",
-  "checkDigit": "0",
-  "codes": [
-    "9",
-    "1",
-    "310120",
-    "MAEXK9GG9",
-    "0",
-  ],
-  "entityCategoryCode": "1",
-  "names": [
-    "工商",
-    "企业",
-  ],
-  "organizationCode": "MAEXK9GG9",
-  "raw": "91310120MAEXK9GG90",
-  "registrationAuthorityCode": "9",
-  "valid": false,
-}
-`;

package/src/cn/parseChineseNumber.test.ts

@@ -36,7 +36,7 @@ test('parseChineseNumber', () => {
 
 function formatChineseNumber(v: number): string {
 	if (v < 0) {
-		return '负' + formatChineseNumber(-v);
+		return `负${formatChineseNumber(-v)}`;
 	}
 
 	// 数字对应的中文表示
@@ -88,7 +88,7 @@ function formatChineseNumber(v: number): string {
 export function formatChineseAmount0(amount: number): string {
 	// 检查金额是否合理
 	if (amount < 0) {
-		return '(负)' + formatChineseAmount0(-amount);
+		return `(负)${formatChineseAmount0(-amount)}`;
 	}
 	// 大写数字和单位
 	const digits = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
@@ -111,10 +111,10 @@ export function formatChineseAmount0(amount: number): string {
 	integerAmount = Math.floor(integerAmount / 100); // 转为元为单位
 
 	if (fen > 0) {
-		result = digits[fen] + '分' + result;
+		result = `${digits[fen]}分${result}`;
 	}
 	if (jiao > 0) {
-		result = digits[jiao] + '角' + result;
+		result = `${digits[jiao]}角${result}`;
 	}
 	if (cents === 0) {
 		result += '整';

package/src/consola/formatLogObject.ts

@@ -90,7 +90,7 @@ export function formatLogObject(
 		}
 
 		if (type === 'trace') {
-			const _err = new Error('Trace: ' + o.message);
+			const _err = new Error(`Trace: ${o.message}`);
 			line += formatStack(_err.stack || '', _err.message);
 		}
 	}
@@ -139,11 +139,11 @@ function parseStack(stack: string, message: string) {
 function formatStack(stack: string, message: string, opts?: FormatOptions) {
 	const indent = '  '.repeat((opts?.errorLevel || 0) + 1);
 	return (
-		`\n${indent}`
-		+ parseStack(stack, message)
+		`\n${indent}` +
+		parseStack(stack, message)
 			.map(
 				(line) =>
-					'  ' + line.replace(/^at +/, (m) => colors.gray(m)).replace(/\((.+)\)/, (_, m) => `(${colors.cyan(m)})`),
+					`  ${line.replace(/^at +/, (m) => colors.gray(m)).replace(/\((.+)\)/, (_, m) => `(${colors.cyan(m)})`)}`,
 			)
 			.join(`\n${indent}`)
 	);
@@ -201,7 +201,7 @@ function formatError(err: any, opts: FormatOptions): string {
 
 	const level = opts?.errorLevel || 0;
 	const causedPrefix = level > 0 ? `${'  '.repeat(level)}[cause]: ` : '';
-	const causedError = err.cause ? '\n\n' + formatError(err.cause, { ...opts, errorLevel: level + 1 }) : '';
+	const causedError = err.cause ? `\n\n${formatError(err.cause, { ...opts, errorLevel: level + 1 })}` : '';
 
-	return causedPrefix + message + '\n' + stack + causedError;
+	return `${causedPrefix + message}\n${stack}${causedError}`;
 }

package/src/data/maybeNumber.ts

@@ -20,7 +20,7 @@ export function maybeNumber(v: MaybeNumber) {
 			}
 	}
 	const n = Number(v);
-	if (isNaN(n)) {
+	if (Number.isNaN(n)) {
 		return undefined;
 	}
 	return n;

package/src/data/parseSort.test.ts

@@ -1,5 +1,4 @@
 import { describe, expect, test } from 'vitest';
-import { formatSort } from './formatSort';
 import { parseSort } from './parseSort';
 
 describe('parseSort', () => {

package/src/data/types.d.ts

@@ -25,14 +25,14 @@ export type ListQueryInput = {
 	deleted?: boolean;
 };
 
-type ListResult<T = any> = {
+type _ListResult<T = any> = {
 	/** List of items */
 	data: T[];
 	/** Total number of items */
 	total: number;
 };
 
-type PageInfo = {
+type _PageInfo = {
 	/** Whether there are more items */
 	hasNextPage: boolean;
 	/** Whether there are previous items */

package/src/dayjs/formatDuration.ts

@@ -1,5 +1,5 @@
-import { type OpUnitType, type UnitTypeLongPlural } from 'dayjs';
-import { type Duration } from 'dayjs/plugin/duration';
+import type { OpUnitType, UnitTypeLongPlural } from 'dayjs';
+import type { Duration } from 'dayjs/plugin/duration';
 import { parseDuration } from './parseDuration';
 
 type FormatDurationOptions = {

package/src/dayjs/resolveRelativeTime.ts

@@ -1,3 +1,4 @@
+import { parseDate, type MaybeDate } from '@wener/utils';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import quarterOfYear from 'dayjs/plugin/quarterOfYear';
@@ -75,26 +76,22 @@ dayjs.extend(weekOfYear);
  * resolveRelativeTime('now\\d', refDate);  // End of reference day
  * ```
  */
-export function resolveRelativeTime(s: string | Date | number, now?: Date | undefined): Date {
+export function resolveRelativeTime(s: string | Date | number, now?: Date | undefined): Date;
+export function resolveRelativeTime(s: MaybeDate, now?: Date | undefined): Date | undefined;
+export function resolveRelativeTime(s: MaybeDate, now?: Date | undefined): Date | undefined {
 	{
-		let out: Date | undefined;
-		if (!s) {
-		} else if (s instanceof Date) {
-			out = s;
-		} else if (typeof s === 'number') {
-			out = new Date(s);
-		} else if (!s.startsWith('now')) {
-			out = new Date(s);
-		}
+		let out = parseDate(s);
 		if (out) {
-			if (isNaN(out.getTime())) {
-				throw new Error(`Invalid date: ${s}`);
-			}
 			return out;
 		}
+		if (s == null) {
+			return;
+		}
 	}
 
-	if (typeof s !== 'string' || !s.startsWith('now')) {
+	if (typeof s === 'string' && s.startsWith('now')) {
+		// valid
+	} else {
 		throw new Error(`Invalid relative time format: ${s}`);
 	}