@kubb/adapter-oas 5.16.0 → 5.17.0

package/dist/index.js

@@ -19,7 +19,7 @@ var compatibility = {
 	"node": ">=22.22"
 };
 // package.json
-var version = "5.16.0";
+var version = "5.17.0";
 // src/constants.ts
 /**
 * Default parser options applied when no explicit options are provided.
@@ -1204,6 +1204,30 @@ function resolveServerUrl(server, overrides) {
 	}
 	return url;
 }
+/**
+* Maps OpenAPI servers to `InputServer` entries: drops entries without a `url` and fills `{variable}` defaults.
+*/
+function toInputServers(servers) {
+	return servers.filter((entry) => entry.url).map(({ url, description, variables }) => {
+		const declared = variables && Object.keys(variables).length > 0 ? { variables } : {};
+		try {
+			return {
+				url: resolveServerUrl({
+					url,
+					variables
+				}),
+				description,
+				...declared
+			};
+		} catch {
+			return {
+				url,
+				description,
+				...declared
+			};
+		}
+	});
+}
 // src/model/mediaType.ts
 /**
 * The media type without its parameters, so `text/event-stream; charset=utf-8` matches the bare name.
@@ -1378,7 +1402,7 @@ function flattenSchema(schema) {
 /**
 * Links one freshly converted schema and its nested schemas to their RFC 6901 pointers
 * (`#/components/schemas/Pet/properties/owner/properties/name`), and reports the advisory
-* diagnostics (`KUBB_UNSUPPORTED_FORMAT`, `KUBB_DEPRECATED`) against them.
+* diagnostics (`KUBB_UNSUPPORTED_FORMAT`, `KUBB_DEPRECATED`, `KUBB_DUPLICATE_DISCRIMINATOR`) against them.
 * Refs are not followed, so the resolved schema is handled under its own walk.
 * Reports land in the active build run, are a no-op outside one, and repeats are deduped by the build.
 */
@@ -1423,11 +1447,55 @@ function visit(node, pointer) {
 		for (const member of node.members ?? []) visit(member, `${pointer}/not`);
 		return;
 	}
+	if (node.type === "union" && node.discriminatorPropertyName) reportDuplicateDiscriminators(node, node.discriminatorPropertyName, pointer);
 	if (node.type === "union" || node.type === "intersection") {
 		const keyword = node.type === "intersection" ? "allOf" : node.strategy === "any" ? "anyOf" : "oneOf";
 		for (const [index, member] of (node.members ?? []).entries()) visit(member, `${pointer}/${keyword}/${index}`);
 	}
 }
+/**
+* Reports a declared discriminator whose value pins more than one member. The spec cannot tell
+* those members apart, and Zod's `z.discriminatedUnion` throws on the first parse.
+* One diagnostic per union, since the build dedupes by code and pointer.
+*/
+function reportDuplicateDiscriminators(node, propertyName, pointer) {
+	const keyword = node.strategy === "any" ? "anyOf" : "oneOf";
+	const membersByValue = /* @__PURE__ */ new Map();
+	for (const [index, member] of (node.members ?? []).entries()) {
+		const label = memberName(member) ?? `${keyword}/${index}`;
+		for (const value of memberValues(member, propertyName)) membersByValue.set(value, [...membersByValue.get(value) ?? [], label]);
+	}
+	const duplicates = [...membersByValue].filter(([, members]) => members.length > 1);
+	if (!duplicates.length) return;
+	Diagnostics.report({
+		code: Diagnostics.code.duplicateDiscriminator,
+		severity: "warning",
+		message: duplicates.map(([value, members]) => `Discriminator "${propertyName}" value ${JSON.stringify(value)} matches more than one member (${members.join(", ")}).`).join(" "),
+		help: `Give each member its own "${propertyName}" value, or drop the discriminator. Zod's z.discriminatedUnion throws on the first parse of this union.`,
+		location: {
+			kind: "schema",
+			pointer
+		}
+	});
+}
+function memberValues(node, propertyName, seen = /* @__PURE__ */ new Set()) {
+	if (seen.has(node)) return [];
+	seen.add(node);
+	const target = node.type === "ref" && node.schema ? node.schema : node;
+	if (target.type === "union") return [...new Set(target.members?.flatMap((member) => memberValues(member, propertyName, seen)))];
+	return intersect(ast.resolveSchemaProperties({
+		node,
+		propertyName
+	}).map((property) => [...ast.getSchemaLiteralValues(property.schema)]));
+}
+function intersect(slices) {
+	const pinned = slices.filter((values) => values.length > 0);
+	return pinned.reduce((acc, values) => acc.filter((value) => values.includes(value)), pinned[0] ?? []);
+}
+function memberName(member) {
+	if (member.type === "ref") return member.name ?? void 0;
+	if (member.type === "intersection") return member.members?.map(memberName).find(Boolean);
+}
 // src/operation.ts
 function slugify(value) {
 	return value.replace(/[^a-zA-Z0-9]/g, "-").replace(/-{2,}/g, "-").replace(/^-|-$/g, "");
@@ -1768,6 +1836,7 @@ function parseOperation({ operation, ...ctx }) {
 		const fallback = operation.pathItem[key];
 		return typeof fallback === "string" ? fallback : void 0;
 	};
+	const servers = operation.schema.servers ?? operation.pathItem.servers;
 	return ast.factory.createOperation({
 		pointer,
 		operationId,
@@ -1781,7 +1850,8 @@ function parseOperation({ operation, ...ctx }) {
 		parameters,
 		requestBody,
 		responses,
-		extensions: pickExtensions(operation.schema)
+		extensions: pickExtensions(operation.schema),
+		...servers && { servers: toInputServers(servers) }
 	});
 }
 // src/emit/createNode.ts
@@ -3340,25 +3410,7 @@ const adapterOas = defineExtension({
 						document,
 						server
 					}),
-					servers: (document.servers ?? []).filter((entry) => entry.url).map(({ url, description, variables }) => {
-						const declared = variables && Object.keys(variables).length > 0 ? { variables } : {};
-						try {
-							return {
-								url: resolveServerUrl({
-									url,
-									variables
-								}),
-								description,
-								...declared
-							};
-						} catch {
-							return {
-								url,
-								description,
-								...declared
-							};
-						}
-					}),
+					servers: toInputServers(document.servers ?? []),
 					securitySchemes: Object.entries(document.components?.securitySchemes ?? {}).flatMap(([name, value]) => {
 						const scheme = refs.deref(value);
 						return scheme?.type ? [{