@kubb/oas 4.12.10 → 4.12.11

package/dist/index.d.cts

@@ -1,40 +1,58 @@
-import { c as HttpMethods, d as OpenAPIV3_1, f as Operation, h as Infer, l as OasTypes, m as contentType, n as RequestParams, p as SchemaObject, r as Model, s as HttpMethod, t as Response, u as OpenAPIV3 } from "./index-BuoKUWab.cjs";
 import { findSchemaDefinition, matchesMimeType } from "oas/utils";
-import { OASDocument, ParameterObject, SchemaObject as SchemaObject$1, User } from "oas/types";
-import { Operation as Operation$1 } from "oas/operation";
-import { OpenAPIV3 as OpenAPIV3$1, OpenAPIV3_1 as OpenAPIV3_1$1 } from "openapi-types";
 import * as oas_normalize_lib_types0 from "oas-normalize/lib/types";
 import BaseOas from "oas";
+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 * 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 { KubbFile } from "@kubb/fabric-core/types";
 import { Fabric } from "@kubb/react-fabric";
 
+//#region src/types.d.ts
+type contentType = 'application/json' | (string & {});
+type SchemaObject = SchemaObject$1 & {
+  'x-nullable'?: boolean;
+  $ref?: string;
+};
+declare const HttpMethods: {
+  GET: "get";
+  POST: "post";
+  PUT: "put";
+  PATCH: "patch";
+  DELETE: "delete";
+  HEAD: "head";
+  OPTIONS: "options";
+  TRACE: "trace";
+};
+type HttpMethod = HttpMethods$1;
+type Document = OASDocument;
+type Operation = Operation$1;
+type DiscriminatorObject = DiscriminatorObject$1;
+type ReferenceObject = OpenAPIV3$1.ReferenceObject;
+type ResponseObject = ResponseObject$1;
+type MediaTypeObject = MediaTypeObject$1;
+//#endregion
 //#region src/Oas.d.ts
 type Options$1 = {
   contentType?: contentType;
   discriminator?: 'strict' | 'inherit';
 };
