@kubb/adapter-oas 5.2.0 → 5.2.2

package/dist/index.js

@@ -594,6 +594,19 @@ function isBinary(schema) {
 	return schema.type === "string" && schema.contentMediaType === "application/octet-stream";
 }
 /**
+* Returns the binary schema for an `application/octet-stream` entry the OAS 3.1 upgrade emptied
+* out, or `undefined` when the entry carries a schema of its own. Without the fallback such a
+* body resolves to the empty schema type instead of a blob.
+*/
+function getBinaryFallbackSchema(mediaType, schema) {
+	if (mediaType !== "application/octet-stream") return void 0;
+	if (schema && Object.keys(schema).length > 0) return void 0;
+	return {
+		type: "string",
+		contentMediaType: "application/octet-stream"
+	};
+}
+/**
 * MIME type fragments that mark a media type as JSON-like.
 *
 * A content type is JSON when it contains any of these substrings. The `+json` entry catches
@@ -1358,10 +1371,7 @@ function convertUnion({ schema, name, nullable, defaultValue, rawOptions, parse,
 	};
 	const unionMembers = [...schema.oneOf ?? [], ...schema.anyOf ?? []];
 	const strategy = schema.oneOf ? "one" : "any";
-	const unionExtras = {
-		discriminatorPropertyName: isDiscriminator(schema) ? schema.discriminator.propertyName : void 0,
-		strategy
-	};
+	const explicitDiscriminatorPropertyName = isDiscriminator(schema) ? schema.discriminator.propertyName : void 0;
 	const discriminator = isDiscriminator(schema) ? schema.discriminator : void 0;
 	const { oneOf: _o, anyOf: _a, discriminator: _d, ...memberBaseSchema } = schema;
 	const sharedPropertiesNode = schema.properties ? parse({
@@ -1380,8 +1390,9 @@ function convertUnion({ schema, name, nullable, defaultValue, rawOptions, parse,
 		});
 		const unionNode = createNode(ctx, {
 			type: "union",
-			...unionExtras,
-			members
+			strategy,
+			members,
+			discriminatorPropertyName: explicitDiscriminatorPropertyName ?? ast.inferDiscriminatorPropertyName(members)
 		});
 		if (!sharedPropertiesNode) return unionNode;
 		return createNode(ctx, {
@@ -1389,13 +1400,15 @@ function convertUnion({ schema, name, nullable, defaultValue, rawOptions, parse,
 			members: [unionNode, sharedPropertiesNode]
 		});
 	}
+	const members = unionMembers.map((s) => parse({
+		schema: s,
+		name
+	}, rawOptions));
 	const unionNode = createNode(ctx, {
 		type: "union",
-		...unionExtras,
-		members: unionMembers.map((s) => parse({
-			schema: s,
-			name
-		}, rawOptions))
+		strategy,
+		members,
+		discriminatorPropertyName: explicitDiscriminatorPropertyName ?? ast.inferDiscriminatorPropertyName(members)
 	});
 	return ast.applyMacros(unionNode, [macroSimplifyUnion], { depth: "shallow" });
 }
@@ -2062,9 +2075,8 @@ function getResponseBody(responseBody, contentType) {
 	if (isReference(responseBody)) return false;
 	const body = responseBody;
 	if (!body.content) return false;
-	if (contentType) return contentType in body.content ? body.content[contentType] : false;
-	const picked = pickContentEntry(body.content);
-	return picked ? picked[1] : false;
+	if (contentType) return contentType in body.content ? [contentType, body.content[contentType]] : false;
+	return pickContentEntry(body.content);
 }
 /**
 * Returns the response schema for a given operation and HTTP status code.
@@ -2084,7 +2096,10 @@ function getResponseSchema({ document, operation, refs, statusCode, options = {}
 		statusCode
 	}), options.contentType);
 	if (responseBody === false) return {};
-	const schema = responseBody.schema;
+	const [mediaType, entry] = responseBody;
+	const schema = entry.schema;
+	const binary = getBinaryFallbackSchema(mediaType, schema);
+	if (binary) return binary;
 	if (!schema) return {};
 	return dereferenceWithRef(document, schema);
 }
@@ -2105,10 +2120,8 @@ function getRequestSchema({ document, operation, refs, options = {} }) {
 	if (requestBody === false) return null;
 	const mediaType = Array.isArray(requestBody) ? requestBody[0] : options.contentType;
 	const schema = Array.isArray(requestBody) ? requestBody[1].schema : requestBody.schema;
-	if (mediaType === "application/octet-stream" && (!schema || Object.keys(schema).length === 0)) return {
-		type: "string",
-		contentMediaType: "application/octet-stream"
-	};
+	const binary = getBinaryFallbackSchema(mediaType, schema);
+	if (binary) return binary;
 	if (!schema) return null;
 	return dereferenceWithRef(document, schema);
 }