@kubb/adapter-oas 5.0.0-alpha.10 → 5.0.0-alpha.11

package/dist/index.cjs

@@ -39,6 +39,110 @@ jsonpointer = __toESM(jsonpointer);
 let oas = require("oas");
 oas = __toESM(oas);
 let oas_utils = require("oas/utils");
+//#region src/constants.ts
+/**
+* Default values for all `Options` fields.
+*/
+const DEFAULT_PARSER_OPTIONS = {
+	dateType: "string",
+	integerType: "number",
+	unknownType: "any",
+	emptySchemaType: "any",
+	enumSuffix: "enum"
+};
+/**
+* OpenAPI version string written into merged document stubs.
+*/
+const MERGE_OPENAPI_VERSION = "3.0.0";
+/**
+* Fallback `info.title` used when merging multiple API documents.
+*/
+const MERGE_DEFAULT_TITLE = "Merged API";
+/**
+* Fallback `info.version` used when merging multiple API documents.
+*/
+const MERGE_DEFAULT_VERSION = "1.0.0";
+/**
+* JSON Schema keywords that indicate structural composition.
+* A schema fragment containing any of these keys must not be inlined into its
+* parent during `allOf` flattening — it carries semantic meaning of its own.
+*/
+const structuralKeys = new Set([
+	"properties",
+	"items",
+	"additionalProperties",
+	"oneOf",
+	"anyOf",
+	"allOf",
+	"not"
+]);
+/**
+* Maps OAS/JSON Schema `format` strings to their Kubb `SchemaType` equivalents.
+*
+* Only formats that need a type different from the raw OAS `type` are listed.
+* `int64`, `date-time`, `date`, and `time` are handled separately because their
+* mapping depends on runtime parser options.
+*
+* Note: `ipv4`, `ipv6`, and `hostname` map to `'url'` — the closest supported
+* scalar type in the Kubb AST, even though these are not strictly URLs.
+*/
+const formatMap = {
+	uuid: "uuid",
+	email: "email",
+	"idn-email": "email",
+	uri: "url",
+	"uri-reference": "url",
+	url: "url",
+	ipv4: "url",
+	ipv6: "url",
+	hostname: "url",
+	"idn-hostname": "url",
+	binary: "blob",
+	byte: "blob",
+	int32: "integer",
+	float: "number",
+	double: "number"
+};
+/**
+* Exhaustive list of media types that Kubb recognizes.
+*/
+const knownMediaTypes = new Set([
+	"application/json",
+	"application/xml",
+	"application/x-www-form-urlencoded",
+	"application/octet-stream",
+	"application/pdf",
+	"application/zip",
+	"application/graphql",
+	"multipart/form-data",
+	"text/plain",
+	"text/html",
+	"text/csv",
+	"text/xml",
+	"image/png",
+	"image/jpeg",
+	"image/gif",
+	"image/webp",
+	"image/svg+xml",
+	"audio/mpeg",
+	"video/mp4"
+]);
+/**
+* Vendor extension keys used to attach human-readable labels to enum values.
+* Checked in priority order: the first key found wins.
+*/
+const enumExtensionKeys = ["x-enumNames", "x-enum-varnames"];
+/**
+* Scalar primitive schema types used for union member simplification.
+*/
+const SCALAR_PRIMITIVE_TYPES = new Set([
+	"string",
+	"number",
+	"integer",
+	"bigint",
+	"boolean"
+]);
+//#endregion
 //#region src/oas/resolveServerUrl.ts
 /**
 * Resolves an OpenAPI server URL by substituting `{variable}` placeholders.
@@ -117,6 +221,27 @@ function pascalCase(text, { isFile, prefix = "", suffix = "" } = {}) {
 	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, true);
 }
 //#endregion
+//#region ../../internals/utils/src/names.ts
+/**
+* Returns a unique name by appending an incrementing numeric suffix when the name has already been used.
+* Mutates `data` in-place as a usage counter so subsequent calls remain consistent.
+*
+* @example
+* const seen: Record<string, number> = {}
+* getUniqueName('Foo', seen) // 'Foo'
+* getUniqueName('Foo', seen) // 'Foo2'
+* getUniqueName('Foo', seen) // 'Foo3'
+*/
+function getUniqueName(originalName, data) {
+	let used = data[originalName] || 0;
+	if (used) {
+		data[originalName] = ++used;
+		originalName += used;
+	}
+	data[originalName] = 1;
+	return originalName;
+}
+//#endregion
 //#region ../../internals/utils/src/reserved.ts
 /**
 * Returns `true` when `name` is a syntactically valid JavaScript variable name.
@@ -233,100 +358,6 @@ var URLPath = class {
 	}
 };
 //#endregion
-//#region src/constants.ts
-/**
-* OpenAPI version string written into merged document stubs.
-*/
-const MERGE_OPENAPI_VERSION = "3.0.0";
-/**
-* Fallback `info.title` used when merging multiple API documents.
-*/
-const MERGE_DEFAULT_TITLE = "Merged API";
-/**
-* Fallback `info.version` used when merging multiple API documents.
-*/
-const MERGE_DEFAULT_VERSION = "1.0.0";
-/**
-* JSON Schema keywords that indicate structural composition.
-* A schema fragment containing any of these keys must not be inlined into its
-* parent during `allOf` flattening — it carries semantic meaning of its own.
-*/
-const structuralKeys = new Set([
-	"properties",
-	"items",
-	"additionalProperties",
-	"oneOf",
-	"anyOf",
-	"allOf",
-	"not"
-]);
-/**
-* Maps OAS/JSON Schema `format` strings to their Kubb `SchemaType` equivalents.
-*
-* Only formats that need a type different from the raw OAS `type` are listed.
-* `int64`, `date-time`, `date`, and `time` are handled separately because their
-* mapping depends on runtime parser options.
-*
-* Note: `ipv4`, `ipv6`, and `hostname` map to `'url'` — the closest supported
-* scalar type in the Kubb AST, even though these are not strictly URLs.
-*/
-const formatMap = {
-	uuid: "uuid",
-	email: "email",
-	"idn-email": "email",
-	uri: "url",
-	"uri-reference": "url",
-	url: "url",
-	ipv4: "url",
-	ipv6: "url",
-	hostname: "url",
-	"idn-hostname": "url",
-	binary: "blob",
-	byte: "blob",
-	int32: "integer",
-	float: "number",
-	double: "number"
-};
-/**
-* Exhaustive list of media types that Kubb recognizes.
-*/
-const knownMediaTypes = new Set([
-	"application/json",
-	"application/xml",
-	"application/x-www-form-urlencoded",
-	"application/octet-stream",
-	"application/pdf",
-	"application/zip",
-	"application/graphql",
-	"multipart/form-data",
-	"text/plain",
-	"text/html",
-	"text/csv",
-	"text/xml",
-	"image/png",
-	"image/jpeg",
-	"image/gif",
-	"image/webp",
-	"image/svg+xml",
-	"audio/mpeg",
-	"video/mp4"
-]);
-/**
-* Vendor extension keys used to attach human-readable labels to enum values.
-* Checked in priority order: the first key found wins.
-*/
-const enumExtensionKeys = ["x-enumNames", "x-enum-varnames"];
-/**
-* Scalar primitive schema types used for union member simplification.
-*/
-const SCALAR_PRIMITIVE_TYPES = new Set([
-	"string",
-	"number",
-	"integer",
-	"bigint",
-	"boolean"
-]);
-//#endregion
 //#region src/oas/Oas.ts
 /**
 * Prefix used to create synthetic `$ref` values for anonymous (inline) discriminator schemas.
@@ -1080,16 +1111,6 @@ function getImports({ node, nameMapping, resolve }) {
 //#endregion
 //#region src/parser.ts
 /**
-* Default values for all `Options` fields.
-*/
-const DEFAULT_OPTIONS = {
-	dateType: "string",
-	integerType: "number",
-	unknownType: "any",
-	emptySchemaType: "any",
-	enumSuffix: "enum"
-};
-/**
 * Looks up the Kubb `SchemaType` for a given OAS `format` string.
 * Returns `undefined` for formats not in `formatMap` (e.g. `int64`, `date-time`),
 * which are handled separately because their output depends on parser options.
@@ -1138,6 +1159,8 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 		contentType,
 		collisionDetection
 	});
+	const usedEnumNames = {};
+	const isLegacyNaming = collisionDetection === false;
 	/**
 	* Maps an `'any' | 'unknown' | 'void'` option string to the corresponding `SchemaType` constant.
 	* Used for both `unknownType` (unannotated schemas) and `emptySchemaType` (empty `{}` schemas).
@@ -1184,7 +1207,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 	* Shared metadata fields included in every `createSchema` call.
 	* Centralizes the common properties so sub-handlers don't repeat them.
 	*/
