@kubb/adapter-oas 5.9.3 → 5.9.4

package/dist/index.js

@@ -1,9 +1,9 @@
 import "./rolldown-runtime-C0LytTxp.js";
 import { Diagnostics, ast, childName, defineExtension, enumPropName, extractRefName, macroDiscriminatorEnum, macroEnumName, macroSimplifyUnion, mergeAdjacentObjectsLazy } from "@kubb/kit";
 import { access, readFile } from "node:fs/promises";
-import { parse } from "yaml";
 import { upgrade } from "@scalar/openapi-upgrader";
 import { bundle } from "api-ref-bundler";
+import { parse } from "yaml";
 //#region kubb-extension.json
 var compatibility = {
 	"kubb": ">=5.8.3",
@@ -11,7 +11,7 @@ var compatibility = {
 };
 //#endregion
 //#region package.json
-var version = "5.9.3";
+var version = "5.9.4";
 //#endregion
 //#region src/constants.ts
 /**
@@ -69,7 +69,7 @@ const structuralKeys = /* @__PURE__ */ new Set([
 /**
 * Formats `convertFormat` maps to a dedicated type without going through `formatMap`:
 * `int64`, `uint64` and the date/time family. Keep this in sync with the `convertFormat`
-* special-cases in `parser.ts`. `isHandledFormat` reads it so the
+* special-cases in `emit/converters/scalar.ts`. `isHandledFormat` reads it so the
 * `KUBB_UNSUPPORTED_FORMAT` diagnostic and the parser agree on what is handled.
 */
 const specialCasedFormats = /* @__PURE__ */ new Set([
@@ -138,17 +138,7 @@ const enumDescriptionKeys = ["x-enumDescriptions", "x-enum-descriptions"];
 function buildDiscriminatorChildMap(schemas) {
 	const childMap = /* @__PURE__ */ new Map();
 	for (const schema of schemas) {
-		let unionNode = ast.narrowSchema(schema, "union");
-		if (!unionNode) {
-			const intersectionMembers = ast.narrowSchema(schema, "intersection")?.members;
-			if (intersectionMembers) for (const m of intersectionMembers) {
-				const u = ast.narrowSchema(m, "union");
-				if (u) {
-					unionNode = u;
-					break;
-				}
-			}
-		}
+		const unionNode = ast.narrowSchema(schema, "union") ?? ast.narrowSchema(schema, "intersection")?.members?.map((member) => ast.narrowSchema(member, "union")).find((union) => union);
 		if (!unionNode?.discriminatorPropertyName || !unionNode.members) continue;
 		const { discriminatorPropertyName, members } = unionNode;
 		for (const member of members) {
@@ -455,29 +445,15 @@ async function bundleDocument(pathOrUrl) {
 	return await bundle(pathOrUrl, resolver);
 }
 /**
-* Loads and bundles an OpenAPI document, returning the raw `Document`.
-*
-* A string is a file path or URL: it is bundled via `api-ref-bundler`, hoisting external file
-* schemas into named `components.schemas` entries so generators can emit named types and imports.
-* An object is treated as an already-parsed document. Swagger 2.0 and OpenAPI 3.0 documents are
-* up-converted to OpenAPI 3.1 via `@scalar/openapi-upgrader`.
-*
-* @example
-* ```ts
-* const document = await parseDocument('./openapi.yaml')
-* const document = await parseDocument(rawDocumentObject)
-* ```
-*/
-async function parseDocument(pathOrApi) {
-	if (typeof pathOrApi === "string") return parseDocument(await bundleDocument(pathOrApi));
-	return upgrade(pathOrApi, "3.1");
-}
-/**
 * Creates a `Document` from an `AdapterSource`.
 *
-* - `{ type: 'path' }` bundles an absolute file path (core resolves `input`) or remote URL.
+* - `{ type: 'path' }` bundles an absolute file path (core resolves `input`) or remote URL via
+*   `api-ref-bundler`, hoisting external file schemas into named `components.schemas` entries so
+*   generators can emit named types and imports.
 * - `{ type: 'data' }` parses an inline string (YAML/JSON) or raw object.
 *
+* Swagger 2.0 and OpenAPI 3.0 documents are up-converted to OpenAPI 3.1 via `@scalar/openapi-upgrader`.
+*
 * @example
 * ```ts
 * const document = await parseFromConfig({ type: 'path', path: './openapi.yaml' })
@@ -485,9 +461,12 @@ async function parseDocument(pathOrApi) {
 * ```
 */
 async function parseFromConfig(source) {
-	if (source.type === "data") return parseDocument(typeof source.data === "string" ? parse(source.data) : structuredClone(source.data));
-	await assertInputExists(source.path);
-	return parseDocument(source.path);
+	const raw = await (async () => {
+		if (source.type === "data") return typeof source.data === "string" ? parse(source.data) : structuredClone(source.data);
+		await assertInputExists(source.path);
+		return bundleDocument(source.path);
+	})();
+	return upgrade(raw, "3.1");
 }
 /**
 * Asserts the parsed input is an OpenAPI or Swagger document.
@@ -693,17 +672,6 @@ const semanticSuffixes = {
 	requestBodies: "Request"
 };
 /**
-* Picks the collision suffix for one name-colliding schema: none when the name is unique,
-* a semantic suffix (`Schema`, `Response`, `Request`) when the collision spans sources, otherwise
-* a numeric suffix (`2`, `3`, …) for same-source collisions.
-*/
-function collisionSuffix({ isSingle, hasMultipleSources, source, index }) {
-	if (isSingle) return "";
-	if (hasMultipleSources) return semanticSuffixes[source];
-	if (index === 0) return "";
-	return String(index + 1);
-}
-/**
 * Collects component schemas from one or more sources and resolves name collisions.
 *
 * Sources default to `['schemas', 'requestBodies', 'responses']`. Returned schemas are
@@ -750,12 +718,7 @@ function getSchemas(document, { contentType }, refs) {
 		const isSingle = items.length === 1;
 		const hasMultipleSources = !isSingle && new Set(items.map((item) => item.source)).size > 1;
 		items.forEach((item, index) => {
-			const suffix = collisionSuffix({
-				isSingle,
-				hasMultipleSources,
-				source: item.source,
-				index
-			});
+			const suffix = isSingle ? "" : hasMultipleSources ? semanticSuffixes[item.source] : index ? String(index + 1) : "";
 			const uniqueName = item.originalName + suffix;
 			schemas[uniqueName] = item.schema;
 			if (suffix) renames.set(`#/components/${item.source}/${item.originalName}`, uniqueName);
@@ -1357,11 +1320,11 @@ function resolveUnionMembers(members, siblingProperties) {
 		const obj = member;
 		if (!Array.isArray(obj.required) || obj.required.length === 0) return member;
 		const existingProps = obj.properties ?? {};
-		const missingKeys = obj.required.filter((key) => !Object.prototype.hasOwnProperty.call(existingProps, key));
+		const missingKeys = obj.required.filter((key) => !Object.hasOwn(existingProps, key));
 		if (missingKeys.length === 0) return member;
 		const newProperties = { ...existingProps };
 		for (const key of missingKeys) {
-			const value = Object.prototype.hasOwnProperty.call(siblingProperties, key) ? siblingProperties[key] : {};
+			const value = Object.hasOwn(siblingProperties, key) ? siblingProperties[key] : {};
 			Object.defineProperty(newProperties, key, {
 				value,
 				enumerable: true,
@@ -1403,7 +1366,7 @@ function convertRef({ schema, name, nullable, defaultValue, document, parse, ref
 		nullable,
 		defaultValue
 	};
-	if (refPath && document.components && !refs.exists(refPath)) return createNode(ctx, { type: "unknown" });
+	if (refPath && document.components && !refs.resolve(refPath, { report: false })) return createNode(ctx, { type: "unknown" });
 	const targetName = renames?.get(schema.$ref);
 	return createNode(ctx, {
 		type: "ref",
@@ -1613,29 +1576,6 @@ function getNumericConstraints(schema) {
 		multipleOf: schema.multipleOf
 	};
 }
-function getDateType(options, format) {
-	const value = resolveDateTypeValue(options.dateType, format);
-	if (format !== "date-time") return {
-		type: format,
-		representation: value === "date" ? "date" : "string"
-	};
-	if (value === "date") return {
-		type: "date",
-		representation: "date"
-	};
-	if (value === "stringOffset") return {
-		type: "datetime",
-		offset: true
-	};
-	if (value === "stringLocal") return {
-		type: "datetime",
-		local: true
-	};
-	return {
-		type: "datetime",
-		offset: false
-	};
-}
 /**
 * Builds a `null` scalar node carrying the schema's documentation. Shared by the `const: null`
 * and the drf-spectacular `NullEnum` (`{ enum: [null] }`) branches, which render identically.
@@ -1679,17 +1619,17 @@ function convertFormat(context) {
 		...getNumericConstraints(schema)
 	});
 	if (schema.format === "date-time" || schema.format === "date" || schema.format === "time") {
-		const dateType = getDateType(options, schema.format);
-		if (dateType.type === "datetime") return createNode(context, {
+		const value = resolveDateTypeValue(options.dateType, schema.format);
+		if (schema.format === "date-time" && value !== "date") return createNode(context, {
 			primitive: "string",
 			type: "datetime",
-			offset: dateType.offset,
-			local: dateType.local
+			offset: value === "stringOffset",
+			local: value === "stringLocal"
 		});
 		return createNode(context, {
 			primitive: "string",
-			type: dateType.type,
-			representation: dateType.representation
+			type: schema.format === "date-time" ? "date" : schema.format,
+			representation: value === "date" ? "date" : "string"
 		});
 	}
 	const specialType = formatMap[schema.format];
@@ -1717,47 +1657,37 @@ function convertEnum({ schema, name, nullable, type, parse }) {
 	if (nullInEnum && filteredValues.length === 0) return createNullNode(schema, name);
 	const enumNullable = nullable || nullInEnum || void 0;
 	const enumDefault = schema.default === null && enumNullable ? void 0 : schema.default;
-	const enumPrimitive = getPrimitiveType(type);
+	const primitive = type === "boolean" ? "boolean" : type === "number" || type === "integer" ? "number" : "string";
+	const uniqueValues = [...new Set(filteredValues)];
 	const ctx = {
 		schema,
 		name,
 		nullable: enumNullable,
 		defaultValue: enumDefault
 	};
-	const enumExtras = {
-		type: "enum",
-		primitive: enumPrimitive
-	};
 	const extensionKey = enumExtensionKeys.find((key) => key in schema);
 	const descriptionKey = enumDescriptionKeys.find((key) => key in schema);
-	if (extensionKey || descriptionKey || enumPrimitive === "number" || enumPrimitive === "integer" || enumPrimitive === "boolean") {
-		const enumPrimitiveType = (() => {
-			if (enumPrimitive === "boolean") return "boolean";
-			if (enumPrimitive === "number" || enumPrimitive === "integer") return "number";
-			return "string";
-		})();
-		const rawEnumNames = extensionKey ? schema[extensionKey] : void 0;
-		const rawEnumDescriptions = descriptionKey ? schema[descriptionKey] : void 0;
-		const uniqueValues = [...new Set(filteredValues)];
-		const seenNames = /* @__PURE__ */ new Set();
-		return createNode(ctx, {
-			...enumExtras,
-			primitive: enumPrimitiveType,
-			namedEnumValues: uniqueValues.map((value, index) => ({
-				name: String(rawEnumNames?.[index] ?? value),
-				value,
-				primitive: enumPrimitiveType,
-				description: rawEnumDescriptions?.[index]
-			})).filter((entry) => {
-				if (seenNames.has(entry.name)) return false;
-				seenNames.add(entry.name);
-				return true;
-			})
-		});
-	}
+	if (!extensionKey && !descriptionKey && primitive === "string") return createNode(ctx, {
+		type: "enum",
+		primitive,
+		enumValues: uniqueValues
+	});
+	const rawEnumNames = extensionKey ? schema[extensionKey] : void 0;
+	const rawEnumDescriptions = descriptionKey ? schema[descriptionKey] : void 0;
+	const seenNames = /* @__PURE__ */ new Set();
 	return createNode(ctx, {
-		...enumExtras,
-		enumValues: [...new Set(filteredValues)]
+		type: "enum",
+		primitive,
+		namedEnumValues: uniqueValues.map((value, index) => ({
+			name: String(rawEnumNames?.[index] ?? value),
+			value,
+			primitive,
+			description: rawEnumDescriptions?.[index]
+		})).filter((entry) => {
+			if (seenNames.has(entry.name)) return false;
+			seenNames.add(entry.name);
+			return true;
+		})
 	});
 }
 /**
@@ -2111,7 +2041,6 @@ function refPromotedEnums(node, promoted) {
 * const refs = createRefs(document)
 * refs.resolve<SchemaObject>('#/components/schemas/Pet')
 * refs.resolve<SchemaObject>('#/components/schemas/Pet', { report: false })
-* refs.exists('#/components/schemas/Pet')
 * refs.resolveNode('#/components/schemas/Pet', parseSchema)
 * refs.deref<ResponseObject>(operation.schema.responses?.['200'])
 * refs.derefKeepingRef(parameter)
@@ -2163,14 +2092,6 @@ function createRefs(document) {
 		return null;
 	}
 	/**
-	* Returns `true` when a `$ref` path resolves to a component the document actually defines.
-	* A circular ref still resolves to an existing target, so this stays `true` for cycles and only
-	* goes `false` for a `$ref` that points at a component the spec never declares.
-	*/
-	function exists(refPath) {
-		return !!resolve(refPath, { report: false });
-	}
-	/**
 	* Resolves a `$ref` to its parsed node via `parse`, guarding against cycles and memoizing per
 	* instance. Returns `null` when the ref is currently being resolved (a cycle) or cannot be
 	* resolved (e.g. a minimal document in a unit test).
@@ -2213,7 +2134,6 @@ function createRefs(document) {
 	}
 	return {
 		resolve,
-		exists,
 		resolveNode,
 		deref,
 		derefKeepingRef
@@ -2222,20 +2142,16 @@ function createRefs(document) {
 //#endregion
 //#region src/schemaDiagnostics.ts
 /**
-* 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.
+* Reports the advisory diagnostics (`KUBB_UNSUPPORTED_FORMAT`, `KUBB_DEPRECATED`) for one freshly
+* converted 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 recorded by name and not followed, so the resolved schema is reported under its own walk.
+* 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.
 */
 function scanSchema({ node, name }) {
-	const refs = /* @__PURE__ */ new Set();
-	visit(node, `#/components/schemas/${escapePointerToken(name)}`, refs);
-	return refs;
+	visit(node, `#/components/schemas/${escapePointerToken(name)}`);
 }
 /**
 * Escapes a single JSON pointer reference token per RFC 6901 (`~` → `~0`, `/` → `~1`), so a
@@ -2244,11 +2160,7 @@ function scanSchema({ node, name }) {
 function escapePointerToken(token) {
 	return token.replace(/~/g, "~0").replace(/\//g, "~1");
 }
-function visit(node, pointer, refs) {
-	if (node.type === "ref") {
-		const refName = ast.resolveRefName(node);
-		if (refName) refs.add(refName);
-	}
+function visit(node, pointer) {
 	if (node.deprecated) Diagnostics.report({
 		code: Diagnostics.code.deprecated,
 		severity: "info",
@@ -2269,19 +2181,19 @@ function visit(node, pointer, refs) {
 		}
 	});
 	if (node.type === "object") {
-		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);
+		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`);
 		return;
 	}
 	if (node.type === "array") {
-		for (const item of node.items ?? []) visit(item, `${pointer}/items`, refs);
+		for (const item of node.items ?? []) visit(item, `${pointer}/items`);
 		return;
 	}
 	if (node.type === "tuple") {
-		for (const [index, item] of (node.items ?? []).entries()) visit(item, `${pointer}/items/${index}`, refs);
+		for (const [index, item] of (node.items ?? []).entries()) visit(item, `${pointer}/items/${index}`);
 		return;
 	}
-	if (node.type === "union" || node.type === "intersection") for (const [index, member] of (node.members ?? []).entries()) visit(member, `${pointer}/members/${index}`, refs);
+	if (node.type === "union" || node.type === "intersection") for (const [index, member] of (node.members ?? []).entries()) visit(member, `${pointer}/members/${index}`);
 }
 //#endregion
 //#region src/adapter.ts
@@ -2344,23 +2256,21 @@ const adapterOas = defineExtension({
 			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
 				});
 				parsedByName.set(name, node);
-				const refs = scanSchema({
+				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 (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 = [...ast.findCircularSchemasFromGraph(refGraph)];
+			const circularNames = [...ast.findCircularSchemas([...parsedByName.values()])];
 			const discriminatorChildMap = discriminatorParentNodes.length > 0 ? buildDiscriminatorChildMap(discriminatorParentNodes) : null;
 			const operationNodes = getOperations(document, refs).map((operation) => parseOperation({
 				operation,
@@ -2406,8 +2316,10 @@ const adapterOas = defineExtension({
 				return parsedDocument;
 			},
 			async validate(input, options) {
-				await assertInputExists(input);
-				const document = await parseDocument(input);
+				const document = await parseFromConfig({
+					type: "path",
+					path: input
+				});
 				assertDocument(document);
 				await validateDocument(document, options);
 			},