zod 4.1.0-canary.20250723T221600 → 4.1.0-canary.20250724T211341

package/v4/core/errors.cjs

@@ -41,13 +41,7 @@ const initializer = (inst, def) => {
         value: def,
         enumerable: false,
     });
-    Object.defineProperty(inst, "message", {
-        get() {
-            return JSON.stringify(def, util.jsonStringifyReplacer, 2);
-        },
-        enumerable: true,
-        // configurable: false,
-    });
+    inst.message = JSON.stringify(def, util.jsonStringifyReplacer, 2);
     Object.defineProperty(inst, "toString", {
         value: () => inst.message,
         enumerable: false,
@@ -194,8 +188,9 @@ function treeifyError(error, _mapper) {
  *   ✖ Invalid input: expected number
  * ```
  */
-function toDotPath(path) {
+function toDotPath(_path) {
     const segs = [];
+    const path = _path.map((seg) => (typeof seg === "object" ? seg.key : seg));
     for (const seg of path) {
         if (typeof seg === "number")
             segs.push(`[${seg}]`);
@@ -214,7 +209,7 @@ function toDotPath(path) {
 function prettifyError(error) {
     const lines = [];
     // sort by path length
-    const issues = [...error.issues].sort((a, b) => a.path.length - b.path.length);
+    const issues = [...error.issues].sort((a, b) => (a.path ?? []).length - (b.path ?? []).length);
     // Process each issue
     for (const issue of issues) {
         lines.push(`✖ ${issue.message}`);

package/v4/core/errors.d.cts

@@ -1,6 +1,7 @@
 import type { $ZodCheck, $ZodStringFormats } from "./checks.cjs";
 import { $constructor } from "./core.cjs";
 import type { $ZodType } from "./schemas.cjs";
+import type { StandardSchemaV1 } from "./standard-schema.cjs";
 import * as util from "./util.cjs";
 export interface $ZodIssueBase {
     readonly code?: string;
@@ -107,7 +108,7 @@ type RawIssue<T extends $ZodIssueBase> = util.Flatten<util.MakePartial<T, "messa
     readonly input?: unknown;
     /** The schema or check that originated this issue. */
     readonly inst?: $ZodType | $ZodCheck;
-    /** @deprecated Internal use only. If `true`, Zod will continue executing validation despite this issue. */
+    /** If `true`, Zod will continue executing validation despite this issue. */
     readonly continue?: boolean | undefined;
 } & Record<string, any>>;
 export interface $ZodErrorMap<T extends $ZodIssueBase = $ZodIssue> {
@@ -202,9 +203,6 @@ export declare function treeifyError<T, U>(error: $ZodError<T>, mapper?: (issue:
  *   ✖ Invalid input: expected number
  * ```
  */
-export declare function toDotPath(path: (string | number | symbol)[]): string;
-interface BaseError {
-    issues: $ZodIssueBase[];
-}
-export declare function prettifyError(error: BaseError): string;
+export declare function toDotPath(_path: readonly (string | number | symbol | StandardSchemaV1.PathSegment)[]): string;
+export declare function prettifyError(error: StandardSchemaV1.FailureResult): string;
 export {};

package/v4/core/errors.d.ts

@@ -1,6 +1,7 @@
 import type { $ZodCheck, $ZodStringFormats } from "./checks.js";
 import { $constructor } from "./core.js";
 import type { $ZodType } from "./schemas.js";
+import type { StandardSchemaV1 } from "./standard-schema.js";
 import * as util from "./util.js";
 export interface $ZodIssueBase {
     readonly code?: string;
@@ -107,7 +108,7 @@ type RawIssue<T extends $ZodIssueBase> = util.Flatten<util.MakePartial<T, "messa
     readonly input?: unknown;
     /** The schema or check that originated this issue. */
     readonly inst?: $ZodType | $ZodCheck;
-    /** @deprecated Internal use only. If `true`, Zod will continue executing validation despite this issue. */
+    /** If `true`, Zod will continue executing validation despite this issue. */
     readonly continue?: boolean | undefined;
 } & Record<string, any>>;
 export interface $ZodErrorMap<T extends $ZodIssueBase = $ZodIssue> {
@@ -202,9 +203,6 @@ export declare function treeifyError<T, U>(error: $ZodError<T>, mapper?: (issue:
  *   ✖ Invalid input: expected number
  * ```
  */
-export declare function toDotPath(path: (string | number | symbol)[]): string;
-interface BaseError {
-    issues: $ZodIssueBase[];
-}
-export declare function prettifyError(error: BaseError): string;
+export declare function toDotPath(_path: readonly (string | number | symbol | StandardSchemaV1.PathSegment)[]): string;
+export declare function prettifyError(error: StandardSchemaV1.FailureResult): string;
 export {};

package/v4/core/errors.js

@@ -10,13 +10,7 @@ const initializer = (inst, def) => {
         value: def,
         enumerable: false,
     });
-    Object.defineProperty(inst, "message", {
-        get() {
-            return JSON.stringify(def, util.jsonStringifyReplacer, 2);
-        },
-        enumerable: true,
-        // configurable: false,
-    });
+    inst.message = JSON.stringify(def, util.jsonStringifyReplacer, 2);
     Object.defineProperty(inst, "toString", {
         value: () => inst.message,
         enumerable: false,
@@ -163,8 +157,9 @@ export function treeifyError(error, _mapper) {
  *   ✖ Invalid input: expected number
  * ```
  */
-export function toDotPath(path) {
+export function toDotPath(_path) {
     const segs = [];
+    const path = _path.map((seg) => (typeof seg === "object" ? seg.key : seg));
     for (const seg of path) {
         if (typeof seg === "number")
             segs.push(`[${seg}]`);
@@ -183,7 +178,7 @@ export function toDotPath(path) {
 export function prettifyError(error) {
     const lines = [];
     // sort by path length
-    const issues = [...error.issues].sort((a, b) => a.path.length - b.path.length);
+    const issues = [...error.issues].sort((a, b) => (a.path ?? []).length - (b.path ?? []).length);
     // Process each issue
     for (const issue of issues) {
         lines.push(`✖ ${issue.message}`);

package/v4/core/registries.cjs

@@ -40,7 +40,8 @@ class $ZodRegistry {
         if (p) {
             const pm = { ...(this.get(p) ?? {}) };
             delete pm.id; // do not inherit id
-            return { ...pm, ...this._map.get(schema) };
+            const f = { ...pm, ...this._map.get(schema) };
+            return Object.keys(f).length ? f : undefined;
         }
         return this._map.get(schema);
     }

package/v4/core/registries.d.cts

@@ -9,7 +9,7 @@ export type $replace<Meta, S extends $ZodType> = Meta extends $output ? core.out
 }) => $replace<R, S> : Meta extends object ? {
     [K in keyof Meta]: $replace<Meta[K], S>;
 } : Meta;
-type MetadataType = Record<string, unknown> | undefined;
+type MetadataType = object | undefined;
 export declare class $ZodRegistry<Meta extends MetadataType = MetadataType, Schema extends $ZodType = $ZodType> {
     _meta: Meta;
     _schema: Schema;

package/v4/core/registries.d.ts

@@ -9,7 +9,7 @@ export type $replace<Meta, S extends $ZodType> = Meta extends $output ? core.out
 }) => $replace<R, S> : Meta extends object ? {
     [K in keyof Meta]: $replace<Meta[K], S>;
 } : Meta;
-type MetadataType = Record<string, unknown> | undefined;
+type MetadataType = object | undefined;
 export declare class $ZodRegistry<Meta extends MetadataType = MetadataType, Schema extends $ZodType = $ZodType> {
     _meta: Meta;
     _schema: Schema;

package/v4/core/registries.js

@@ -36,7 +36,8 @@ export class $ZodRegistry {
         if (p) {
             const pm = { ...(this.get(p) ?? {}) };
             delete pm.id; // do not inherit id
-            return { ...pm, ...this._map.get(schema) };
+            const f = { ...pm, ...this._map.get(schema) };
+            return Object.keys(f).length ? f : undefined;
         }
         return this._map.get(schema);
     }

package/v4/core/schemas.cjs

@@ -187,9 +187,10 @@ exports.$ZodURL = core.$constructor("$ZodURL", (inst, def) => {
     exports.$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)) {
@@ -218,12 +219,14 @@ exports.$ZodURL = 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;
         }
@@ -299,6 +302,7 @@ exports.$ZodIPv6 = core.$constructor("$ZodIPv6", (inst, def) => {
     });
     inst._zod.check = (payload) => {
         try {
+            // @ts-ignore
             new URL(`http://[${payload.value}]`);
             // return;
         }
@@ -330,6 +334,7 @@ exports.$ZodCIDRv6 = core.$constructor("$ZodCIDRv6", (inst, def) => {
                 throw new Error();
             if (prefixNum < 0 || prefixNum > 128)
                 throw new Error();
+            // @ts-ignore
             new URL(`http://[${address}]`);
         }
         catch {
@@ -350,6 +355,7 @@ function isValidBase64(data) {
     if (data.length % 4 !== 0)
         return false;
     try {
+        // @ts-ignore
         atob(data);
         return true;
     }
@@ -414,6 +420,7 @@ 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;
@@ -684,36 +691,16 @@ exports.$ZodArray = 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;
     }
 }
@@ -765,42 +752,25 @@ exports.$ZodObject = core.$constructor("$ZodObject", (inst, def) => {
         // 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;`);
@@ -838,33 +808,16 @@ exports.$ZodObject = core.$constructor("$ZodObject", (inst, def) => {
             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 = [];
@@ -881,10 +834,10 @@ exports.$ZodObject = core.$constructor("$ZodObject", (inst, def) => {
             }
             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) {
@@ -909,6 +862,11 @@ function handleUnionResults(results, final, inst, ctx) {
             return final;
         }
     }
+    const nonaborted = results.filter((r) => !util.aborted(r));
+    if (nonaborted.length === 1) {
+        final.value = nonaborted[0].value;
+        return nonaborted[0];
+    }
     final.issues.push({
         code: "invalid_union",
         input: final.value,
@@ -1374,14 +1332,15 @@ function handleSetResult(result, final) {
 exports.$ZodEnum = core.$constructor("$ZodEnum", (inst, def) => {
     exports.$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({
@@ -1395,9 +1354,12 @@ exports.$ZodEnum = core.$constructor("$ZodEnum", (inst, def) => {
 });
 exports.$ZodLiteral = core.$constructor("$ZodLiteral", (inst, def) => {
     exports.$ZodType.init(inst, def);
+    if (def.values.length === 0) {
+        throw new Error("Cannot create literal schema with no valid values");
+    }
     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;
@@ -1417,6 +1379,7 @@ exports.$ZodFile = core.$constructor("$ZodFile", (inst, def) => {
     exports.$ZodType.init(inst, def);
     inst._zod.parse = (payload, _ctx) => {
         const input = payload.value;
+        // @ts-ignore
         if (input instanceof File)
             return payload;
         payload.issues.push({
@@ -1562,7 +1525,7 @@ exports.$ZodSuccess = core.$constructor("$ZodSuccess", (inst, def) => {
 });
 exports.$ZodCatch = core.$constructor("$ZodCatch", (inst, def) => {
     exports.$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) => {
@@ -1627,7 +1590,7 @@ exports.$ZodPipe = core.$constructor("$ZodPipe", (inst, def) => {
     };
 });
 function handlePipeResult(left, def, ctx) {
-    if (util.aborted(left)) {
+    if (left.issues.length) {
         return left;
     }
     return def.out._zod.run({ value: left.value, issues: left.issues }, ctx);

package/v4/core/schemas.d.cts

@@ -54,6 +54,7 @@ export interface _$ZodTypeInternals {
      * Todo: unions?
      */
     values?: util.PrimitiveSet | undefined;
+    /** Default value bubbled up from  */
     /** @internal A set of literal discriminators used for the fast path in discriminated unions. */
     propValues?: util.PropValues | undefined;
     /** @internal This flag indicates that a schema validation can be represented with a regular expression. Used to determine allowable schemas in z.templateLiteral(). */
@@ -148,6 +149,7 @@ export declare const $ZodEmail: core.$constructor<$ZodEmail>;
 export interface $ZodURLDef extends $ZodStringFormatDef<"url"> {
     hostname?: RegExp | undefined;
     protocol?: RegExp | undefined;
+    normalize?: boolean | undefined;
 }
 export interface $ZodURLInternals extends $ZodStringFormatInternals<"url"> {
     def: $ZodURLDef;
@@ -762,9 +764,12 @@ export interface $ZodLiteral<T extends util.Literal = util.Literal> extends $Zod
 }
 export declare const $ZodLiteral: core.$constructor<$ZodLiteral>;
 type _File = typeof globalThis extends {
-    File: new (...args: any[]) => any;
-} ? InstanceType<typeof globalThis.File> : {};
-interface File extends _File {
+    File: infer F extends new (...args: any[]) => any;
+} ? InstanceType<F> : {};
+/** Do not reference this directly. */
+export interface File extends _File {
+    type: string;
+    size: number;
 }
 export interface $ZodFileDef extends $ZodTypeDef {
     type: "file";

package/v4/core/schemas.d.ts

@@ -54,6 +54,7 @@ export interface _$ZodTypeInternals {
      * Todo: unions?
      */
     values?: util.PrimitiveSet | undefined;
+    /** Default value bubbled up from  */
     /** @internal A set of literal discriminators used for the fast path in discriminated unions. */
     propValues?: util.PropValues | undefined;
     /** @internal This flag indicates that a schema validation can be represented with a regular expression. Used to determine allowable schemas in z.templateLiteral(). */
@@ -148,6 +149,7 @@ export declare const $ZodEmail: core.$constructor<$ZodEmail>;
 export interface $ZodURLDef extends $ZodStringFormatDef<"url"> {
     hostname?: RegExp | undefined;
     protocol?: RegExp | undefined;
+    normalize?: boolean | undefined;
 }
 export interface $ZodURLInternals extends $ZodStringFormatInternals<"url"> {
     def: $ZodURLDef;
@@ -762,9 +764,12 @@ export interface $ZodLiteral<T extends util.Literal = util.Literal> extends $Zod
 }
 export declare const $ZodLiteral: core.$constructor<$ZodLiteral>;
 type _File = typeof globalThis extends {
-    File: new (...args: any[]) => any;
-} ? InstanceType<typeof globalThis.File> : {};
-interface File extends _File {
+    File: infer F extends new (...args: any[]) => any;
+} ? InstanceType<F> : {};
+/** Do not reference this directly. */
+export interface File extends _File {
+    type: string;
+    size: number;
 }
 export interface $ZodFileDef extends $ZodTypeDef {
     type: "file";