zod 3.25.74 → 3.25.76

package/v4/core/schemas.d.ts

@@ -635,6 +635,8 @@ export interface $ZodIntersectionDef<Left extends SomeType = $ZodType, Right ext
 export interface $ZodIntersectionInternals<A extends SomeType = $ZodType, B extends SomeType = $ZodType> extends $ZodTypeInternals<core.output<A> & core.output<B>, core.input<A> & core.input<B>> {
     def: $ZodIntersectionDef<A, B>;
     isst: never;
+    optin: A["_zod"]["optin"] | B["_zod"]["optin"];
+    optout: A["_zod"]["optout"] | B["_zod"]["optout"];
 }
 export interface $ZodIntersection<A extends SomeType = $ZodType, B extends SomeType = $ZodType> extends $ZodType {
     _zod: $ZodIntersectionInternals<A, B>;
@@ -686,6 +688,8 @@ export type $InferZodRecordInput<Key extends $ZodRecordKey = $ZodRecordKey, Valu
 export interface $ZodRecordInternals<Key extends $ZodRecordKey = $ZodRecordKey, Value extends SomeType = $ZodType> extends $ZodTypeInternals<$InferZodRecordOutput<Key, Value>, $InferZodRecordInput<Key, Value>> {
     def: $ZodRecordDef<Key, Value>;
     isst: errors.$ZodIssueInvalidType | errors.$ZodIssueInvalidKey<Record<PropertyKey, unknown>>;
+    optin?: "optional" | undefined;
+    optout?: "optional" | undefined;
 }
 export type $partial = {
     "~~partial": true;
@@ -702,6 +706,8 @@ export interface $ZodMapDef<Key extends SomeType = $ZodType, Value extends SomeT
 export interface $ZodMapInternals<Key extends SomeType = $ZodType, Value extends SomeType = $ZodType> extends $ZodTypeInternals<Map<core.output<Key>, core.output<Value>>, Map<core.input<Key>, core.input<Value>>> {
     def: $ZodMapDef<Key, Value>;
     isst: errors.$ZodIssueInvalidType | errors.$ZodIssueInvalidKey | errors.$ZodIssueInvalidElement<unknown>;
+    optin?: "optional" | undefined;
+    optout?: "optional" | undefined;
 }
 export interface $ZodMap<Key extends SomeType = $ZodType, Value extends SomeType = $ZodType> extends $ZodType {
     _zod: $ZodMapInternals<Key, Value>;
@@ -714,6 +720,8 @@ export interface $ZodSetDef<T extends SomeType = $ZodType> extends $ZodTypeDef {
 export interface $ZodSetInternals<T extends SomeType = $ZodType> extends $ZodTypeInternals<Set<core.output<T>>, Set<core.input<T>>> {
     def: $ZodSetDef<T>;
     isst: errors.$ZodIssueInvalidType;
+    optin?: "optional" | undefined;
+    optout?: "optional" | undefined;
 }
 export interface $ZodSet<T extends SomeType = $ZodType> extends $ZodType {
     _zod: $ZodSetInternals<T>;
@@ -826,6 +834,7 @@ export interface $ZodDefaultDef<T extends SomeType = $ZodType> extends $ZodTypeD
 export interface $ZodDefaultInternals<T extends SomeType = $ZodType> extends $ZodTypeInternals<util.NoUndefined<core.output<T>>, core.input<T> | undefined> {
     def: $ZodDefaultDef<T>;
     optin: "optional";
+    optout?: "optional" | undefined;
     isst: never;
     values: T["_zod"]["values"];
 }
@@ -842,6 +851,7 @@ export interface $ZodPrefaultDef<T extends SomeType = $ZodType> extends $ZodType
 export interface $ZodPrefaultInternals<T extends SomeType = $ZodType> extends $ZodTypeInternals<util.NoUndefined<core.output<T>>, core.input<T> | undefined> {
     def: $ZodPrefaultDef<T>;
     optin: "optional";
+    optout?: "optional" | undefined;
     isst: never;
     values: T["_zod"]["values"];
 }
@@ -857,6 +867,8 @@ export interface $ZodNonOptionalInternals<T extends SomeType = $ZodType> extends
     def: $ZodNonOptionalDef<T>;
     isst: errors.$ZodIssueInvalidType;
     values: T["_zod"]["values"];
+    optin: "optional" | undefined;
+    optout: "optional" | undefined;
 }
 export interface $ZodNonOptional<T extends SomeType = $ZodType> extends $ZodType {
     _zod: $ZodNonOptionalInternals<T>;
@@ -869,6 +881,8 @@ export interface $ZodSuccessDef<T extends SomeType = $ZodType> extends $ZodTypeD
 export interface $ZodSuccessInternals<T extends SomeType = $ZodType> extends $ZodTypeInternals<boolean, core.input<T>> {
     def: $ZodSuccessDef<T>;
     isst: never;
+    optin: T["_zod"]["optin"];
+    optout: "optional" | undefined;
 }
 export interface $ZodSuccess<T extends SomeType = $ZodType> extends $ZodType {
     _zod: $ZodSuccessInternals<T>;

package/v4/core/schemas.js

@@ -35,8 +35,8 @@ export const $ZodType = /*@__PURE__*/ core.$constructor("$ZodType", (inst, def)
             let isAborted = util.aborted(payload);
             let asyncResult;
             for (const ch of checks) {
-                if (ch._zod.when) {
-                    const shouldRun = ch._zod.when(payload);
+                if (ch._zod.def.when) {
+                    const shouldRun = ch._zod.def.when(payload);
                     if (!shouldRun)
                         continue;
                 }

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

@@ -151,9 +151,10 @@ class JSONSchemaGenerator {
                     case "unknown": {
                         break;
                     }
-                    case "undefined":
-                    case "never": {
-                        _json.not = {};
+                    case "undefined": {
+                        if (this.unrepresentable === "throw") {
+                            throw new Error("Undefined cannot be represented in JSON Schema");
+                        }
                         break;
                     }
                     case "void": {
@@ -162,6 +163,10 @@ class JSONSchemaGenerator {
                         }
                         break;
                     }
+                    case "never": {
+                        _json.not = {};
+                        break;
+                    }
                     case "date": {
                         if (this.unrepresentable === "throw") {
                             throw new Error("Date cannot be represented in JSON Schema");
@@ -531,6 +536,8 @@ class JSONSchemaGenerator {
             throw new Error("Unprocessed schema. This is a bug in Zod.");
         // initialize result with root schema fields
         // Object.assign(result, seen.cached);
+        // returns a ref to the schema
+        // defId will be empty if the ref points to an external schema (or #)
         const makeURI = (entry) => {
             // comparing the seen objects because sometimes
             // multiple schemas map to the same seen object.
@@ -540,12 +547,14 @@ class JSONSchemaGenerator {
             if (params.external) {
                 const externalId = params.external.registry.get(entry[0])?.id; // ?? "__shared";// `__schema${this.counter++}`;
                 // check if schema is in the external registry
-                if (externalId)
-                    return { ref: params.external.uri(externalId) };
+                const uriGenerator = params.external.uri ?? ((id) => id);
+                if (externalId) {
+                    return { ref: uriGenerator(externalId) };
+                }
                 // otherwise, add to __shared
                 const id = entry[1].defId ?? entry[1].schema.id ?? `schema${this.counter++}`;
-                entry[1].defId = id;
-                return { defId: id, ref: `${params.external.uri("__shared")}#/${defsSegment}/${id}` };
+                entry[1].defId = id; // set defId so it will be reused if needed
+                return { defId: id, ref: `${uriGenerator("__shared")}#/${defsSegment}/${id}` };
             }
             if (entry[1] === root) {
                 return { ref: "#" };
@@ -559,6 +568,7 @@ class JSONSchemaGenerator {
         // stored cached version in `def` property
         // remove all properties, set $ref
         const extractToDef = (entry) => {
+            // if the schema is already a reference, do not extract it
             if (entry[1].schema.$ref) {
                 return;
             }
@@ -575,14 +585,24 @@ class JSONSchemaGenerator {
             }
             schema.$ref = ref;
         };
+        // throw on cycles
+        // break cycles
+        if (params.cycles === "throw") {
+            for (const entry of this.seen.entries()) {
+                const seen = entry[1];
+                if (seen.cycle) {
+                    throw new Error("Cycle detected: " +
+                        `#/${seen.cycle?.join("/")}/<root>` +
+                        '\n\nSet the `cycles` parameter to `"ref"` to resolve cyclical schemas with defs.');
+                }
+            }
+        }
         // extract schemas into $defs
         for (const entry of this.seen.entries()) {
             const seen = entry[1];
             // convert root schema to # $ref
-            // also prevents root schema from being extracted
             if (schema === entry[0]) {
-                // do not copy to defs...this is the root schema
-                extractToDef(entry);
+                extractToDef(entry); // this has special handling for the root schema
                 continue;
             }
             // extract schemas that are in the external registry
@@ -601,14 +621,8 @@ class JSONSchemaGenerator {
             }
             // break cycles
             if (seen.cycle) {
-                if (params.cycles === "throw") {
-                    throw new Error("Cycle detected: " +
-                        `#/${seen.cycle?.join("/")}/<root>` +
-                        '\n\nSet the `cycles` parameter to `"ref"` to resolve cyclical schemas with defs.');
-                }
-                else if (params.cycles === "ref") {
-                    extractToDef(entry);
-                }
+                // any
+                extractToDef(entry);
                 continue;
             }
             // extract reused schemas
@@ -666,6 +680,12 @@ class JSONSchemaGenerator {
         else {
             console.warn(`Invalid target: ${this.target}`);
         }
+        if (params.external?.uri) {
+            const id = params.external.registry.get(schema)?.id;
+            if (!id)
+                throw new Error("Schema is missing an `id` property");
+            result.$id = params.external.uri(id);
+        }
         Object.assign(result, root.def);
         // build defs object
         const defs = params.external?.defs ?? {};
@@ -676,12 +696,16 @@ class JSONSchemaGenerator {
             }
         }
         // set definitions in result
-        if (!params.external && Object.keys(defs).length > 0) {
-            if (this.target === "draft-2020-12") {
-                result.$defs = defs;
-            }
-            else {
-                result.definitions = defs;
+        if (params.external) {
+        }
+        else {
+            if (Object.keys(defs).length > 0) {
+                if (this.target === "draft-2020-12") {
+                    result.$defs = defs;
+                }
+                else {
+                    result.definitions = defs;
+                }
             }
         }
         try {
@@ -707,7 +731,7 @@ function toJSONSchema(input, _params) {
         const schemas = {};
         const external = {
             registry: input,
-            uri: _params?.uri || ((id) => id),
+            uri: _params?.uri,
             defs,
         };
         for (const entry of input._idmap.entries()) {

package/v4/core/to-json-schema.d.cts

@@ -39,7 +39,7 @@ interface EmitParams {
         registry: $ZodRegistry<{
             id?: string | undefined;
         }>;
-        uri: (id: string) => string;
+        uri?: ((id: string) => string) | undefined;
         defs: Record<string, JSONSchema.BaseSchema>;
     } | undefined;
 }

package/v4/core/to-json-schema.d.ts

@@ -39,7 +39,7 @@ interface EmitParams {
         registry: $ZodRegistry<{
             id?: string | undefined;
         }>;
-        uri: (id: string) => string;
+        uri?: ((id: string) => string) | undefined;
         defs: Record<string, JSONSchema.BaseSchema>;
     } | undefined;
 }

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

@@ -147,9 +147,10 @@ export class JSONSchemaGenerator {
                     case "unknown": {
                         break;
                     }
-                    case "undefined":
-                    case "never": {
-                        _json.not = {};
+                    case "undefined": {
+                        if (this.unrepresentable === "throw") {
+                            throw new Error("Undefined cannot be represented in JSON Schema");
+                        }
                         break;
                     }
                     case "void": {
@@ -158,6 +159,10 @@ export class JSONSchemaGenerator {
                         }
                         break;
                     }
+                    case "never": {
+                        _json.not = {};
+                        break;
+                    }
                     case "date": {
                         if (this.unrepresentable === "throw") {
                             throw new Error("Date cannot be represented in JSON Schema");
@@ -527,6 +532,8 @@ export class JSONSchemaGenerator {
             throw new Error("Unprocessed schema. This is a bug in Zod.");
         // initialize result with root schema fields
         // Object.assign(result, seen.cached);
+        // returns a ref to the schema
+        // defId will be empty if the ref points to an external schema (or #)
         const makeURI = (entry) => {
             // comparing the seen objects because sometimes
             // multiple schemas map to the same seen object.
@@ -536,12 +543,14 @@ export class JSONSchemaGenerator {
             if (params.external) {
                 const externalId = params.external.registry.get(entry[0])?.id; // ?? "__shared";// `__schema${this.counter++}`;
                 // check if schema is in the external registry
-                if (externalId)
-                    return { ref: params.external.uri(externalId) };
+                const uriGenerator = params.external.uri ?? ((id) => id);
+                if (externalId) {
+                    return { ref: uriGenerator(externalId) };
+                }
                 // otherwise, add to __shared
                 const id = entry[1].defId ?? entry[1].schema.id ?? `schema${this.counter++}`;
-                entry[1].defId = id;
-                return { defId: id, ref: `${params.external.uri("__shared")}#/${defsSegment}/${id}` };
+                entry[1].defId = id; // set defId so it will be reused if needed
+                return { defId: id, ref: `${uriGenerator("__shared")}#/${defsSegment}/${id}` };
             }
             if (entry[1] === root) {
                 return { ref: "#" };
@@ -555,6 +564,7 @@ export class JSONSchemaGenerator {
         // stored cached version in `def` property
         // remove all properties, set $ref
         const extractToDef = (entry) => {
+            // if the schema is already a reference, do not extract it
             if (entry[1].schema.$ref) {
                 return;
             }
@@ -571,14 +581,24 @@ export class JSONSchemaGenerator {
             }
             schema.$ref = ref;
         };
+        // throw on cycles
+        // break cycles
+        if (params.cycles === "throw") {
+            for (const entry of this.seen.entries()) {
+                const seen = entry[1];
+                if (seen.cycle) {
+                    throw new Error("Cycle detected: " +
+                        `#/${seen.cycle?.join("/")}/<root>` +
+                        '\n\nSet the `cycles` parameter to `"ref"` to resolve cyclical schemas with defs.');
+                }
+            }
+        }
         // extract schemas into $defs
         for (const entry of this.seen.entries()) {
             const seen = entry[1];
             // convert root schema to # $ref
-            // also prevents root schema from being extracted
             if (schema === entry[0]) {
-                // do not copy to defs...this is the root schema
-                extractToDef(entry);
+                extractToDef(entry); // this has special handling for the root schema
                 continue;
             }
             // extract schemas that are in the external registry
@@ -597,14 +617,8 @@ export class JSONSchemaGenerator {
             }
             // break cycles
             if (seen.cycle) {
-                if (params.cycles === "throw") {
-                    throw new Error("Cycle detected: " +
-                        `#/${seen.cycle?.join("/")}/<root>` +
-                        '\n\nSet the `cycles` parameter to `"ref"` to resolve cyclical schemas with defs.');
-                }
-                else if (params.cycles === "ref") {
-                    extractToDef(entry);
-                }
+                // any
+                extractToDef(entry);
                 continue;
             }
             // extract reused schemas
@@ -662,6 +676,12 @@ export class JSONSchemaGenerator {
         else {
             console.warn(`Invalid target: ${this.target}`);
         }
+        if (params.external?.uri) {
+            const id = params.external.registry.get(schema)?.id;
+            if (!id)
+                throw new Error("Schema is missing an `id` property");
+            result.$id = params.external.uri(id);
+        }
         Object.assign(result, root.def);
         // build defs object
         const defs = params.external?.defs ?? {};
@@ -672,12 +692,16 @@ export class JSONSchemaGenerator {
             }
         }
         // set definitions in result
-        if (!params.external && Object.keys(defs).length > 0) {
-            if (this.target === "draft-2020-12") {
-                result.$defs = defs;
-            }
-            else {
-                result.definitions = defs;
+        if (params.external) {
+        }
+        else {
+            if (Object.keys(defs).length > 0) {
+                if (this.target === "draft-2020-12") {
+                    result.$defs = defs;
+                }
+                else {
+                    result.definitions = defs;
+                }
             }
         }
         try {
@@ -702,7 +726,7 @@ export function toJSONSchema(input, _params) {
         const schemas = {};
         const external = {
             registry: input,
-            uri: _params?.uri || ((id) => id),
+            uri: _params?.uri,
             defs,
         };
         for (const entry of input._idmap.entries()) {