@kubb/adapter-oas 5.3.5 → 5.3.7

package/dist/index.js

@@ -924,9 +924,7 @@ function getRequestContentType({ operation, refs }) {
 		refs
 	});
 	const mediaTypes = content ? Object.keys(content) : [];
-	let result = mediaTypes[0] ?? "application/json";
-	for (const mt of mediaTypes) if (isJsonMimeType(mt)) result = mt;
-	return result;
+	return mediaTypes.findLast(isJsonMimeType) ?? mediaTypes[0] ?? "application/json";
 }
 /**
 * Builds an `Operation` for every supported HTTP method on every path, in document order.
@@ -1482,7 +1480,11 @@ function createNullNode(schema, name, nullable) {
 function convertConst({ schema, name, nullable, defaultValue }) {
 	const constValue = schema.const;
 	if (constValue === null) return createNullNode(schema, name);
-	const constPrimitive = getPrimitiveType(typeof constValue === "number" ? "number" : typeof constValue === "boolean" ? "boolean" : "string");
+	const constPrimitive = getPrimitiveType((() => {
+		if (typeof constValue === "number") return "number";
+		if (typeof constValue === "boolean") return "boolean";
+		return "string";
+	})());
 	return createNode({
 		schema,
 		name,
@@ -1566,9 +1568,11 @@ function convertEnum({ schema, name, nullable, type, rawOptions, parse }) {
 	const extensionKey = enumExtensionKeys.find((key) => key in schema);
 	const descriptionKey = enumDescriptionKeys.find((key) => key in schema);
 	if (extensionKey || descriptionKey || enumPrimitive === "number" || enumPrimitive === "integer" || enumPrimitive === "boolean") {
-		let enumPrimitiveType = "string";
-		if (enumPrimitive === "number" || enumPrimitive === "integer") enumPrimitiveType = "number";
-		else if (enumPrimitive === "boolean") enumPrimitiveType = "boolean";
+		const enumPrimitiveType = (() => {
+			if (enumPrimitive === "boolean") return "boolean";
+			if (enumPrimitive === "number" || enumPrimitive === "integer") return "number";
+			return "string";
+		})();
 		const rawEnumNames = extensionKey ? schema[extensionKey] : void 0;
 		const rawEnumDescriptions = descriptionKey ? schema[descriptionKey] : void 0;
 		const uniqueValues = [...new Set(filteredValues)];
@@ -1710,10 +1714,11 @@ function convertObject({ schema, name, nullable, defaultValue, rawOptions, optio
 		});
 	}) : [];
 	const additionalProperties = schema.additionalProperties;
-	let additionalPropertiesNode;
-	if (additionalProperties === true) additionalPropertiesNode = true;
-	else if (additionalProperties) additionalPropertiesNode = resolveMapSchema(additionalProperties, options, parse, rawOptions);
-	else additionalPropertiesNode = additionalProperties;
+	const additionalPropertiesNode = (() => {
+		if (additionalProperties === true) return true;
+		if (additionalProperties) return resolveMapSchema(additionalProperties, options, parse, rawOptions);
+		return additionalProperties;
+	})();
 	const rawPatternProperties = "patternProperties" in schema ? schema.patternProperties : void 0;
 	const patternProperties = rawPatternProperties ? Object.fromEntries(Object.entries(rawPatternProperties).map(([pattern, patternSchema]) => [pattern, resolveMapSchema(patternSchema, options, parse, rawOptions)])) : void 0;
 	const objectNode = createNode({
@@ -2560,24 +2565,19 @@ const adapterOas = createAdapter((options) => {
 			const operationNode = parseOperation(parserOptions, operation);
 			if (operationNode) operationNodes.push(operationNode);
 		}
-		let promotedEnums = null;
-		if (enums === "root") {
-			promotedEnums = collectInlineEnums([...parsedByName.values(), ...operationNodes], new Set(Object.keys(schemas)));
-			for (const name of promotedEnums.keys()) enumNames.push(name);
-		}
+		const promotedEnums = enums === "root" ? collectInlineEnums([...parsedByName.values(), ...operationNodes], new Set(Object.keys(schemas))) : null;
+		if (promotedEnums) for (const name of promotedEnums.keys()) enumNames.push(name);
 		const schemaNodes = promotedEnums ? [...promotedEnums.values()] : [];
 		for (const name of Object.keys(schemas)) {
 			const alias = refAliasMap.get(name);
-			let node;
-			if (alias?.name && parsedByName.has(alias.name)) node = {
+			const node = alias?.name && parsedByName.has(alias.name) ? {
 				...parsedByName.get(alias.name),
 				name
-			};
-			else {
+			} : (() => {
 				const parsed = parsedByName.get(name);
 				const child = discriminatorChildMap?.get(name);
-				node = child ? patchDiscriminatorNode(parsed, child) : parsed;
-			}
+				return child ? patchDiscriminatorNode(parsed, child) : parsed;
+			})();
 			schemaNodes.push(promotedEnums ? refPromotedEnums(node, promotedEnums) : node);
 		}
 		const operations = promotedEnums ? operationNodes.map((node) => refPromotedEnums(node, promotedEnums)) : operationNodes;
@@ -2622,11 +2622,13 @@ const adapterOas = createAdapter((options) => {
 			assertDocument(document);
 			await validateDocument(document, options);
 		},
-		async parse(source) {
+		async parse(source, { signal } = {}) {
+			signal?.throwIfAborted();
 			const cached = inputCache.get(source);
 			if (cached) return cached;
 			const promise = (async () => {
 				const document = await parseFromConfig(source);
+				signal?.throwIfAborted();
 				assertDocument(document);
 				if (validate) await validateDocument(document);
 				parsedDocument = document;
@@ -2645,7 +2647,10 @@ const adapterOas = createAdapter((options) => {
 				});
 			})();
 			inputCache.set(source, promise);
-			return promise;
+			return promise.catch((error) => {
+				if (signal?.aborted) inputCache.delete(source);
+				throw error;
+			});
 		}
 	};
 });