@kubb/adapter-oas 5.0.2 → 5.0.3

package/dist/index.js

@@ -162,11 +162,11 @@ function buildDiscriminatorChildMap(schemas) {
 			if (!existing) {
 				childMap.set(refNode.name, {
 					propertyName: discriminatorPropertyName,
-					enumValues: [...enumValues]
+					enumValues: [...new Set(enumValues)]
 				});
 				continue;
 			}
-			existing.enumValues.push(...enumValues);
+			existing.enumValues = [.../* @__PURE__ */ new Set([...existing.enumValues, ...enumValues])];
 		}
 	}
 	return childMap;
@@ -174,10 +174,11 @@ function buildDiscriminatorChildMap(schemas) {
 /**
 * Patches a single top-level `SchemaNode` with its discriminator entry (adds or replaces
 * the discriminant property).
+*
+* A child declared with `allOf` parses to an intersection rather than an object, so the
+* discriminant is intersected on as an extra member instead.
 */
 function patchDiscriminatorNode(node, entry) {
-	const objectNode = ast.narrowSchema(node, "object");
-	if (!objectNode) return node;
 	const { propertyName, enumValues } = entry;
 	const enumSchema = ast.factory.createSchema({
 		type: "enum",
@@ -188,11 +189,27 @@ function patchDiscriminatorNode(node, entry) {
 		required: true,
 		schema: enumSchema
 	});
-	const existingIdx = objectNode.properties.findIndex((p) => p.name === propertyName);
-	const newProperties = existingIdx >= 0 ? objectNode.properties.map((p, i) => i === existingIdx ? newProp : p) : [...objectNode.properties, newProp];
+	const objectNode = ast.narrowSchema(node, "object");
+	if (objectNode) {
+		const existingIdx = objectNode.properties.findIndex((p) => p.name === propertyName);
+		const newProperties = existingIdx >= 0 ? objectNode.properties.map((p, i) => i === existingIdx ? newProp : p) : [...objectNode.properties, newProp];
+		return {
+			...objectNode,
+			properties: newProperties
+		};
+	}
+	const intersectionNode = ast.narrowSchema(node, "intersection");
+	if (!intersectionNode?.members) return node;
+	const discriminantNode = ast.factory.createSchema({
+		type: "object",
+		primitive: "object",
+		properties: [newProp]
+	});
+	const patchedIdx = intersectionNode.members.findIndex((member) => ast.narrowSchema(member, "object")?.properties.some((p) => p.name === propertyName));
+	const newMembers = patchedIdx >= 0 ? intersectionNode.members.map((member, i) => i === patchedIdx ? patchDiscriminatorNode(member, entry) : member) : [...intersectionNode.members, discriminantNode];
 	return {
-		...objectNode,
-		properties: newProperties
+		...intersectionNode,
+		members: newMembers
 	};
 }
 //#endregion
@@ -1079,11 +1096,11 @@ function createNode({ schema, name, nullable, defaultValue }, extras) {
 *
 * @example
 * ```ts
-* createDiscriminantNode({ propertyName: 'type', value: 'dog' })
+* createDiscriminantNode({ propertyName: 'type', values: ['dog'] })
 * // -> { type: 'object', properties: [{ name: 'type', required: true, schema: enum('dog') }] }
 * ```
 */
-function createDiscriminantNode({ propertyName, value }) {
+function createDiscriminantNode({ propertyName, values }) {
 	return ast.factory.createSchema({
 		type: "object",
 		primitive: "object",
@@ -1092,23 +1109,26 @@ function createDiscriminantNode({ propertyName, value }) {
 			schema: ast.factory.createSchema({
 				type: "enum",
 				primitive: "string",
-				enumValues: [value]
+				enumValues: values
 			}),
 			required: true
 		})]
 	});
 }
 /**
-* Returns the discriminator key whose mapping value matches `ref`, or `null` when there is no match.
+* Returns every discriminator key whose mapping value matches `ref`, in mapping order.
+*
+* A mapping may point several keys at the same schema, in which case the member has to be
+* narrowed to all of them — keeping only the first would drop the rest from the union.
 *
 * @example
 * ```ts
-* findDiscriminator({ dog: '#/components/schemas/Dog' }, '#/components/schemas/Dog') // 'dog'
+* findDiscriminators({ dog: '#/components/schemas/Dog', hound: '#/components/schemas/Dog' }, '#/components/schemas/Dog') // ['dog', 'hound']
 * ```
 */
-function findDiscriminator(mapping, ref) {
-	if (!mapping || !ref) return null;
-	return Object.entries(mapping).find(([, value]) => value === ref)?.[0] ?? null;
+function findDiscriminators(mapping, ref) {
+	if (!mapping || !ref) return [];
+	return Object.entries(mapping).filter(([, value]) => value === ref).map(([key]) => key);
 }
 /**
 * Narrows each `oneOf`/`anyOf` member with its discriminant value, intersecting the member's own
@@ -1153,21 +1173,23 @@ function narrowUnionMembers({ unionMembers, discriminator, sharedPropertiesNode,
 	}
 	return unionMembers.map((s) => {
 		const ref = isReference(s) ? s.$ref : void 0;
-		const discriminatorValue = findDiscriminator(discriminator?.mapping, ref) ?? implicitDiscriminantValue(s);
+		const mappedValues = findDiscriminators(discriminator?.mapping, ref);
+		const implicitValue = mappedValues.length ? null : implicitDiscriminantValue(s);
+		const discriminatorValues = mappedValues.length ? mappedValues : implicitValue ? [implicitValue] : [];
 		const memberNode = parse({
 			schema: s,
 			name
 		}, rawOptions);
-		if (!discriminatorValue || !discriminator) return memberNode;
+		if (!discriminatorValues.length || !discriminator) return memberNode;
 		const narrowedDiscriminatorNode = sharedPropertiesNode ? pickDiscriminatorPropertyNode(ast.applyMacros(sharedPropertiesNode, [macroDiscriminatorEnum({
 			propertyName: discriminator.propertyName,
-			values: [discriminatorValue]
+			values: discriminatorValues
 		})], { depth: "shallow" }), discriminator.propertyName) : void 0;
 		return ast.factory.createSchema({
 			type: "intersection",
 			members: [memberNode, narrowedDiscriminatorNode ?? createDiscriminantNode({
 				propertyName: discriminator.propertyName,
-				value: discriminatorValue
+				values: discriminatorValues
 			})]
 		});
 	});
@@ -1192,10 +1214,10 @@ function extractDiscriminatedAllOfMembers({ allOfMembers, name, refs }) {
 			const inOneOf = parentUnion.some((oneOfItem) => isReference(oneOfItem) && oneOfItem.$ref === childRef);
 			const inMapping = Object.values(deref.discriminator.mapping ?? {}).some((v) => v === childRef);
 			if (inOneOf || inMapping) {
-				const discriminatorValue = findDiscriminator(deref.discriminator.mapping, childRef);
-				if (discriminatorValue) discriminantValues.push({
+				const values = findDiscriminators(deref.discriminator.mapping, childRef);
+				if (values.length) discriminantValues.push({
 					propertyName: deref.discriminator.propertyName,
-					value: discriminatorValue
+					values
 				});
 				return false;
 			}
@@ -1300,9 +1322,9 @@ function convertAllOf({ schema, name, nullable, defaultValue, rawOptions, parse,
 		const { allOf: _allOf, ...schemaWithoutAllOf } = schema;
 		allOfMembers.push(parse({ schema: schemaWithoutAllOf }, rawOptions));
 	}
-	for (const { propertyName, value } of discriminantValues) allOfMembers.push(createDiscriminantNode({
+	for (const { propertyName, values } of discriminantValues) allOfMembers.push(createDiscriminantNode({
 		propertyName,
-		value
+		values
 	}));
 	return createNode({
 		schema,