@kubb/adapter-oas 5.14.1 → 5.14.3

package/dist/index.js

@@ -20,7 +20,7 @@ var compatibility = {
 };
 //#endregion
 //#region package.json
-var version = "5.14.1";
+var version = "5.14.3";
 //#endregion
 //#region src/constants.ts
 /**
@@ -1291,12 +1291,21 @@ function getParameters({ operation, refs }) {
 	for (const entry of [...pathLevelParams, ...operationParams]) if (entry.param.name && entry.param.in) paramMap.set(`${entry.param.in}:${entry.param.name}`, entry);
 	return Array.from(paramMap.values());
 }
-/** The `encoding` of a media type, reduced to the entries that set a field Kubb carries. */
+const PARAMETER_STYLES = /* @__PURE__ */ new Set([
+	"matrix",
+	"label",
+	"form",
+	"simple",
+	"spaceDelimited",
+	"pipeDelimited",
+	"deepObject"
+]);
+/** The `encoding` of a media type, reduced to the entries that set a field Kubb carries. A `style` outside the OpenAPI set is dropped. */
 function getEncoding(encoding) {
 	const entries = Object.entries(encoding ?? {}).flatMap(([property, { contentType, style, explode, allowReserved }]) => {
 		const node = {
 			...contentType !== void 0 ? { contentType } : {},
-			...style !== void 0 ? { style } : {},
+			...style !== void 0 && PARAMETER_STYLES.has(style) ? { style } : {},
 			...explode !== void 0 ? { explode } : {},
 			...allowReserved !== void 0 ? { allowReserved } : {}
 		};
@@ -1358,7 +1367,7 @@ function parseParameter({ param, pointer, parentName, options, parseSchema }) {
 		name: schemaName
 	}) : ast.factory.createSchema({ type: options.unknownType });
 	if (rawSchema) scanSchema(schema, contentType ? `${pointer}/content/${escapePointerToken(contentType)}/schema` : `${pointer}/schema`);
-	const style = param.style;
+	const style = param.style !== void 0 && PARAMETER_STYLES.has(param.style) ? param.style : void 0;
 	const explode = param.explode;
 	const allowReserved = param.allowReserved;
 	return ast.factory.createParameter({
@@ -1894,7 +1903,7 @@ function convertRef({ schema, name, nullable, defaultValue, document, parse, ref
 		nullable,
 		defaultValue
 	};
-	if (refPath && document.components && !refs.resolve(refPath, { report: false })) return createNode(ctx, { type: "unknown" });
+	if (refPath && document.components && !refs.resolve(refPath, { report: false })) return createNode(ctx, { type: ast.schemaTypes.unknown });
 	if (refPath && !refPath.startsWith("#/components/schemas/") && resolvedSchema) return ast.factory.createSchema({
 		...resolvedSchema,
 		title: schema.title ?? resolvedSchema.title,
@@ -1908,7 +1917,7 @@ function convertRef({ schema, name, nullable, defaultValue, document, parse, ref
 	});
 	const targetName = renames?.get(schema.$ref);
 	return createNode(ctx, {
-		type: "ref",
+		type: ast.schemaTypes.ref,
 		name: extractRefName(schema.$ref),
 		ref: schema.$ref,
 		...targetName ? { targetName } : {},
@@ -1920,7 +1929,7 @@ function convertNot({ schema, name, nullable, defaultValue, parse }) {
 	const { not, ...rest } = schema;
 	const [subschema] = resolveUnionMembers([not], rest.properties ?? {});
 	const notNode = ast.factory.createSchema({
-		type: "not",
+		type: ast.schemaTypes.not,
 		members: [parse({ schema: subschema })]
 	});
 	return createNode({
@@ -1929,7 +1938,7 @@ function convertNot({ schema, name, nullable, defaultValue, parse }) {
 		nullable,
 		defaultValue
 	}, {
-		type: "intersection",
+		type: ast.schemaTypes.intersection,
 		members: [parse({
 			schema: rest,
 			name
@@ -2049,7 +2058,7 @@ function convertAllOf({ schema: original, name, nullable, defaultValue, parse, r
 		nullable,
 		defaultValue
 	}, {
-		type: "intersection",
+		type: ast.schemaTypes.intersection,
 		members: [...mergeAdjacentObjectsLazy(allOfMembers.slice(0, syntheticStart)), ...mergeAdjacentObjectsLazy(allOfMembers.slice(syntheticStart))]
 	});
 }
@@ -2075,7 +2084,8 @@ function convertUnion(context) {
 		schema: memberBaseSchema,
 		name
 	}) : void 0;
-	if (sharedPropertiesNode || discriminator) {
+	const missingRequired = (Array.isArray(schema.required) ? schema.required : []).filter((key) => !Object.hasOwn(schema.properties ?? {}, key));
+	if (sharedPropertiesNode || discriminator || missingRequired.length) {
 		const members = narrowUnionMembers({
 			unionMembers,
 			discriminator,
@@ -2090,15 +2100,25 @@ function convertUnion(context) {
 			refs
 		});
 		const unionNode = createNode(ctx, {
-			type: "union",
+			type: ast.schemaTypes.union,
 			strategy,
 			members,
 			discriminatorPropertyName: explicitDiscriminatorPropertyName ?? ast.inferDiscriminatorPropertyName(members)
 		});
-		if (!sharedPropertiesNode) return unionNode;
+		const requiredProperties = missingRequired.map((name) => ast.factory.createProperty({
+			name,
+			required: true,
+			schema: ast.factory.createSchema({ type: ast.schemaTypes.unknown })
+		}));
+		const siblings = sharedPropertiesNode ? [sharedPropertiesNode] : [];
+		if (requiredProperties.length) siblings.push(ast.factory.createSchema({
+			type: ast.schemaTypes.object,
+			properties: requiredProperties
+		}));
+		if (!siblings.length) return unionNode;
 		return createNode(ctx, {
-			type: "intersection",
-			members: [unionNode, sharedPropertiesNode]
+			type: ast.schemaTypes.intersection,
+			members: [unionNode, ...siblings]
 		});
 	}
 	const members = unionMembers.map((s) => parse({
@@ -2106,7 +2126,7 @@ function convertUnion(context) {
 		name
 	}));
 	const unionNode = createNode(ctx, {
-		type: "union",
+		type: ast.schemaTypes.union,
 		strategy,
 		members,
 		discriminatorPropertyName: explicitDiscriminatorPropertyName ?? ast.inferDiscriminatorPropertyName(members)
@@ -2128,7 +2148,7 @@ function convertMultiType({ schema, name, nullable, defaultValue, parse }) {
 		nullable: types.includes("null") || nullable || void 0,
 		defaultValue
 	}, {
-		type: "union",
+		type: ast.schemaTypes.union,
 		members: nonNullTypes.map((t) => {
 			return parse({
 				schema: {
@@ -2905,9 +2925,13 @@ const adapterOas = defineExtension({
 			}));
 			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 aliasTargetOf = (name) => {
+				const node = refAliasMap.get(name);
+				return node?.ref ? ast.refName(node.ref) : node?.name;
+			};
 			function isAliasCycle(name) {
 				const seen = /* @__PURE__ */ new Set([name]);
-				for (let next = refAliasMap.get(name)?.name; next; next = refAliasMap.get(next)?.name) {
+				for (let next = aliasTargetOf(name); next; next = aliasTargetOf(next)) {
 					if (next === name) return true;
 					if (seen.has(next)) return false;
 					seen.add(next);