@wener/common 2.0.5 → 2.0.6

package/lib/schema/createSchemaData.js

@@ -1,74 +1,120 @@
-import { match, P } from "ts-pattern";
-import { toJsonSchema } from "./toJsonSchema.js";
+import { match, P } from 'ts-pattern';
+import { toJsonSchema } from './toJsonSchema.js';
 export function createSchemaData(ts, options = {}) {
-    const schema = toJsonSchema(ts);
-    return createJsonSchemaData(schema, options);
+	const schema = toJsonSchema(ts);
+	return createJsonSchemaData(schema, options);
 }
 function createJsonSchemaData(schema, options) {
-    let skip = (s, ctx) => Boolean(!ctx.required && s.nullable);
-    if (options.all) {
-        skip = () => false;
-    }
-    if (options.skip) {
-        skip = options.skip;
-    }
-    return _create(schema, {
-        skip
-    }, {
-        required: false
-    });
+	let skip = (s, ctx) => Boolean(!ctx.required && s.nullable);
+	if (options.all) {
+		skip = () => false;
+	}
+	if (options.skip) {
+		skip = options.skip;
+	}
+	return _create(
+		schema,
+		{
+			skip,
+		},
+		{
+			required: false,
+		},
+	);
 }
 function _create(schema, options, ctx) {
-    const { skip } = options;
-    if (skip(schema, ctx)) {
-        return schema.default;
-    }
-    if (schema.default !== undefined) {
-        return schema.default;
-    }
-    return match(schema).returnType().with({
-        default: P.select()
-    }, (v) => v).with({
-        const: P.nonNullable
-    }, (v) => v.const).with({
-        anyOf: P.nonNullable
-    }, (schema) => {
-        return _create(schema.anyOf[0], options, {
-            required: false
-        });
-    }).with({
-        oneOf: P.nonNullable
-    }, (schema) => {
-        return _create(schema.oneOf[0], options, {
-            required: false
-        });
-    }).with({
-        type: "string"
-    }, (_schema) => "").with({
-        type: P.union("number", "integer")
-    }, (_schema) => 0).with({
-        type: "object"
-    }, () => {
-        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"
-    }, () => null).with({
-        type: "boolean"
-    }, (_schema) => false).with({
-        type: "array"
-    }, (_schema) => []).otherwise(() => {
-        return undefined;
-    });
+	const { skip } = options;
+	if (skip(schema, ctx)) {
+		return schema.default;
+	}
+	if (schema.default !== undefined) {
+		return schema.default;
+	}
+	return match(schema)
+		.returnType()
+		.with(
+			{
+				default: P.select(),
+			},
+			(v) => v,
+		)
+		.with(
+			{
+				const: P.nonNullable,
+			},
+			(v) => v.const,
+		)
+		.with(
+			{
+				anyOf: P.nonNullable,
+			},
+			(schema) => {
+				return _create(schema.anyOf[0], options, {
+					required: false,
+				});
+			},
+		)
+		.with(
+			{
+				oneOf: P.nonNullable,
+			},
+			(schema) => {
+				return _create(schema.oneOf[0], options, {
+					required: false,
+				});
+			},
+		)
+		.with(
+			{
+				type: 'string',
+			},
+			(_schema) => '',
+		)
+		.with(
+			{
+				type: P.union('number', 'integer'),
+			},
+			(_schema) => 0,
+		)
+		.with(
+			{
+				type: 'object',
+			},
+			() => {
+				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',
+			},
+			() => null,
+		)
+		.with(
+			{
+				type: 'boolean',
+			},
+			(_schema) => false,
+		)
+		.with(
+			{
+				type: 'array',
+			},
+			(_schema) => [],
+		)
+		.otherwise(() => {
+			return undefined;
+		});
 }
 //# sourceMappingURL=createSchemaData.js.map

package/lib/schema/findJsonSchemaByPath.js