-	function buildSchemaBase(schema, name, nullable, defaultValue) {
+	function renderSchemaBase(schema, name, nullable, defaultValue) {
 		return {
 			name,
 			nullable,
@@ -1292,7 +1315,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 		return (0, _kubb_ast.createSchema)({
 			type: "intersection",
 			members: [...allOfMembers.slice(0, syntheticStart), ...mergeAdjacentAnonymousObjects(allOfMembers.slice(syntheticStart))],
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...renderSchemaBase(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
@@ -1306,23 +1329,23 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 	function convertUnion({ schema, name, nullable, defaultValue, options }) {
 		const unionMembers = [...schema.oneOf ?? [], ...schema.anyOf ?? []];
 		const unionBase = {
-			...buildSchemaBase(schema, name, nullable, defaultValue),
+			...renderSchemaBase(schema, name, nullable, defaultValue),
 			discriminatorPropertyName: isDiscriminator(schema) ? schema.discriminator.propertyName : void 0
 		};
 		if (schema.properties) {
 			const { oneOf: _oneOf, anyOf: _anyOf, ...schemaWithoutUnion } = schema;
 			const discriminator = isDiscriminator(schema) ? schema.discriminator : void 0;
-			const memberBaseSchema = discriminator ? Object.fromEntries(Object.entries(schemaWithoutUnion).filter(([key]) => key !== "discriminator")) : schemaWithoutUnion;
+			const sharedPropertiesNode = convertSchema({
+				schema: discriminator ? Object.fromEntries(Object.entries(schemaWithoutUnion).filter(([key]) => key !== "discriminator")) : schemaWithoutUnion,
+				name: isLegacyNaming ? void 0 : name
+			}, options);
 			return (0, _kubb_ast.createSchema)({
 				type: "union",
 				...unionBase,
 				members: unionMembers.map((s) => {
 					const ref = isReference(s) ? s.$ref : void 0;
 					const discriminatorValue = discriminator?.mapping && ref ? Object.entries(discriminator.mapping).find(([, v]) => v === ref)?.[0] : void 0;
-					let propertiesNode = convertSchema({
-						schema: memberBaseSchema,
-						name
-					}, options);
+					let propertiesNode = sharedPropertiesNode;
 					if (discriminatorValue && discriminator) propertiesNode = applyDiscriminatorEnum({
 						node: propertiesNode,
 						propertyName: discriminator.propertyName,
@@ -1361,7 +1384,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			type: "enum",
 			primitive: getPrimitiveType(typeof constValue === "number" ? "number" : typeof constValue === "boolean" ? "boolean" : "string"),
 			enumValues: [constValue],
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...renderSchemaBase(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
@@ -1370,7 +1393,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 	* (i.e. `format: 'date-time'` with `dateType: false`).
 	*/
 	function convertFormat({ schema, name, nullable, defaultValue, mergedOptions }) {
-		const base = buildSchemaBase(schema, name, nullable, defaultValue);
+		const base = renderSchemaBase(schema, name, nullable, defaultValue);
 		if (schema.format === "int64") return (0, _kubb_ast.createSchema)({
 			type: mergedOptions.integerType === "bigint" ? "bigint" : "integer",
 			primitive: "integer",
@@ -1508,29 +1531,62 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 	* - not required + not nullable → `optional: true`
 	* - not required + nullable → `nullish: true`
 	*/
+	/**
+	* Builds the propagation name for a child property during recursive schema conversion.
+	*
+	* - **Legacy naming** (`isLegacyNaming`): only the immediate property key is used
+	*   (e.g. `Params` for property `params`), keeping nested names short.
+	* - **Default naming**: the parent name is prepended so the full path is encoded
+	*   (e.g. `OrderParams` when parent is `Order`).
+	*/
+	function resolveChildName(parentName, propName) {
+		if (isLegacyNaming) return pascalCase(propName);
+		return parentName ? pascalCase([parentName, propName].join(" ")) : void 0;
+	}
+	/**
+	* Derives the final name for an enum property schema node.
+	*
+	* The raw name always includes the enum suffix (e.g. `StatusEnum`).
+	* In legacy mode an additional deduplication step appends a numeric suffix
+	* when the same name has already been used (e.g. `ParamsStatusEnum2`).
+	*/
+	function resolveEnumPropName(parentName, propName, enumSuffix) {
+		const raw = pascalCase([
+			parentName,
+			propName,
+			enumSuffix
+		].filter(Boolean).join(" "));
+		return isLegacyNaming ? getUniqueName(raw, usedEnumNames) : raw;
+	}
+	/**
+	* Given a freshly-converted property schema, returns the node with a correct
+	* `name` attached — or stripped — depending on whether the node is a named
+	* enum, a boolean const-enum (always inlined), or a regular schema.
+	*/
+	function applyEnumName(propNode, parentName, propName, enumSuffix) {
+		const enumNode = (0, _kubb_ast.narrowSchema)(propNode, "enum");
+		if (enumNode?.primitive === "boolean") return {
+			...propNode,
+			name: void 0
+		};
+		if (enumNode) return {
+			...propNode,
+			name: resolveEnumPropName(parentName, propName, enumSuffix)
+		};
+		return propNode;
+	}
 	function convertObject({ schema, name, nullable, defaultValue, options, mergedOptions }) {
 		const properties = schema.properties ? Object.entries(schema.properties).map(([propName, propSchema]) => {
 			const required = Array.isArray(schema.required) ? schema.required.includes(propName) : !!schema.required;
 			const resolvedPropSchema = propSchema;
 			const propNullable = isNullable(resolvedPropSchema);
-			const basePropName = name ? pascalCase([name, propName].join(" ")) : void 0;
-			const propNode = convertSchema({
-				schema: resolvedPropSchema,
-				name: basePropName
-			}, options);
-			const isEnumNode = !!(0, _kubb_ast.narrowSchema)(propNode, "enum");
-			const derivedPropName = isEnumNode && name ? pascalCase([
-				name,
-				propName,
-				mergedOptions.enumSuffix
-			].filter(Boolean).join(" ")) : basePropName;
 			return (0, _kubb_ast.createProperty)({
 				name: propName,
 				schema: {
-					...isEnumNode && derivedPropName !== basePropName ? {
-						...propNode,
-						name: derivedPropName
-					} : propNode,
+					...applyEnumName(convertSchema({
+						schema: resolvedPropSchema,
+						name: resolveChildName(name, propName)
+					}, options), name, propName, mergedOptions.enumSuffix),
 					nullable: propNullable || void 0,
 					optional: !required && !propNullable ? true : void 0,
 					nullish: !required && propNullable ? true : void 0
@@ -1552,7 +1608,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			properties,
 			additionalProperties: additionalPropertiesNode,
 			patternProperties,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...renderSchemaBase(schema, name, nullable, defaultValue)
 		});
 		if (isDiscriminator(schema) && schema.discriminator.mapping) {
 			const discPropName = schema.discriminator.propertyName;
@@ -1560,11 +1616,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 				node: objectNode,
 				propertyName: discPropName,
 				values: Object.keys(schema.discriminator.mapping),
-				enumName: name ? pascalCase([
-					name,
-					discPropName,
-					mergedOptions.enumSuffix
-				].filter(Boolean).join(" ")) : void 0
+				enumName: name ? resolveEnumPropName(name, discPropName, mergedOptions.enumSuffix) : void 0
 			});
 		}
 		return objectNode;
@@ -1583,7 +1635,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			rest: schema.items ? convertSchema({ schema: schema.items }, options) : void 0,
 			min: schema.minItems,
 			max: schema.maxItems,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...renderSchemaBase(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
@@ -1594,7 +1646,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 	*/
 	function convertArray({ schema, name, nullable, defaultValue, options, mergedOptions }) {
 		const rawItems = schema.items;
-		const itemName = rawItems?.enum?.length && name ? pascalCase([name, mergedOptions.enumSuffix].join(" ")) : void 0;
+		const itemName = rawItems?.enum?.length && name ? resolveEnumPropName(void 0, name, mergedOptions.enumSuffix) : void 0;
 		return (0, _kubb_ast.createSchema)({
 			type: "array",
 			primitive: "array",
@@ -1605,7 +1657,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			min: schema.minItems,
 			max: schema.maxItems,
 			unique: schema.uniqueItems ?? void 0,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...renderSchemaBase(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
@@ -1618,7 +1670,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			min: schema.minLength,
 			max: schema.maxLength,
 			pattern: schema.pattern,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...renderSchemaBase(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
@@ -1632,7 +1684,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			max: schema.maximum,
 			exclusiveMinimum: typeof schema.exclusiveMinimum === "number" ? schema.exclusiveMinimum : void 0,
 			exclusiveMaximum: typeof schema.exclusiveMaximum === "number" ? schema.exclusiveMaximum : void 0,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...renderSchemaBase(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
@@ -1642,7 +1694,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 		return (0, _kubb_ast.createSchema)({
 			type: "boolean",
 			primitive: "boolean",
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...renderSchemaBase(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
@@ -1677,7 +1729,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 	*/
 	function convertSchema({ schema, name }, options) {
 		const mergedOptions = {
-			...DEFAULT_OPTIONS,
+			...DEFAULT_PARSER_OPTIONS,
 			...options
 		};
 		const flattenedSchema = flattenSchema(schema);
@@ -1708,7 +1760,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 		if (schema.type === "string" && schema.contentMediaType === "application/octet-stream") return (0, _kubb_ast.createSchema)({
 			type: "blob",
 			primitive: "string",
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...renderSchemaBase(schema, name, nullable, defaultValue)
 		});
 		if (Array.isArray(schema.type) && schema.type.length > 1) {
 			const nonNullTypes = schema.type.filter((t) => t !== "null");
@@ -1722,7 +1774,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 					},
 					name
 				}, options)),
-				...buildSchemaBase(schema, name, arrayNullable, defaultValue)
+				...renderSchemaBase(schema, name, arrayNullable, defaultValue)
 			});
 		}
 		if (!type) {
@@ -1803,7 +1855,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 	*/
 	function parse(options) {
 		const mergedOptions = {
-			...DEFAULT_OPTIONS,
+			...DEFAULT_PARSER_OPTIONS,
 			...options
 		};
 		const schemas = Object.entries(schemaObjects).map(([name, schemaObject]) => convertSchema({
@@ -1873,7 +1925,7 @@ const adapterOasName = "oas";
 * ```
 */
 const adapterOas = (0, _kubb_core.createAdapter)((options) => {
-	const { validate = true, oasClass, contentType, serverIndex, serverVariables, discriminator = "strict", collisionDetection = false, dateType = "string", integerType = "number", unknownType = "any", emptySchemaType = unknownType } = options;
+	const { validate = true, oasClass, contentType, serverIndex, serverVariables, discriminator = "strict", collisionDetection = true, dateType = DEFAULT_PARSER_OPTIONS.dateType, integerType = DEFAULT_PARSER_OPTIONS.integerType, unknownType = DEFAULT_PARSER_OPTIONS.unknownType, enumSuffix = DEFAULT_PARSER_OPTIONS.enumSuffix, emptySchemaType = unknownType || DEFAULT_PARSER_OPTIONS.emptySchemaType } = options;
 	const nameMapping = /* @__PURE__ */ new Map();
 	return {
 		name: "oas",
@@ -1889,6 +1941,7 @@ const adapterOas = (0, _kubb_core.createAdapter)((options) => {
 			integerType,
 			unknownType,
 			emptySchemaType,
+			enumSuffix,
 			nameMapping
 		},
 		getImports(node, resolve) {
@@ -1921,7 +1974,8 @@ const adapterOas = (0, _kubb_core.createAdapter)((options) => {
 					dateType,
 					integerType,
 					unknownType,
-					emptySchemaType
+					emptySchemaType,
+					enumSuffix
 				}),
 				meta: {
 					title: oas.api.info?.title,