@kubb/oas 4.12.9 → 4.12.11

package/dist/index.cjs

@@ -46,12 +46,12 @@ let jsonpointer = require("jsonpointer");
 jsonpointer = __toESM(jsonpointer);
 let oas = require("oas");
 oas = __toESM(oas);
-let oas_normalize = require("oas-normalize");
-oas_normalize = __toESM(oas_normalize);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let _kubb_core_utils = require("@kubb/core/utils");
 let oas_types = require("oas/types");
+let oas_normalize = require("oas-normalize");
+oas_normalize = __toESM(oas_normalize);
 let remeda = require("remeda");
 let swagger2openapi = require("swagger2openapi");
 swagger2openapi = __toESM(swagger2openapi);
@@ -4193,9 +4193,9 @@ async function parse(pathOrApi, { oasClass = Oas, canBundle = true, enablePaths
 	}).load();
 	if (isOpenApiV2Document(document)) {
 		const { openapi } = await swagger2openapi.default.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, {
@@ -4234,11 +4234,10 @@ function parseFromConfig(config, oasClass = Oas) {
 //#region src/Oas.ts
 var Oas = class extends oas.default {
 	#options = { discriminator: "strict" };
-	document = void 0;
-	constructor({ oas: oas$1, user }) {
-		if (typeof oas$1 === "string") oas$1 = JSON.parse(oas$1);
-		super(oas$1, user);
-		this.document = oas$1;
+	document;
+	constructor(document) {
+		super(document, void 0);
+		this.document = document;
 	}
 	setOptions(options) {
 		this.#options = {
@@ -4253,7 +4252,7 @@ var Oas = class extends oas.default {
 	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.default.get(this.api, $ref);
@@ -4277,6 +4276,7 @@ var Oas = class extends oas.default {
 		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) {
@@ -4284,33 +4284,58 @@ var Oas = class extends oas.default {
 						...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
@@ -4419,7 +4444,7 @@ var Oas = class extends oas.default {
 		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";
@@ -4455,13 +4480,13 @@ var Oas = class extends oas.default {
 		});
 	}
 	async valdiate() {
-		return new oas_normalize.default(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;
@@ -4488,7 +4513,6 @@ const HttpMethods = {
 //#endregion
 exports.HttpMethods = HttpMethods;
 exports.Oas = Oas;
-exports.__toCommonJS = __toCommonJS;
 Object.defineProperty(exports, 'findSchemaDefinition', {
   enumerable: true,
   get: function () {