@@ -1,26 +1,31 @@
-import { firstOfMaybeArray } from "@wener/utils";
-import { toJsonSchema } from "./toJsonSchema.js";
+import { firstOfMaybeArray } from '@wener/utils';
+import { toJsonSchema } from './toJsonSchema.js';
 export function findJsonSchemaByPath(schema, objectPath) {
-    schema = toJsonSchema(schema);
-    if (!objectPath || !schema) {
-        return undefined;
-    }
-    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;
-        }
-        if (/^\d$/.test(segment) || segment === "[]") {
-            if (currentSchema.items) {
-                currentSchema = firstOfMaybeArray(currentSchema.items);
-                continue;
-            }
-        }
-        return undefined;
-    }
-    return currentSchema;
+	schema = toJsonSchema(schema);
+	if (!objectPath || !schema) {
+		return undefined;
+	}
+	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;
+		}
+		if (/^\d$/.test(segment) || segment === '[]') {
+			if (currentSchema.items) {
+				currentSchema = firstOfMaybeArray(currentSchema.items);
+				continue;
+			}
+		}
+		return undefined;
+	}
+	return currentSchema;
 }
 //# sourceMappingURL=findJsonSchemaByPath.js.map

package/lib/schema/formatZodError.js

@@ -1,138 +1,119 @@
-import { findJsonSchemaByPath } from "./findJsonSchemaByPath.js";
+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");
+	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;
-    // 处理常见的错误类型，生成更友好的消息
-    switch (issue.code) {
-        case "invalid_type":
-            {
-                const i = issue;
-                // Zod v4 doesn't have 'received' field directly, extract from message
-                const match = issue.message.match(/received (\w+)/);
-                const received = match?.[1];
-                if (received === "undefined") {
-                    message = "\u5FC5\u586B";
-                }
-                else if (received === "null") {
-                    message = "\u4E0D\u80FD\u4E3A\u7A7A";
-                }
-                else {
-                    message = issue.message || `期望类型 ${i.expected}，但收到 ${received}`;
-                }
-                break;
-            }
-        case "invalid_format":
-            {
-                const i = issue;
-                if (i.format === "email") {
-                    message = "\u8BF7\u8F93\u5165\u6709\u6548\u7684\u90AE\u7BB1\u5730\u5740";
-                }
-                else if (i.format === "url") {
-                    message = "\u8BF7\u8F93\u5165\u6709\u6548\u7684 URL";
-                }
-                else if (i.format === "uuid") {
-                    message = "\u8BF7\u8F93\u5165\u6709\u6548\u7684 UUID";
-                }
-                else if (i.format === "date") {
-                    message = "\u8BF7\u8F93\u5165\u6709\u6548\u7684\u65E5\u671F";
-                }
-                break;
-            }
-        case "too_small":
-            {
-                const i = issue;
-                if (i.origin === "string" && i.minimum === 1) {
-                    message = "\u4E0D\u80FD\u4E3A\u7A7A";
-                }
-                else if (i.origin === "string") {
-                    message = `至少需要 ${i.minimum} 个字符`;
-                }
-                else if (i.origin === "number" || i.origin === "int") {
-                    message = `至少需要 ${i.minimum}`;
-                }
-                else if (i.origin === "array") {
-                    message = `至少需要 ${i.minimum} 项`;
-                }
-                break;
-            }
-        case "too_big":
-            {
-                const i = issue;
-                if (i.origin === "string") {
-                    message = `最多 ${i.maximum} 个字符`;
-                }
-                else if (i.origin === "number" || i.origin === "int") {
-                    message = `最多 ${i.maximum}`;
-                }
-                else if (i.origin === "array") {
-                    message = `最多 ${i.maximum} 项`;
-                }
-                break;
-            }
-        case "invalid_value":
-            {
-                const i = issue;
-                if (i.values.length === 1) {
-                    // Single value means it's a literal check
-                    message = `必须是 ${String(i.values[0])}`;
-                }
-                else {
-                    message = `必须是以下值之一: ${i.values.map(String).join(", ")}`;
-                }
-                break;
-            }
-        case "unrecognized_keys":
-            {
-                const i = issue;
-                message = `不支持的字段: ${i.keys.join(", ")}`;
-                break;
-            }
-        case "invalid_union":
-            {
-                message = "\u4E0D\u7B26\u5408\u4EFB\u4F55\u5141\u8BB8\u7684\u7C7B\u578B";
-                break;
-            }
-        case "custom":
-            {
-                // 保留自定义错误消息
-                message = issue.message;
-                break;
-            }
-        default:
-            // 保留原始消息
-            message = issue.message;
-    }
-    return message;
+	let message = issue.message;
+	// 处理常见的错误类型，生成更友好的消息
+	switch (issue.code) {
+		case 'invalid_type': {
+			const i = issue;
+			// Zod v4 doesn't have 'received' field directly, extract from message
+			const match = issue.message.match(/received (\w+)/);
+			const received = match?.[1];
+			if (received === 'undefined') {
+				message = '\u5FC5\u586B';
+			} else if (received === 'null') {
+				message = '\u4E0D\u80FD\u4E3A\u7A7A';
+			} else {
+				message = issue.message || `期望类型 ${i.expected}，但收到 ${received}`;
+			}
+			break;
+		}
+		case 'invalid_format': {
+			const i = issue;
+			if (i.format === 'email') {
+				message = '\u8BF7\u8F93\u5165\u6709\u6548\u7684\u90AE\u7BB1\u5730\u5740';
+			} else if (i.format === 'url') {
+				message = '\u8BF7\u8F93\u5165\u6709\u6548\u7684 URL';
+			} else if (i.format === 'uuid') {
+				message = '\u8BF7\u8F93\u5165\u6709\u6548\u7684 UUID';
+			} else if (i.format === 'date') {
+				message = '\u8BF7\u8F93\u5165\u6709\u6548\u7684\u65E5\u671F';
+			}
+			break;
+		}
+		case 'too_small': {
+			const i = issue;
+			if (i.origin === 'string' && i.minimum === 1) {
+				message = '\u4E0D\u80FD\u4E3A\u7A7A';
+			} else if (i.origin === 'string') {
+				message = `至少需要 ${i.minimum} 个字符`;
+			} else if (i.origin === 'number' || i.origin === 'int') {
+				message = `至少需要 ${i.minimum}`;
+			} else if (i.origin === 'array') {
+				message = `至少需要 ${i.minimum} 项`;
+			}
+			break;
+		}
+		case 'too_big': {
+			const i = issue;
+			if (i.origin === 'string') {
+				message = `最多 ${i.maximum} 个字符`;
+			} else if (i.origin === 'number' || i.origin === 'int') {
+				message = `最多 ${i.maximum}`;
+			} else if (i.origin === 'array') {
+				message = `最多 ${i.maximum} 项`;
+			}
+			break;
+		}
+		case 'invalid_value': {
+			const i = issue;
+			if (i.values.length === 1) {
+				// Single value means it's a literal check
+				message = `必须是 ${String(i.values[0])}`;
+			} else {
+				message = `必须是以下值之一: ${i.values.map(String).join(', ')}`;
+			}
+			break;
+		}
+		case 'unrecognized_keys': {
+			const i = issue;
+			message = `不支持的字段: ${i.keys.join(', ')}`;
+			break;
+		}
+		case 'invalid_union': {
+			message = '\u4E0D\u7B26\u5408\u4EFB\u4F55\u5141\u8BB8\u7684\u7C7B\u578B';
+			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(".");
+	if (path.length === 0) {
+		return '\u8868\u5355';
+	}
+	return path.map(String).join('.');
 }
 //# sourceMappingURL=formatZodError.js.map