@kubb/adapter-oas 5.10.1 → 5.10.3

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { t as __name } from "./rolldown-runtime-C0LytTxp.js";
 import { AdapterFactoryOptions, ast } from "@kubb/kit";
 //#region ../../node_modules/.pnpm/@types+json-schema@7.0.15/node_modules/@types/json-schema/index.d.ts
 // ==================================================================================================

package/dist/index.js

@@ -1,9 +1,10 @@
-import "./rolldown-runtime-C0LytTxp.js";
-import { Diagnostics, ast, childName, defineExtension, enumPropName, extractRefName, macroDiscriminatorEnum, macroEnumName, macroSimplifyUnion, mergeAdjacentObjectsLazy } from "@kubb/kit";
+import { defineExtension } from "@kubb/core";
+import { Diagnostics, ast, childName, enumPropName, extractRefName, macroDiscriminatorEnum, macroEnumName, macroSimplifyUnion, mergeAdjacentObjectsLazy } from "@kubb/kit";
 import { access, readFile } from "node:fs/promises";
 import { upgrade } from "@scalar/openapi-upgrader";
 import { bundle } from "api-ref-bundler";
 import { parse } from "yaml";
+//#endregion
 //#region kubb-extension.json
 var compatibility = {
 	"kubb": ">=5.8.3",
@@ -11,7 +12,7 @@ var compatibility = {
 };
 //#endregion
 //#region package.json
-var version = "5.10.1";
+var version = "5.10.3";
 //#endregion
 //#region src/constants.ts
 /**
@@ -240,6 +241,20 @@ function pascalCase(text, { prefix = "", suffix = "" } = {}) {
 //#endregion
 //#region ../../internals/utils/src/errors.ts
 /**
+* Coerces an unknown thrown value to an `Error` instance.
+* Returns the value as-is when it is already an `Error`; otherwise wraps it with `String(value)`.
+*
+* @example
+* ```ts
+* try { ... } catch(err) {
+*   throw new Error('Build failed', { cause: toError(err) })
+* }
+* ```
+*/
+function toError(value) {
+	return value instanceof Error ? value : new Error(String(value));
+}
+/**
 * Extracts a human-readable message from any thrown value.
 *
 * @example
@@ -252,6 +267,20 @@ function getErrorMessage(value) {
 	return value instanceof Error ? value.message : String(value);
 }
 //#endregion
+//#region ../../internals/utils/src/jsonPointer.ts
+/**
+* Escapes a single JSON pointer reference token per RFC 6901 (`~` → `~0`, `/` → `~1`), so a
+* name holding those characters maps to a distinct pointer.
+*
+* @example
+* ```ts
+* escapePointerToken('/pets/{id}') // '~1pets~1{id}'
+* ```
+*/
+function escapePointerToken(token) {
+	return token.replaceAll("~", "~0").replaceAll("/", "~1");
+}
+//#endregion
 //#region ../../internals/utils/src/runtime.ts
 const isBun = typeof Bun !== "undefined";
 const isDeno = "Deno" in globalThis;
@@ -377,7 +406,28 @@ async function resolveSource(sourcePath) {
 	try {
 		return JSON.parse(data);
 	} catch {
+		return parseYaml(data, {
+			origin: sourcePath,
+			help: "Fix the syntax at the reported line, or check that `input` points at the spec and not an HTML page."
+		});
+	}
+}
+/**
+* Parses a YAML (or JSON) spec. A syntax error throws `KUBB_INVALID_DOCUMENT` naming `origin`,
+* with the parser message, which keeps the line and column.
+*/
+function parseYaml(data, { origin, help }) {
+	try {
 		return parse(data);
+	} catch (error) {
+		throw new Diagnostics.Error({
+			code: Diagnostics.code.invalidDocument,
+			severity: "error",
+			message: `Cannot parse ${origin} as JSON or YAML: ${getErrorMessage(error)}`,
+			help,
+			location: { kind: "config" },
+			cause: toError(error)
+		});
 	}
 }
 /**
@@ -462,11 +512,26 @@ async function bundleDocument(pathOrUrl) {
 */
 async function parseFromConfig(source) {
 	const raw = await (async () => {
-		if (source.type === "data") return typeof source.data === "string" ? parse(source.data) : structuredClone(source.data);
+		if (source.type === "data") return typeof source.data === "string" ? parseYaml(source.data, {
+			origin: "the inline `input` string",
+			help: "Fix the syntax at the reported line. Kubb reads `input` as an inline spec, not a file path, because it starts with `{`, `[`, `openapi:`, or `swagger:`, or spans several lines."
+		}) : structuredClone(source.data);
 		await assertInputExists(source.path);
 		return bundleDocument(source.path);
 	})();
-	return upgrade(raw, "3.1");
+	try {
+		return upgrade(raw, "3.1");
+	} catch (error) {
+		const declared = raw && typeof raw === "object" ? raw.openapi ?? raw.swagger : void 0;
+		throw new Diagnostics.Error({
+			code: Diagnostics.code.invalidDocument,
+			severity: "error",
+			message: `Cannot upgrade the document${declared ? ` (version ${String(declared)})` : ""} to OpenAPI 3.1: ${getErrorMessage(error)}`,
+			help: "Kubb reads Swagger 2.0, OpenAPI 3.0, and OpenAPI 3.1. Set `swagger` or `openapi` to one of those versions, and fix the reported problem in the document.",
+			location: { kind: "config" },
+			cause: toError(error)
+		});
+	}
 }
 /**
 * Asserts the parsed input is an OpenAPI or Swagger document.
@@ -477,7 +542,7 @@ async function parseFromConfig(source) {
 * be a usable document, so it is fatal regardless of the `validate` option.
 */
 function assertDocument(document) {
-	if (document && ("openapi" in document || "swagger" in document)) return;
+	if (document && typeof document === "object" && ("openapi" in document || "swagger" in document)) return;
 	throw new Diagnostics.Error({
 		code: Diagnostics.code.invalidDocument,
 		severity: "error",
@@ -514,7 +579,12 @@ async function validateDocument(document, { throwOnError = false } = {}) {
 		return;
 	}
 	if (result.valid) return;
-	if (throwOnError) throw new Error(compileErrors(result));
+	if (throwOnError) throw new Diagnostics.Error({
+		code: Diagnostics.code.invalidSpec,
+		severity: "error",
+		message: compileErrors(result),
+		help: "Fix each problem listed in the spec, then validate again."
+	});
 	for (const { message } of result.errors) reportInvalidSpec(message.replace(/\n.*/s, ""));
 	if (result.additionalErrors > 0) reportInvalidSpec(`${result.additionalErrors} more validation errors are not listed.`);
 }
@@ -2188,13 +2258,6 @@ function createRefs(document) {
 function scanSchema({ node, name }) {
 	visit(node, `#/components/schemas/${escapePointerToken(name)}`);
 }
-/**
-* Escapes a single JSON pointer reference token per RFC 6901 (`~` → `~0`, `/` → `~1`), so a
-* property name with those characters maps to a distinct pointer instead of colliding in the dedupe.
-*/
-function escapePointerToken(token) {
-	return token.replace(/~/g, "~0").replace(/\//g, "~1");
-}
 function visit(node, pointer) {
 	if (node.deprecated) Diagnostics.report({
 		code: Diagnostics.code.deprecated,