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

package/dist/index.cjs

@@ -84,12 +84,13 @@ const structuralKeys = /* @__PURE__ */ new Set([
 ]);
 /**
 * Formats `convertFormat` maps to a dedicated type without going through `formatMap`:
-* `int64` and the date/time family. Keep this in sync with the `convertFormat`
+* `int64`, `uint64` and the date/time family. Keep this in sync with the `convertFormat`
 * special-cases in `parser.ts`. `isHandledFormat` reads it so the
 * `KUBB_UNSUPPORTED_FORMAT` diagnostic and the parser agree on what is handled.
 */
 const specialCasedFormats = /* @__PURE__ */ new Set([
 	"int64",
+	"uint64",
 	"date-time",
 	"date",
 	"time"
@@ -844,14 +845,14 @@ function getOperations(document, refs) {
 //#region src/emit/schemaShape.ts
 /**
 * Returns the Kubb `SchemaType` for a given OAS `format` string, or `null` if not found.
-* Formats not in `formatMap` (e.g., `int64`, `date-time`) are handled separately by parser options.
+* Formats not in `formatMap` (e.g., `int64`, `uint64`, `date-time`) are handled separately by parser options.
 */
 function getSchemaType(format) {
 	return formatMap[format] ?? null;
 }
 /**
 * Whether the parser maps `format` to a dedicated type. True for any `formatMap` entry, plus the
-* `specialCasedFormats` that `convertFormat` handles directly. False means the format falls back to
+* `specialCasedFormats` that `convertFormat` handles directly (int64, uint64, date-time, date, time). False means the format falls back to
 * the base type, which is what `KUBB_UNSUPPORTED_FORMAT` flags. Reading both sources keeps the
 * diagnostic in step with the parser as `formatMap` grows.
 */
@@ -1369,7 +1370,7 @@ function convertFormat({ schema, name, nullable, defaultValue, options }) {
 		nullable,
 		defaultValue
 	};
-	if (schema.format === "int64") return createNode(ctx, {
+	if (schema.format === "int64" || schema.format === "uint64") return createNode(ctx, {
 		type: options.integerType === "bigint" ? "bigint" : "integer",
 		primitive: "integer",
 		min: schema.minimum,
@@ -2281,15 +2282,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
@@ -2298,7 +2304,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 = (0, _kubb_ast.resolveRefName)(node);
+		if (refName) refs.add(refName);
+	}
 	if (node.deprecated) _kubb_core.Diagnostics.report({
 		code: _kubb_core.Diagnostics.code.deprecated,
 		severity: "info",
@@ -2319,19 +2329,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
@@ -2384,21 +2394,23 @@ const adapterOas = (0, _kubb_core.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 ((0, _kubb_ast.narrowSchema)(node, "enum") && node.name) enumNames.push(node.name);
 			if (discriminator === "propagate" && (schema.oneOf ?? schema.anyOf) && schema.discriminator?.propertyName) discriminatorParentNodes.push(node);
 		}
-		const circularNames = [...(0, _kubb_ast.findCircularSchemas)([...parsedByName.values()])];
+		const circularNames = [...(0, _kubb_ast.findCircularSchemasFromGraph)(refGraph)];
 		const discriminatorChildMap = discriminatorParentNodes.length > 0 ? buildDiscriminatorChildMap(discriminatorParentNodes) : null;
 		const operationNodes = [];
 		for (const operation of getOperations(document, refs)) {