@kubb/oas 4.5.8 → 4.5.9

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-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-C674urwx.cjs";
+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";

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-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-BGlrm4xM.js";
+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";

package/dist/index.js

@@ -4407,7 +4407,11 @@ var Oas = class extends BaseOas {
 		this.document = oas;
 	}
 	setOptions(options) {
-		this.#options = options;
+		this.#options = {
+			...this.#options,
+			...options
+		};
+		if (this.#options.discriminator === "inherit") this.#applyDiscriminatorInheritance();
 	}
 	get options() {
 		return this.#options;
@@ -4434,8 +4438,7 @@ var Oas = class extends BaseOas {
 			jsonpointer.set(this.api, $ref, value);
 		}
 	}
-	getDiscriminator(schema$2) {
-		if (!isDiscriminator(schema$2)) return;
+	#setDiscriminator(schema$2) {
 		const { mapping = {}, propertyName } = schema$2.discriminator;
 		if (this.#options.discriminator === "inherit") Object.entries(mapping).forEach(([mappingKey, mappingValue]) => {
 			if (mappingValue) {
@@ -4447,11 +4450,15 @@ var Oas = class extends BaseOas {
 						...childSchema.properties ? childSchema.properties[propertyName] : {},
 						enum: [...property?.enum?.filter((value) => value !== mappingKey) ?? [], mappingKey]
 					};
-					childSchema.required = [...childSchema.required ?? [], propertyName];
+					childSchema.required = [...new Set([...childSchema.required ?? [], propertyName])];
 					this.set(mappingValue, childSchema);
 				}
 			}
 		});
+	}
+	getDiscriminator(schema$2) {
+		if (!isDiscriminator(schema$2)) return;
+		const { mapping = {}, propertyName } = schema$2.discriminator;
 		if (schema$2.oneOf) schema$2.oneOf.forEach((schema$3) => {
 			if (isReference(schema$3)) {
 				const key = this.getKey(schema$3.$ref);
@@ -4483,6 +4490,39 @@ var Oas = class extends BaseOas {
 		};
 		return schema$2;
 	}
+	#applyDiscriminatorInheritance() {
+		const components = this.api.components;
+		if (!components?.schemas) return;
+		const visited = /* @__PURE__ */ new WeakSet();
+		const enqueue = (value) => {
+			if (!value) return;
+			if (Array.isArray(value)) {
+				for (const item of value) enqueue(item);
+				return;
+			}
+			if (typeof value === "object") visit(value);
+		};
+		const visit = (schema$2) => {
+			if (!schema$2 || typeof schema$2 !== "object") return;
+			if (isReference(schema$2)) {
+				visit(this.get(schema$2.$ref));
+				return;
+			}
+			const schemaObject = schema$2;
+			if (visited.has(schemaObject)) return;
+			visited.add(schemaObject);
+			if (isDiscriminator(schemaObject)) this.#setDiscriminator(schemaObject);
+			if ("allOf" in schemaObject) enqueue(schemaObject.allOf);
+			if ("oneOf" in schemaObject) enqueue(schemaObject.oneOf);
+			if ("anyOf" in schemaObject) enqueue(schemaObject.anyOf);
+			if ("not" in schemaObject) enqueue(schemaObject.not);
+			if ("items" in schemaObject) enqueue(schemaObject.items);
+			if ("prefixItems" in schemaObject) enqueue(schemaObject.prefixItems);
+			if (schemaObject.properties) enqueue(Object.values(schemaObject.properties));
+			if (schemaObject.additionalProperties && typeof schemaObject.additionalProperties === "object") enqueue(schemaObject.additionalProperties);
+		};
+		for (const schema$2 of Object.values(components.schemas)) visit(schema$2);
+	}
 	/**
 	* Oas does not have a getResponseBody(contentType)
 	*/