zod-openapi 5.4.1 → 5.4.3

package/dist/api.cjs

@@ -1,4 +1,4 @@
-const require_components = require('./components-y0WDbAMK.cjs');
+const require_components = require('./components-BtkBk4ss.cjs');
 
 exports.createComponents = require_components.createComponents;
 exports.createRegistry = require_components.createRegistry;

package/dist/api.js

@@ -1,3 +1,3 @@
-import { createComponents, createRegistry, isAnyZodType, unwrapZodObject } from "./components-DTiQQs5D.js";
+import { createComponents, createRegistry, isAnyZodType, unwrapZodObject } from "./components-DV_-zLJ6.js";
 
 export { createComponents, createRegistry, isAnyZodType, unwrapZodObject };

package/dist/{components-y0WDbAMK.cjs → components-BtkBk4ss.cjs}

@@ -32,12 +32,9 @@ const isAnyZodType = (schema) => typeof schema === "object" && schema !== null &
 //#endregion
 //#region src/create/examples.ts
 const createExamples = (examples, registry$1, path) => {
-	if (!examples) return void 0;
+	if (!examples) return;
 	const examplesObject = {};
-	for (const [name, example] of Object.entries(examples)) {
-		const exampleObject = registry$1.addExample(example, [...path, name]);
-		examplesObject[name] = exampleObject;
-	}
+	for (const [name, example] of Object.entries(examples)) examplesObject[name] = registry$1.addExample(example, [...path, name]);
 	return examplesObject;
 };
 
