zod 4.0.4 → 4.0.6

package/v4/core/schemas.js

@@ -156,9 +156,10 @@ export const $ZodURL = /*@__PURE__*/ core.$constructor("$ZodURL", (inst, def) =>
     $ZodStringFormat.init(inst, def);
     inst._zod.check = (payload) => {
         try {
-            const orig = payload.value;
-            const url = new URL(orig);
-            const href = url.href;
+            // Trim whitespace from input
+            const trimmed = payload.value.trim();
+            // @ts-ignore
+            const url = new URL(trimmed);
             if (def.hostname) {
                 def.hostname.lastIndex = 0;
                 if (!def.hostname.test(url.hostname)) {
@@ -187,12 +188,14 @@ export const $ZodURL = /*@__PURE__*/ core.$constructor("$ZodURL", (inst, def) =>
                     });
                 }
             }
-            // payload.value = url.href;
-            if (!orig.endsWith("/") && href.endsWith("/")) {
-                payload.value = href.slice(0, -1);
+            // Set the output value based on normalize flag
+            if (def.normalize) {
+                // Use normalized URL
+                payload.value = url.href;
             }
             else {
-                payload.value = href;
+                // Preserve the original input (trimmed)
+                payload.value = trimmed;
             }
             return;
         }
@@ -268,6 +271,7 @@ export const $ZodIPv6 = /*@__PURE__*/ core.$constructor("$ZodIPv6", (inst, def)
     });
     inst._zod.check = (payload) => {
         try {
+            // @ts-ignore
             new URL(`http://[${payload.value}]`);
             // return;
         }
@@ -299,6 +303,7 @@ export const $ZodCIDRv6 = /*@__PURE__*/ core.$constructor("$ZodCIDRv6", (inst, d
                 throw new Error();
             if (prefixNum < 0 || prefixNum > 128)
                 throw new Error();
+            // @ts-ignore
             new URL(`http://[${address}]`);
         }
         catch {
@@ -319,6 +324,7 @@ export function isValidBase64(data) {
     if (data.length % 4 !== 0)
         return false;
     try {
+        // @ts-ignore
         atob(data);
         return true;
     }
@@ -383,6 +389,7 @@ export function isValidJWT(token, algorithm = null) {
         const [header] = tokensParts;
         if (!header)
             return false;
+        // @ts-ignore
         const parsedHeader = JSON.parse(atob(header));
         if ("typ" in parsedHeader && parsedHeader?.typ !== "JWT")
             return false;
@@ -653,36 +660,16 @@ export const $ZodArray = /*@__PURE__*/ core.$constructor("$ZodArray", (inst, def
         return payload; //handleArrayResultsAsync(parseResults, final);
     };
 });
-function handleObjectResult(result, final, key) {
-    // if(isOptional)
+function handlePropertyResult(result, final, key, input) {
     if (result.issues.length) {
         final.issues.push(...util.prefixIssues(key, result.issues));
     }
-    final.value[key] = result.value;
-}
-function handleOptionalObjectResult(result, final, key, input) {
-    if (result.issues.length) {
-        // validation failed against value schema
-        if (input[key] === undefined) {
-            // if input was undefined, ignore the error
-            if (key in input) {
-                final.value[key] = undefined;
-            }
-            else {
-                final.value[key] = result.value;
-            }
-        }
-        else {
-            final.issues.push(...util.prefixIssues(key, result.issues));
-        }
-    }
-    else if (result.value === undefined) {
-        // validation returned `undefined`
-        if (key in input)
+    if (result.value === undefined) {
+        if (key in input) {
             final.value[key] = undefined;
+        }
     }
     else {
-        // non-undefined value
         final.value[key] = result.value;
     }
 }
@@ -734,42 +721,25 @@ export const $ZodObject = /*@__PURE__*/ core.$constructor("$ZodObject", (inst, d
         // A: preserve key order {
         doc.write(`const newResult = {}`);
         for (const key of normalized.keys) {
-            if (normalized.optionalKeys.has(key)) {
-                const id = ids[key];
-                doc.write(`const ${id} = ${parseStr(key)};`);
-                const k = util.esc(key);
-                doc.write(`
+            const id = ids[key];
+            const k = util.esc(key);
+            doc.write(`const ${id} = ${parseStr(key)};`);
+            doc.write(`
         if (${id}.issues.length) {
-          if (input[${k}] === undefined) {
-            if (${k} in input) {
-              newResult[${k}] = undefined;
-            }
-          } else {
-            payload.issues = payload.issues.concat(
-              ${id}.issues.map((iss) => ({
-                ...iss,
-                path: iss.path ? [${k}, ...iss.path] : [${k}],
-              }))
-            );
+          payload.issues = payload.issues.concat(${id}.issues.map(iss => ({
+            ...iss,
+            path: iss.path ? [${k}, ...iss.path] : [${k}]
+          })));
+        }
+        
+        if (${id}.value === undefined) {
+          if (${k} in input) {
+            newResult[${k}] = undefined;
           }
-        } else if (${id}.value === undefined) {
-          if (${k} in input) newResult[${k}] = undefined;
         } else {
           newResult[${k}] = ${id}.value;
         }
-        `);
-            }
-            else {
-                const id = ids[key];
-                //  const id = ids[key];
-                doc.write(`const ${id} = ${parseStr(key)};`);
-                doc.write(`
-          if (${id}.issues.length) payload.issues = payload.issues.concat(${id}.issues.map(iss => ({
-            ...iss,
-            path: iss.path ? [${util.esc(key)}, ...iss.path] : [${util.esc(key)}]
-          })));`);
-                doc.write(`newResult[${util.esc(key)}] = ${id}.value`);
-            }
+      `);
         }
         doc.write(`payload.value = newResult;`);
         doc.write(`return payload;`);
@@ -807,33 +777,16 @@ export const $ZodObject = /*@__PURE__*/ core.$constructor("$ZodObject", (inst, d
             const shape = value.shape;
             for (const key of value.keys) {
                 const el = shape[key];
-                // do not add omitted optional keys
-                // if (!(key in input)) {
-                //   if (optionalKeys.has(key)) continue;
-                //   payload.issues.push({
-                //     code: "invalid_type",
-                //     path: [key],
-                //     expected: "nonoptional",
-                //     note: `Missing required key: "${key}"`,
-                //     input,
-                //     inst,
-                //   });
-                // }
                 const r = el._zod.run({ value: input[key], issues: [] }, ctx);
-                const isOptional = el._zod.optin === "optional" && el._zod.optout === "optional";
                 if (r instanceof Promise) {
-                    proms.push(r.then((r) => isOptional ? handleOptionalObjectResult(r, payload, key, input) : handleObjectResult(r, payload, key)));
-                }
-                else if (isOptional) {
-                    handleOptionalObjectResult(r, payload, key, input);
+                    proms.push(r.then((r) => handlePropertyResult(r, payload, key, input)));
                 }
                 else {
-                    handleObjectResult(r, payload, key);
+                    handlePropertyResult(r, payload, key, input);
                 }
             }
         }
         if (!catchall) {
-            // return payload;
             return proms.length ? Promise.all(proms).then(() => payload) : payload;
         }
         const unrecognized = [];
@@ -850,10 +803,10 @@ export const $ZodObject = /*@__PURE__*/ core.$constructor("$ZodObject", (inst, d
             }
             const r = _catchall.run({ value: input[key], issues: [] }, ctx);
             if (r instanceof Promise) {
-                proms.push(r.then((r) => handleObjectResult(r, payload, key)));
+                proms.push(r.then((r) => handlePropertyResult(r, payload, key, input)));
             }
             else {
-                handleObjectResult(r, payload, key);
+                handlePropertyResult(r, payload, key, input);
             }
         }
         if (unrecognized.length) {
@@ -878,6 +831,11 @@ function handleUnionResults(results, final, inst, ctx) {
             return final;
         }
     }
+    const nonaborted = results.filter((r) => !util.aborted(r));
+    if (nonaborted.length > 0) {
+        final.value = nonaborted[0].value;
+        return nonaborted[0];
+    }
     final.issues.push({
         code: "invalid_union",
         input: final.value,
@@ -953,7 +911,7 @@ core.$constructor("$ZodDiscriminatedUnion", (inst, def) => {
         const opts = def.options;
         const map = new Map();
         for (const o of opts) {
-            const values = o._zod.propValues[def.discriminator];
+            const values = o._zod.propValues?.[def.discriminator];
             if (!values || values.size === 0)
                 throw new Error(`Invalid discriminated union option at index "${def.options.indexOf(o)}"`);
             for (const v of values) {
@@ -1343,14 +1301,15 @@ function handleSetResult(result, final) {
 export const $ZodEnum = /*@__PURE__*/ core.$constructor("$ZodEnum", (inst, def) => {
     $ZodType.init(inst, def);
     const values = util.getEnumValues(def.entries);
-    inst._zod.values = new Set(values);
+    const valuesSet = new Set(values);
+    inst._zod.values = valuesSet;
     inst._zod.pattern = new RegExp(`^(${values
         .filter((k) => util.propertyKeyTypes.has(typeof k))
         .map((o) => (typeof o === "string" ? util.escapeRegex(o) : o.toString()))
         .join("|")})$`);
     inst._zod.parse = (payload, _ctx) => {
         const input = payload.value;
-        if (inst._zod.values.has(input)) {
+        if (valuesSet.has(input)) {
             return payload;
         }
         payload.issues.push({
@@ -1366,7 +1325,7 @@ export const $ZodLiteral = /*@__PURE__*/ core.$constructor("$ZodLiteral", (inst,
     $ZodType.init(inst, def);
     inst._zod.values = new Set(def.values);
     inst._zod.pattern = new RegExp(`^(${def.values
-        .map((o) => (typeof o === "string" ? util.escapeRegex(o) : o ? o.toString() : String(o)))
+        .map((o) => (typeof o === "string" ? util.escapeRegex(o) : o ? util.escapeRegex(o.toString()) : String(o)))
         .join("|")})$`);
     inst._zod.parse = (payload, _ctx) => {
         const input = payload.value;
@@ -1386,6 +1345,7 @@ export const $ZodFile = /*@__PURE__*/ core.$constructor("$ZodFile", (inst, def)
     $ZodType.init(inst, def);
     inst._zod.parse = (payload, _ctx) => {
         const input = payload.value;
+        // @ts-ignore
         if (input instanceof File)
             return payload;
         payload.issues.push({
@@ -1531,7 +1491,7 @@ export const $ZodSuccess = /*@__PURE__*/ core.$constructor("$ZodSuccess", (inst,
 });
 export const $ZodCatch = /*@__PURE__*/ core.$constructor("$ZodCatch", (inst, def) => {
     $ZodType.init(inst, def);
-    inst._zod.optin = "optional";
+    util.defineLazy(inst._zod, "optin", () => def.innerType._zod.optin);
     util.defineLazy(inst._zod, "optout", () => def.innerType._zod.optout);
     util.defineLazy(inst._zod, "values", () => def.innerType._zod.values);
     inst._zod.parse = (payload, ctx) => {
@@ -1586,6 +1546,7 @@ export const $ZodPipe = /*@__PURE__*/ core.$constructor("$ZodPipe", (inst, def)
     util.defineLazy(inst._zod, "values", () => def.in._zod.values);
     util.defineLazy(inst._zod, "optin", () => def.in._zod.optin);
     util.defineLazy(inst._zod, "optout", () => def.out._zod.optout);
+    util.defineLazy(inst._zod, "propValues", () => def.in._zod.propValues);
     inst._zod.parse = (payload, ctx) => {
         const left = def.in._zod.run(payload, ctx);
         if (left instanceof Promise) {

package/v4/core/to-json-schema.cjs

@@ -678,6 +678,7 @@ class JSONSchemaGenerator {
             result.$schema = "http://json-schema.org/draft-07/schema#";
         }
         else {
+            // @ts-ignore
             console.warn(`Invalid target: ${this.target}`);
         }
         if (params.external?.uri) {

package/v4/core/to-json-schema.js

@@ -674,6 +674,7 @@ export class JSONSchemaGenerator {
             result.$schema = "http://json-schema.org/draft-07/schema#";
         }
         else {
+            // @ts-ignore
             console.warn(`Invalid target: ${this.target}`);
         }
         if (params.external?.uri) {

package/v4/core/util.cjs

@@ -15,6 +15,7 @@ exports.cleanRegex = cleanRegex;
 exports.floatSafeRemainder = floatSafeRemainder;
 exports.defineLazy = defineLazy;
 exports.assignProp = assignProp;
+exports.cloneDef = cloneDef;
 exports.getElementAtPath = getElementAtPath;
 exports.promiseAllObject = promiseAllObject;
 exports.randomString = randomString;
@@ -127,6 +128,11 @@ function assignProp(target, prop, value) {
         configurable: true,
     });
 }
+function cloneDef(schema) {
+    const def = {};
+    Object.defineProperties(def, Object.getOwnPropertyDescriptors(schema._zod.def));
+    return def;
+}
 function getElementAtPath(obj, path) {
     if (!path)
         return obj;
@@ -154,13 +160,12 @@ function randomString(length = 10) {
 function esc(str) {
     return JSON.stringify(str);
 }
-exports.captureStackTrace = Error.captureStackTrace
-    ? Error.captureStackTrace
-    : (..._args) => { };
+exports.captureStackTrace = ("captureStackTrace" in Error ? Error.captureStackTrace : (..._args) => { });
 function isObject(data) {
     return typeof data === "object" && data !== null && !Array.isArray(data);
 }
 exports.allowsEval = cached(() => {
+    // @ts-ignore
     if (typeof navigator !== "undefined" && navigator?.userAgent?.includes("Cloudflare")) {
         return false;
     }
@@ -235,6 +240,7 @@ const getParsedType = (data) => {
             if (typeof Date !== "undefined" && data instanceof Date) {
                 return "date";
             }
+            // @ts-ignore
             if (typeof File !== "undefined" && data instanceof File) {
                 return "file";
             }
@@ -329,140 +335,184 @@ exports.BIGINT_FORMAT_RANGES = {
     uint64: [/* @__PURE__*/ BigInt(0), /* @__PURE__*/ BigInt("18446744073709551615")],
 };
 function pick(schema, mask) {
-    const newShape = {};
-    const currDef = schema._zod.def; //.shape;
-    for (const key in mask) {
-        if (!(key in currDef.shape)) {
-            throw new Error(`Unrecognized key: "${key}"`);
-        }
-        if (!mask[key])
-            continue;
-        // pick key
-        newShape[key] = currDef.shape[key];
-    }
-    return clone(schema, {
-        ...schema._zod.def,
-        shape: newShape,
-        checks: [],
+    const currDef = schema._zod.def;
+    const def = cloneDef(schema);
+    Object.defineProperties(def, {
+        shape: {
+            get() {
+                const newShape = {};
+                for (const key in mask) {
+                    if (!(key in currDef.shape)) {
+                        throw new Error(`Unrecognized key: "${key}"`);
+                    }
+                    if (!mask[key])
+                        continue;
+                    newShape[key] = currDef.shape[key];
+                }
+                assignProp(this, "shape", newShape); // self-caching
+                return newShape;
+            },
+        },
+        checks: {
+            value: [],
+        },
     });
+    return clone(schema, def);
 }
 function omit(schema, mask) {
-    const newShape = { ...schema._zod.def.shape };
-    const currDef = schema._zod.def; //.shape;
-    for (const key in mask) {
-        if (!(key in currDef.shape)) {
-            throw new Error(`Unrecognized key: "${key}"`);
-        }
-        if (!mask[key])
-            continue;
-        delete newShape[key];
-    }
-    return clone(schema, {
-        ...schema._zod.def,
-        shape: newShape,
-        checks: [],
+    const currDef = schema._zod.def;
+    const def = cloneDef(schema);
+    Object.defineProperties(def, {
+        shape: {
+            get() {
+                const newShape = { ...schema._zod.def.shape };
+                for (const key in mask) {
+                    if (!(key in currDef.shape)) {
+                        throw new Error(`Unrecognized key: "${key}"`);
+                    }
+                    if (!mask[key])
+                        continue;
+                    delete newShape[key];
+                }
+                assignProp(this, "shape", newShape); // self-caching
+                return newShape;
+            },
+        },
+        checks: {
+            value: [],
+        },
     });
+    return clone(schema, def);
 }
 function extend(schema, shape) {
     if (!isPlainObject(shape)) {
         throw new Error("Invalid input to extend: expected a plain object");
     }
-    const def = {
-        ...schema._zod.def,
-        get shape() {
-            const _shape = { ...schema._zod.def.shape, ...shape };
-            assignProp(this, "shape", _shape); // self-caching
-            return _shape;
+    const def = cloneDef(schema);
+    Object.defineProperties(def, {
+        shape: {
+            get() {
+                const _shape = { ...schema._zod.def.shape, ...shape };
+                assignProp(this, "shape", _shape); // self-caching
+                return _shape;
+            },
         },
-        checks: [], // delete existing checks
-    };
+        checks: {
+            value: [],
+        },
+    });
     return clone(schema, def);
 }
 function merge(a, b) {
-    return clone(a, {
-        ...a._zod.def,
-        get shape() {
-            const _shape = { ...a._zod.def.shape, ...b._zod.def.shape };
-            assignProp(this, "shape", _shape); // self-caching
-            return _shape;
+    const def = cloneDef(a);
+    Object.defineProperties(def, {
+        shape: {
+            get() {
+                const _shape = { ...a._zod.def.shape, ...b._zod.def.shape };
+                assignProp(this, "shape", _shape); // self-caching
+                return _shape;
+            },
+        },
+        catchall: {
+            get() {
+                return b._zod.def.catchall;
+            },
+        },
+        checks: {
+            value: [], // delete existing checks
         },
-        catchall: b._zod.def.catchall,
-        checks: [], // delete existing checks
     });
+    return clone(a, def);
 }
 function partial(Class, schema, mask) {
-    const oldShape = schema._zod.def.shape;
-    const shape = { ...oldShape };
-    if (mask) {
-        for (const key in mask) {
-            if (!(key in oldShape)) {
-                throw new Error(`Unrecognized key: "${key}"`);
-            }
-            if (!mask[key])
-                continue;
-            // if (oldShape[key]!._zod.optin === "optional") continue;
-            shape[key] = Class
-                ? new Class({
-                    type: "optional",
-                    innerType: oldShape[key],
-                })
-                : oldShape[key];
-        }
-    }
-    else {
-        for (const key in oldShape) {
-            // if (oldShape[key]!._zod.optin === "optional") continue;
-            shape[key] = Class
-                ? new Class({
-                    type: "optional",
-                    innerType: oldShape[key],
-                })
-                : oldShape[key];
-        }
-    }
-    return clone(schema, {
-        ...schema._zod.def,
-        shape,
-        checks: [],
+    const def = cloneDef(schema);
+    Object.defineProperties(def, {
+        shape: {
+            get() {
+                const oldShape = schema._zod.def.shape;
+                const shape = { ...oldShape };
+                if (mask) {
+                    for (const key in mask) {
+                        if (!(key in oldShape)) {
+                            throw new Error(`Unrecognized key: "${key}"`);
+                        }
+                        if (!mask[key])
+                            continue;
+                        // if (oldShape[key]!._zod.optin === "optional") continue;
+                        shape[key] = Class
+                            ? new Class({
+                                type: "optional",
+                                innerType: oldShape[key],
+                            })
+                            : oldShape[key];
+                    }
+                }
+                else {
+                    for (const key in oldShape) {
+                        // if (oldShape[key]!._zod.optin === "optional") continue;
+                        shape[key] = Class
+                            ? new Class({
+                                type: "optional",
+                                innerType: oldShape[key],
+                            })
+                            : oldShape[key];
+                    }
+                }
+                assignProp(this, "shape", shape); // self-caching
+                return shape;
+            },
+        },
+        checks: {
+            value: [],
+        },
     });
+    return clone(schema, def);
 }
 function required(Class, schema, mask) {
-    const oldShape = schema._zod.def.shape;
-    const shape = { ...oldShape };
-    if (mask) {
-        for (const key in mask) {
-            if (!(key in shape)) {
-                throw new Error(`Unrecognized key: "${key}"`);
-            }
-            if (!mask[key])
-                continue;
-            // overwrite with non-optional
-            shape[key] = new Class({
-                type: "nonoptional",
-                innerType: oldShape[key],
-            });
-        }
-    }
-    else {
-        for (const key in oldShape) {
-            // overwrite with non-optional
-            shape[key] = new Class({
-                type: "nonoptional",
-                innerType: oldShape[key],
-            });
-        }
-    }
-    return clone(schema, {
-        ...schema._zod.def,
-        shape,
-        // optional: [],
-        checks: [],
+    const def = cloneDef(schema);
+    Object.defineProperties(def, {
+        shape: {
+            get() {
+                const oldShape = schema._zod.def.shape;
+                const shape = { ...oldShape };
+                if (mask) {
+                    for (const key in mask) {
+                        if (!(key in shape)) {
+                            throw new Error(`Unrecognized key: "${key}"`);
+                        }
+                        if (!mask[key])
+                            continue;
+                        // overwrite with non-optional
+                        shape[key] = new Class({
+                            type: "nonoptional",
+                            innerType: oldShape[key],
+                        });
+                    }
+                }
+                else {
+                    for (const key in oldShape) {
+                        // overwrite with non-optional
+                        shape[key] = new Class({
+                            type: "nonoptional",
+                            innerType: oldShape[key],
+                        });
+                    }
+                }
+                assignProp(this, "shape", shape); // self-caching
+                return shape;
+            },
+        },
+        checks: {
+            value: [],
+        },
     });
+    return clone(schema, def);
 }
 function aborted(x, startIndex = 0) {
     for (let i = startIndex; i < x.issues.length; i++) {
-        if (x.issues[i]?.continue !== true)
+        if (x.issues[i]?.continue !== true) {
             return true;
+        }
     }
     return false;
 }
@@ -501,6 +551,7 @@ function getSizableOrigin(input) {
         return "set";
     if (input instanceof Map)
         return "map";
+    // @ts-ignore
     if (input instanceof File)
         return "file";
     return "unknown";

package/v4/core/util.d.cts

@@ -121,6 +121,7 @@ export declare function cleanRegex(source: string): string;
 export declare function floatSafeRemainder(val: number, step: number): number;
 export declare function defineLazy<T, K extends keyof T>(object: T, key: K, getter: () => T[K]): void;
 export declare function assignProp<T extends object, K extends PropertyKey>(target: T, prop: K, value: K extends keyof T ? T[K] : any): void;
+export declare function cloneDef(schema: schemas.$ZodType): any;
 export declare function getElementAtPath(obj: any, path: (string | number)[] | null | undefined): any;
 export declare function promiseAllObject<T extends object>(promisesObj: T): Promise<{
     [k in keyof T]: Awaited<T[k]>;

package/v4/core/util.d.ts

@@ -121,6 +121,7 @@ export declare function cleanRegex(source: string): string;
 export declare function floatSafeRemainder(val: number, step: number): number;
 export declare function defineLazy<T, K extends keyof T>(object: T, key: K, getter: () => T[K]): void;
 export declare function assignProp<T extends object, K extends PropertyKey>(target: T, prop: K, value: K extends keyof T ? T[K] : any): void;
+export declare function cloneDef(schema: schemas.$ZodType): any;
 export declare function getElementAtPath(obj: any, path: (string | number)[] | null | undefined): any;
 export declare function promiseAllObject<T extends object>(promisesObj: T): Promise<{
     [k in keyof T]: Awaited<T[k]>;