@kubb/adapter-oas 5.0.0-alpha.13 → 5.0.0-alpha.15

package/dist/index.d.ts

@@ -54,11 +54,6 @@ type ReferenceObject = OpenAPIV3.ReferenceObject;
 type OasOptions = {
   contentType?: contentType;
   discriminator?: 'strict' | 'inherit';
-  /**
-   * Resolve name collisions when schemas from different components share the same name (case-insensitive).
-   * @default false
-   */
-  collisionDetection?: boolean;
 };
 declare class Oas extends BaseOas {
   #private;
@@ -92,7 +87,6 @@ declare class Oas extends BaseOas {
   getSchemas(options?: {
     contentType?: contentType;
     includes?: Array<'schemas' | 'responses' | 'requestBodies'>;
-    collisionDetection?: boolean;
   }): {
     schemas: Record<string, SchemaObject$1>;
     nameMapping: Map<string, string>;
@@ -163,16 +157,6 @@ type OasAdapterOptions = {
    * @default 'strict'
    */
   discriminator?: 'strict' | 'inherit';
-  /**
-   * Enable collision detection for inline enum and schema type names.
-   * When `true` (default), full-path names are used and name collisions
-   * across schema components are automatically resolved (e.g. `OrderParamsStatusEnum`).
-   * When `false`, enum names use only the immediate property context
-   * (e.g. `ParamsStatusEnum`) matching the v4 naming conventions, with numeric
-   * suffixes for deduplication (e.g. `ParamsStatusEnum2`).
-   * @default true
-   */
-  collisionDetection?: boolean;
 } & Partial<ParserOptions>;
 type OasAdapterResolvedOptions = {
   validate: boolean;
@@ -181,7 +165,6 @@ type OasAdapterResolvedOptions = {
   serverIndex: OasAdapterOptions['serverIndex'];
   serverVariables: OasAdapterOptions['serverVariables'];
   discriminator: NonNullable<OasAdapterOptions['discriminator']>;
-  collisionDetection: boolean;
   dateType: NonNullable<OasAdapterOptions['dateType']>;
   integerType: NonNullable<OasAdapterOptions['integerType']>;
   unknownType: NonNullable<OasAdapterOptions['unknownType']>;

package/dist/index.js

@@ -196,27 +196,6 @@ 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.
@@ -620,7 +599,6 @@ var Oas = class extends BaseOas {
 			"requestBodies",
 			"responses"
 		];
-		const shouldResolveCollisions = options.collisionDetection ?? this.#options.collisionDetection ?? false;
 		const components = this.getDefinition().components;
 		const schemasWithMeta = [];
 		if (includes.includes("schemas")) {
@@ -674,7 +652,7 @@ var Oas = class extends BaseOas {
 				}
 			}
 		}
-		const { schemas, nameMapping } = shouldResolveCollisions ? resolveCollisions(schemasWithMeta) : legacyResolve(schemasWithMeta);
+		const { schemas, nameMapping } = resolveCollisions(schemasWithMeta);
 		return {
 			schemas: sortSchemas(schemas),
 			nameMapping
@@ -886,29 +864,13 @@ function extractSchemaFromContent(content, preferredContentType) {
 * Returns the PascalCase suffix appended to a component name when resolving
 * cross-source name collisions (schemas vs. responses vs. requestBodies).
 */
+const semanticSuffixes = {
+	schemas: "Schema",
+	responses: "Response",
+	requestBodies: "Request"
+};
 function getSemanticSuffix(source) {
-	switch (source) {
-		case "schemas": return "Schema";
-		case "responses": return "Response";
-		case "requestBodies": return "Request";
-	}
-}
-/**
-* Builds `GetSchemasResult` without any collision detection.
-* Each schema is registered under its original component name and its full
-* `#/components/<source>/<name>` ref path.
-*/
-function legacyResolve(schemasWithMeta) {
-	const schemas = {};
-	const nameMapping = /* @__PURE__ */ new Map();
-	for (const item of schemasWithMeta) {
-		schemas[item.originalName] = item.schema;
-		nameMapping.set(`#/components/${item.source}/${item.originalName}`, item.originalName);
-	}
-	return {
-		schemas,
-		nameMapping
-	};
+	return semanticSuffixes[source];
 }
 /**
 * Builds `GetSchemasResult` with automatic name-collision resolution.
@@ -1129,13 +1091,8 @@ function toMediaType(contentType) {
 * const root = parser.parse({ emptySchemaType: 'unknown' })
 * ```
 */
-function createOasParser(oas, { contentType, collisionDetection } = {}) {
-	const { schemas: schemaObjects, nameMapping } = oas.getSchemas({
-		contentType,
-		collisionDetection
-	});
-	const usedEnumNames = {};
-	const isLegacyNaming = collisionDetection === false;
+function createOasParser(oas, { contentType } = {}) {
+	const { schemas: schemaObjects, nameMapping } = oas.getSchemas({ contentType });
 	/**
 	* Maps an `'any' | 'unknown' | 'void'` option string to the corresponding `SchemaType` constant.
 	* Used for both `unknownType` (unannotated schemas) and `emptySchemaType` (empty `{}` schemas).
@@ -1334,7 +1291,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			const discriminator = isDiscriminator(schema) ? schema.discriminator : void 0;
 			const sharedPropertiesNode = convertSchema({
 				schema: discriminator ? Object.fromEntries(Object.entries(schemaWithoutUnion).filter(([key]) => key !== "discriminator")) : schemaWithoutUnion,
-				name: isLegacyNaming ? void 0 : name
+				name
 			}, options);
 			return createSchema({
 				type: "union",
@@ -1557,29 +1514,24 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 	/**
 	* 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
+	* 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`).
+	* The resulting name always includes the enum suffix and full parent path context
+	* (e.g. `OrderParamsStatusEnum`).
 	*/
 	function resolveEnumPropName(parentName, propName, enumSuffix) {
-		const raw = pascalCase([
+		return 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
@@ -1619,9 +1571,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 				name: propName,
 				schema: {
 					...schemaNode,
-					nullable: schemaNode.type === "null" ? void 0 : propNullable || void 0,
-					optional: !required && !propNullable ? true : void 0,
-					nullish: !required && propNullable ? true : void 0
+					nullable: schemaNode.type === "null" ? void 0 : propNullable || void 0
 				},
 				required
 			});
@@ -1843,8 +1793,7 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			in: param["in"],
 			schema: {
 				...schema,
-				description: param["description"] ?? schema.description,
-				optional: !required || !!schema.optional ? true : void 0
+				description: param["description"] ?? schema.description
 			},
 			required
 		});
@@ -1969,7 +1918,7 @@ const adapterOasName = "oas";
 * ```
 */
 const adapterOas = createAdapter((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 { validate = true, oasClass, contentType, serverIndex, serverVariables, discriminator = "strict", 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",
@@ -1980,7 +1929,6 @@ const adapterOas = createAdapter((options) => {
 			serverIndex,
 			serverVariables,
 			discriminator,
-			collisionDetection,
 			dateType,
 			integerType,
 			unknownType,
@@ -1999,18 +1947,14 @@ const adapterOas = createAdapter((options) => {
 			const oas = await parseFromConfig(sourceToFakeConfig(source), oasClass);
 			oas.setOptions({
 				contentType,
-				discriminator,
-				collisionDetection
+				discriminator
 			});
 			if (validate) try {
 				await oas.validate();
 			} catch (_err) {}
 			const server = serverIndex !== void 0 ? oas.api.servers?.at(serverIndex) : void 0;
 			const baseURL = server?.url ? resolveServerUrl(server, serverVariables) : void 0;
-			const parser = createOasParser(oas, {
-				contentType,
-				collisionDetection
-			});
+			const parser = createOasParser(oas, { contentType });
 			const root = parser.parse({
 				dateType,
 				integerType,