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

package/dist/index.cjs

@@ -1037,7 +1037,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 }) {
@@ -1062,7 +1062,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;
@@ -1077,12 +1077,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
 	};
 }
 /**
@@ -1248,18 +1248,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 _kubb_ast.ast.factory.createSchema({
 		...buildSchemaNode(schema, name, nullable, defaultValue),
 		type: "unknown"
 	});
+	const targetName = renames?.get(schema.$ref);
 	return _kubb_ast.ast.factory.createSchema({
 		...buildSchemaNode(schema, name, nullable, defaultValue),
 		type: "ref",
 		name: (0, _kubb_ast.extractRefName)(schema.$ref),
 		ref: schema.$ref,
+		...targetName ? { targetName } : {},
 		schema: resolvedSchema
 	});
 }
@@ -1900,7 +1902,8 @@ function createSchemaParser(ctx) {
 			parse: parseSchema,
 			document,
 			resolveRefNode,
-			refExists
+			refExists,
+			renames: ctx.renames
 		};
 		for (const rule of schemaRules) {
 			if (!rule.match(context)) continue;
@@ -2201,7 +2204,6 @@ const adapterOas = (0, _kubb_core.createAdapter)((options) => {
 		emptySchemaType,
 		enumSuffix
 	};
-	let nameMapping = /* @__PURE__ */ new Map();
 	let parsedDocument = null;
 	const documentCache = /* @__PURE__ */ new WeakMap();
 	const schemasCache = /* @__PURE__ */ new WeakMap();
@@ -2222,16 +2224,16 @@ const adapterOas = (0, _kubb_core.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;
@@ -2313,8 +2315,7 @@ const adapterOas = (0, _kubb_core.createAdapter)((options) => {
 				integerType,
 				unknownType,
 				emptySchemaType,
-				enumSuffix,
-				nameMapping
+				enumSuffix
 			};
 		},
 		get document() {
@@ -2324,24 +2325,16 @@ const adapterOas = (0, _kubb_core.createAdapter)((options) => {
 			await assertInputExists(input);
 			await validateDocument(await parseDocument(input), options);
 		},
-		getImports(node, resolve) {
-			return (0, _kubb_ast.collect)(node, { schema(schemaNode) {
-				const schemaRef = (0, _kubb_ast.narrowSchema)(schemaNode, "ref");
-				if (!schemaRef?.ref) return null;
-				const result = resolve(nameMapping.get(schemaRef.ref) ?? (0, _kubb_ast.extractRefName)(schemaRef.ref));
-				if (!result) return null;
-				return _kubb_ast.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
+				})
 			});
 		}
 	};