@hy_ong/zod-kit 0.1.1 → 0.1.3

package/dist/index.cjs

@@ -1291,35 +1291,31 @@ var validateIdType = (value, type) => {
   return pattern ? pattern.test(value) : false;
 };
 function id(required, options) {
-  const {
-    type = "auto",
-    minLength,
-    maxLength,
-    allowedTypes,
-    customRegex,
-    includes,
-    excludes,
-    startsWith,
-    endsWith,
-    caseSensitive = true,
-    transform,
-    defaultValue,
-    i18n
-  } = options ?? {};
+  const { type = "auto", minLength, maxLength, allowedTypes, customRegex, includes, excludes, startsWith, endsWith, caseSensitive = true, transform, defaultValue, i18n } = options ?? {};
   const isRequired = required ?? false;
-  const actualDefaultValue = defaultValue ?? (isRequired ? "" : null);
+  const isNumericType = type === "numeric";
+  const actualDefaultValue = defaultValue !== void 0 ? defaultValue : isRequired ? isNumericType ? NaN : "" : null;
   const getMessage = (key, params) => {
     if (i18n) {
       const currentLocale2 = getLocale();
       const customMessages = i18n[currentLocale2];
       if (customMessages && customMessages[key]) {
         const template = customMessages[key];
-        return template.replace(/\$\{(\w+)}/g, (_, k) => params?.[k] ?? "");
+        return template.replace(/\$\{(\w+)}/g, (_match, k) => params?.[k] ?? "");
       }
     }
     return t(`common.id.${key}`, params);
   };
-  const preprocessFn = (val) => {
+  const preprocessNumericFn = (val) => {
+    if (val === "" || val === null || val === void 0) {
+      if (isRequired && defaultValue === void 0) {
+        return void 0;
+      }
+      return actualDefaultValue;
+    }
+    return Number(val);
+  };
+  const preprocessStringFn = (val) => {
     if (val === "" || val === null || val === void 0) {
       return actualDefaultValue;
     }
@@ -1329,7 +1325,30 @@ function id(required, options) {
     }
     return processed;
   };
-  const baseSchema = isRequired ? import_zod6.z.preprocess(preprocessFn, import_zod6.z.string()) : import_zod6.z.preprocess(preprocessFn, import_zod6.z.string().nullable());
+  if (isNumericType) {
+    const numericSchema = import_zod6.z.preprocess(preprocessNumericFn, import_zod6.z.any()).refine((val) => {
+      if (!isRequired && val === null) return true;
+      if (val === void 0 || isRequired && val === null) {
+        throw new import_zod6.z.ZodError([{ code: "custom", message: getMessage("required"), path: [] }]);
+      }
+      if (typeof val !== "number" || isNaN(val)) {
+        throw new import_zod6.z.ZodError([{ code: "custom", message: getMessage("numeric"), path: [] }]);
+      }
+      const strVal = String(val);
+      if (!ID_PATTERNS.numeric.test(strVal)) {
+        throw new import_zod6.z.ZodError([{ code: "custom", message: getMessage("numeric"), path: [] }]);
+      }
+      if (minLength !== void 0 && strVal.length < minLength) {
+        throw new import_zod6.z.ZodError([{ code: "custom", message: getMessage("minLength", { minLength }), path: [] }]);
+      }
+      if (maxLength !== void 0 && strVal.length > maxLength) {
+        throw new import_zod6.z.ZodError([{ code: "custom", message: getMessage("maxLength", { maxLength }), path: [] }]);
+      }
+      return true;
+    });
+    return numericSchema;
+  }
+  const baseSchema = isRequired ? import_zod6.z.preprocess(preprocessStringFn, import_zod6.z.string()) : import_zod6.z.preprocess(preprocessStringFn, import_zod6.z.string().nullable());
   const schema = baseSchema.refine((val) => {
     if (val === null) return true;
     if (isRequired && (val === "" || val === "null" || val === "undefined")) {
@@ -1355,7 +1374,7 @@ function id(required, options) {
           const typeNames = allowedTypes.join(", ");
           throw new import_zod6.z.ZodError([{ code: "custom", message: getMessage("invalid") + ` (allowed types: ${typeNames})`, path: [] }]);
         }
-      } else if (type !== "auto") {
+      } else if (type && type !== "auto") {
         isValidId = validateIdType(val, type);
         if (!isValidId) {
           throw new import_zod6.z.ZodError([{ code: "custom", message: getMessage(type) || getMessage("invalid"), path: [] }]);
@@ -1366,7 +1385,7 @@ function id(required, options) {
           throw new import_zod6.z.ZodError([{ code: "custom", message: getMessage("invalid"), path: [] }]);
         }
       }
-    } else if (val !== null && hasContentValidations && type !== "auto" && !customRegex) {
+    } else if (val !== null && hasContentValidations && type && type !== "auto" && !customRegex) {
       if (allowedTypes && allowedTypes.length > 0) {
         const isValidType = allowedTypes.some((allowedType) => validateIdType(val, allowedType));
         if (!isValidType) {

package/dist/index.d.cts

@@ -978,10 +978,11 @@ type IdType = "numeric" | "uuid" | "objectId" | "nanoid" | "snowflake" | "cuid"
  * Configuration options for ID validation
  *
  * @template IsRequired - Whether the field is required (affects return type)
+ * @template Type - The ID type being validated
  *
  * @interface IdOptions
  * @property {IsRequired} [required=true] - Whether the field is required
- * @property {IdType} [type="auto"] - Expected ID type or auto-detection
+ * @property {Type} [type="auto"] - Expected ID type or auto-detection
  * @property {number} [minLength] - Minimum length of ID
  * @property {number} [maxLength] - Maximum length of ID
  * @property {IdType[]} [allowedTypes] - Multiple allowed ID types (overrides type)
@@ -992,11 +993,11 @@ type IdType = "numeric" | "uuid" | "objectId" | "nanoid" | "snowflake" | "cuid"
  * @property {string} [endsWith] - String that ID must end with
  * @property {boolean} [caseSensitive=true] - Whether validation is case-sensitive
  * @property {Function} [transform] - Custom transformation function for ID
- * @property {string | null} [defaultValue] - Default value when input is empty
+ * @property {any} [defaultValue] - Default value when input is empty (string for string types, number for numeric)
  * @property {Record<Locale, IdMessages>} [i18n] - Custom error messages for different locales
  */
-type IdOptions<IsRequired extends boolean = true> = {
-    type?: IdType;
+type IdOptions<Type extends IdType | undefined = undefined> = {
+    type?: Type;
     minLength?: number;
     maxLength?: number;
     allowedTypes?: IdType[];
@@ -1007,17 +1008,20 @@ type IdOptions<IsRequired extends boolean = true> = {
     endsWith?: string;
     caseSensitive?: boolean;
     transform?: (value: string) => string;
-    defaultValue?: IsRequired extends true ? string : string | null;
+    defaultValue?: any;
     i18n?: Record<Locale, IdMessages>;
 };
 /**
- * Type alias for ID validation schema based on required flag
+ * Type alias for ID validation schema based on required flag and ID type
  *
  * @template IsRequired - Whether the field is required
+ * @template IdType - The ID type being validated
  * @typedef IdSchema
- * @description Returns ZodString if required, ZodNullable<ZodString> if optional
+ * @description Returns appropriate Zod type based on required flag and ID type:
+ * - numeric type: ZodNumber or ZodNullable<ZodNumber>
+ * - other types: ZodString or ZodNullable<ZodString>
  */
-type IdSchema<IsRequired extends boolean> = IsRequired extends true ? ZodString : ZodNullable<ZodString>;
+type IdSchema<IsRequired extends boolean, Type extends IdType | undefined = undefined> = Type extends "numeric" ? IsRequired extends true ? ZodNumber : ZodNullable<ZodNumber> : IsRequired extends true ? ZodString : ZodNullable<ZodString>;
 /**
  * Regular expression patterns for different ID formats
  *
@@ -1079,9 +1083,9 @@ declare const validateIdType: (value: string, type: IdType) => boolean;
  * Creates a Zod schema for ID validation with comprehensive format support
  *
  * @template IsRequired - Whether the field is required (affects return type)
+ * @template Type - The ID type being validated (affects return type for numeric)
  * @param {IsRequired} [required=false] - Whether the field is required
- * @param {Omit<ValidatorOptions<IsRequired>, 'required'>} [options] - Configuration options for validation
- * @returns {IdSchema<IsRequired>} Zod schema for ID validation
+ * @returns {IdSchema<IsRequired, Type>} Zod schema for ID validation
  *
  * @description
  * Creates a comprehensive ID validator with support for multiple ID formats,
@@ -1149,7 +1153,16 @@ declare const validateIdType: (value: string, type: IdType) => boolean;
  * @see {@link detectIdType} for auto-detection logic
  * @see {@link validateIdType} for type-specific validation
  */
-declare function id<IsRequired extends boolean = false>(required?: IsRequired, options?: Omit<IdOptions<IsRequired>, 'required'>): IdSchema<IsRequired>;
+declare function id<IsRequired extends boolean = false>(required?: IsRequired): IdSchema<IsRequired, undefined>;
+declare function id<IsRequired extends boolean = false>(required: IsRequired, options: Omit<IdOptions<"numeric">, "required"> & {
+    type: "numeric";
+}): IdSchema<IsRequired, "numeric">;
+declare function id<IsRequired extends boolean = false, Type extends Exclude<IdType, "numeric"> = Exclude<IdType, "numeric">>(required: IsRequired, options: Omit<IdOptions<Type>, "required"> & {
+    type: Type;
+}): IdSchema<IsRequired, Type>;
+declare function id<IsRequired extends boolean = false>(required: IsRequired, options: Omit<IdOptions, "required"> & {
+    type?: never;
+}): IdSchema<IsRequired, undefined>;
 
 /**
  * @fileoverview Number validator for Zod Kit

package/dist/index.d.ts

@@ -978,10 +978,11 @@ type IdType = "numeric" | "uuid" | "objectId" | "nanoid" | "snowflake" | "cuid"
  * Configuration options for ID validation
  *
  * @template IsRequired - Whether the field is required (affects return type)
+ * @template Type - The ID type being validated
  *
  * @interface IdOptions
  * @property {IsRequired} [required=true] - Whether the field is required
- * @property {IdType} [type="auto"] - Expected ID type or auto-detection
+ * @property {Type} [type="auto"] - Expected ID type or auto-detection
  * @property {number} [minLength] - Minimum length of ID
  * @property {number} [maxLength] - Maximum length of ID
  * @property {IdType[]} [allowedTypes] - Multiple allowed ID types (overrides type)
@@ -992,11 +993,11 @@ type IdType = "numeric" | "uuid" | "objectId" | "nanoid" | "snowflake" | "cuid"
  * @property {string} [endsWith] - String that ID must end with
  * @property {boolean} [caseSensitive=true] - Whether validation is case-sensitive
  * @property {Function} [transform] - Custom transformation function for ID
- * @property {string | null} [defaultValue] - Default value when input is empty
+ * @property {any} [defaultValue] - Default value when input is empty (string for string types, number for numeric)
  * @property {Record<Locale, IdMessages>} [i18n] - Custom error messages for different locales
  */
-type IdOptions<IsRequired extends boolean = true> = {
-    type?: IdType;
+type IdOptions<Type extends IdType | undefined = undefined> = {
+    type?: Type;
     minLength?: number;
     maxLength?: number;
     allowedTypes?: IdType[];
@@ -1007,17 +1008,20 @@ type IdOptions<IsRequired extends boolean = true> = {
     endsWith?: string;
     caseSensitive?: boolean;
     transform?: (value: string) => string;
-    defaultValue?: IsRequired extends true ? string : string | null;
+    defaultValue?: any;
     i18n?: Record<Locale, IdMessages>;
 };
 /**
- * Type alias for ID validation schema based on required flag
+ * Type alias for ID validation schema based on required flag and ID type
  *
  * @template IsRequired - Whether the field is required
+ * @template IdType - The ID type being validated
  * @typedef IdSchema
- * @description Returns ZodString if required, ZodNullable<ZodString> if optional
+ * @description Returns appropriate Zod type based on required flag and ID type:
+ * - numeric type: ZodNumber or ZodNullable<ZodNumber>
+ * - other types: ZodString or ZodNullable<ZodString>
  */
-type IdSchema<IsRequired extends boolean> = IsRequired extends true ? ZodString : ZodNullable<ZodString>;
+type IdSchema<IsRequired extends boolean, Type extends IdType | undefined = undefined> = Type extends "numeric" ? IsRequired extends true ? ZodNumber : ZodNullable<ZodNumber> : IsRequired extends true ? ZodString : ZodNullable<ZodString>;
 /**
  * Regular expression patterns for different ID formats
  *
@@ -1079,9 +1083,9 @@ declare const validateIdType: (value: string, type: IdType) => boolean;
  * Creates a Zod schema for ID validation with comprehensive format support
  *
  * @template IsRequired - Whether the field is required (affects return type)
+ * @template Type - The ID type being validated (affects return type for numeric)
  * @param {IsRequired} [required=false] - Whether the field is required
- * @param {Omit<ValidatorOptions<IsRequired>, 'required'>} [options] - Configuration options for validation
- * @returns {IdSchema<IsRequired>} Zod schema for ID validation
+ * @returns {IdSchema<IsRequired, Type>} Zod schema for ID validation
  *
  * @description
  * Creates a comprehensive ID validator with support for multiple ID formats,
@@ -1149,7 +1153,16 @@ declare const validateIdType: (value: string, type: IdType) => boolean;
  * @see {@link detectIdType} for auto-detection logic
  * @see {@link validateIdType} for type-specific validation
  */
-declare function id<IsRequired extends boolean = false>(required?: IsRequired, options?: Omit<IdOptions<IsRequired>, 'required'>): IdSchema<IsRequired>;
+declare function id<IsRequired extends boolean = false>(required?: IsRequired): IdSchema<IsRequired, undefined>;
+declare function id<IsRequired extends boolean = false>(required: IsRequired, options: Omit<IdOptions<"numeric">, "required"> & {
+    type: "numeric";
+}): IdSchema<IsRequired, "numeric">;
+declare function id<IsRequired extends boolean = false, Type extends Exclude<IdType, "numeric"> = Exclude<IdType, "numeric">>(required: IsRequired, options: Omit<IdOptions<Type>, "required"> & {
+    type: Type;
+}): IdSchema<IsRequired, Type>;
+declare function id<IsRequired extends boolean = false>(required: IsRequired, options: Omit<IdOptions, "required"> & {
+    type?: never;
+}): IdSchema<IsRequired, undefined>;
 
 /**
  * @fileoverview Number validator for Zod Kit

package/dist/index.js

@@ -1213,35 +1213,31 @@ var validateIdType = (value, type) => {
   return pattern ? pattern.test(value) : false;
 };
 function id(required, options) {
-  const {
-    type = "auto",
-    minLength,
-    maxLength,
-    allowedTypes,
-    customRegex,
-    includes,
-    excludes,
-    startsWith,
-    endsWith,
-    caseSensitive = true,
-    transform,
-    defaultValue,
-    i18n
-  } = options ?? {};
+  const { type = "auto", minLength, maxLength, allowedTypes, customRegex, includes, excludes, startsWith, endsWith, caseSensitive = true, transform, defaultValue, i18n } = options ?? {};
   const isRequired = required ?? false;
-  const actualDefaultValue = defaultValue ?? (isRequired ? "" : null);
+  const isNumericType = type === "numeric";
+  const actualDefaultValue = defaultValue !== void 0 ? defaultValue : isRequired ? isNumericType ? NaN : "" : null;
   const getMessage = (key, params) => {
     if (i18n) {
       const currentLocale2 = getLocale();
       const customMessages = i18n[currentLocale2];
       if (customMessages && customMessages[key]) {
         const template = customMessages[key];
-        return template.replace(/\$\{(\w+)}/g, (_, k) => params?.[k] ?? "");
+        return template.replace(/\$\{(\w+)}/g, (_match, k) => params?.[k] ?? "");
       }
     }
     return t(`common.id.${key}`, params);
   };
-  const preprocessFn = (val) => {
+  const preprocessNumericFn = (val) => {
+    if (val === "" || val === null || val === void 0) {
+      if (isRequired && defaultValue === void 0) {
+        return void 0;
+      }
+      return actualDefaultValue;
+    }
+    return Number(val);
+  };
+  const preprocessStringFn = (val) => {
     if (val === "" || val === null || val === void 0) {
       return actualDefaultValue;
     }
@@ -1251,7 +1247,30 @@ function id(required, options) {
     }
     return processed;
   };
-  const baseSchema = isRequired ? z6.preprocess(preprocessFn, z6.string()) : z6.preprocess(preprocessFn, z6.string().nullable());
+  if (isNumericType) {
+    const numericSchema = z6.preprocess(preprocessNumericFn, z6.any()).refine((val) => {
+      if (!isRequired && val === null) return true;
+      if (val === void 0 || isRequired && val === null) {
+        throw new z6.ZodError([{ code: "custom", message: getMessage("required"), path: [] }]);
+      }
+      if (typeof val !== "number" || isNaN(val)) {
+        throw new z6.ZodError([{ code: "custom", message: getMessage("numeric"), path: [] }]);
+      }
+      const strVal = String(val);
+      if (!ID_PATTERNS.numeric.test(strVal)) {
+        throw new z6.ZodError([{ code: "custom", message: getMessage("numeric"), path: [] }]);
+      }
+      if (minLength !== void 0 && strVal.length < minLength) {
+        throw new z6.ZodError([{ code: "custom", message: getMessage("minLength", { minLength }), path: [] }]);
+      }
+      if (maxLength !== void 0 && strVal.length > maxLength) {
+        throw new z6.ZodError([{ code: "custom", message: getMessage("maxLength", { maxLength }), path: [] }]);
+      }
+      return true;
+    });
+    return numericSchema;
+  }
+  const baseSchema = isRequired ? z6.preprocess(preprocessStringFn, z6.string()) : z6.preprocess(preprocessStringFn, z6.string().nullable());
   const schema = baseSchema.refine((val) => {
     if (val === null) return true;
     if (isRequired && (val === "" || val === "null" || val === "undefined")) {
@@ -1277,7 +1296,7 @@ function id(required, options) {
           const typeNames = allowedTypes.join(", ");
           throw new z6.ZodError([{ code: "custom", message: getMessage("invalid") + ` (allowed types: ${typeNames})`, path: [] }]);
         }
-      } else if (type !== "auto") {
+      } else if (type && type !== "auto") {
         isValidId = validateIdType(val, type);
         if (!isValidId) {
           throw new z6.ZodError([{ code: "custom", message: getMessage(type) || getMessage("invalid"), path: [] }]);
@@ -1288,7 +1307,7 @@ function id(required, options) {
           throw new z6.ZodError([{ code: "custom", message: getMessage("invalid"), path: [] }]);
         }
       }
-    } else if (val !== null && hasContentValidations && type !== "auto" && !customRegex) {
+    } else if (val !== null && hasContentValidations && type && type !== "auto" && !customRegex) {
       if (allowedTypes && allowedTypes.length > 0) {
         const isValidType = allowedTypes.some((allowedType) => validateIdType(val, allowedType));
         if (!isValidType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hy_ong/zod-kit",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "A comprehensive TypeScript library providing pre-built Zod validation schemas with full internationalization support for common data types and Taiwan-specific formats",
   "keywords": [
     "zod",

package/src/validators/common/date.ts

@@ -238,38 +238,44 @@ export function date<IsRequired extends boolean = false>(required?: IsRequired,
 
   const baseSchema = isRequired ? z.preprocess(preprocessFn, z.string()) : z.preprocess(preprocessFn, z.string().nullable())
 
-  const schema = baseSchema.refine((val) => {
-    if (val === null) return true
+  const schema = baseSchema.superRefine((val, ctx) => {
+    if (val === null) return
 
     // Required check
     if (isRequired && (val === "" || val === "null" || val === "undefined")) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("required"), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("required") })
+      return
     }
 
     // Format validation
     if (val !== null && !dayjs(val, format, true).isValid()) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("format", { format }), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("format", { format }) })
+      return
     }
 
     const dateObj = dayjs(val, format)
 
     // Range checks
     if (val !== null && min !== undefined && !dateObj.isSameOrAfter(dayjs(min, format))) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("min", { min }), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("min", { min }) })
+      return
     }
     if (val !== null && max !== undefined && !dateObj.isSameOrBefore(dayjs(max, format))) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("max", { max }), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("max", { max }) })
+      return
     }
 
     // String content checks
     if (val !== null && includes !== undefined && !val.includes(includes)) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("includes", { includes }), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("includes", { includes }) })
+      return
     }
     if (val !== null && excludes !== undefined) {
       const excludeList = Array.isArray(excludes) ? excludes : [excludes]
       for (const exclude of excludeList) {
         if (val.includes(exclude)) {
-          throw new z.ZodError([{ code: "custom", message: getMessage("excludes", { excludes: exclude }), path: [] }])
+          ctx.addIssue({ code: "custom", message: getMessage("excludes", { excludes: exclude }) })
+          return
         }
       }
     }
@@ -279,27 +285,31 @@ export function date<IsRequired extends boolean = false>(required?: IsRequired,
     const targetDate = dateObj.startOf('day')
 
     if (val !== null && mustBePast && !targetDate.isBefore(today)) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("past"), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("past") })
+      return
     }
     if (val !== null && mustBeFuture && !targetDate.isAfter(today)) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("future"), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("future") })
+      return
     }
     if (val !== null && mustBeToday && !targetDate.isSame(today)) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("today"), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("today") })
+      return
     }
     if (val !== null && mustNotBeToday && targetDate.isSame(today)) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("notToday"), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("notToday") })
+      return
     }
 
     // Weekday/weekend validations
     if (val !== null && weekdaysOnly && (dateObj.day() === 0 || dateObj.day() === 6)) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("weekday"), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("weekday") })
+      return
     }
     if (val !== null && weekendsOnly && dateObj.day() !== 0 && dateObj.day() !== 6) {
-      throw new z.ZodError([{ code: "custom", message: getMessage("weekend"), path: [] }])
+      ctx.addIssue({ code: "custom", message: getMessage("weekend") })
+      return
     }
-
-    return true
   })
 
   return schema as unknown as DateSchema<IsRequired>