zod 3.26.0-canary.20250707T201657 → 3.26.0-canary.20250708T225111

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

@@ -532,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.
@@ -541,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: "#" };
@@ -560,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;
             }
@@ -576,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
@@ -602,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
@@ -667,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 ?? {};
@@ -677,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 {
@@ -707,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()) {