@hy_ong/zod-kit 0.2.4 → 0.2.6

package/dist/chunk-5NBWPAHC.cjs

@@ -0,0 +1,77 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+
+
+var _chunkQ7TUNJD4cjs = require('./chunk-Q7TUNJD4.cjs');
+
+// src/validators/common/one-of.ts
+var _zod = require('zod');
+function oneOf(required, options) {
+  const { values = [], defaultValue = null, caseSensitive = true, transform, i18n } = _nullishCoalesce(options, () => ( {}));
+  const isRequired = _nullishCoalesce(required, () => ( false));
+  const valuesArr = values;
+  const isAllStrings = valuesArr.every((v) => typeof v === "string");
+  const getMessage = (key, params) => {
+    if (i18n) {
+      const currentLocale = _chunkQ7TUNJD4cjs.getLocale.call(void 0, );
+      const customMessages = i18n[currentLocale];
+      if (customMessages && customMessages[key]) {
+        const template = customMessages[key];
+        return template.replace(/\$\{(\w+)}/g, (_, k) => _nullishCoalesce(_optionalChain([params, 'optionalAccess', _2 => _2[k]]), () => ( "")));
+      }
+    }
+    return _chunkQ7TUNJD4cjs.t.call(void 0, `common.oneOf.${key}`, params);
+  };
+  const isEmpty = (v) => v === "" || v === null || v === void 0;
+  let valueSchema;
+  if (isAllStrings && valuesArr.length > 0) {
+    valueSchema = _zod.z.enum(valuesArr, {
+      error: (issue) => {
+        if (isEmpty(issue.input)) return getMessage("required");
+        return getMessage("invalid", { values: valuesArr.join(", ") });
+      }
+    });
+  } else if (valuesArr.length >= 2) {
+    const literals = valuesArr.map((v) => _zod.z.literal(v));
+    valueSchema = _zod.z.union(literals, {
+      error: () => getMessage("invalid", { values: valuesArr.join(", ") })
+    });
+  } else if (valuesArr.length === 1) {
+    valueSchema = _zod.z.literal(valuesArr[0]);
+  } else {
+    valueSchema = _zod.z.never();
+  }
+  if (!caseSensitive) {
+    valueSchema = _zod.z.string().transform((v) => {
+      const match = valuesArr.find((val) => typeof val === "string" && val.toLowerCase() === v.toLowerCase());
+      return _nullishCoalesce(match, () => ( v));
+    }).pipe(valueSchema);
+  }
+  if (transform) {
+    valueSchema = valueSchema.transform((v) => transform(v));
+  }
+  const fallback = defaultValue;
+  const emptySchema = _zod.z.union([_zod.z.literal(""), _zod.z.null(), _zod.z.undefined()]).transform(() => fallback);
+  if (isRequired && fallback === null) {
+    const emptyRejectSchema = _zod.z.union([_zod.z.literal(""), _zod.z.null(), _zod.z.undefined()]).refine(() => false, { message: getMessage("required") });
+    if (!isAllStrings) {
+      const numCoerceSchema = _zod.z.string().transform((v) => {
+        const n = Number(v);
+        return isNaN(n) ? v : n;
+      }).pipe(valueSchema);
+      return _zod.z.union([valueSchema, numCoerceSchema, emptyRejectSchema]);
+    }
+    return _zod.z.union([valueSchema, emptyRejectSchema]);
+  }
+  if (!isAllStrings) {
+    const numCoerceSchema = _zod.z.string().transform((v) => {
+      const n = Number(v);
+      return isNaN(n) ? v : n;
+    }).pipe(valueSchema);
+    return _zod.z.union([valueSchema, numCoerceSchema, emptySchema]);
+  }
+  return _zod.z.union([valueSchema, emptySchema]);
+}
+
+
+
+exports.oneOf = oneOf;

package/dist/{chunk-BZWQPSHO.cjs → chunk-5U5ERV2P.cjs}

