@kubb/oas 4.27.2 → 4.27.3

package/dist/index.d.cts

@@ -1,5 +1,4 @@
-import { findSchemaDefinition, matchesMimeType } from "oas/utils";
-import * as oas_normalize_lib_types0 from "oas-normalize/lib/types";
+import * as _readme_openapi_parser0 from "@readme/openapi-parser";
 import BaseOas from "oas";
 import { Operation as Operation$1 } from "oas/operation";
 import * as OasTypes from "oas/types";
@@ -57,7 +56,7 @@ declare class Oas extends BaseOas {
   getResponseSchema(operation: Operation, statusCode: string | number): SchemaObject;
   getRequestSchema(operation: Operation): SchemaObject | undefined;
   getParametersSchema(operation: Operation, inKey: 'path' | 'query' | 'header'): SchemaObject | null;
-  validate(): Promise<oas_normalize_lib_types0.ValidationResult>;
+  validate(): Promise<_readme_openapi_parser0.ValidationResult>;
   flattenSchema(schema: SchemaObject | null): SchemaObject | null;
   /**
    * Get schemas from OpenAPI components (schemas, responses, requestBodies).
@@ -115,7 +114,6 @@ declare function isOptional(schema?: SchemaObject$1): boolean;
 declare function getDefaultValue(schema?: SchemaObject$1): string | undefined;
 declare function parse(pathOrApi: string | Document, {
   oasClass,
-  canBundle,
   enablePaths
 }?: {
   oasClass?: typeof Oas;
@@ -131,7 +129,7 @@ declare function parseFromConfig(config: Config, oasClass?: typeof Oas): Promise
 /**
  * Validate an OpenAPI document using oas-normalize.
  */
-declare function validate(document: Document): Promise<oas_normalize_lib_types0.ValidationResult>;
+declare function validate(document: Document): Promise<_readme_openapi_parser0.ValidationResult>;
 //#endregion
-export { DiscriminatorObject, Document, HttpMethod, HttpMethods, MediaTypeObject, Oas, type OasTypes, type OpenAPIV3, type OpenAPIV3_1, Operation, ReferenceObject, ResponseObject, SchemaObject, contentType, findSchemaDefinition, getDefaultValue, isAllOptional, isDiscriminator, isNullable, isOpenApiV3_1Document, isOptional, isParameterObject, isReference, isRequired, matchesMimeType, merge, parse, parseFromConfig, validate };
+export { DiscriminatorObject, Document, HttpMethod, HttpMethods, MediaTypeObject, Oas, type OasTypes, type OpenAPIV3, type OpenAPIV3_1, Operation, ReferenceObject, ResponseObject, SchemaObject, contentType, getDefaultValue, isAllOptional, isDiscriminator, isNullable, isOpenApiV3_1Document, isOptional, isParameterObject, isReference, isRequired, merge, parse, parseFromConfig, validate };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.ts

@@ -1,9 +1,8 @@
 import { i as __name } from "./chunk-BdfDOGov.js";
-import { findSchemaDefinition, matchesMimeType } from "oas/utils";
 import BaseOas from "oas";
+import * as _readme_openapi_parser0 from "@readme/openapi-parser";
 import * as OasTypes from "oas/types";
 import { DiscriminatorObject as DiscriminatorObject$1, HttpMethods as HttpMethods$1, MediaTypeObject as MediaTypeObject$1, OASDocument, ParameterObject, ResponseObject as ResponseObject$1, SchemaObject as SchemaObject$1 } from "oas/types";
-import * as oas_normalize_lib_types0 from "oas-normalize/lib/types";
 import { Operation as Operation$1 } from "oas/operation";
 import { OpenAPIV3, OpenAPIV3 as OpenAPIV3$1, OpenAPIV3_1, OpenAPIV3_1 as OpenAPIV3_1$1 } from "openapi-types";
 import { Config } from "@kubb/core";
@@ -56,7 +55,7 @@ declare class Oas extends BaseOas {
   getResponseSchema(operation: Operation, statusCode: string | number): SchemaObject;
   getRequestSchema(operation: Operation): SchemaObject | undefined;
   getParametersSchema(operation: Operation, inKey: 'path' | 'query' | 'header'): SchemaObject | null;
-  validate(): Promise<oas_normalize_lib_types0.ValidationResult>;
+  validate(): Promise<_readme_openapi_parser0.ValidationResult>;
   flattenSchema(schema: SchemaObject | null): SchemaObject | null;
   /**
    * Get schemas from OpenAPI components (schemas, responses, requestBodies).
@@ -114,7 +113,6 @@ declare function isOptional(schema?: SchemaObject$1): boolean;
 declare function getDefaultValue(schema?: SchemaObject$1): string | undefined;
 declare function parse(pathOrApi: string | Document, {
   oasClass,
-  canBundle,
   enablePaths
 }?: {
   oasClass?: typeof Oas;
@@ -130,7 +128,7 @@ declare function parseFromConfig(config: Config, oasClass?: typeof Oas): Promise
 /**
  * Validate an OpenAPI document using oas-normalize.
  */
-declare function validate(document: Document): Promise<oas_normalize_lib_types0.ValidationResult>;
+declare function validate(document: Document): Promise<_readme_openapi_parser0.ValidationResult>;
 //#endregion
-export { DiscriminatorObject, Document, HttpMethod, HttpMethods, MediaTypeObject, Oas, type OasTypes, type OpenAPIV3, type OpenAPIV3_1, Operation, ReferenceObject, ResponseObject, SchemaObject, contentType, findSchemaDefinition, getDefaultValue, isAllOptional, isDiscriminator, isNullable, isOpenApiV3_1Document, isOptional, isParameterObject, isReference, isRequired, matchesMimeType, merge, parse, parseFromConfig, validate };
+export { DiscriminatorObject, Document, HttpMethod, HttpMethods, MediaTypeObject, Oas, type OasTypes, type OpenAPIV3, type OpenAPIV3_1, Operation, ReferenceObject, ResponseObject, SchemaObject, contentType, getDefaultValue, isAllOptional, isDiscriminator, isNullable, isOpenApiV3_1Document, isOptional, isParameterObject, isReference, isRequired, merge, parse, parseFromConfig, validate };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,11 +1,11 @@
 import { a as __require, i as __name, n as __esmMin, o as __toCommonJS, r as __exportAll, s as __toESM, t as __commonJSMin } from "./chunk-BdfDOGov.js";
-import { findSchemaDefinition, matchesMimeType, matchesMimeType as matchesMimeType$1 } from "oas/utils";
 import jsonpointer from "jsonpointer";
 import BaseOas from "oas";
+import { matchesMimeType } from "oas/utils";
 import path from "node:path";
 import { pascalCase } from "@kubb/core/transformers";
 import { URLPath } from "@kubb/core/utils";
-import { bundle, loadConfig } from "@redocly/openapi-core";
+import { bundle } from "@readme/openapi-parser";
 import { isRef } from "oas/types";
 import OASNormalize from "oas-normalize";
 import { isPlainObject, mergeDeep } from "remeda";
@@ -4390,16 +4390,15 @@ function getDefaultValue(schema) {
 	}
 	if (schema.type === "object" || schema.properties) return "{}";
 }
-async function parse(pathOrApi, { oasClass = Oas, canBundle = true, enablePaths = true } = {}) {
-	if (typeof pathOrApi === "string" && canBundle) return parse((await bundle({
-		ref: pathOrApi,
-		config: await loadConfig(),
-		base: pathOrApi
-	})).bundle.parsed, {
-		oasClass,
-		canBundle,
-		enablePaths
-	});
+async function parse(pathOrApi, { oasClass = Oas, enablePaths = true } = {}) {
+	if (typeof pathOrApi === "string" && !pathOrApi.match(/\n/) && !pathOrApi.match(/^\s*\{/) && enablePaths) try {
+		return parse(await bundle(pathOrApi), {
+			oasClass,
+			enablePaths
+		});
+	} catch (e) {
+		console.warn(`[kubb] Failed to bundle external $refs in "${pathOrApi}": ${e.message}. Falling back to plain load.`);
+	}
 	const document = await new OASNormalize(pathOrApi, {
 		enablePaths,
 		colorizeErrors: true
@@ -4413,8 +4412,7 @@ async function parse(pathOrApi, { oasClass = Oas, canBundle = true, enablePaths
 async function merge(pathOrApi, { oasClass = Oas } = {}) {
 	const instances = await Promise.all(pathOrApi.map((p) => parse(p, {
 		oasClass,
-		enablePaths: false,
-		canBundle: false
+		enablePaths: false
 	})));
 	if (instances.length === 0) throw new Error("No OAS instances provided for merging.");
 	return parse(instances.reduce((acc, current) => {
@@ -4756,7 +4754,7 @@ var Oas = class extends BaseOas {
 			let availableContentType;
 			const contentTypes = Object.keys(responseBody.content);
 			contentTypes.forEach((mt) => {
-				if (!availableContentType && matchesMimeType$1.json(mt)) availableContentType = mt;
+				if (!availableContentType && matchesMimeType.json(mt)) availableContentType = mt;
 			});
 			if (!availableContentType) contentTypes.forEach((mt) => {
 				if (!availableContentType) availableContentType = mt;
@@ -4907,5 +4905,5 @@ const HttpMethods = {
 };
 
 //#endregion
-export { HttpMethods, Oas, findSchemaDefinition, getDefaultValue, isAllOptional, isDiscriminator, isNullable, isOpenApiV3_1Document, isOptional, isParameterObject, isReference, isRequired, matchesMimeType, merge, parse, parseFromConfig, validate };
+export { HttpMethods, Oas, getDefaultValue, isAllOptional, isDiscriminator, isNullable, isOpenApiV3_1Document, isOptional, isParameterObject, isReference, isRequired, merge, parse, parseFromConfig, validate };
 //# sourceMappingURL=index.js.map