@@ -46,13 +43,11 @@ const createExamples = (examples, registry$1, path) => {
 const createMediaTypeObject = (mediaType, ctx, path) => {
 	const { schema, examples,...rest } = mediaType;
 	const mediaTypeObject = rest;
-	if (isAnyZodType(schema)) {
-		const schemaObject = ctx.registry.addSchema(schema, [...path, "schema"], {
-			io: ctx.io,
-			source: { type: "mediaType" }
-		});
-		mediaTypeObject.schema = schemaObject;
-	} else mediaTypeObject.schema = schema;
+	if (isAnyZodType(schema)) mediaTypeObject.schema = ctx.registry.addSchema(schema, [...path, "schema"], {
+		io: ctx.io,
+		source: { type: "mediaType" }
+	});
+	else mediaTypeObject.schema = schema;
 	if (examples) mediaTypeObject.examples = createExamples(examples, ctx.registry, [...path, "examples"]);
 	return mediaTypeObject;
 };
@@ -83,14 +78,11 @@ const isRequired = (zodType, io) => {
 //#endregion
 //#region src/create/headers.ts
 const createHeaders = (headers, registry$1, path) => {
-	if (!headers) return void 0;
+	if (!headers) return;
 	if (isAnyZodType(headers)) {
 		const zodObject = unwrapZodObject(headers, "output", path);
 		const headersObject = {};
-		for (const [key, zodSchema] of Object.entries(zodObject._zod.def.shape)) {
-			const header = registry$1.addHeader(zodSchema, [...path, key]);
-			headersObject[key] = header;
-		}
+		for (const [key, zodSchema] of Object.entries(zodObject._zod.def.shape)) headersObject[key] = registry$1.addHeader(zodSchema, [...path, key]);
 		return headersObject;
 	}
 	return headers;
@@ -99,19 +91,16 @@ const createHeaders = (headers, registry$1, path) => {
 //#endregion
 //#region src/create/links.ts
 const createLinks = (links, registry$1, path) => {
-	if (!links) return void 0;
+	if (!links) return;
 	const linksObject = {};
-	for (const [name, link] of Object.entries(links)) {
-		const linkObject = registry$1.addLink(link, [...path, name]);
-		linksObject[name] = linkObject;
-	}
+	for (const [name, link] of Object.entries(links)) linksObject[name] = registry$1.addLink(link, [...path, name]);
 	return linksObject;
 };
 
 //#endregion
 //#region src/create/parameters.ts
 const createManualParameters = (parameters, registry$1, path) => {
-	if (!parameters) return void 0;
+	if (!parameters) return;
 	const parameterObjects = [];
 	for (const parameter of parameters) {
 		if (isAnyZodType(parameter)) {
@@ -124,7 +113,7 @@ const createManualParameters = (parameters, registry$1, path) => {
 	return parameterObjects;
 };
 const createParameters = (requestParams, registry$1, path) => {
-	if (!requestParams) return void 0;
+	if (!requestParams) return;
 	const parameterObjects = [];
 	for (const [location, schema] of Object.entries(requestParams ?? {})) {
 		const zodObject = unwrapZodObject(schema, "input", path);
@@ -150,7 +139,7 @@ const isISpecificationExtension = (key) => key.startsWith("x-");
 //#endregion
 //#region src/create/callbacks.ts
 const createCallbacks = (callbacks, registry$1, path) => {
-	if (!callbacks) return void 0;
+	if (!callbacks) return;
 	const callbacksObject = {};
 	for (const [name, value] of Object.entries(callbacks)) {
 		if (isISpecificationExtension(name)) {
@@ -165,7 +154,7 @@ const createCallbacks = (callbacks, registry$1, path) => {
 //#endregion
 //#region src/create/responses.ts
 const createResponses = (responses, registry$1, path) => {
-	if (!responses) return void 0;
+	if (!responses) return;
 	const responsesObject = {};
 	for (const [statusCode, response] of Object.entries(responses)) {
 		if (!response) continue;
@@ -177,8 +166,7 @@ const createResponses = (responses, registry$1, path) => {
 			responsesObject[statusCode] = response;
 			continue;
 		}
-		const responseObject = registry$1.addResponse(response, [...path, statusCode]);
-		responsesObject[statusCode] = responseObject;
+		responsesObject[statusCode] = registry$1.addResponse(response, [...path, statusCode]);
 	}
 	return responsesObject;
 };
@@ -200,7 +188,7 @@ const createOperation = (operation, registry$1, path) => {
 	return operationObject;
 };
 const createPaths = (paths, registry$1, path) => {
-	if (!paths) return void 0;
+	if (!paths) return;
 	const pathsObject = {};
 	for (const [singlePath, pathItemObject] of Object.entries(paths)) {
 		if (isISpecificationExtension(singlePath)) {
@@ -323,14 +311,12 @@ const renameComponents = (components, outputIds, ctx, refPath) => {
 		componentDependencies.set(key, { dependencies });
 	}
 	for (const [key] of stringifiedComponents) {
-		const registeredComponent = ctx.registry.components.schemas.ids.get(key);
-		if (!registeredComponent) continue;
+		if (!ctx.registry.components.schemas.ids.get(key)) continue;
 		if (isDependencyPure(componentDependencies, stringifiedComponents, ctx.registry, key)) continue;
 		const newName = outputIds.get(key) ?? `${key}${ctx.opts.outputIdSuffix ?? "Output"}`;
 		componentsToRename.set(key, newName);
 		components[newName] = components[key];
 		delete components[key];
-		continue;
 	}
 	return componentsToRename;
 };
@@ -352,11 +338,7 @@ const isDependencyPure = (componentDependencies, stringifiedComponents, registry
 
 //#endregion
 //#region src/create/schema/schema.ts
-const createSchema = (schema, ctx = {
-	registry: createRegistry(),
-	io: "output",
-	opts: {}
-}) => {
+const createSchema = (schema, ctx = {}) => {
 	ctx.registry ??= createRegistry({ schemas: ctx.schemaComponents });
 	ctx.opts ??= {};
 	ctx.io ??= "output";
@@ -402,6 +384,7 @@ const createSchemas = (schemas, ctx) => {
 	zodRegistry.add((0, zod_v4.object)(entries), { id: "zodOpenApiCreateSchema" });
 	for (const [id, { zodType }] of ctx.registry.components.schemas.manual) zodRegistry.add(zodType, { id });
 	const outputIds = /* @__PURE__ */ new Map();
+	const defsName = satisfiesVersion(ctx.openapiVersion ?? "3.1.0", "3.1.0") ? "$defs" : "definitions";
 	const jsonSchema = (0, zod_v4.toJSONSchema)(zodRegistry, {
 		override(context) {
 			const meta = zod_v4.globalRegistry.get(context.zodSchema);
@@ -430,10 +413,10 @@ const createSchemas = (schemas, ctx) => {
 		reused: ctx.opts.reused,
 		cycles: ctx.opts.cycles,
 		target: satisfiesVersion(ctx.openapiVersion ?? "3.1.0", "3.1.0") ? void 0 : "openapi-3.0",
-		uri: (id) => id === "__shared" ? `#ZOD_OPENAPI/${id}` : `#ZOD_OPENAPI/__shared#/$defs/${id}`
+		uri: (id) => id === "__shared" ? `#ZOD_OPENAPI/${id}` : `#ZOD_OPENAPI/__shared#/${defsName}/${id}`
 	});
-	const components = jsonSchema.schemas.__shared?.$defs ?? {};
-	jsonSchema.schemas.__shared ??= { $defs: components };
+	const components = jsonSchema.schemas.__shared?.[defsName] ?? {};
+	jsonSchema.schemas.__shared ??= { [defsName]: components };
 	const dynamicComponents = /* @__PURE__ */ new Map();
 	for (const [key, value] of Object.entries(components)) {
 		deleteInvalidJsonSchemaFields(value);
@@ -452,15 +435,14 @@ const createSchemas = (schemas, ctx) => {
 		deleteInvalidJsonSchemaFields(manualComponent);
 	}
 	const manualUsed = {};
-	const parsedJsonSchema = JSON.parse(JSON.stringify(jsonSchema).replace(/"#ZOD_OPENAPI\/__shared#\/\$defs\/([^"]+)"/g, (_, match) => {
+	const parsedJsonSchema = JSON.parse(JSON.stringify(jsonSchema).replace(/"#ZOD_OPENAPI\/__shared#\/(?:\$defs|definitions)\/([^"]+)"/g, (_, match) => {
 		const dynamic = dynamicComponents.get(match);
 		if (dynamic) return dynamic;
-		const manualComponent = ctx.registry.components.schemas.manual.get(match);
-		if (manualComponent) manualUsed[match] = true;
+		if (ctx.registry.components.schemas.manual.get(match)) manualUsed[match] = true;
 		return `"${refPath}${match}"`;
 	}));
-	const parsedComponents = parsedJsonSchema.schemas.__shared?.$defs ?? {};
-	parsedJsonSchema.schemas.__shared ??= { $defs: parsedComponents };
+	const parsedComponents = parsedJsonSchema.schemas.__shared?.[defsName] ?? {};
+	parsedJsonSchema.schemas.__shared ??= { [defsName]: parsedComponents };
 	for (const [key] of ctx.registry.components.schemas.manual) {
 		const manualComponent = parsedJsonSchema.schemas[key];
 		if (!manualComponent) continue;
@@ -486,7 +468,7 @@ const createSchemas = (schemas, ctx) => {
 		return `"${refPath}${match}"`;
 	}));
 	const renamedSchemas = renamedJsonSchema.schemas.zodOpenApiCreateSchema?.properties;
-	const renamedComponents = renamedJsonSchema.schemas.__shared?.$defs ?? {};
+	const renamedComponents = renamedJsonSchema.schemas.__shared?.[defsName] ?? {};
 	delete renamedJsonSchema.schemas.zodOpenApiCreateSchema;
 	delete renamedJsonSchema.schemas.__shared;
 	return {
@@ -923,8 +905,7 @@ const createIOSchemas = (ctx) => {
 };
 const createManualSchemas = (registry$1) => {
 	for (const [key, value] of registry$1.components.schemas.manual) if (!value.input.used) {
-		const io = zod_v4_core.globalRegistry.get(value.zodType)?.unusedIO ?? "output";
-		const schema = value[io].schemaObject;
+		const schema = value[zod_v4_core.globalRegistry.get(value.zodType)?.unusedIO ?? "output"].schemaObject;
 		registry$1.components.schemas.ids.set(key, schema);
 	}
 };

package/dist/{components-DTiQQs5D.js → components-DV_-zLJ6.js}

@@ -7,12 +7,9 @@ const isAnyZodType = (schema) => typeof schema === "object" && schema !== null &
 //#endregion
 //#region src/create/examples.ts
 const createExamples = (examples, registry$1, path) => {
-	if (!examples) return void 0;
+	if (!examples) return;
 	const examplesObject = {};
-	for (const [name, example] of Object.entries(examples)) {
-		const exampleObject = registry$1.addExample(example, [...path, name]);
-		examplesObject[name] = exampleObject;
-	}
+	for (const [name, example] of Object.entries(examples)) examplesObject[name] = registry$1.addExample(example, [...path, name]);
 	return examplesObject;
 };
 
@@ -21,13 +18,11 @@ const createExamples = (examples, registry$1, path) => {
 const createMediaTypeObject = (mediaType, ctx, path) => {
 	const { schema, examples,...rest } = mediaType;
 	const mediaTypeObject = rest;
-	if (isAnyZodType(schema)) {
-		const schemaObject = ctx.registry.addSchema(schema, [...path, "schema"], {
-			io: ctx.io,
-			source: { type: "mediaType" }
-		});
-		mediaTypeObject.schema = schemaObject;
-	} else mediaTypeObject.schema = schema;
+	if (isAnyZodType(schema)) mediaTypeObject.schema = ctx.registry.addSchema(schema, [...path, "schema"], {
+		io: ctx.io,
+		source: { type: "mediaType" }
+	});
+	else mediaTypeObject.schema = schema;
 	if (examples) mediaTypeObject.examples = createExamples(examples, ctx.registry, [...path, "examples"]);
 	return mediaTypeObject;
 };
@@ -58,14 +53,11 @@ const isRequired = (zodType, io) => {
 //#endregion
 //#region src/create/headers.ts
 const createHeaders = (headers, registry$1, path) => {
-	if (!headers) return void 0;
+	if (!headers) return;
 	if (isAnyZodType(headers)) {
 		const zodObject = unwrapZodObject(headers, "output", path);
 		const headersObject = {};
-		for (const [key, zodSchema] of Object.entries(zodObject._zod.def.shape)) {
-			const header = registry$1.addHeader(zodSchema, [...path, key]);
-			headersObject[key] = header;
-		}
+		for (const [key, zodSchema] of Object.entries(zodObject._zod.def.shape)) headersObject[key] = registry$1.addHeader(zodSchema, [...path, key]);
 		return headersObject;
 	}
 	return headers;
@@ -74,19 +66,16 @@ const createHeaders = (headers, registry$1, path) => {
 //#endregion
 //#region src/create/links.ts
 const createLinks = (links, registry$1, path) => {
-	if (!links) return void 0;
+	if (!links) return;
 	const linksObject = {};
-	for (const [name, link] of Object.entries(links)) {
-		const linkObject = registry$1.addLink(link, [...path, name]);
-		linksObject[name] = linkObject;
-	}
+	for (const [name, link] of Object.entries(links)) linksObject[name] = registry$1.addLink(link, [...path, name]);
 	return linksObject;
 };
 
 //#endregion
 //#region src/create/parameters.ts
 const createManualParameters = (parameters, registry$1, path) => {
-	if (!parameters) return void 0;
+	if (!parameters) return;
 	const parameterObjects = [];
 	for (const parameter of parameters) {
 		if (isAnyZodType(parameter)) {
@@ -99,7 +88,7 @@ const createManualParameters = (parameters, registry$1, path) => {
 	return parameterObjects;
 };
 const createParameters = (requestParams, registry$1, path) => {
-	if (!requestParams) return void 0;
+	if (!requestParams) return;
 	const parameterObjects = [];
 	for (const [location, schema] of Object.entries(requestParams ?? {})) {
 		const zodObject = unwrapZodObject(schema, "input", path);
@@ -125,7 +114,7 @@ const isISpecificationExtension = (key) => key.startsWith("x-");
 //#endregion
 //#region src/create/callbacks.ts
 const createCallbacks = (callbacks, registry$1, path) => {
-	if (!callbacks) return void 0;
+	if (!callbacks) return;
 	const callbacksObject = {};
 	for (const [name, value] of Object.entries(callbacks)) {
 		if (isISpecificationExtension(name)) {
@@ -140,7 +129,7 @@ const createCallbacks = (callbacks, registry$1, path) => {
 //#endregion
 //#region src/create/responses.ts
 const createResponses = (responses, registry$1, path) => {
-	if (!responses) return void 0;
+	if (!responses) return;
 	const responsesObject = {};
 	for (const [statusCode, response] of Object.entries(responses)) {
 		if (!response) continue;
@@ -152,8 +141,7 @@ const createResponses = (responses, registry$1, path) => {
 			responsesObject[statusCode] = response;
 			continue;
 		}
-		const responseObject = registry$1.addResponse(response, [...path, statusCode]);
-		responsesObject[statusCode] = responseObject;
+		responsesObject[statusCode] = registry$1.addResponse(response, [...path, statusCode]);
 	}
 	return responsesObject;
 };
@@ -175,7 +163,7 @@ const createOperation = (operation, registry$1, path) => {
 	return operationObject;
 };
 const createPaths = (paths, registry$1, path) => {
-	if (!paths) return void 0;
+	if (!paths) return;
 	const pathsObject = {};
 	for (const [singlePath, pathItemObject] of Object.entries(paths)) {
 		if (isISpecificationExtension(singlePath)) {
@@ -298,14 +286,12 @@ const renameComponents = (components, outputIds, ctx, refPath) => {
 		componentDependencies.set(key, { dependencies });
 	}
 	for (const [key] of stringifiedComponents) {
-		const registeredComponent = ctx.registry.components.schemas.ids.get(key);
-		if (!registeredComponent) continue;
+		if (!ctx.registry.components.schemas.ids.get(key)) continue;
 		if (isDependencyPure(componentDependencies, stringifiedComponents, ctx.registry, key)) continue;
 		const newName = outputIds.get(key) ?? `${key}${ctx.opts.outputIdSuffix ?? "Output"}`;
 		componentsToRename.set(key, newName);
 		components[newName] = components[key];
 		delete components[key];
-		continue;
 	}
 	return componentsToRename;
 };
@@ -327,11 +313,7 @@ const isDependencyPure = (componentDependencies, stringifiedComponents, registry
 
 //#endregion
 //#region src/create/schema/schema.ts
-const createSchema = (schema, ctx = {
-	registry: createRegistry(),
-	io: "output",
-	opts: {}
-}) => {
+const createSchema = (schema, ctx = {}) => {
 	ctx.registry ??= createRegistry({ schemas: ctx.schemaComponents });
 	ctx.opts ??= {};
 	ctx.io ??= "output";
@@ -377,6 +359,7 @@ const createSchemas = (schemas, ctx) => {
 	zodRegistry.add(object(entries), { id: "zodOpenApiCreateSchema" });
 	for (const [id, { zodType }] of ctx.registry.components.schemas.manual) zodRegistry.add(zodType, { id });
 	const outputIds = /* @__PURE__ */ new Map();
+	const defsName = satisfiesVersion(ctx.openapiVersion ?? "3.1.0", "3.1.0") ? "$defs" : "definitions";
 	const jsonSchema = toJSONSchema$1(zodRegistry, {
 		override(context) {
 			const meta = globalRegistry$1.get(context.zodSchema);
@@ -405,10 +388,10 @@ const createSchemas = (schemas, ctx) => {
 		reused: ctx.opts.reused,
 		cycles: ctx.opts.cycles,
 		target: satisfiesVersion(ctx.openapiVersion ?? "3.1.0", "3.1.0") ? void 0 : "openapi-3.0",
-		uri: (id) => id === "__shared" ? `#ZOD_OPENAPI/${id}` : `#ZOD_OPENAPI/__shared#/$defs/${id}`
+		uri: (id) => id === "__shared" ? `#ZOD_OPENAPI/${id}` : `#ZOD_OPENAPI/__shared#/${defsName}/${id}`
 	});
-	const components = jsonSchema.schemas.__shared?.$defs ?? {};
-	jsonSchema.schemas.__shared ??= { $defs: components };
+	const components = jsonSchema.schemas.__shared?.[defsName] ?? {};
+	jsonSchema.schemas.__shared ??= { [defsName]: components };
 	const dynamicComponents = /* @__PURE__ */ new Map();
 	for (const [key, value] of Object.entries(components)) {
 		deleteInvalidJsonSchemaFields(value);
@@ -427,15 +410,14 @@ const createSchemas = (schemas, ctx) => {
 		deleteInvalidJsonSchemaFields(manualComponent);
 	}
 	const manualUsed = {};
-	const parsedJsonSchema = JSON.parse(JSON.stringify(jsonSchema).replace(/"#ZOD_OPENAPI\/__shared#\/\$defs\/([^"]+)"/g, (_, match) => {
+	const parsedJsonSchema = JSON.parse(JSON.stringify(jsonSchema).replace(/"#ZOD_OPENAPI\/__shared#\/(?:\$defs|definitions)\/([^"]+)"/g, (_, match) => {
 		const dynamic = dynamicComponents.get(match);
 		if (dynamic) return dynamic;
-		const manualComponent = ctx.registry.components.schemas.manual.get(match);
-		if (manualComponent) manualUsed[match] = true;
+		if (ctx.registry.components.schemas.manual.get(match)) manualUsed[match] = true;
 		return `"${refPath}${match}"`;
 	}));
-	const parsedComponents = parsedJsonSchema.schemas.__shared?.$defs ?? {};
-	parsedJsonSchema.schemas.__shared ??= { $defs: parsedComponents };
+	const parsedComponents = parsedJsonSchema.schemas.__shared?.[defsName] ?? {};
+	parsedJsonSchema.schemas.__shared ??= { [defsName]: parsedComponents };
 	for (const [key] of ctx.registry.components.schemas.manual) {
 		const manualComponent = parsedJsonSchema.schemas[key];
 		if (!manualComponent) continue;
@@ -461,7 +443,7 @@ const createSchemas = (schemas, ctx) => {
 		return `"${refPath}${match}"`;
 	}));
 	const renamedSchemas = renamedJsonSchema.schemas.zodOpenApiCreateSchema?.properties;
-	const renamedComponents = renamedJsonSchema.schemas.__shared?.$defs ?? {};
+	const renamedComponents = renamedJsonSchema.schemas.__shared?.[defsName] ?? {};
 	delete renamedJsonSchema.schemas.zodOpenApiCreateSchema;
 	delete renamedJsonSchema.schemas.__shared;
 	return {
@@ -898,8 +880,7 @@ const createIOSchemas = (ctx) => {
 };
 const createManualSchemas = (registry$1) => {
 	for (const [key, value] of registry$1.components.schemas.manual) if (!value.input.used) {
-		const io = globalRegistry.get(value.zodType)?.unusedIO ?? "output";
-		const schema = value[io].schemaObject;
+		const schema = value[globalRegistry.get(value.zodType)?.unusedIO ?? "output"].schemaObject;
 		registry$1.components.schemas.ids.set(key, schema);
 	}
 };

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_components = require('./components-y0WDbAMK.cjs');
+const require_components = require('./components-BtkBk4ss.cjs');
 
 //#region src/create/document.ts
 const createDocument = (zodOpenApiObject, opts = {}) => {

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createComponents, createPaths, createRegistry, createSchema } from "./components-DTiQQs5D.js";
+import { createComponents, createPaths, createRegistry, createSchema } from "./components-DV_-zLJ6.js";
 
 //#region src/create/document.ts
 const createDocument = (zodOpenApiObject, opts = {}) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod-openapi",
-  "version": "5.4.1",
+  "version": "5.4.3",
   "description": "Convert Zod Schemas to OpenAPI v3.x documentation",
   "keywords": [
     "typescript",
@@ -53,10 +53,10 @@
     "eslint-plugin-import-zod": "1.2.0",
     "eslint-plugin-zod-openapi": "2.0.0",
     "skuba": "12.2.0",
-    "tsdown": "0.14.2",
+    "tsdown": "0.15.6",
     "vitest": "3.2.4",
     "yaml": "2.8.1",
-    "zod": "4.1.5"
+    "zod": "4.1.11"
   },
   "peerDependencies": {
     "zod": "^3.25.74 || ^4.0.0"