@kubb/plugin-ts 5.3.0-canary.20261025T201031 → 5.3.0

package/dist/index.js

@@ -3,7 +3,7 @@ import { Resolver, addGenerator, ast, createResolver, defineExtension, defineGen
 import { generate } from "yuku-codegen";
 import { Fragment, jsx, jsxs } from "kubb/jsx/jsx-runtime";
 import { parserTs } from "@kubb/parser-ts";
-//#region \0rolldown/runtime.js
+// \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", {
 	value,
@@ -18,8 +18,7 @@ var __exportAll = (all, no_symbols) => {
 	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
-//#endregion
-//#region ../../internals/utils/src/casing.ts
+// ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
 * Splits on common word boundaries (spaces, hyphens, underscores, dots, slashes, colons)
@@ -92,8 +91,7 @@ function screamingSnakeCase(text, { prefix = "", suffix = "" } = {}) {
 		suffix
 	}).toUpperCase();
 }
-//#endregion
-//#region ../../internals/utils/src/reserved.ts
+// ../../internals/utils/src/reserved.ts
 /**
 * JavaScript and Java reserved words.
 * @link https://github.com/jonschlinkert/reserved/blob/master/index.js
@@ -101,6 +99,7 @@ function screamingSnakeCase(text, { prefix = "", suffix = "" } = {}) {
 const reservedWords = /* @__PURE__ */ new Set([
 	"abstract",
 	"arguments",
+	"await",
 	"boolean",
 	"break",
 	"byte",
@@ -231,8 +230,7 @@ function ensureValidVarName(name) {
 function isIdentifier(name) {
 	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }
-//#endregion
-//#region ../../internals/utils/src/strings.ts
+// ../../internals/utils/src/strings.ts
 /**
 * Strips a single matching pair of `"..."`, `'...'`, or `` `...` `` from both ends of `text`.
 * Returns the string unchanged when no balanced quote pair is found.
@@ -279,8 +277,7 @@ function stringify(value) {
 function jsDocEscape(input) {
 	return `${input}`.replace(/^(\s*)@/gm, "$1\\@");
 }
-//#endregion
-//#region ../../internals/utils/src/fs.ts
+// ../../internals/utils/src/fs.ts
 /**
 * Builds a nested file path from a dotted name. Splits on dots that precede a letter
 * (so version numbers embedded in operationIds like `v2025.0` stay intact), camelCases
@@ -304,8 +301,7 @@ function toFilePath(name, caseLast = camelCase) {
 	const parts = name.split(/\.(?=[a-zA-Z])/);
 	return parts.map((part, i) => i === parts.length - 1 ? caseLast(part) : camelCase(part)).filter(Boolean).join("/");
 }
-//#endregion
-//#region src/factory.ts
+// src/factory.ts
 var factory_exports = /* @__PURE__ */ __exportAll({
 	appendJSDocToNode: () => appendJSDocToNode,
 	buildIndexSignatures: () => buildIndexSignatures,
@@ -696,11 +692,20 @@ function createUrlTemplateType(path) {
 	};
 }
 /**
-* Converts a primitive const value to a TypeScript literal type.
+* Converts a const value to a literal type, preserving nested arrays and objects.
 */
 function constToTypeNode(value, format) {
-	if (format === "boolean") return createLiteralType(value === true);
-	return createLiteralType(format === "number" && typeof value === "number" ? value : String(value));
+	if (value === null) return keywordTypeNodes.null;
+	if (Array.isArray(value)) return {
+		type: "TSTupleType",
+		elementTypes: value.map((item) => constToTypeNode(item))
+	};
+	if (typeof value === "object") return createTypeLiteralNode(Object.entries(value).map(([name, item]) => createPropertySignature({
+		name,
+		type: constToTypeNode(item)
+	})));
+	if ((format ?? typeof value) === "boolean") return createLiteralType(value === true);
+	return createLiteralType((format ?? typeof value) === "number" && typeof value === "number" ? value : String(value));
 }
 /**
 * Returns a `Date` reference type when `representation` is `'date'`, otherwise falls back to `string`.
@@ -794,8 +799,7 @@ function buildIndexSignatures(node, propertyCount, printNode) {
 		accessibility: null
 	}];
 }
-//#endregion
-//#region src/components/Enum.tsx
+// src/components/Enum.tsx
 /**
 * Resolves the runtime identifier name and the TypeScript type name for an enum schema node.
 *
@@ -809,7 +813,7 @@ function buildIndexSignatures(node, propertyCount, printNode) {
 function getEnumNames({ node, enum: enumOptions, resolver }) {
 	const resolved = resolver.name(node.name);
 	return {
-		enumName: enumOptions.constCasing === "pascalCase" ? resolved : camelCase(node.name),
+		enumName: enumOptions.constCasing === "pascalCase" ? resolved : ensureValidVarName(camelCase(node.name)),
 		typeName: enumOptions.type === "asConst" ? resolver.enum.keyName(node, enumOptions.typeSuffix) : resolved
 	};
 }
@@ -862,8 +866,7 @@ function Enum({ node, enum: enumOptions, resolver }) {
 		children: typeNode
 	})] });
 }
-//#endregion
-//#region ../../internals/shared/src/operation.ts
+// ../../internals/shared/src/operation.ts
 /**
 * Maps a content type to the PascalCase suffix used to name per-content-type variants
 * (e.g. `application/json` → `Json`, `application/xml` → `Xml`, `multipart/form-data` → `FormData`).
@@ -946,7 +949,10 @@ function getOperationParameters(node) {
 * shape from the same inputs. `primitive: 'object'` is a no-op for the TS printer and tells the Zod
 * printer to emit `z.object(…)` rather than a record.
 */
-function buildOptionsSchema(node, resolver) {
+function hasRequestContentTypeChoice(node) {
+	return (node.requestBody?.content ?? []).filter((entry) => entry.schema).length > 1;
+}
+function buildOptionsSchema(node, resolver, { pairContentTypes = false } = {}) {
 	const { path, query, header } = getOperationParameters(node);
 	const hasBody = Boolean(node.requestBody?.content?.[0]?.schema);
 	const createNever = () => ast.factory.createSchema({
@@ -971,29 +977,57 @@ function buildOptionsSchema(node, resolver) {
 			resolve: resolver.param.headers
 		}
 	];
-	return ast.factory.createSchema({
+	const createOptions = (body, extra = []) => ast.factory.createSchema({
 		type: "object",
 		primitive: "object",
 		deprecated: node.deprecated,
-		properties: [ast.factory.createProperty({
-			name: "body",
-			required: hasBody,
-			schema: hasBody ? ast.factory.createSchema({
-				type: "ref",
-				name: resolver.response.body(node)
-			}) : createNever()
-		}), ...groups.map(({ name, params, resolve }) => {
-			const required = params.some((param) => param.required);
-			return ast.factory.createProperty({
-				name,
-				required,
-				schema: params.length > 0 ? ast.factory.createSchema({
-					type: "ref",
-					name: resolve.call(resolver.param, node, params[0]),
-					optional: !required
-				}) : createNever()
-			});
-		})]
+		properties: [
+			ast.factory.createProperty({
+				name: "body",
+				required: hasBody,
+				schema: body
+			}),
+			...groups.map(({ name, params, resolve }) => {
+				const required = params.some((param) => param.required);
+				return ast.factory.createProperty({
+					name,
+					required,
+					schema: params.length > 0 ? ast.factory.createSchema({
+						type: "ref",
+						name: resolve.call(resolver.param, node, params[0]),
+						optional: !required
+					}) : createNever()
+				});
+			}),
+			...extra
+		]
+	});
+	const variants = pairContentTypes && hasRequestContentTypeChoice(node) ? resolveContentTypeVariants(node.requestBody?.content ?? [], resolver.response.body(node)) : [];
+	if (variants.length < 2) return createOptions(hasBody ? ast.factory.createSchema({
+		type: "ref",
+		name: resolver.response.body(node)
+	}) : createNever());
+	return ast.factory.createSchema({
+		type: "union",
+		members: variants.map((variant, index) => createOptions(ast.factory.createSchema({
+			type: "ref",
+			name: variant.name
+		}), [ast.factory.createProperty({
+			name: "contentType",
+			required: index > 0,
+			schema: ast.factory.createSchema({
+				type: "object",
+				primitive: "object",
+				properties: [ast.factory.createProperty({
+					name: "request",
+					required: true,
+					schema: ast.factory.createSchema({
+						type: "enum",
+						enumValues: [variant.contentType]
+					})
+				})]
+			})
+		})]))
 	});
 }
 /**
@@ -1060,17 +1094,24 @@ function isSuccessStatusCode(statusCode) {
 	const code = getStatusCodeNumber(statusCode);
 	return code !== null && code >= 200 && code < 300;
 }
-//#endregion
-//#region ../../internals/shared/src/resolver.ts
+// ../../internals/shared/src/resolver.ts
 /**
-* Resolves a single operation parameter name with the
-* `<operationId> <in> <name>` template.
+* Builds the allocation key for a declaration an operation owns. `scope` names which declaration
+* it is, so two of them never share an allocation even when a custom resolver gives both the same
+* name. Leave `scope` empty for the operation's own declaration.
 *
 * @example
-* `operationParamName.call(resolver, node, param) // → 'DeletePetPathPetId'`
+* ```ts
+* resolver.resolveName({ key: operationKey(node, 'response', 'status', 404), name })
+* ```
 */
-function operationParamName(node, param) {
-	return this.name(`${node.operationId} ${param.in} ${param.name}`);
+function operationKey(node, ...scope) {
+	return [
+		"operation",
+		node.method,
+		node.path,
+		...scope.map(String)
+	];
 }
 /**
 * Builds the shared `param` namespace. Spread the result into `createResolver`
@@ -1083,15 +1124,33 @@ function operationParamName(node, param) {
 */
 function createOperationParamResolver() {
 	return {
-		name: operationParamName,
+		name(node, param) {
+			const name = this.name(`${node.operationId} ${param.in} ${param.name}`);
+			return this.resolveName({
+				key: operationKey(node, "param", "name", param.in, param.name),
+				name
+			});
+		},
 		path(node) {
-			return this.name(`${node.operationId} Path`);
+			const name = this.name(`${node.operationId} Path`);
+			return this.resolveName({
+				key: operationKey(node, "param", "path"),
+				name
+			});
 		},
 		query(node) {
-			return this.name(`${node.operationId} Query`);
+			const name = this.name(`${node.operationId} Query`);
+			return this.resolveName({
+				key: operationKey(node, "param", "query"),
+				name
+			});
 		},
 		headers(node) {
-			return this.name(`${node.operationId} Headers`);
+			const name = this.name(`${node.operationId} Headers`);
+			return this.resolveName({
+				key: operationKey(node, "param", "headers"),
+				name
+			});
 		}
 	};
 }
@@ -1108,16 +1167,32 @@ function createOperationParamResolver() {
 function createOperationResponseResolver() {
 	return {
 		status(node, statusCode) {
-			return this.name(`${node.operationId} Status ${statusCode}`);
+			const name = this.name(`${node.operationId} Status ${statusCode}`);
+			return this.resolveName({
+				key: operationKey(node, "response", "status", statusCode),
+				name
+			});
 		},
 		body(node) {
-			return this.name(`${node.operationId} Body`);
+			const name = this.name(`${node.operationId} Body`);
+			return this.resolveName({
+				key: operationKey(node, "response", "body"),
+				name
+			});
 		},
 		responses(node) {
-			return this.name(`${node.operationId} Responses`);
+			const name = this.name(`${node.operationId} Responses`);
+			return this.resolveName({
+				key: operationKey(node, "response", "responses"),
+				name
+			});
 		},
 		response(node) {
-			return this.name(`${node.operationId} Response`);
+			const name = this.name(`${node.operationId} Response`);
+			return this.resolveName({
+				key: operationKey(node, "response", "response"),
+				name
+			});
 		}
 	};
 }
@@ -1135,8 +1210,7 @@ function createCasedFile(caseLast) {
 		return `${toFilePath(name, caseLast)}${extname}`;
 	} };
 }
-//#endregion
-//#region ../../internals/shared/src/group.ts
+// ../../internals/shared/src/group.ts
 /**
 * Builds the `group` config a Kubb plugin passes to `ctx.setOptions`, applying the
 * shared default naming so every plugin groups output consistently:
@@ -1166,8 +1240,7 @@ function createGroupConfig(group) {
 		name: group.name ? group.name : defaultName
 	};
 }
-//#endregion
-//#region ../../internals/shared/src/schemaTraversal.ts
+// ../../internals/shared/src/schemaTraversal.ts
 /**
 * Maps each property of an object schema to its transformed output. Pairs every result with the
 * original property so the printer keeps full control over modifiers, getters, and key syntax.
@@ -1195,8 +1268,38 @@ function mapSchemaItems(node, transform) {
 		output: transform(schema)
 	}));
 }
-//#endregion
-//#region src/utils.ts
+// src/utils.ts
+/**
+* Renames inline enum declarations and their uses together.
+*/
+function resolveInlineEnumNames({ node, owner, resolver, enumOptions }) {
+	return ast.transform(node, { schema(child) {
+		if (child === node || child.type !== "enum" || !child.name) return;
+		const name = resolver.resolveName({
+			key: [
+				"enum",
+				owner,
+				child.pointer ?? child.name
+			],
+			name: child.name,
+			normalize: (value) => {
+				const { enumName, typeName } = getEnumNames({
+					node: {
+						...child,
+						name: value
+					},
+					enum: enumOptions,
+					resolver
+				});
+				return enumOptions.type === "literal" ? [typeName] : [enumName, typeName];
+			}
+		});
+		return name === child.name ? void 0 : {
+			...child,
+			name
+		};
+	} });
+}
 function enumTypeName({ resolver, name, enumOptions, isEnum }) {
 	return isEnum && enumOptions?.type === "asConst" && enumOptions.typeSuffix ? resolver.enum.keyName({ name }, enumOptions.typeSuffix) : resolver.name(name);
 }
@@ -1229,6 +1332,7 @@ function formatExample(value) {
 function buildPropertyJSDocComments(schema, optional) {
 	const meta = syncSchemaRef(schema);
 	const isArray = meta?.primitive === "array";
+	const isNumeric = meta?.primitive === "number" || meta?.primitive === "integer" || meta?.primitive === "bigint";
 	const hasDescription = meta && "description" in meta && meta.description;
 	const formatComment = meta && "format" in meta && meta.format ? hasDescription ? [" ", `Format: \`${meta.format}\``] : ["@description", `Format: \`${meta.format}\``] : [];
 	const exampleValues = meta?.examples ?? [];
@@ -1236,8 +1340,8 @@ function buildPropertyJSDocComments(schema, optional) {
 		hasDescription ? `@description ${jsDocEscape(meta.description)}` : null,
 		...formatComment,
 		meta && "deprecated" in meta && meta.deprecated ? "@deprecated" : null,
-		!isArray && meta && "min" in meta && meta.min !== void 0 ? `@minLength ${meta.min}` : null,
-		!isArray && meta && "max" in meta && meta.max !== void 0 ? `@maxLength ${meta.max}` : null,
+		!isArray && meta && "min" in meta && meta.min !== void 0 ? `@${isNumeric ? "minimum" : "minLength"} ${meta.min}` : null,
+		!isArray && meta && "max" in meta && meta.max !== void 0 ? `@${isNumeric ? "maximum" : "maxLength"} ${meta.max}` : null,
 		meta && "pattern" in meta && meta.pattern ? `@pattern ${meta.pattern}` : null,
 		meta && "default" in meta && meta.default !== void 0 ? `@default ${"primitive" in meta && meta.primitive === "string" && typeof meta.default === "string" ? stringify(meta.default) : formatExample(meta.default)}` : null,
 		...exampleValues.map((example) => `@example ${formatExample(example)}`)
@@ -1277,8 +1381,7 @@ function buildResponseUnion(node, { resolver }) {
 		}))
 	});
 }
-//#endregion
-//#region src/printers/printerTs.ts
+// src/printers/printerTs.ts
 const { isNonNullable } = factory_exports;
 /**
 * Adapts user overrides, which work in strings, to the node-based printer: `this.transform` hands them printed
@@ -1362,6 +1465,7 @@ const printerTs = ast.createPrinter((options) => {
 			},
 			enum(node) {
 				const values = ast.getSchemaLiteralValues(node);
+				if (values.some((value) => value !== null && typeof value === "object")) return createUnionDeclaration({ nodes: values.map((value) => constToTypeNode(value)) });
 				if (this.options.enum.type === "inlineLiteral" || !node.name || isInlineConstEnum(node, this.options.enumSchemaNames)) return createUnionDeclaration({ nodes: values.filter((v) => v !== null && v !== void 0).map((value) => constToTypeNode(value, typeof value)).filter(isNonNullable) });
 				return createTypeReferenceNode(enumTypeName({
 					resolver: this.options.resolver,
@@ -1396,6 +1500,12 @@ const printerTs = ast.createPrinter((options) => {
 			},
 			object(node) {
 				const { transform, options } = this;
+				const keySchema = node.propertyNames && syncSchemaRef(node.propertyNames);
+				if (!node.properties.length && !Object.keys(node.patternProperties ?? {}).length && node.propertyNames && keySchema?.type === "enum" && node.additionalProperties !== false) {
+					const keyType = transform(node.propertyNames) ?? keywordTypeNodes.string;
+					const valueSchema = typeof node.additionalProperties === "object" ? node.additionalProperties : ast.factory.createSchema({ type: "unknown" });
+					return createTypeReferenceNode("Partial", [createTypeReferenceNode("Record", [keyType, buildPropertyType(valueSchema, transform(valueSchema) ?? keywordTypeNodes.unknown, options.optionalType, false)])]);
+				}
 				const addsQuestionToken = options.optionalType === "questionToken" || options.optionalType === "questionTokenAndUndefined";
 				const propertyNodes = mapSchemaProperties(node, (schema) => transform(schema)).map(({ name, property, output }) => {
 					const baseType = output ?? keywordTypeNodes.unknown;
@@ -1447,8 +1557,7 @@ const printerTs = ast.createPrinter((options) => {
 		}
 	};
 });
-//#endregion
-//#region src/components/Type.tsx
+// src/components/Type.tsx
 function Type({ name, node, printer, enum: enumOptions, resolver, inline }) {
 	if (inline) {
 		const withoutEnums = ast.transform(node, { schema: (n) => n.type === ast.schemaTypes.enum && n.name ? {
@@ -1500,8 +1609,7 @@ function Type({ name, node, printer, enum: enumOptions, resolver, inline }) {
 		children: output
 	})] });
 }
-//#endregion
-//#region src/generators/typeGenerator.tsx
+// src/generators/typeGenerator.tsx
 /**
 * Built-in generator for `@kubb/plugin-ts`. Emits one TypeScript file per
 * schema in the spec plus per-operation request, response, and parameter
@@ -1514,6 +1622,12 @@ const typeGenerator = defineGenerator({
 	schema(node, ctx) {
 		const { enum: enumOptions, syntaxType, optionalType, arrayType, output, group, printer } = ctx.options;
 		const { config, resolver, root } = ctx;
+		if (enumOptions.type !== "inlineLiteral") node = resolveInlineEnumNames({
+			node,
+			owner: node.name ?? "",
+			resolver,
+			enumOptions
+		});
 		if (!node.name) return;
 		const enumSchemaNames = new Set(ctx.meta.enumNames);
 		const importName = (schemaName) => enumTypeName({
@@ -1621,6 +1735,12 @@ const typeGenerator = defineGenerator({
 		}) : null;
 		function renderSchemaType({ schema, name, keysToOmit }) {
 			if (!schema) return null;
+			if (!inline && enumOptions.type !== "inlineLiteral") schema = resolveInlineEnumNames({
+				node: schema,
+				owner: node.operationId,
+				resolver,
+				enumOptions
+			});
 			const imports = resolver.imports({
 				node: schema,
 				root,
@@ -1730,13 +1850,13 @@ const typeGenerator = defineGenerator({
 				schema: primary?.schema ? {
 					...primary.schema,
 					pointer: res.pointer ?? primary.schema.pointer
-				} : null,
+				} : ast.factory.createSchema({ type: "unknown" }),
 				name: resolver.response.status(node, res.statusCode),
 				keysToOmit: primary?.keysToOmit
 			});
 		});
 		const optionsType = renderSchemaType({
-			schema: buildOptionsSchema(node, resolver),
+			schema: buildOptionsSchema(node, resolver, { pairContentTypes: true }),
 			name: resolver.response.options(node)
 		});
 		const responsesType = renderSchemaType({
@@ -1745,13 +1865,12 @@ const typeGenerator = defineGenerator({
 		});
 		function buildResponseType() {
 			const hasSchema = (res) => (res.content ?? []).some((entry) => entry.schema);
-			if (!node.responses.some(hasSchema)) return null;
 			const responseName = resolver.response.response(node);
 			const responsesWithSchema = node.responses.filter(hasSchema);
 			if (new Set(responsesWithSchema.flatMap((res) => (res.content ?? []).flatMap((entry) => entry.schema ? ast.collectImportedRefNames(entry.schema).map(importName) : []))).has(responseName)) return null;
 			return renderSchemaType({
 				schema: {
-					...buildResponseUnion(node, { resolver }),
+					...buildResponseUnion(node, { resolver }) ?? ast.factory.createSchema({ type: "unknown" }),
 					description: "Union of all possible responses"
 				},
 				name: responseName
@@ -1789,22 +1908,18 @@ const typeGenerator = defineGenerator({
 		});
 	}
 });
-//#endregion
-//#region kubb-extension.json
+// kubb-extension.json
 var compatibility = {
-	"kubb": ">=5.14.0",
+	"kubb": ">=5.14.6",
 	"node": ">=22.22"
 };
-//#endregion
-//#region package.json
-var version = "5.3.0-canary.20261025T201031";
-//#endregion
-//#region src/resolvers/resolverTs.ts
+// package.json
+var version = "5.3.0";
+// src/resolvers/resolverTs.ts
 /**
 * Default resolver used by `@kubb/plugin-ts`. Decides the names and file paths
-* for every generated TypeScript type. Import this in other plugins that need
-* to reference the exact names `plugin-ts` produces without duplicating the
-* casing/file-layout rules.
+* for generated TypeScript types. Other plugins should read the build's resolver
+* through `driver.getResolver(pluginTsName)` to share its name allocations.
 *
 * The `default` helpers are supplied by `createResolver`. This plugin overrides the top-level `name`
 * to use PascalCase for value and type names and `file` to write PascalCase file paths (dotted names
@@ -1829,15 +1944,18 @@ const resolverTs = createResolver({
 	response: {
 		...createOperationResponseResolver(),
 		options(node) {
-			return this.name(`${node.operationId} Options`);
+			const name = this.name(`${node.operationId} Options`);
+			return this.resolveName({
+				key: operationKey(node, "response", "options"),
+				name
+			});
 		}
 	},
 	enum: { keyName(node, enumTypeSuffix = "key") {
 		return `${this.name(node.name ?? "")}${enumTypeSuffix}`;
 	} }
 });
-//#endregion
-//#region src/plugin.ts
+// src/plugin.ts
 /**
 * Canonical plugin name for `@kubb/plugin-ts`. Used for driver lookups and
 * cross-plugin dependency references.
@@ -1903,8 +2021,7 @@ const pluginTs = defineExtension({
 		};
 	}
 });
-//#endregion
-//#region src/printers/functionParams.ts
+// src/printers/functionParams.ts
 /**
 * Narrows a {@link TypeExpression} to a {@link TypeLiteralNode}.
 */
@@ -2013,8 +2130,7 @@ function createFunctionParameters(props = {}) {
 		...props
 	};
 }
-//#endregion
-//#region src/printers/functionPrinter.ts
+// src/printers/functionPrinter.ts
 /**
 * Ordering priority for function parameters: lower = sorted earlier.
 */
@@ -2157,7 +2273,6 @@ function functionPrinter(options) {
 		}
 	};
 }
-//#endregion
 export { Enum, Type, buildParams, createFunctionParameter, createFunctionParameters, createIndexedAccessType, createObjectBindingPattern, createTypeLiteral, pluginTs as default, pluginTs, enumTypeName, functionPrinter, pluginTsName, printerTs, renderType, resolverTs, typeGenerator };
 
 //# sourceMappingURL=index.js.map