@kubb/oas 4.33.2 → 4.33.3

package/dist/index.cjs

@@ -38,11 +38,9 @@ jsonpointer = __toESM(jsonpointer);
 let oas = require("oas");
 oas = __toESM(oas);
 let oas_utils = require("oas/utils");
-let node_fs = require("node:fs");
-node_fs = __toESM(node_fs);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
-let _readme_openapi_parser = require("@readme/openapi-parser");
+let _redocly_openapi_core = require("@redocly/openapi-core");
 let oas_types = require("oas/types");
 let oas_normalize = require("oas-normalize");
 oas_normalize = __toESM(oas_normalize);
@@ -4543,96 +4541,16 @@ function getDefaultValue(schema) {
 	}
 	if (schema.type === "object" || schema.properties) return "{}";
 }
-/**
-* Recursively collect all external local-file $ref prefixes (e.g. "api-definitions.yml")
-* from an object tree. URL refs (http/https) are ignored.
-*/
-function collectExternalFilePaths(obj, files) {
-	if (!obj || typeof obj !== "object") return;
-	if (Array.isArray(obj)) {
-		for (const item of obj) collectExternalFilePaths(item, files);
-		return;
-	}
-	for (const [key, value] of Object.entries(obj)) if (key === "$ref" && typeof value === "string") {
-		const hashIdx = value.indexOf("#");
-		const filePart = hashIdx > 0 ? value.slice(0, hashIdx) : hashIdx === -1 ? value : "";
-		if (filePart && !filePart.startsWith("http://") && !filePart.startsWith("https://")) files.add(filePart);
-	} else collectExternalFilePaths(value, files);
-}
-/**
-* Replace all $refs that start with `externalFile#` with the corresponding
-* internal ref (i.e. just the fragment part, `#/...`).
-*/
-function replaceExternalRefsInPlace(obj, externalFile) {
-	if (!obj || typeof obj !== "object") return;
-	if (Array.isArray(obj)) {
-		for (const item of obj) replaceExternalRefsInPlace(item, externalFile);
-		return;
-	}
-	const record = obj;
-	for (const key of Object.keys(record)) {
-		const value = record[key];
-		if (key === "$ref" && typeof value === "string" && value.startsWith(`${externalFile}#`)) record[key] = value.slice(externalFile.length);
-		else if (value && typeof value === "object") replaceExternalRefsInPlace(value, externalFile);
-	}
-}
-/**
-* Before bundling, scan the main spec file for external local-file references and merge
-* their `components` sections into the main document. This ensures that schemas defined
-* in external files (e.g. `api-definitions.yml#/components/schemas/Parcel`) end up in
-* `#/components/schemas/Parcel` of the bundled output, rather than being inlined as
-* anonymous path-based refs.
-*
-* Returns the merged document, or `null` if no external file components were found.
-*/
-function mergeExternalFileComponents(mainFilePath) {
-	let mainContent;
-	try {
-		mainContent = node_fs.default.readFileSync(mainFilePath, "utf-8");
-	} catch {
-		return null;
-	}
-	const mainDoc = import_yaml.parse(mainContent);
-	if (!mainDoc || typeof mainDoc !== "object") return null;
-	const mainDir = node_path.default.dirname(mainFilePath);
-	const externalFiles = /* @__PURE__ */ new Set();
-	collectExternalFilePaths(mainDoc, externalFiles);
-	if (externalFiles.size === 0) return null;
-	let hasMergedComponents = false;
-	for (const externalFile of externalFiles) {
-		const externalFilePath = node_path.default.resolve(mainDir, externalFile);
-		let externalContent;
-		try {
-			externalContent = node_fs.default.readFileSync(externalFilePath, "utf-8");
-		} catch {
-			continue;
-		}
-		const externalDoc = import_yaml.parse(externalContent);
-		if (!externalDoc?.components || typeof externalDoc.components !== "object") continue;
-		const mainComponents = mainDoc.components ?? {};
-		mainDoc.components = mainComponents;
-		for (const [componentType, components] of Object.entries(externalDoc.components)) {
-			if (!components || typeof components !== "object") continue;
-			mainComponents[componentType] = {
-				...components,
-				...mainComponents[componentType] ?? {}
-			};
-			hasMergedComponents = true;
-		}
-	}
-	if (!hasMergedComponents) return null;
-	for (const externalFile of externalFiles) replaceExternalRefsInPlace(mainDoc, externalFile);
-	return mainDoc;
-}
-async function parse(pathOrApi, { oasClass = Oas, enablePaths = true } = {}) {
-	if (typeof pathOrApi === "string" && !pathOrApi.match(/\n/) && !pathOrApi.match(/^\s*\{/) && enablePaths) try {
-		return parse(await (0, _readme_openapi_parser.bundle)(mergeExternalFileComponents(pathOrApi) ?? pathOrApi), {
-			oasClass,
-			enablePaths
-		});
-	} catch (e) {
-		console.warn(`[kubb] Failed to bundle external $refs in "${pathOrApi}": ${e.message}. Falling back to plain load.`);
-	}
+async function parse(pathOrApi, { oasClass = Oas, canBundle = true, enablePaths = true } = {}) {
+	if (typeof pathOrApi === "string" && canBundle) return parse((await (0, _redocly_openapi_core.bundle)({
+		ref: pathOrApi,
+		config: await (0, _redocly_openapi_core.loadConfig)(),
+		base: pathOrApi
+	})).bundle.parsed, {
+		oasClass,
+		canBundle,
+		enablePaths
+	});
 	const document = await new oas_normalize.default(pathOrApi, {
 		enablePaths,
 		colorizeErrors: true
@@ -4646,7 +4564,8 @@ async function parse(pathOrApi, { oasClass = Oas, enablePaths = true } = {}) {
 async function merge(pathOrApi, { oasClass = Oas } = {}) {
 	const instances = await Promise.all(pathOrApi.map((p) => parse(p, {
 		oasClass,
-		enablePaths: false
+		enablePaths: false,
+		canBundle: false
 	})));
 	if (instances.length === 0) throw new Error("No OAS instances provided for merging.");
 	return parse(instances.reduce((acc, current) => {
@@ -5031,9 +4950,14 @@ var Oas = class extends oas.default {
 	}
 	getParametersSchema(operation, inKey) {
 		const { contentType = operation.getContentType() } = this.#options;
-		const params = operation.getParameters().map((schema) => {
-			return this.dereferenceWithRef(schema);
-		}).filter((v) => v.in === inKey);
+		const resolveParams = (params) => params.map((p) => this.dereferenceWithRef(p)).filter((p) => !!p && typeof p === "object" && "in" in p && "name" in p);
+		const operationParams = resolveParams(operation.schema?.parameters || []);
+		const pathItem = this.api?.paths?.[operation.path];
+		const pathLevelParams = resolveParams(pathItem && !isReference(pathItem) && pathItem.parameters ? pathItem.parameters : []);
+		const paramMap = /* @__PURE__ */ new Map();
+		for (const p of pathLevelParams) if (p.name && p.in) paramMap.set(`${p.in}:${p.name}`, p);
+		for (const p of operationParams) if (p.name && p.in) paramMap.set(`${p.in}:${p.name}`, p);
+		const params = Array.from(paramMap.values()).filter((v) => v.in === inKey);
 		if (!params.length) return null;
 		return params.reduce((schema, pathParameters) => {
 			const property = pathParameters.content?.[contentType]?.schema ?? pathParameters.schema;