@kubb/adapter-oas 5.0.0-beta.94 → 5.0.0-beta.96

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { t as __name } from "./rolldown-runtime-C0LytTxp.js";
 import { ast } from "@kubb/ast";
 import { AdapterFactoryOptions } from "@kubb/core";
-
 //#region ../../node_modules/.pnpm/@types+json-schema@7.0.15/node_modules/@types/json-schema/index.d.ts
 // ==================================================================================================
 // JSON Schema Draft 04
@@ -10,12 +9,12 @@ import { AdapterFactoryOptions } from "@kubb/core";
  * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.1
  */
 type JSONSchema4TypeName = "string" //
-| "number" | "integer" | "boolean" | "object" | "array" | "null" | "any";
+ | "number" | "integer" | "boolean" | "object" | "array" | "null" | "any";
 /**
  * @see https://tools.ietf.org/html/draft-zyp-json-schema-04#section-3.5
  */
 type JSONSchema4Type = string //
-| number | boolean | JSONSchema4Object | JSONSchema4Array | null;
+ | number | boolean | JSONSchema4Object | JSONSchema4Array | null;
 // Workaround for infinite type recursion
 interface JSONSchema4Object {
   [key: string]: JSONSchema4Type;
@@ -204,9 +203,9 @@ interface JSONSchema4 {
 // JSON Schema Draft 06
 // ==================================================================================================
 type JSONSchema6TypeName = "string" //
-| "number" | "integer" | "boolean" | "object" | "array" | "null" | "any";
+ | "number" | "integer" | "boolean" | "object" | "array" | "null" | "any";
 type JSONSchema6Type = string //
-| number | boolean | JSONSchema6Object | JSONSchema6Array | null;
+ | number | boolean | JSONSchema6Object | JSONSchema6Array | null;
 // Workaround for infinite type recursion
 interface JSONSchema6Object {
   [key: string]: JSONSchema6Type;
@@ -472,13 +471,13 @@ interface JSONSchema6 {
  * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1.1
  */
 type JSONSchema7TypeName = "string" //
-| "number" | "integer" | "boolean" | "object" | "array" | "null";
+ | "number" | "integer" | "boolean" | "object" | "array" | "null";
 /**
  * Primitive type
  * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1.1
  */
 type JSONSchema7Type = string //
-| number | boolean | JSONSchema7Object | JSONSchema7Array | null;
+ | number | boolean | JSONSchema7Object | JSONSchema7Array | null;
 // Workaround for infinite type recursion
 interface JSONSchema7Object {
   [key: string]: JSONSchema7Type;
@@ -634,7 +633,7 @@ declare namespace OpenAPIV3_1 {
   export type PathItemObject<T extends {} = {}> = Modify<OpenAPIV3.PathItemObject<T>, {
     servers?: ServerObject[];
     parameters?: (ReferenceObject | ParameterObject)[];
-  }> & { [method in HttpMethods]?: OperationObject<T> };
+  }> & { [method in HttpMethods]?: OperationObject<T>; };
   export type OperationObject<T extends {} = {}> = Modify<OpenAPIV3.OperationObject<T>, {
     parameters?: (ReferenceObject | ParameterObject)[];
     requestBody?: ReferenceObject | RequestBodyObject;
@@ -799,7 +798,7 @@ declare namespace OpenAPIV3 {
     description?: string;
     servers?: ServerObject[];
     parameters?: (ReferenceObject | ParameterObject)[];
-  } & { [method in HttpMethods]?: OperationObject<T> };
+  } & { [method in HttpMethods]?: OperationObject<T>; };
   type OperationObject<T extends {} = {}> = {
     tags?: string[];
     summary?: string;
@@ -1240,7 +1239,7 @@ type AdapterOasOptions = {
   enums?: 'inline' | 'root';
 } & Partial<ast.ParserOptions>;
 /**
- * Adapter options after defaults have been applied and schema name collisions resolved.
+ * Adapter options after defaults have been applied.
  */
 type AdapterOasResolvedOptions = {
   validate: boolean;
@@ -1253,17 +1252,6 @@ type AdapterOasResolvedOptions = {
   unknownType: NonNullable<AdapterOasOptions['unknownType']>;
   emptySchemaType: NonNullable<AdapterOasOptions['emptySchemaType']>;
   enumSuffix: AdapterOasOptions['enumSuffix'];
-  /**
-   * Map from original `$ref` paths to their collision-resolved schema names.
-   * Populated once the adapter resolves a spec's schemas, on the first `parse()`.
-   *
-   * @example
-   * ```ts
-   * nameMapping.get('#/components/schemas/Order') // 'Order'
-   * nameMapping.get('#/components/responses/Order') // 'OrderResponse'
-   * ```
-   */
-  nameMapping: Map<string, string>;
 };
 /**
  * `@kubb/core` adapter factory type for the OpenAPI adapter.

package/dist/index.js

@@ -1,5 +1,5 @@
 import "./rolldown-runtime-C0LytTxp.js";
-import { ast, childName, collect, enumPropName, extractRefName, findCircularSchemas, macroDiscriminatorEnum, macroEnumName, macroSimplifyUnion, mergeAdjacentObjectsLazy, narrowSchema } from "@kubb/ast";
+import { ast, childName, enumPropName, extractRefName, findCircularSchemas, macroDiscriminatorEnum, macroEnumName, macroSimplifyUnion, mergeAdjacentObjectsLazy, narrowSchema } from "@kubb/ast";
 import { Diagnostics, createAdapter } from "@kubb/core";
 import path from "node:path";
 import { access, readFile } from "node:fs/promises";
@@ -1014,7 +1014,7 @@ function resolveSchemaRef(document, schema) {
 *
 * @example
 * ```ts
-* const { schemas, nameMapping } = getSchemas(document, { contentType: 'application/json' })
+* const { schemas, renames } = getSchemas(document, { contentType: 'application/json' })
 * ```
 */
 function getSchemas(document, { contentType }) {
@@ -1039,7 +1039,7 @@ function getSchemas(document, { contentType }) {
 		normalizedNames.set(key, bucket);
 	}
 	const schemas = {};
-	const nameMapping = /* @__PURE__ */ new Map();
+	const renames = /* @__PURE__ */ new Map();
 	for (const [, items] of normalizedNames) {
 		const isSingle = items.length === 1;
 		let hasMultipleSources = false;
@@ -1054,12 +1054,12 @@ function getSchemas(document, { contentType }) {
 			const suffix = isSingle ? "" : hasMultipleSources ? semanticSuffixes[item.source] : index === 0 ? "" : String(index + 1);
 			const uniqueName = item.originalName + suffix;
 			schemas[uniqueName] = item.schema;
-			nameMapping.set(`#/components/${item.source}/${item.originalName}`, uniqueName);
+			if (suffix) renames.set(`#/components/${item.source}/${item.originalName}`, uniqueName);
 		});
 	}
 	return {
 		schemas: sortSchemas(schemas),
-		nameMapping
+		renames
 	};
 }
 /**
@@ -1225,18 +1225,20 @@ function nameEnums(node, options) {
 * Use `syncSchemaRef(node)` in printers to get a merged view of both.
 * Circular refs are detected in `resolveRefNode` and leave `schema` as `null`.
 */
-function convertRef({ schema, name, nullable, defaultValue, rawOptions, document, resolveRefNode, refExists }) {
+function convertRef({ schema, name, nullable, defaultValue, rawOptions, document, resolveRefNode, refExists, renames }) {
 	const refPath = schema.$ref;
 	const resolvedSchema = refPath ? resolveRefNode(refPath, rawOptions) : null;
 	if (refPath && document.components && !refExists(refPath)) return ast.factory.createSchema({
 		...buildSchemaNode(schema, name, nullable, defaultValue),
 		type: "unknown"
 	});
+	const targetName = renames?.get(schema.$ref);
 	return ast.factory.createSchema({
 		...buildSchemaNode(schema, name, nullable, defaultValue),
 		type: "ref",
 		name: extractRefName(schema.$ref),
 		ref: schema.$ref,
+		...targetName ? { targetName } : {},
 		schema: resolvedSchema
 	});
 }
@@ -1877,7 +1879,8 @@ function createSchemaParser(ctx) {
 			parse: parseSchema,
 			document,
 			resolveRefNode,
-			refExists
+			refExists,
+			renames: ctx.renames
 		};
 		for (const rule of schemaRules) {
 			if (!rule.match(context)) continue;
@@ -2178,7 +2181,6 @@ const adapterOas = createAdapter((options) => {
 		emptySchemaType,
 		enumSuffix
 	};
-	let nameMapping = /* @__PURE__ */ new Map();
 	let parsedDocument = null;
 	const documentCache = /* @__PURE__ */ new WeakMap();
 	const schemasCache = /* @__PURE__ */ new WeakMap();
@@ -2199,16 +2201,16 @@ const adapterOas = createAdapter((options) => {
 		const cached = schemasCache.get(document);
 		if (cached) return cached;
 		const result = getSchemas(document, { contentType });
-		nameMapping = result.nameMapping;
-		schemasCache.set(document, result.schemas);
-		return result.schemas;
+		schemasCache.set(document, result);
+		return result;
 	}
-	function ensureSchemaParser(document) {
+	function ensureSchemaParser({ document, renames }) {
 		const cached = schemaParserCache.get(document);
 		if (cached) return cached;
 		const parser = createSchemaParser({
 			document,
-			contentType
+			contentType,
+			renames
 		});
 		schemaParserCache.set(document, parser);
 		return parser;
@@ -2290,8 +2292,7 @@ const adapterOas = createAdapter((options) => {
 				integerType,
 				unknownType,
 				emptySchemaType,
-				enumSuffix,
-				nameMapping
+				enumSuffix
 			};
 		},
 		get document() {
@@ -2301,24 +2302,16 @@ const adapterOas = createAdapter((options) => {
 			await assertInputExists(input);
 			await validateDocument(await parseDocument(input), options);
 		},
-		getImports(node, resolve) {
-			return collect(node, { schema(schemaNode) {
-				const schemaRef = narrowSchema(schemaNode, "ref");
-				if (!schemaRef?.ref) return null;
-				const result = resolve(nameMapping.get(schemaRef.ref) ?? extractRefName(schemaRef.ref));
-				if (!result) return null;
-				return ast.factory.createImport({
-					name: [result.name],
-					path: result.path
-				});
-			} });
-		},
 		async parse(source) {
 			const document = await ensureDocument(source);
+			const { schemas, renames } = ensureSchemas(document);
 			return parseInput({
 				document,
-				schemas: ensureSchemas(document),
-				parser: ensureSchemaParser(document)
+				schemas,
+				parser: ensureSchemaParser({
+					document,
+					renames
+				})
 			});
 		}
 	};