@@ -8,6 +8,7 @@ var _zod = require('zod');
 function manyOf(required, options) {
   const { values = [], defaultValue = null, min, max, allowDuplicates = false, caseSensitive = true, transform, i18n } = _nullishCoalesce(options, () => ( {}));
   const isRequired = _nullishCoalesce(required, () => ( false));
+  const valuesArr = values;
   const getMessage = (key, params) => {
     if (i18n) {
       const currentLocale = _chunkQ7TUNJD4cjs.getLocale.call(void 0, );
@@ -20,44 +21,24 @@ function manyOf(required, options) {
     return _chunkQ7TUNJD4cjs.t.call(void 0, `common.manyOf.${key}`, params);
   };
   const normalizeItem = (item) => {
-    const hasNumbers = values.some((v) => typeof v === "number");
+    const hasNumbers = valuesArr.some((v) => typeof v === "number");
     if (hasNumbers && typeof item === "string" && !isNaN(Number(item)) && item.trim() !== "") {
       const numVal = Number(item);
-      if (values.includes(numVal)) return numVal;
+      if (valuesArr.includes(numVal)) return numVal;
     }
     if (!caseSensitive && typeof item === "string") {
-      const match = values.find((v) => typeof v === "string" && v.toLowerCase() === item.toLowerCase());
+      const match = valuesArr.find((v) => typeof v === "string" && v.toLowerCase() === item.toLowerCase());
       if (match !== void 0) return match;
       return item;
     }
     return item;
   };
-  const preprocessFn = (val) => {
-    if (val === null || val === void 0 || val === "") {
-      return defaultValue;
-    }
-    if (!Array.isArray(val)) {
-      return [normalizeItem(val)];
-    }
-    return val.map(normalizeItem);
-  };
-  const baseSchema = _zod.z.preprocess(preprocessFn, _zod.z.any());
-  const schema = baseSchema.superRefine((val, ctx) => {
-    if (val === null) {
-      if (isRequired) {
-        ctx.addIssue({ code: "custom", message: getMessage("required") });
-      }
-      return;
-    }
-    if (!Array.isArray(val)) {
-      ctx.addIssue({ code: "custom", message: getMessage("invalid", { values: values.join(", ") }) });
-      return;
-    }
+  const arraySchema = _zod.z.array(_zod.z.any()).transform((arr) => arr.map(normalizeItem)).superRefine((val, ctx) => {
     for (const item of val) {
-      if (!values.includes(item)) {
+      if (!valuesArr.includes(item)) {
         ctx.addIssue({
           code: "custom",
-          message: getMessage("invalid", { values: values.join(", ") })
+          message: getMessage("invalid", { values: valuesArr.join(", ") })
         });
         return;
       }
@@ -81,10 +62,17 @@ function manyOf(required, options) {
       return;
     }
   }).transform((val) => {
-    if (val === null || !Array.isArray(val) || !transform) return val;
+    if (!transform) return val;
     return transform(val);
   });
-  return schema;
+  const singleToArray = _zod.z.union([_zod.z.string(), _zod.z.number()]).transform((v) => [normalizeItem(v)]).pipe(arraySchema);
+  const fallback = defaultValue;
+  if (isRequired && fallback === null) {
+    const emptyRejectSchema = _zod.z.union([_zod.z.literal(""), _zod.z.null(), _zod.z.undefined()]).refine(() => false, { message: getMessage("required") });
+    return _zod.z.union([arraySchema, singleToArray, emptyRejectSchema]);
+  }
+  const emptySchema = _zod.z.union([_zod.z.literal(""), _zod.z.null(), _zod.z.undefined()]).transform(() => fallback);
+  return _zod.z.union([arraySchema, singleToArray, emptySchema]);
 }
 
 

package/dist/{chunk-7X3XPK6A.js → chunk-S4OJGXWC.js}

@@ -8,6 +8,7 @@ import { z } from "zod";
 function manyOf(required, options) {
   const { values = [], defaultValue = null, min, max, allowDuplicates = false, caseSensitive = true, transform, i18n } = options ?? {};
   const isRequired = required ?? false;
+  const valuesArr = values;
   const getMessage = (key, params) => {
     if (i18n) {
       const currentLocale = getLocale();
@@ -20,44 +21,24 @@ function manyOf(required, options) {
     return t(`common.manyOf.${key}`, params);
   };
   const normalizeItem = (item) => {
-    const hasNumbers = values.some((v) => typeof v === "number");
+    const hasNumbers = valuesArr.some((v) => typeof v === "number");
     if (hasNumbers && typeof item === "string" && !isNaN(Number(item)) && item.trim() !== "") {
       const numVal = Number(item);
-      if (values.includes(numVal)) return numVal;
+      if (valuesArr.includes(numVal)) return numVal;
     }
     if (!caseSensitive && typeof item === "string") {
-      const match = values.find((v) => typeof v === "string" && v.toLowerCase() === item.toLowerCase());
+      const match = valuesArr.find((v) => typeof v === "string" && v.toLowerCase() === item.toLowerCase());
       if (match !== void 0) return match;
       return item;
     }
     return item;
   };
-  const preprocessFn = (val) => {
-    if (val === null || val === void 0 || val === "") {
-      return defaultValue;
-    }
-    if (!Array.isArray(val)) {
-      return [normalizeItem(val)];
-    }
-    return val.map(normalizeItem);
-  };
-  const baseSchema = z.preprocess(preprocessFn, z.any());
-  const schema = baseSchema.superRefine((val, ctx) => {
-    if (val === null) {
-      if (isRequired) {
-        ctx.addIssue({ code: "custom", message: getMessage("required") });
-      }
-      return;
-    }
-    if (!Array.isArray(val)) {
-      ctx.addIssue({ code: "custom", message: getMessage("invalid", { values: values.join(", ") }) });
-      return;
-    }
+  const arraySchema = z.array(z.any()).transform((arr) => arr.map(normalizeItem)).superRefine((val, ctx) => {
     for (const item of val) {
-      if (!values.includes(item)) {
+      if (!valuesArr.includes(item)) {
         ctx.addIssue({
           code: "custom",
-          message: getMessage("invalid", { values: values.join(", ") })
+          message: getMessage("invalid", { values: valuesArr.join(", ") })
         });
         return;
       }
@@ -81,10 +62,17 @@ function manyOf(required, options) {
       return;
     }
   }).transform((val) => {
-    if (val === null || !Array.isArray(val) || !transform) return val;
+    if (!transform) return val;
     return transform(val);
   });
-  return schema;
+  const singleToArray = z.union([z.string(), z.number()]).transform((v) => [normalizeItem(v)]).pipe(arraySchema);
+  const fallback = defaultValue;
+  if (isRequired && fallback === null) {
+    const emptyRejectSchema = z.union([z.literal(""), z.null(), z.undefined()]).refine(() => false, { message: getMessage("required") });
+    return z.union([arraySchema, singleToArray, emptyRejectSchema]);
+  }
+  const emptySchema = z.union([z.literal(""), z.null(), z.undefined()]).transform(() => fallback);
+  return z.union([arraySchema, singleToArray, emptySchema]);
 }
 
 export {

package/dist/chunk-YG6YHVAE.js

@@ -0,0 +1,77 @@
+import {
+  getLocale,
+  t
+} from "./chunk-POIDES2L.js";
+
+// src/validators/common/one-of.ts
+import { z } from "zod";
+function oneOf(required, options) {
+  const { values = [], defaultValue = null, caseSensitive = true, transform, i18n } = options ?? {};
+  const isRequired = required ?? false;
+  const valuesArr = values;
+  const isAllStrings = valuesArr.every((v) => typeof v === "string");
+  const getMessage = (key, params) => {
+    if (i18n) {
+      const currentLocale = getLocale();
+      const customMessages = i18n[currentLocale];
+      if (customMessages && customMessages[key]) {
+        const template = customMessages[key];
+        return template.replace(/\$\{(\w+)}/g, (_, k) => params?.[k] ?? "");
+      }
+    }
+    return t(`common.oneOf.${key}`, params);
+  };
+  const isEmpty = (v) => v === "" || v === null || v === void 0;
+  let valueSchema;
+  if (isAllStrings && valuesArr.length > 0) {
+    valueSchema = z.enum(valuesArr, {
+      error: (issue) => {
+        if (isEmpty(issue.input)) return getMessage("required");
+        return getMessage("invalid", { values: valuesArr.join(", ") });
+      }
+    });
+  } else if (valuesArr.length >= 2) {
+    const literals = valuesArr.map((v) => z.literal(v));
+    valueSchema = z.union(literals, {
+      error: () => getMessage("invalid", { values: valuesArr.join(", ") })
+    });
+  } else if (valuesArr.length === 1) {
+    valueSchema = z.literal(valuesArr[0]);
+  } else {
+    valueSchema = z.never();
+  }
+  if (!caseSensitive) {
+    valueSchema = z.string().transform((v) => {
+      const match = valuesArr.find((val) => typeof val === "string" && val.toLowerCase() === v.toLowerCase());
+      return match ?? v;
+    }).pipe(valueSchema);
+  }
+  if (transform) {
+    valueSchema = valueSchema.transform((v) => transform(v));
+  }
+  const fallback = defaultValue;
+  const emptySchema = z.union([z.literal(""), z.null(), z.undefined()]).transform(() => fallback);
+  if (isRequired && fallback === null) {
+    const emptyRejectSchema = z.union([z.literal(""), z.null(), z.undefined()]).refine(() => false, { message: getMessage("required") });
+    if (!isAllStrings) {
+      const numCoerceSchema = z.string().transform((v) => {
+        const n = Number(v);
+        return isNaN(n) ? v : n;
+      }).pipe(valueSchema);
+      return z.union([valueSchema, numCoerceSchema, emptyRejectSchema]);
+    }
+    return z.union([valueSchema, emptyRejectSchema]);
+  }
+  if (!isAllStrings) {
+    const numCoerceSchema = z.string().transform((v) => {
+      const n = Number(v);
+      return isNaN(n) ? v : n;
+    }).pipe(valueSchema);
+    return z.union([valueSchema, numCoerceSchema, emptySchema]);
+  }
+  return z.union([valueSchema, emptySchema]);
+}
+
+export {
+  oneOf
+};

package/dist/common/many-of.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkBZWQPSHOcjs = require('../chunk-BZWQPSHO.cjs');
+var _chunk5U5ERV2Pcjs = require('../chunk-5U5ERV2P.cjs');
 require('../chunk-Q7TUNJD4.cjs');
 
 
-exports.manyOf = _chunkBZWQPSHOcjs.manyOf;
+exports.manyOf = _chunk5U5ERV2Pcjs.manyOf;

package/dist/common/many-of.d.cts

@@ -7,8 +7,10 @@ import { L as Locale } from '../config-CABSSvAp.cjs';
  * Provides multi-select validation that restricts input to an array of values
  * from a predefined set, with min/max selection, duplicate control, and transformation.
  *
+ * Avoids z.preprocess() to preserve z.input types for React Hook Form compatibility.
+ *
  * @author Ong Hoe Yuan
- * @version 0.2.2
+ * @version 0.2.6
  */
 
 /**
@@ -32,11 +34,11 @@ type ManyOfMessages = {
  * Configuration options for manyOf validation
  *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values, preserving literal types
  *
  * @interface ManyOfOptions
- * @property {T[]} values - Array of allowed values
- * @property {T[] | null} [defaultValue] - Default value when input is empty
+ * @property {V} values - Array of allowed values
+ * @property {V[number][] | null} [defaultValue] - Default value when input is empty
  * @property {number} [min] - Minimum number of selections
  * @property {number} [max] - Maximum number of selections
  * @property {boolean} [allowDuplicates=false] - Whether to allow duplicate selections
@@ -58,17 +60,19 @@ type ManyOfOptions<IsRequired extends boolean = true, V extends readonly (string
  * Type alias for manyOf validation schema based on required flag
  *
  * @template IsRequired - Whether the field is required
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values
  */
-type ManyOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true ? ZodType<V[number][]> : ZodType<V[number][] | null>;
+type ManyOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true ? ZodType<V[number][], V[number][]> : ZodType<V[number][] | null, V[number][] | "" | null | undefined>;
 /**
  * Creates a Zod schema for multi-select validation that restricts values to a predefined set
  *
+ * Avoids z.preprocess() to preserve z.input types for React Hook Form compatibility.
+ *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values (string | number)
+ * @template V - The tuple type of allowed values (inferred via const type parameter)
  * @param {IsRequired} [required=false] - Whether the field is required
- * @param {ManyOfOptions<IsRequired, T>} options - Configuration options (values is required)
- * @returns {ManyOfSchema<IsRequired, T>} Zod schema for manyOf validation
+ * @param {ManyOfOptions<IsRequired, V>} options - Configuration options (values is required)
+ * @returns {ManyOfSchema<IsRequired, V>} Zod schema for manyOf validation
  *
  * @example
  * ```typescript

package/dist/common/many-of.d.ts

@@ -7,8 +7,10 @@ import { L as Locale } from '../config-CABSSvAp.js';
  * Provides multi-select validation that restricts input to an array of values
  * from a predefined set, with min/max selection, duplicate control, and transformation.
  *
+ * Avoids z.preprocess() to preserve z.input types for React Hook Form compatibility.
+ *
  * @author Ong Hoe Yuan
- * @version 0.2.2
+ * @version 0.2.6
  */
 
 /**
@@ -32,11 +34,11 @@ type ManyOfMessages = {
  * Configuration options for manyOf validation
  *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values, preserving literal types
  *
  * @interface ManyOfOptions
- * @property {T[]} values - Array of allowed values
- * @property {T[] | null} [defaultValue] - Default value when input is empty
+ * @property {V} values - Array of allowed values
+ * @property {V[number][] | null} [defaultValue] - Default value when input is empty
  * @property {number} [min] - Minimum number of selections
  * @property {number} [max] - Maximum number of selections
  * @property {boolean} [allowDuplicates=false] - Whether to allow duplicate selections
@@ -58,17 +60,19 @@ type ManyOfOptions<IsRequired extends boolean = true, V extends readonly (string
  * Type alias for manyOf validation schema based on required flag
  *
  * @template IsRequired - Whether the field is required
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values
  */
-type ManyOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true ? ZodType<V[number][]> : ZodType<V[number][] | null>;
+type ManyOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true ? ZodType<V[number][], V[number][]> : ZodType<V[number][] | null, V[number][] | "" | null | undefined>;
 /**
  * Creates a Zod schema for multi-select validation that restricts values to a predefined set
  *
+ * Avoids z.preprocess() to preserve z.input types for React Hook Form compatibility.
+ *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values (string | number)
+ * @template V - The tuple type of allowed values (inferred via const type parameter)
  * @param {IsRequired} [required=false] - Whether the field is required
- * @param {ManyOfOptions<IsRequired, T>} options - Configuration options (values is required)
- * @returns {ManyOfSchema<IsRequired, T>} Zod schema for manyOf validation
+ * @param {ManyOfOptions<IsRequired, V>} options - Configuration options (values is required)
+ * @returns {ManyOfSchema<IsRequired, V>} Zod schema for manyOf validation
  *
  * @example
  * ```typescript

package/dist/common/many-of.js

@@ -1,6 +1,6 @@
 import {
   manyOf
-} from "../chunk-7X3XPK6A.js";
+} from "../chunk-S4OJGXWC.js";
 import "../chunk-POIDES2L.js";
 export {
   manyOf

package/dist/common/one-of.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkFMPHW7IDcjs = require('../chunk-FMPHW7ID.cjs');
+var _chunk5NBWPAHCcjs = require('../chunk-5NBWPAHC.cjs');
 require('../chunk-Q7TUNJD4.cjs');
 
 
-exports.oneOf = _chunkFMPHW7IDcjs.oneOf;
+exports.oneOf = _chunk5NBWPAHCcjs.oneOf;

package/dist/common/one-of.d.cts

@@ -7,8 +7,11 @@ import { L as Locale } from '../config-CABSSvAp.cjs';
  * Provides single-select validation that restricts input to a predefined set of allowed values,
  * with support for case-insensitive matching, default values, and transformation.
  *
+ * When required=true, z.input is narrowed to V[number] (no empty/null/undefined),
+ * making it fully compatible with React Hook Form resolvers and type-aware form libraries.
+ *
  * @author Ong Hoe Yuan
- * @version 0.2.2
+ * @version 0.2.6
  */
 
 /**
@@ -26,11 +29,11 @@ type OneOfMessages = {
  * Configuration options for oneOf validation
  *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values, preserving literal types
  *
  * @interface OneOfOptions
- * @property {T[]} values - Array of allowed values
- * @property {T | null} [defaultValue] - Default value when input is empty
+ * @property {V} values - Array of allowed values
+ * @property {V[number] | null} [defaultValue] - Default value when input is empty
  * @property {boolean} [caseSensitive=true] - Whether string matching is case-sensitive
  * @property {Function} [transform] - Custom transformation function applied after validation
  * @property {Record<Locale, OneOfMessages>} [i18n] - Custom error messages for different locales
@@ -46,17 +49,20 @@ type OneOfOptions<IsRequired extends boolean = true, V extends readonly (string
  * Type alias for oneOf validation schema based on required flag
  *
  * @template IsRequired - Whether the field is required
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values
  */
-type OneOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true ? ZodType<V[number]> : ZodType<V[number] | null>;
+type OneOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true ? ZodType<V[number], V[number]> : ZodType<V[number] | null, V[number] | "" | null | undefined>;
 /**
  * Creates a Zod schema for single-select validation that restricts values to a predefined set
  *
+ * When required=true, z.input is narrowed to V[number] only (no empty/null/undefined),
+ * ensuring full compatibility with React Hook Form and other type-aware form libraries.
+ *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values (string | number)
+ * @template V - The tuple type of allowed values (inferred via const type parameter)
  * @param {IsRequired} [required=false] - Whether the field is required
- * @param {OneOfOptions<IsRequired, T>} options - Configuration options (values is required)
- * @returns {OneOfSchema<IsRequired, T>} Zod schema for oneOf validation
+ * @param {OneOfOptions<IsRequired, V>} options - Configuration options (values is required)
+ * @returns {OneOfSchema<IsRequired, V>} Zod schema for oneOf validation
  *
  * @example
  * ```typescript
@@ -65,7 +71,7 @@ type OneOfSchema<IsRequired extends boolean, V extends readonly (string | number
  * roleSchema.parse("admin") // ✓ "admin"
  * roleSchema.parse(null)    // ✓ null
  *
- * // Required
+ * // Required — z.input and z.output are both "active" | "inactive" | "pending"
  * const statusSchema = oneOf(true, { values: ["active", "inactive", "pending"] })
  * statusSchema.parse("active") // ✓ "active"
  * statusSchema.parse(null)     // ✗ Required

package/dist/common/one-of.d.ts

@@ -7,8 +7,11 @@ import { L as Locale } from '../config-CABSSvAp.js';
  * Provides single-select validation that restricts input to a predefined set of allowed values,
  * with support for case-insensitive matching, default values, and transformation.
  *
+ * When required=true, z.input is narrowed to V[number] (no empty/null/undefined),
+ * making it fully compatible with React Hook Form resolvers and type-aware form libraries.
+ *
  * @author Ong Hoe Yuan
- * @version 0.2.2
+ * @version 0.2.6
  */
 
 /**
@@ -26,11 +29,11 @@ type OneOfMessages = {
  * Configuration options for oneOf validation
  *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values, preserving literal types
  *
  * @interface OneOfOptions
- * @property {T[]} values - Array of allowed values
- * @property {T | null} [defaultValue] - Default value when input is empty
+ * @property {V} values - Array of allowed values
+ * @property {V[number] | null} [defaultValue] - Default value when input is empty
  * @property {boolean} [caseSensitive=true] - Whether string matching is case-sensitive
  * @property {Function} [transform] - Custom transformation function applied after validation
  * @property {Record<Locale, OneOfMessages>} [i18n] - Custom error messages for different locales
@@ -46,17 +49,20 @@ type OneOfOptions<IsRequired extends boolean = true, V extends readonly (string
  * Type alias for oneOf validation schema based on required flag
  *
  * @template IsRequired - Whether the field is required
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values
  */
-type OneOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true ? ZodType<V[number]> : ZodType<V[number] | null>;
+type OneOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true ? ZodType<V[number], V[number]> : ZodType<V[number] | null, V[number] | "" | null | undefined>;
 /**
  * Creates a Zod schema for single-select validation that restricts values to a predefined set
  *
+ * When required=true, z.input is narrowed to V[number] only (no empty/null/undefined),
+ * ensuring full compatibility with React Hook Form and other type-aware form libraries.
+ *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values (string | number)
+ * @template V - The tuple type of allowed values (inferred via const type parameter)
  * @param {IsRequired} [required=false] - Whether the field is required
- * @param {OneOfOptions<IsRequired, T>} options - Configuration options (values is required)
- * @returns {OneOfSchema<IsRequired, T>} Zod schema for oneOf validation
+ * @param {OneOfOptions<IsRequired, V>} options - Configuration options (values is required)
+ * @returns {OneOfSchema<IsRequired, V>} Zod schema for oneOf validation
  *
  * @example
  * ```typescript
@@ -65,7 +71,7 @@ type OneOfSchema<IsRequired extends boolean, V extends readonly (string | number
  * roleSchema.parse("admin") // ✓ "admin"
  * roleSchema.parse(null)    // ✓ null
  *
- * // Required
+ * // Required — z.input and z.output are both "active" | "inactive" | "pending"
  * const statusSchema = oneOf(true, { values: ["active", "inactive", "pending"] })
  * statusSchema.parse("active") // ✓ "active"
  * statusSchema.parse(null)     // ✗ Required

package/dist/common/one-of.js

@@ -1,6 +1,6 @@
 import {
   oneOf
-} from "../chunk-3ZF5JO3F.js";
+} from "../chunk-YG6YHVAE.js";
 import "../chunk-POIDES2L.js";
 export {
   oneOf

package/dist/index.cjs

@@ -60,7 +60,7 @@ var _chunkBZSPJJYTcjs = require('./chunk-BZSPJJYT.cjs');
 var _chunkG747FHUZcjs = require('./chunk-G747FHUZ.cjs');
 
 
-var _chunkFMPHW7IDcjs = require('./chunk-FMPHW7ID.cjs');
+var _chunk5NBWPAHCcjs = require('./chunk-5NBWPAHC.cjs');
 
 
 var _chunkQ24GYUTOcjs = require('./chunk-Q24GYUTO.cjs');
@@ -114,7 +114,7 @@ var _chunkKIUO2HIRcjs = require('./chunk-KIUO2HIR.cjs');
 var _chunkJZEF5Q3Wcjs = require('./chunk-JZEF5Q3W.cjs');
 
 
-var _chunkBZWQPSHOcjs = require('./chunk-BZWQPSHO.cjs');
+var _chunk5U5ERV2Pcjs = require('./chunk-5U5ERV2P.cjs');
 
 
 
@@ -185,4 +185,4 @@ var _chunkQ7TUNJD4cjs = require('./chunk-Q7TUNJD4.cjs');
 
 
 
-exports.DATETIME_PATTERNS = _chunk53EEWALQcjs.DATETIME_PATTERNS; exports.ID_PATTERNS = _chunkJZEF5Q3Wcjs.ID_PATTERNS; exports.TAIWAN_BANK_CODES = _chunkQQWX3ICKcjs.TAIWAN_BANK_CODES; exports.TIME_PATTERNS = _chunkEDTNS2XLcjs.TIME_PATTERNS; exports.VALID_3_DIGIT_PREFIXES = _chunkFP4O2ICMcjs.VALID_3_DIGIT_PREFIXES; exports.boolean = _chunkLNWEJED7cjs.boolean; exports.color = _chunkA2GAEU4Ocjs.color; exports.coordinate = _chunkFEL432I2cjs.coordinate; exports.creditCard = _chunkZCX22PY4cjs.creditCard; exports.date = _chunk4AQB4RSUcjs.date; exports.datetime = _chunk53EEWALQcjs.datetime; exports.detectCardType = _chunkZCX22PY4cjs.detectCardType; exports.detectIdType = _chunkJZEF5Q3Wcjs.detectIdType; exports.email = _chunkH25N5GP6cjs.email; exports.file = _chunkKIUO2HIRcjs.file; exports.getLocale = _chunkQ7TUNJD4cjs.getLocale; exports.id = _chunkJZEF5Q3Wcjs.id; exports.ip = _chunkLXFRQLH4cjs.ip; exports.manyOf = _chunkBZWQPSHOcjs.manyOf; exports.normalizeDateTimeValue = _chunk53EEWALQcjs.normalizeDateTimeValue; exports.normalizeTime = _chunkEDTNS2XLcjs.normalizeTime; exports.number = _chunkG747FHUZcjs.number; exports.oneOf = _chunkFMPHW7IDcjs.oneOf; exports.parseDateTimeValue = _chunk53EEWALQcjs.parseDateTimeValue; exports.parseTimeToMinutes = _chunkEDTNS2XLcjs.parseTimeToMinutes; exports.password = _chunkQ24GYUTOcjs.password; exports.setLocale = _chunkQ7TUNJD4cjs.setLocale; exports.text = _chunkHZ2WESSLcjs.text; exports.time = _chunkEDTNS2XLcjs.time; exports.twBankAccount = _chunkQQWX3ICKcjs.twBankAccount; exports.twBusinessId = _chunkIWR3H7IHcjs.twBusinessId; exports.twFax = _chunkBZSPJJYTcjs.twFax; exports.twInvoice = _chunkV2KKGSKQcjs.twInvoice; exports.twLicensePlate = _chunkTPXRQT2Hcjs.twLicensePlate; exports.twMobile = _chunkAYCXAJRAcjs.twMobile; exports.twNationalId = _chunkUCPKW43Kcjs.twNationalId; exports.twPassport = _chunk5ZMTAI4Gcjs.twPassport; exports.twPostalCode = _chunkFP4O2ICMcjs.twPostalCode; exports.twTel = _chunkVKBNKPFOcjs.twTel; exports.url = _chunkTDEXEIHHcjs.url; exports.validate3DigitPostalCode = _chunkFP4O2ICMcjs.validate3DigitPostalCode; exports.validate5DigitPostalCode = _chunkFP4O2ICMcjs.validate5DigitPostalCode; exports.validate6DigitPostalCode = _chunkFP4O2ICMcjs.validate6DigitPostalCode; exports.validateCitizenId = _chunkUCPKW43Kcjs.validateCitizenId; exports.validateColor = _chunkA2GAEU4Ocjs.validateColor; exports.validateCreditCard = _chunkZCX22PY4cjs.validateCreditCard; exports.validateDateTimeFormat = _chunk53EEWALQcjs.validateDateTimeFormat; exports.validateIPv4 = _chunkLXFRQLH4cjs.validateIPv4; exports.validateIPv6 = _chunkLXFRQLH4cjs.validateIPv6; exports.validateIdType = _chunkJZEF5Q3Wcjs.validateIdType; exports.validateLatitude = _chunkFEL432I2cjs.validateLatitude; exports.validateLongitude = _chunkFEL432I2cjs.validateLongitude; exports.validateNewResidentId = _chunkUCPKW43Kcjs.validateNewResidentId; exports.validateOldResidentId = _chunkUCPKW43Kcjs.validateOldResidentId; exports.validateTaiwanBankAccount = _chunkQQWX3ICKcjs.validateTaiwanBankAccount; exports.validateTaiwanBusinessId = _chunkIWR3H7IHcjs.validateTaiwanBusinessId; exports.validateTaiwanFax = _chunkBZSPJJYTcjs.validateTaiwanFax; exports.validateTaiwanInvoice = _chunkV2KKGSKQcjs.validateTaiwanInvoice; exports.validateTaiwanLicensePlate = _chunkTPXRQT2Hcjs.validateTaiwanLicensePlate; exports.validateTaiwanMobile = _chunkAYCXAJRAcjs.validateTaiwanMobile; exports.validateTaiwanNationalId = _chunkUCPKW43Kcjs.validateTaiwanNationalId; exports.validateTaiwanPassport = _chunk5ZMTAI4Gcjs.validateTaiwanPassport; exports.validateTaiwanPostalCode = _chunkFP4O2ICMcjs.validateTaiwanPostalCode; exports.validateTaiwanTel = _chunkVKBNKPFOcjs.validateTaiwanTel; exports.validateTimeFormat = _chunkEDTNS2XLcjs.validateTimeFormat;
+exports.DATETIME_PATTERNS = _chunk53EEWALQcjs.DATETIME_PATTERNS; exports.ID_PATTERNS = _chunkJZEF5Q3Wcjs.ID_PATTERNS; exports.TAIWAN_BANK_CODES = _chunkQQWX3ICKcjs.TAIWAN_BANK_CODES; exports.TIME_PATTERNS = _chunkEDTNS2XLcjs.TIME_PATTERNS; exports.VALID_3_DIGIT_PREFIXES = _chunkFP4O2ICMcjs.VALID_3_DIGIT_PREFIXES; exports.boolean = _chunkLNWEJED7cjs.boolean; exports.color = _chunkA2GAEU4Ocjs.color; exports.coordinate = _chunkFEL432I2cjs.coordinate; exports.creditCard = _chunkZCX22PY4cjs.creditCard; exports.date = _chunk4AQB4RSUcjs.date; exports.datetime = _chunk53EEWALQcjs.datetime; exports.detectCardType = _chunkZCX22PY4cjs.detectCardType; exports.detectIdType = _chunkJZEF5Q3Wcjs.detectIdType; exports.email = _chunkH25N5GP6cjs.email; exports.file = _chunkKIUO2HIRcjs.file; exports.getLocale = _chunkQ7TUNJD4cjs.getLocale; exports.id = _chunkJZEF5Q3Wcjs.id; exports.ip = _chunkLXFRQLH4cjs.ip; exports.manyOf = _chunk5U5ERV2Pcjs.manyOf; exports.normalizeDateTimeValue = _chunk53EEWALQcjs.normalizeDateTimeValue; exports.normalizeTime = _chunkEDTNS2XLcjs.normalizeTime; exports.number = _chunkG747FHUZcjs.number; exports.oneOf = _chunk5NBWPAHCcjs.oneOf; exports.parseDateTimeValue = _chunk53EEWALQcjs.parseDateTimeValue; exports.parseTimeToMinutes = _chunkEDTNS2XLcjs.parseTimeToMinutes; exports.password = _chunkQ24GYUTOcjs.password; exports.setLocale = _chunkQ7TUNJD4cjs.setLocale; exports.text = _chunkHZ2WESSLcjs.text; exports.time = _chunkEDTNS2XLcjs.time; exports.twBankAccount = _chunkQQWX3ICKcjs.twBankAccount; exports.twBusinessId = _chunkIWR3H7IHcjs.twBusinessId; exports.twFax = _chunkBZSPJJYTcjs.twFax; exports.twInvoice = _chunkV2KKGSKQcjs.twInvoice; exports.twLicensePlate = _chunkTPXRQT2Hcjs.twLicensePlate; exports.twMobile = _chunkAYCXAJRAcjs.twMobile; exports.twNationalId = _chunkUCPKW43Kcjs.twNationalId; exports.twPassport = _chunk5ZMTAI4Gcjs.twPassport; exports.twPostalCode = _chunkFP4O2ICMcjs.twPostalCode; exports.twTel = _chunkVKBNKPFOcjs.twTel; exports.url = _chunkTDEXEIHHcjs.url; exports.validate3DigitPostalCode = _chunkFP4O2ICMcjs.validate3DigitPostalCode; exports.validate5DigitPostalCode = _chunkFP4O2ICMcjs.validate5DigitPostalCode; exports.validate6DigitPostalCode = _chunkFP4O2ICMcjs.validate6DigitPostalCode; exports.validateCitizenId = _chunkUCPKW43Kcjs.validateCitizenId; exports.validateColor = _chunkA2GAEU4Ocjs.validateColor; exports.validateCreditCard = _chunkZCX22PY4cjs.validateCreditCard; exports.validateDateTimeFormat = _chunk53EEWALQcjs.validateDateTimeFormat; exports.validateIPv4 = _chunkLXFRQLH4cjs.validateIPv4; exports.validateIPv6 = _chunkLXFRQLH4cjs.validateIPv6; exports.validateIdType = _chunkJZEF5Q3Wcjs.validateIdType; exports.validateLatitude = _chunkFEL432I2cjs.validateLatitude; exports.validateLongitude = _chunkFEL432I2cjs.validateLongitude; exports.validateNewResidentId = _chunkUCPKW43Kcjs.validateNewResidentId; exports.validateOldResidentId = _chunkUCPKW43Kcjs.validateOldResidentId; exports.validateTaiwanBankAccount = _chunkQQWX3ICKcjs.validateTaiwanBankAccount; exports.validateTaiwanBusinessId = _chunkIWR3H7IHcjs.validateTaiwanBusinessId; exports.validateTaiwanFax = _chunkBZSPJJYTcjs.validateTaiwanFax; exports.validateTaiwanInvoice = _chunkV2KKGSKQcjs.validateTaiwanInvoice; exports.validateTaiwanLicensePlate = _chunkTPXRQT2Hcjs.validateTaiwanLicensePlate; exports.validateTaiwanMobile = _chunkAYCXAJRAcjs.validateTaiwanMobile; exports.validateTaiwanNationalId = _chunkUCPKW43Kcjs.validateTaiwanNationalId; exports.validateTaiwanPassport = _chunk5ZMTAI4Gcjs.validateTaiwanPassport; exports.validateTaiwanPostalCode = _chunkFP4O2ICMcjs.validateTaiwanPostalCode; exports.validateTaiwanTel = _chunkVKBNKPFOcjs.validateTaiwanTel; exports.validateTimeFormat = _chunkEDTNS2XLcjs.validateTimeFormat;

package/dist/index.js

@@ -60,7 +60,7 @@ import {
 } from "./chunk-3QLUXIY2.js";
 import {
   oneOf
-} from "./chunk-3ZF5JO3F.js";
+} from "./chunk-YG6YHVAE.js";
 import {
   password
 } from "./chunk-NWQSOSNF.js";
@@ -114,7 +114,7 @@ import {
 } from "./chunk-H6STFX4I.js";
 import {
   manyOf
-} from "./chunk-7X3XPK6A.js";
+} from "./chunk-S4OJGXWC.js";
 import {
   getLocale,
   setLocale

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hy_ong/zod-kit",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "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/many-of.ts

@@ -4,8 +4,10 @@
  * Provides multi-select validation that restricts input to an array of values
  * from a predefined set, with min/max selection, duplicate control, and transformation.
  *
+ * Avoids z.preprocess() to preserve z.input types for React Hook Form compatibility.
+ *
  * @author Ong Hoe Yuan
- * @version 0.2.2
+ * @version 0.2.6
  */
 
 import { z, ZodType } from "zod"
@@ -34,11 +36,11 @@ export type ManyOfMessages = {
  * Configuration options for manyOf validation
  *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values, preserving literal types
  *
  * @interface ManyOfOptions
- * @property {T[]} values - Array of allowed values
- * @property {T[] | null} [defaultValue] - Default value when input is empty
+ * @property {V} values - Array of allowed values
+ * @property {V[number][] | null} [defaultValue] - Default value when input is empty
  * @property {number} [min] - Minimum number of selections
  * @property {number} [max] - Maximum number of selections
  * @property {boolean} [allowDuplicates=false] - Whether to allow duplicate selections
@@ -61,18 +63,22 @@ export type ManyOfOptions<IsRequired extends boolean = true, V extends readonly
  * Type alias for manyOf validation schema based on required flag
  *
  * @template IsRequired - Whether the field is required
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values
  */
-export type ManyOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true ? ZodType<V[number][]> : ZodType<V[number][] | null>
+export type ManyOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true
+  ? ZodType<V[number][], V[number][]>
+  : ZodType<V[number][] | null, V[number][] | "" | null | undefined>
 
 /**
  * Creates a Zod schema for multi-select validation that restricts values to a predefined set
  *
+ * Avoids z.preprocess() to preserve z.input types for React Hook Form compatibility.
+ *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values (string | number)
+ * @template V - The tuple type of allowed values (inferred via const type parameter)
  * @param {IsRequired} [required=false] - Whether the field is required
- * @param {ManyOfOptions<IsRequired, T>} options - Configuration options (values is required)
- * @returns {ManyOfSchema<IsRequired, T>} Zod schema for manyOf validation
+ * @param {ManyOfOptions<IsRequired, V>} options - Configuration options (values is required)
+ * @returns {ManyOfSchema<IsRequired, V>} Zod schema for manyOf validation
  *
  * @example
  * ```typescript
@@ -117,6 +123,7 @@ export function manyOf<IsRequired extends boolean = false, const V extends reado
   const { values = [] as unknown as V, defaultValue = null, min, max, allowDuplicates = false, caseSensitive = true, transform, i18n } = options ?? {}
 
   const isRequired = required ?? (false as IsRequired)
+  const valuesArr = values as readonly (string | number)[]
 
   const getMessage = (key: keyof ManyOfMessages, params?: Record<string, any>) => {
     if (i18n) {
@@ -132,15 +139,15 @@ export function manyOf<IsRequired extends boolean = false, const V extends reado
 
   const normalizeItem = (item: unknown): unknown => {
     // Coerce number strings to numbers when values contains numbers
-    const hasNumbers = values.some((v) => typeof v === "number")
+    const hasNumbers = valuesArr.some((v) => typeof v === "number")
     if (hasNumbers && typeof item === "string" && !isNaN(Number(item)) && item.trim() !== "") {
       const numVal = Number(item)
-      if ((values as readonly number[]).includes(numVal)) return numVal
+      if ((valuesArr as readonly number[]).includes(numVal)) return numVal
     }
 
     // Case-insensitive normalization
     if (!caseSensitive && typeof item === "string") {
-      const match = values.find((v) => typeof v === "string" && v.toLowerCase() === item.toLowerCase())
+      const match = valuesArr.find((v) => typeof v === "string" && v.toLowerCase() === item.toLowerCase())
       if (match !== undefined) return match
       return item
     }
@@ -148,72 +155,70 @@ export function manyOf<IsRequired extends boolean = false, const V extends reado
     return item
   }
 
-  const preprocessFn = (val: unknown) => {
-    if (val === null || val === undefined || val === "") {
-      return defaultValue
-    }
-
-    if (!Array.isArray(val)) {
-      // Accept single value and wrap in array
-      return [normalizeItem(val)]
-    }
-
-    return val.map(normalizeItem)
-  }
-
-  const baseSchema = z.preprocess(preprocessFn, z.any())
-
-  const schema = baseSchema.superRefine((val, ctx) => {
-    if (val === null) {
-      if (isRequired) {
-        ctx.addIssue({ code: "custom", message: getMessage("required") })
+  // Build an array schema that validates + normalizes items, then applies superRefine for constraints
+  const arraySchema = z
+    .array(z.any())
+    .transform((arr) => arr.map(normalizeItem))
+    .superRefine((val, ctx) => {
+      // Check each item is in the allowed values
+      for (const item of val) {
+        if (!(valuesArr as readonly (string | number)[]).includes(item as string | number)) {
+          ctx.addIssue({
+            code: "custom",
+            message: getMessage("invalid", { values: valuesArr.join(", ") }),
+          })
+          return
+        }
       }
-      return
-    }
 
-    if (!Array.isArray(val)) {
-      ctx.addIssue({ code: "custom", message: getMessage("invalid", { values: values.join(", ") }) })
-      return
-    }
+      // Duplicate check
+      if (!allowDuplicates) {
+        const seen = new Set()
+        for (const item of val) {
+          if (seen.has(item)) {
+            ctx.addIssue({ code: "custom", message: getMessage("duplicate") })
+            return
+          }
+          seen.add(item)
+        }
+      }
 
-    // Check each item is in the allowed values
-    for (const item of val) {
-      if (!(values as readonly (string | number)[]).includes(item as V[number])) {
-        ctx.addIssue({
-          code: "custom",
-          message: getMessage("invalid", { values: values.join(", ") }),
-        })
+      // Min/max selection count
+      if (min !== undefined && val.length < min) {
+        ctx.addIssue({ code: "custom", message: getMessage("minSelect", { min }) })
         return
       }
-    }
 
-    // Duplicate check
-    if (!allowDuplicates) {
-      const seen = new Set()
-      for (const item of val) {
-        if (seen.has(item)) {
-          ctx.addIssue({ code: "custom", message: getMessage("duplicate") })
-          return
-        }
-        seen.add(item)
+      if (max !== undefined && val.length > max) {
+        ctx.addIssue({ code: "custom", message: getMessage("maxSelect", { max }) })
+        return
       }
-    }
-
-    // Min/max selection count
-    if (min !== undefined && val.length < min) {
-      ctx.addIssue({ code: "custom", message: getMessage("minSelect", { min }) })
-      return
-    }
+    })
+    .transform((val) => {
+      if (!transform) return val as V[number][]
+      return transform(val as V[number][])
+    })
+
+  // Single value → wrap in array
+  const singleToArray = z.union([z.string(), z.number()]).transform((v) => [normalizeItem(v)])
+    .pipe(arraySchema)
+
+  // Handle required vs optional
+  const fallback = defaultValue as V[number][] | null
+
+  if (isRequired && fallback === null) {
+    // Required, no default: empty values should fail with "required" message
+    const emptyRejectSchema = z
+      .union([z.literal("" as const), z.null(), z.undefined()])
+      .refine(() => false, { message: getMessage("required") })
+
+    return z.union([arraySchema, singleToArray, emptyRejectSchema]) as unknown as ManyOfSchema<IsRequired, V>
+  }
 
-    if (max !== undefined && val.length > max) {
-      ctx.addIssue({ code: "custom", message: getMessage("maxSelect", { max }) })
-      return
-    }
-  })
-  .transform((val) => {
-    if (val === null || !Array.isArray(val) || !transform) return val
-    return transform(val as V[number][])
-  })
+  // Optional or has default: empty values → fallback
+  const emptySchema = z
+    .union([z.literal("" as const), z.null(), z.undefined()])
+    .transform(() => fallback)
 
-  return schema as unknown as ManyOfSchema<IsRequired, V>
+  return z.union([arraySchema, singleToArray, emptySchema]) as unknown as ManyOfSchema<IsRequired, V>
 }

package/src/validators/common/one-of.ts

@@ -4,8 +4,11 @@
  * Provides single-select validation that restricts input to a predefined set of allowed values,
  * with support for case-insensitive matching, default values, and transformation.
  *
+ * When required=true, z.input is narrowed to V[number] (no empty/null/undefined),
+ * making it fully compatible with React Hook Form resolvers and type-aware form libraries.
+ *
  * @author Ong Hoe Yuan
- * @version 0.2.2
+ * @version 0.2.6
  */
 
 import { z, ZodType } from "zod"
@@ -28,11 +31,11 @@ export type OneOfMessages = {
  * Configuration options for oneOf validation
  *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values, preserving literal types
  *
  * @interface OneOfOptions
- * @property {T[]} values - Array of allowed values
- * @property {T | null} [defaultValue] - Default value when input is empty
+ * @property {V} values - Array of allowed values
+ * @property {V[number] | null} [defaultValue] - Default value when input is empty
  * @property {boolean} [caseSensitive=true] - Whether string matching is case-sensitive
  * @property {Function} [transform] - Custom transformation function applied after validation
  * @property {Record<Locale, OneOfMessages>} [i18n] - Custom error messages for different locales
@@ -49,18 +52,23 @@ export type OneOfOptions<IsRequired extends boolean = true, V extends readonly (
  * Type alias for oneOf validation schema based on required flag
  *
  * @template IsRequired - Whether the field is required
- * @template T - The type of allowed values
+ * @template V - The tuple type of allowed values
  */
-export type OneOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true ? ZodType<V[number]> : ZodType<V[number] | null>
+export type OneOfSchema<IsRequired extends boolean, V extends readonly (string | number)[]> = IsRequired extends true
+  ? ZodType<V[number], V[number]>
+  : ZodType<V[number] | null, V[number] | "" | null | undefined>
 
 /**
  * Creates a Zod schema for single-select validation that restricts values to a predefined set
  *
+ * When required=true, z.input is narrowed to V[number] only (no empty/null/undefined),
+ * ensuring full compatibility with React Hook Form and other type-aware form libraries.
+ *
  * @template IsRequired - Whether the field is required (affects return type)
- * @template T - The type of allowed values (string | number)
+ * @template V - The tuple type of allowed values (inferred via const type parameter)
  * @param {IsRequired} [required=false] - Whether the field is required
- * @param {OneOfOptions<IsRequired, T>} options - Configuration options (values is required)
- * @returns {OneOfSchema<IsRequired, T>} Zod schema for oneOf validation
+ * @param {OneOfOptions<IsRequired, V>} options - Configuration options (values is required)
+ * @returns {OneOfSchema<IsRequired, V>} Zod schema for oneOf validation
  *
  * @example
  * ```typescript
@@ -69,7 +77,7 @@ export type OneOfSchema<IsRequired extends boolean, V extends readonly (string |
  * roleSchema.parse("admin") // ✓ "admin"
  * roleSchema.parse(null)    // ✓ null
  *
- * // Required
+ * // Required — z.input and z.output are both "active" | "inactive" | "pending"
  * const statusSchema = oneOf(true, { values: ["active", "inactive", "pending"] })
  * statusSchema.parse("active") // ✓ "active"
  * statusSchema.parse(null)     // ✗ Required
@@ -110,6 +118,8 @@ export function oneOf<IsRequired extends boolean = false, const V extends readon
   const { values = [] as unknown as V, defaultValue = null, caseSensitive = true, transform, i18n } = options ?? {}
 
   const isRequired = required ?? (false as IsRequired)
+  const valuesArr = values as readonly (string | number)[]
+  const isAllStrings = valuesArr.every((v) => typeof v === "string")
 
   const getMessage = (key: keyof OneOfMessages, params?: Record<string, any>) => {
     if (i18n) {
@@ -123,50 +133,82 @@ export function oneOf<IsRequired extends boolean = false, const V extends readon
     return t(`common.oneOf.${key}`, params)
   }
 
-  const preprocessFn = (val: unknown) => {
-    if (val === "" || val === null || val === undefined) {
-      return defaultValue
-    }
+  const isEmpty = (v: unknown) => v === "" || v === null || v === undefined
 
-    // Coerce number strings to numbers when values contains numbers
-    const hasNumbers = values.some((v) => typeof v === "number")
-    if (hasNumbers && typeof val === "string" && !isNaN(Number(val)) && val.trim() !== "") {
-      const numVal = Number(val)
-      if ((values as readonly number[]).includes(numVal)) return numVal
-    }
+  // Build the value-matching schema using z.enum() or z.union(z.literal())
+  let valueSchema: ZodType
+  if (isAllStrings && valuesArr.length > 0) {
+    valueSchema = z.enum(valuesArr as unknown as readonly [string, ...string[]], {
+      error: (issue) => {
+        if (isEmpty(issue.input)) return getMessage("required")
+        return getMessage("invalid", { values: valuesArr.join(", ") })
+      },
+    })
+  } else if (valuesArr.length >= 2) {
+    const literals = valuesArr.map((v) => z.literal(v))
+    valueSchema = z.union(literals as unknown as readonly [ZodType, ZodType, ...ZodType[]], {
+      error: () => getMessage("invalid", { values: valuesArr.join(", ") }),
+    })
+  } else if (valuesArr.length === 1) {
+    valueSchema = z.literal(valuesArr[0])
+  } else {
+    valueSchema = z.never()
+  }
 
-    // Case-insensitive normalization for string values
-    if (!caseSensitive && typeof val === "string") {
-      const match = values.find((v) => typeof v === "string" && v.toLowerCase() === val.toLowerCase())
-      if (match !== undefined) return match
-      return val
-    }
+  // Case-insensitive: pipe through a string normalizer
+  if (!caseSensitive) {
+    valueSchema = z
+      .string()
+      .transform((v) => {
+        const match = valuesArr.find((val) => typeof val === "string" && val.toLowerCase() === v.toLowerCase())
+        return (match ?? v) as string
+      })
+      .pipe(valueSchema as ZodType<any, any>)
+  }
 
-    return val
+  // User transform (applied after validation)
+  if (transform) {
+    valueSchema = valueSchema.transform((v) => transform(v as V[number]))
   }
 
-  const baseSchema = z.preprocess(preprocessFn, z.any())
+  // Handle required vs optional
+  const fallback = defaultValue as V[number] | null
+  const emptySchema = z
+    .union([z.literal("" as const), z.null(), z.undefined()])
+    .transform(() => fallback)
 
-  const schema = baseSchema
-    .superRefine((val, ctx) => {
-      if (val === null) {
-        if (isRequired) {
-          ctx.addIssue({ code: "custom", message: getMessage("required") })
-        }
-        return
-      }
+  if (isRequired && fallback === null) {
+    // Required, no default: empty values should fail with "required" message
+    const emptyRejectSchema = z
+      .union([z.literal("" as const), z.null(), z.undefined()])
+      .refine(() => false, { message: getMessage("required") })
 
-      if (!(values as readonly (string | number)[]).includes(val as V[number])) {
-        ctx.addIssue({
-          code: "custom",
-          message: getMessage("invalid", { values: values.join(", ") }),
+    // For numeric values from forms (string "3" → number 3)
+    if (!isAllStrings) {
+      const numCoerceSchema = z
+        .string()
+        .transform((v) => {
+          const n = Number(v)
+          return isNaN(n) ? v : n
         })
-      }
-    })
-    .transform((val) => {
-      if (val === null || !transform) return val
-      return transform(val as V[number])
-    })
+        .pipe(valueSchema as ZodType<any, any>)
+      return z.union([valueSchema, numCoerceSchema, emptyRejectSchema]) as unknown as OneOfSchema<IsRequired, V>
+    }
+
+    return z.union([valueSchema, emptyRejectSchema]) as unknown as OneOfSchema<IsRequired, V>
+  }
+
+  // Required with default or optional: empty values → fallback
+  if (!isAllStrings) {
+    const numCoerceSchema = z
+      .string()
+      .transform((v) => {
+        const n = Number(v)
+        return isNaN(n) ? v : n
+      })
+      .pipe(valueSchema as ZodType<any, any>)
+    return z.union([valueSchema, numCoerceSchema, emptySchema]) as unknown as OneOfSchema<IsRequired, V>
+  }
 
-  return schema as unknown as OneOfSchema<IsRequired, V>
+  return z.union([valueSchema, emptySchema]) as unknown as OneOfSchema<IsRequired, V>
 }

package/dist/chunk-3ZF5JO3F.js

@@ -1,61 +0,0 @@
-import {
-  getLocale,
-  t
-} from "./chunk-POIDES2L.js";
-
-// src/validators/common/one-of.ts
-import { z } from "zod";
-function oneOf(required, options) {
-  const { values = [], defaultValue = null, caseSensitive = true, transform, i18n } = options ?? {};
-  const isRequired = required ?? false;
-  const getMessage = (key, params) => {
-    if (i18n) {
-      const currentLocale = getLocale();
-      const customMessages = i18n[currentLocale];
-      if (customMessages && customMessages[key]) {
-        const template = customMessages[key];
-        return template.replace(/\$\{(\w+)}/g, (_, k) => params?.[k] ?? "");
-      }
-    }
-    return t(`common.oneOf.${key}`, params);
-  };
-  const preprocessFn = (val) => {
-    if (val === "" || val === null || val === void 0) {
-      return defaultValue;
-    }
-    const hasNumbers = values.some((v) => typeof v === "number");
-    if (hasNumbers && typeof val === "string" && !isNaN(Number(val)) && val.trim() !== "") {
-      const numVal = Number(val);
-      if (values.includes(numVal)) return numVal;
-    }
-    if (!caseSensitive && typeof val === "string") {
-      const match = values.find((v) => typeof v === "string" && v.toLowerCase() === val.toLowerCase());
-      if (match !== void 0) return match;
-      return val;
-    }
-    return val;
-  };
-  const baseSchema = z.preprocess(preprocessFn, z.any());
-  const schema = baseSchema.superRefine((val, ctx) => {
-    if (val === null) {
-      if (isRequired) {
-        ctx.addIssue({ code: "custom", message: getMessage("required") });
-      }
-      return;
-    }
-    if (!values.includes(val)) {
-      ctx.addIssue({
-        code: "custom",
-        message: getMessage("invalid", { values: values.join(", ") })
-      });
-    }
-  }).transform((val) => {
-    if (val === null || !transform) return val;
-    return transform(val);
-  });
-  return schema;
-}
-
-export {
-  oneOf
-};

package/dist/chunk-FMPHW7ID.cjs

@@ -1,61 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
-
-
-var _chunkQ7TUNJD4cjs = require('./chunk-Q7TUNJD4.cjs');
-
-// src/validators/common/one-of.ts
-var _zod = require('zod');
-function oneOf(required, options) {
-  const { values = [], defaultValue = null, caseSensitive = true, transform, i18n } = _nullishCoalesce(options, () => ( {}));
-  const isRequired = _nullishCoalesce(required, () => ( false));
-  const getMessage = (key, params) => {
-    if (i18n) {
-      const currentLocale = _chunkQ7TUNJD4cjs.getLocale.call(void 0, );
-      const customMessages = i18n[currentLocale];
-      if (customMessages && customMessages[key]) {
-        const template = customMessages[key];
-        return template.replace(/\$\{(\w+)}/g, (_, k) => _nullishCoalesce(_optionalChain([params, 'optionalAccess', _2 => _2[k]]), () => ( "")));
-      }
-    }
-    return _chunkQ7TUNJD4cjs.t.call(void 0, `common.oneOf.${key}`, params);
-  };
-  const preprocessFn = (val) => {
-    if (val === "" || val === null || val === void 0) {
-      return defaultValue;
-    }
-    const hasNumbers = values.some((v) => typeof v === "number");
-    if (hasNumbers && typeof val === "string" && !isNaN(Number(val)) && val.trim() !== "") {
-      const numVal = Number(val);
-      if (values.includes(numVal)) return numVal;
-    }
-    if (!caseSensitive && typeof val === "string") {
-      const match = values.find((v) => typeof v === "string" && v.toLowerCase() === val.toLowerCase());
-      if (match !== void 0) return match;
-      return val;
-    }
-    return val;
-  };
-  const baseSchema = _zod.z.preprocess(preprocessFn, _zod.z.any());
-  const schema = baseSchema.superRefine((val, ctx) => {
-    if (val === null) {
-      if (isRequired) {
-        ctx.addIssue({ code: "custom", message: getMessage("required") });
-      }
-      return;
-    }
-    if (!values.includes(val)) {
-      ctx.addIssue({
-        code: "custom",
-        message: getMessage("invalid", { values: values.join(", ") })
-      });
-    }
-  }).transform((val) => {
-    if (val === null || !transform) return val;
-    return transform(val);
-  });
-  return schema;
-}
-
-
-
-exports.oneOf = oneOf;