-declare class Oas<const TOAS = unknown> extends BaseOas {
+declare class Oas extends BaseOas {
   #private;
-  document: TOAS;
-  constructor({
-    oas,
-    user
-  }: {
-    oas: TOAS | OASDocument | string;
-    user?: User;
-  });
+  document: Document;
+  constructor(document: Document);
   setOptions(options: Options$1): void;
   get options(): Options$1;
-  get($ref: string): any;
+  get<T = unknown>($ref: string): T | null;
   getKey($ref: string): string | undefined;
   set($ref: string, value: unknown): false | undefined;
-  getDiscriminator(schema: OasTypes.SchemaObject): OpenAPIV3$1.DiscriminatorObject | undefined;
-  dereferenceWithRef(schema?: unknown): any;
-  getResponseSchema(operation: Operation$1, statusCode: string | number): SchemaObject$1;
-  getRequestSchema(operation: Operation$1): SchemaObject$1 | undefined;
-  getParametersSchema(operation: Operation$1, inKey: 'path' | 'query' | 'header'): SchemaObject$1 | null;
+  getDiscriminator(schema: SchemaObject | null): DiscriminatorObject | null;
+  dereferenceWithRef<T = unknown>(schema?: T): T;
+  getResponseSchema(operation: Operation, statusCode: string | number): SchemaObject;
+  getRequestSchema(operation: Operation): SchemaObject | undefined;
+  getParametersSchema(operation: Operation, inKey: 'path' | 'query' | 'header'): SchemaObject | null;
   valdiate(): Promise<oas_normalize_lib_types0.ValidationResult>;
-  flattenSchema(schema?: SchemaObject$1): SchemaObject$1 | undefined;
+  flattenSchema(schema: SchemaObject | null): SchemaObject | null;
 }
 //#endregion
 //#region ../core/src/Kubb.d.ts
@@ -663,7 +681,7 @@ declare function isDiscriminator(obj?: any): obj is SchemaObject$1 & {
  */
 declare function isRequired(schema?: SchemaObject$1): boolean;
 declare function isOptional(schema?: SchemaObject$1): boolean;
-declare function parse(pathOrApi: string | OASDocument, {
+declare function parse(pathOrApi: string | Document, {
   oasClass,
   canBundle,
   enablePaths
@@ -672,12 +690,12 @@ declare function parse(pathOrApi: string | OASDocument, {
   canBundle?: boolean;
   enablePaths?: boolean;
 }): Promise<Oas>;
-declare function merge(pathOrApi: Array<string | OASDocument>, {
+declare function merge(pathOrApi: Array<string | Document>, {
   oasClass
 }?: {
   oasClass?: typeof Oas;
 }): Promise<Oas>;
 declare function parseFromConfig(config: Config, oasClass?: typeof Oas): Promise<Oas>;
 //#endregion
-export { HttpMethod, HttpMethods, type Infer, type Model, Oas, OasTypes, OpenAPIV3, OpenAPIV3_1, Operation, type RequestParams, type Response, SchemaObject, contentType, findSchemaDefinition, isDiscriminator, isNullable, isOpenApiV3_1Document, isOptional, isParameterObject, isReference, isRequired, matchesMimeType, merge, parse, parseFromConfig };
+export { DiscriminatorObject, Document, HttpMethod, HttpMethods, MediaTypeObject, Oas, type OasTypes, type OpenAPIV3, type OpenAPIV3_1, Operation, ReferenceObject, ResponseObject, SchemaObject, contentType, findSchemaDefinition, isDiscriminator, isNullable, isOpenApiV3_1Document, isOptional, isParameterObject, isReference, isRequired, matchesMimeType, merge, parse, parseFromConfig };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.ts

@@ -1,40 +1,58 @@
-import { c as HttpMethods, d as OpenAPIV3_1, f as Operation, h as Infer, l as OasTypes, m as contentType, n as RequestParams, p as SchemaObject, r as Model, s as HttpMethod, t as Response, u as OpenAPIV3 } from "./index-CT3Sz4Y8.js";
 import { findSchemaDefinition, matchesMimeType } from "oas/utils";
 import BaseOas from "oas";
-import { OASDocument, ParameterObject, SchemaObject as SchemaObject$1, User } from "oas/types";
-import { Operation as Operation$1 } from "oas/operation";
-import { OpenAPIV3 as OpenAPIV3$1, OpenAPIV3_1 as OpenAPIV3_1$1 } from "openapi-types";
+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 { KubbFile } from "@kubb/fabric-core/types";
 import { Fabric } from "@kubb/react-fabric";
 
+//#region src/types.d.ts
+type contentType = 'application/json' | (string & {});
+type SchemaObject = SchemaObject$1 & {
+  'x-nullable'?: boolean;
+  $ref?: string;
+};
+declare const HttpMethods: {
+  GET: "get";
+  POST: "post";
+  PUT: "put";
+  PATCH: "patch";
+  DELETE: "delete";
+  HEAD: "head";
+  OPTIONS: "options";
+  TRACE: "trace";
+};
+type HttpMethod = HttpMethods$1;
+type Document = OASDocument;
+type Operation = Operation$1;
+type DiscriminatorObject = DiscriminatorObject$1;
+type ReferenceObject = OpenAPIV3$1.ReferenceObject;
+type ResponseObject = ResponseObject$1;
+type MediaTypeObject = MediaTypeObject$1;
+//#endregion
 //#region src/Oas.d.ts
 type Options$1 = {
   contentType?: contentType;
   discriminator?: 'strict' | 'inherit';
 };
-declare class Oas<const TOAS = unknown> extends BaseOas {
+declare class Oas extends BaseOas {
   #private;
-  document: TOAS;
-  constructor({
-    oas,
-    user
-  }: {
-    oas: TOAS | OASDocument | string;
-    user?: User;
-  });
+  document: Document;
+  constructor(document: Document);
   setOptions(options: Options$1): void;
   get options(): Options$1;
-  get($ref: string): any;
+  get<T = unknown>($ref: string): T | null;
   getKey($ref: string): string | undefined;
   set($ref: string, value: unknown): false | undefined;
-  getDiscriminator(schema: OasTypes.SchemaObject): OpenAPIV3$1.DiscriminatorObject | undefined;
-  dereferenceWithRef(schema?: unknown): any;
-  getResponseSchema(operation: Operation$1, statusCode: string | number): SchemaObject$1;
-  getRequestSchema(operation: Operation$1): SchemaObject$1 | undefined;
-  getParametersSchema(operation: Operation$1, inKey: 'path' | 'query' | 'header'): SchemaObject$1 | null;
+  getDiscriminator(schema: SchemaObject | null): DiscriminatorObject | null;
+  dereferenceWithRef<T = unknown>(schema?: T): T;
+  getResponseSchema(operation: Operation, statusCode: string | number): SchemaObject;
+  getRequestSchema(operation: Operation): SchemaObject | undefined;
+  getParametersSchema(operation: Operation, inKey: 'path' | 'query' | 'header'): SchemaObject | null;
   valdiate(): Promise<oas_normalize_lib_types0.ValidationResult>;
-  flattenSchema(schema?: SchemaObject$1): SchemaObject$1 | undefined;
+  flattenSchema(schema: SchemaObject | null): SchemaObject | null;
 }
 //#endregion
 //#region ../core/src/Kubb.d.ts
@@ -663,7 +681,7 @@ declare function isDiscriminator(obj?: any): obj is SchemaObject$1 & {
  */
 declare function isRequired(schema?: SchemaObject$1): boolean;
 declare function isOptional(schema?: SchemaObject$1): boolean;
-declare function parse(pathOrApi: string | OASDocument, {
+declare function parse(pathOrApi: string | Document, {
   oasClass,
   canBundle,
   enablePaths
@@ -672,12 +690,12 @@ declare function parse(pathOrApi: string | OASDocument, {
   canBundle?: boolean;
   enablePaths?: boolean;
 }): Promise<Oas>;
-declare function merge(pathOrApi: Array<string | OASDocument>, {
+declare function merge(pathOrApi: Array<string | Document>, {
   oasClass
 }?: {
   oasClass?: typeof Oas;
 }): Promise<Oas>;
 declare function parseFromConfig(config: Config, oasClass?: typeof Oas): Promise<Oas>;
 //#endregion
-export { HttpMethod, HttpMethods, type Infer, type Model, Oas, OasTypes, OpenAPIV3, OpenAPIV3_1, Operation, type RequestParams, type Response, SchemaObject, contentType, findSchemaDefinition, isDiscriminator, isNullable, isOpenApiV3_1Document, isOptional, isParameterObject, isReference, isRequired, matchesMimeType, merge, parse, parseFromConfig };
+export { DiscriminatorObject, Document, HttpMethod, HttpMethods, MediaTypeObject, Oas, type OasTypes, type OpenAPIV3, type OpenAPIV3_1, Operation, ReferenceObject, ResponseObject, SchemaObject, contentType, findSchemaDefinition, isDiscriminator, isNullable, isOpenApiV3_1Document, isOptional, isParameterObject, isReference, isRequired, matchesMimeType, merge, parse, parseFromConfig };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -2,10 +2,10 @@ import { createRequire } from "node:module";
 import { findSchemaDefinition, matchesMimeType, matchesMimeType as matchesMimeType$1 } from "oas/utils";
 import jsonpointer from "jsonpointer";
 import BaseOas from "oas";
-import OASNormalize from "oas-normalize";
 import path from "node:path";
 import { URLPath } from "@kubb/core/utils";
 import { isRef } from "oas/types";
+import OASNormalize from "oas-normalize";
 import { isPlainObject, mergeDeep } from "remeda";
 import swagger2openapi from "swagger2openapi";
 
@@ -4190,9 +4190,9 @@ async function parse(pathOrApi, { oasClass = Oas, canBundle = true, enablePaths
 	}).load();
 	if (isOpenApiV2Document(document)) {
 		const { openapi } = await swagger2openapi.convertObj(document, { anchors: true });
-		return new oasClass({ oas: openapi });
+		return new oasClass(openapi);
 	}
-	return new oasClass({ oas: document });
+	return new oasClass(document);
 }
 async function merge(pathOrApi, { oasClass = Oas } = {}) {
 	const instances = await Promise.all(pathOrApi.map((p) => parse(p, {
@@ -4231,11 +4231,10 @@ function parseFromConfig(config, oasClass = Oas) {
 //#region src/Oas.ts
 var Oas = class extends BaseOas {
 	#options = { discriminator: "strict" };
-	document = void 0;
-	constructor({ oas, user }) {
-		if (typeof oas === "string") oas = JSON.parse(oas);
-		super(oas, user);
-		this.document = oas;
+	document;
+	constructor(document) {
+		super(document, void 0);
+		this.document = document;
 	}
 	setOptions(options) {
 		this.#options = {
@@ -4250,7 +4249,7 @@ var Oas = class extends BaseOas {
 	get($ref) {
 		const origRef = $ref;
 		$ref = $ref.trim();
-		if ($ref === "") return false;
+		if ($ref === "") return null;
 		if ($ref.startsWith("#")) $ref = globalThis.decodeURIComponent($ref.substring(1));
 		else return null;
 		const current = jsonpointer.get(this.api, $ref);
@@ -4274,6 +4273,7 @@ var Oas = class extends BaseOas {
 		if (this.#options.discriminator === "inherit") Object.entries(mapping).forEach(([mappingKey, mappingValue]) => {
 			if (mappingValue) {
 				const childSchema = this.get(mappingValue);
+				if (!childSchema) return;
 				if (!childSchema.properties) childSchema.properties = {};
 				const property = childSchema.properties[propertyName];
 				if (childSchema.properties) {
@@ -4281,33 +4281,58 @@ var Oas = class extends BaseOas {
 						...childSchema.properties ? childSchema.properties[propertyName] : {},
 						enum: [...property?.enum?.filter((value) => value !== mappingKey) ?? [], mappingKey]
 					};
-					childSchema.required = [...new Set([...childSchema.required ?? [], propertyName])];
+					childSchema.required = typeof childSchema.required === "boolean" ? childSchema.required : [...new Set([...childSchema.required ?? [], propertyName])];
 					this.set(mappingValue, childSchema);
 				}
 			}
 		});
 	}
 	getDiscriminator(schema) {
-		if (!isDiscriminator(schema)) return;
+		if (!isDiscriminator(schema) || !schema) return null;
 		const { mapping = {}, propertyName } = schema.discriminator;
-		if (schema.oneOf) schema.oneOf.forEach((schema$1) => {
-			if (isReference(schema$1)) {
-				const key = this.getKey(schema$1.$ref);
-				const propertySchema = this.get(schema$1.$ref).properties?.[propertyName];
-				const canAdd = key && !Object.values(mapping).includes(schema$1.$ref);
-				if (canAdd && propertySchema?.enum?.length === 1) mapping[propertySchema.enum[0]] = schema$1.$ref;
-				else if (canAdd) mapping[key] = schema$1.$ref;
-			}
-		});
-		if (schema.anyOf) schema.anyOf.forEach((schema$1) => {
-			if (isReference(schema$1)) {
-				const key = this.getKey(schema$1.$ref);
-				const propertySchema = this.get(schema$1.$ref).properties?.[propertyName];
-				const canAdd = key && !Object.values(mapping).includes(schema$1.$ref);
-				if (canAdd && propertySchema?.enum?.length === 1) mapping[propertySchema.enum[0]] = schema$1.$ref;
-				else if (canAdd) mapping[key] = schema$1.$ref;
+		/**
+		* Helper to extract discriminator value from a schema.
+		* Checks in order:
+		* 1. Extension property matching propertyName (e.g., x-linode-ref-name)
+		* 2. Property with const value
+		* 3. Property with single enum value
+		* 4. Title as fallback
+		*/
+		const getDiscriminatorValue = (schema$1) => {
+			if (!schema$1) return null;
+			if (propertyName.startsWith("x-")) {
+				const extensionValue = schema$1[propertyName];
+				if (extensionValue && typeof extensionValue === "string") return extensionValue;
 			}
-		});
+			const propertySchema = schema$1.properties?.[propertyName];
+			if (propertySchema && "const" in propertySchema && propertySchema.const !== void 0) return String(propertySchema.const);
+			if (propertySchema && propertySchema.enum?.length === 1) return String(propertySchema.enum[0]);
+			return schema$1.title || null;
+		};
+		/**
+		* Process oneOf/anyOf items to build mapping.
+		* Handles both $ref and inline schemas.
+		*/
+		const processSchemas = (schemas, existingMapping) => {
+			schemas.forEach((schemaItem, index) => {
+				if (isReference(schemaItem)) {
+					const key = this.getKey(schemaItem.$ref);
+					try {
+						const discriminatorValue = getDiscriminatorValue(this.get(schemaItem.$ref));
+						const canAdd = key && !Object.values(existingMapping).includes(schemaItem.$ref);
+						if (canAdd && discriminatorValue) existingMapping[discriminatorValue] = schemaItem.$ref;
+						else if (canAdd) existingMapping[key] = schemaItem.$ref;
+					} catch (_error) {
+						if (key && !Object.values(existingMapping).includes(schemaItem.$ref)) existingMapping[key] = schemaItem.$ref;
+					}
+				} else {
+					const discriminatorValue = getDiscriminatorValue(schemaItem);
+					if (discriminatorValue) existingMapping[discriminatorValue] = `#kubb-inline-${index}`;
+				}
+			});
+		};
+		if (schema.oneOf) processSchemas(schema.oneOf, mapping);
+		if (schema.anyOf) processSchemas(schema.anyOf, mapping);
 		return {
 			...schema.discriminator,
 			mapping
@@ -4416,7 +4441,7 @@ var Oas = class extends BaseOas {
 		if (!params.length) return null;
 		return params.reduce((schema, pathParameters) => {
 			const property = pathParameters.content?.[contentType]?.schema ?? pathParameters.schema;
-			const required = [...schema.required || [], pathParameters.required ? pathParameters.name : void 0].filter(Boolean);
+			const required = typeof schema.required === "boolean" ? schema.required : [...schema.required || [], pathParameters.required ? pathParameters.name : void 0].filter(Boolean);
 			const getDefaultStyle = (location) => {
 				if (location === "query") return "form";
 				if (location === "path") return "simple";
@@ -4452,13 +4477,13 @@ var Oas = class extends BaseOas {
 		});
 	}
 	async valdiate() {
-		return new OASNormalize(this.api, {
+		return new (await (import("oas-normalize").then((m) => m.default)))(this.api, {
 			enablePaths: true,
 			colorizeErrors: true
 		}).validate({ parser: { validate: { errors: { colorize: true } } } });
 	}
 	flattenSchema(schema) {
-		if (!schema?.allOf || schema.allOf.length === 0) return schema;
+		if (!schema?.allOf || schema.allOf.length === 0) return schema || null;
 		if (schema.allOf.some((item) => isReference(item))) return schema;
 		const isPlainFragment = (item) => !Object.keys(item).some((key) => STRUCTURAL_KEYS.has(key));
 		if (!schema.allOf.every((item) => isPlainFragment(item))) return schema;