@kubb/adapter-oas 5.0.0-beta.103 → 5.0.0-beta.104

package/dist/index.js

@@ -1,5 +1,5 @@
 import "./rolldown-runtime-C0LytTxp.js";
-import { ast, findCircularSchemas, narrowSchema } from "@kubb/ast";
+import { ast, findCircularSchemasFromGraph, narrowSchema, resolveRefName } from "@kubb/ast";
 import { Diagnostics, createAdapter } from "@kubb/core";
 import { access, readFile } from "node:fs/promises";
 import path from "node:path";
@@ -2258,15 +2258,20 @@ function refPromotedEnums(node, promoted) {
 //#endregion
 //#region src/schemaDiagnostics.ts
 /**
-* Reports the advisory diagnostics (`KUBB_UNSUPPORTED_FORMAT`, `KUBB_DEPRECATED`) for one
-* top-level schema. Walks the node the parser produced, threading the RFC 6901
-* pointer as it descends so a nested field reports against its full path
-* (`#/components/schemas/Pet/properties/owner/properties/name`). Refs are not followed, so the
-* resolved schema is reported under its own walk. Reports land in the active build run, are a
-* no-op outside one, and repeats are deduped by the build.
+* Scans one freshly converted top-level schema in a single walk, so the post-convert pass never
+* sweeps the same nodes twice. It reports the advisory diagnostics (`KUBB_UNSUPPORTED_FORMAT`,
+* `KUBB_DEPRECATED`) and returns the names of every schema the node references, ready to feed the
+* circular-dependency graph.
+*
+* Walks the node the parser produced, threading the RFC 6901 pointer as it descends so a nested
+* field reports against its full path (`#/components/schemas/Pet/properties/owner/properties/name`).
+* Refs are recorded by name and not followed, so the resolved schema is reported under its own walk.
+* Reports land in the active build run, are a no-op outside one, and repeats are deduped by the build.
 */
-function reportSchemaDiagnostics({ node, name }) {
-	visit(node, `#/components/schemas/${escapePointerToken(name)}`);
+function scanSchema({ node, name }) {
+	const refs = /* @__PURE__ */ new Set();
+	visit(node, `#/components/schemas/${escapePointerToken(name)}`, refs);
+	return refs;
 }
 /**
 * Escapes a single JSON pointer reference token per RFC 6901 (`~` → `~0`, `/` → `~1`), so a
@@ -2275,7 +2280,11 @@ function reportSchemaDiagnostics({ node, name }) {
 function escapePointerToken(token) {
 	return token.replace(/~/g, "~0").replace(/\//g, "~1");
 }
-function visit(node, pointer) {
+function visit(node, pointer, refs) {
+	if (node.type === "ref") {
+		const refName = resolveRefName(node);
+		if (refName) refs.add(refName);
+	}
 	if (node.deprecated) Diagnostics.report({
 		code: Diagnostics.code.deprecated,
 		severity: "info",
@@ -2296,19 +2305,19 @@ function visit(node, pointer) {
 		}
 	});
 	if (node.type === "object") {
-		for (const property of node.properties) visit(property.schema, `${pointer}/properties/${escapePointerToken(property.name)}`);
-		if (node.additionalProperties && typeof node.additionalProperties === "object") visit(node.additionalProperties, `${pointer}/additionalProperties`);
+		for (const property of node.properties) visit(property.schema, `${pointer}/properties/${escapePointerToken(property.name)}`, refs);
+		if (node.additionalProperties && typeof node.additionalProperties === "object") visit(node.additionalProperties, `${pointer}/additionalProperties`, refs);
 		return;
 	}
 	if (node.type === "array") {
-		for (const item of node.items ?? []) visit(item, `${pointer}/items`);
+		for (const item of node.items ?? []) visit(item, `${pointer}/items`, refs);
 		return;
 	}
 	if (node.type === "tuple") {
-		for (const [index, item] of (node.items ?? []).entries()) visit(item, `${pointer}/items/${index}`);
+		for (const [index, item] of (node.items ?? []).entries()) visit(item, `${pointer}/items/${index}`, refs);
 		return;
 	}
-	if (node.type === "union" || node.type === "intersection") for (const [index, member] of (node.members ?? []).entries()) visit(member, `${pointer}/members/${index}`);
+	if (node.type === "union" || node.type === "intersection") for (const [index, member] of (node.members ?? []).entries()) visit(member, `${pointer}/members/${index}`, refs);
 }
 //#endregion
 //#region src/adapter.ts
@@ -2361,21 +2370,23 @@ const adapterOas = createAdapter((options) => {
 		const refAliasMap = /* @__PURE__ */ new Map();
 		const enumNames = [];
 		const discriminatorParentNodes = [];
+		const refGraph = /* @__PURE__ */ new Map();
 		for (const [name, schema] of Object.entries(schemas)) {
 			const node = parseSchema({
 				schema,
 				name
 			}, parserOptions);
 			parsedByName.set(name, node);
-			reportSchemaDiagnostics({
+			const refs = scanSchema({
 				node,
 				name
 			});
+			if (node.name) refGraph.set(node.name, refs);
 			if (node.type === "ref" && node.name && node.name !== name) refAliasMap.set(name, node);
 			if (narrowSchema(node, "enum") && node.name) enumNames.push(node.name);
 			if (discriminator === "propagate" && (schema.oneOf ?? schema.anyOf) && schema.discriminator?.propertyName) discriminatorParentNodes.push(node);
 		}
-		const circularNames = [...findCircularSchemas([...parsedByName.values()])];
+		const circularNames = [...findCircularSchemasFromGraph(refGraph)];
 		const discriminatorChildMap = discriminatorParentNodes.length > 0 ? buildDiscriminatorChildMap(discriminatorParentNodes) : null;
 		const operationNodes = [];
 		for (const operation of getOperations(document, refs)) {