@kubb/adapter-oas 5.9.5 → 5.10.0

package/dist/index.js

@@ -11,7 +11,7 @@ var compatibility = {
 };
 //#endregion
 //#region package.json
-var version = "5.9.5";
+var version = "5.10.0";
 //#endregion
 //#region src/constants.ts
 /**
@@ -534,6 +534,13 @@ function isNullable(schema) {
 	return false;
 }
 /**
+* Returns the `x-*` keys of `source` as-is, or `undefined` when there are none.
+*/
+function pickExtensions(source) {
+	const entries = Object.entries(source).filter(([key]) => key.startsWith("x-"));
+	return entries.length > 0 ? Object.fromEntries(entries) : void 0;
+}
+/**
 * Returns `true` when `obj` is an OpenAPI `$ref` pointer object.
 */
 function isReference(obj) {
@@ -892,6 +899,7 @@ function parseParameter({ param, parentName, options, parseSchema }) {
 	}) : ast.factory.createSchema({ type: options.unknownType });
 	const style = param.style;
 	const explode = param.explode;
+	const allowReserved = param.allowReserved;
 	return ast.factory.createParameter({
 		name: param.name,
 		in: param.in,
@@ -901,7 +909,8 @@ function parseParameter({ param, parentName, options, parseSchema }) {
 		},
 		required: param.required ?? false,
 		...style !== void 0 ? { style } : {},
-		...explode !== void 0 ? { explode } : {}
+		...explode !== void 0 ? { explode } : {},
+		...allowReserved !== void 0 ? { allowReserved } : {}
 	});
 }
 /**
@@ -1002,7 +1011,8 @@ function parseOperation({ operation, ...ctx }) {
 		deprecated: operation.schema.deprecated || void 0,
 		parameters,
 		requestBody,
-		responses
+		responses,
+		extensions: pickExtensions(operation.schema)
 	});
 }
 //#endregion
@@ -1376,6 +1386,27 @@ function convertRef({ schema, name, nullable, defaultValue, document, parse, ref
 		schema: resolvedSchema
 	});
 }
+/** Converts `{ ...rest, not: X }` into `intersection[rest, not[X]]`; a bare `required` inside `not` borrows the outer `properties`. */
+function convertNot({ schema, name, nullable, defaultValue, parse }) {
+	const { not, ...rest } = schema;
+	const [subschema] = resolveUnionMembers([not], rest.properties ?? {});
+	const notNode = ast.factory.createSchema({
+		type: "not",
+		members: [parse({ schema: subschema })]
+	});
+	return createNode({
+		schema,
+		name,
+		nullable,
+		defaultValue
+	}, {
+		type: "intersection",
+		members: [parse({
+			schema: rest,
+			name
+		}), notNode]
+	});
+}
 /**
 * Converts an `allOf` schema into a flattened node or an `IntersectionSchemaNode`.
 */
@@ -1852,7 +1883,7 @@ function convertArray({ schema, name, nullable, defaultValue, options, parse })
 //#endregion
 //#region src/emit/parseSchema.ts
 /**
-* Ordered schema rule table. Order is significant: composition keywords (`$ref`, `allOf`,
+* Ordered schema rule table. Order is significant: composition keywords (`not`, `$ref`, `allOf`,
 * `oneOf`/`anyOf`) take precedence over `const`, which takes precedence over a genuine OAS 3.1
 * multi-type array (more than one non-`null` type), which takes precedence over `format`/`type`.
 * A multi-type array must split into its per-type members before `format` runs, otherwise
@@ -1863,6 +1894,10 @@ function convertArray({ schema, name, nullable, defaultValue, options, parse })
 * match/convert/fall-through contract.
 */
 const schemaRules = [
+	{
+		match: ({ schema }) => typeof schema.not === "object" && schema.not !== null,
+		convert: convertNot
+	},
 	{
 		match: ({ schema }) => isReference(schema),
 		convert: convertRef
@@ -2193,7 +2228,7 @@ function visit(node, pointer) {
 		for (const [index, item] of (node.items ?? []).entries()) visit(item, `${pointer}/items/${index}`);
 		return;
 	}
-	if (node.type === "union" || node.type === "intersection") for (const [index, member] of (node.members ?? []).entries()) visit(member, `${pointer}/members/${index}`);
+	if (node.type === "union" || node.type === "intersection" || node.type === "not") for (const [index, member] of (node.members ?? []).entries()) visit(member, `${pointer}/members/${index}`);
 }
 //#endregion
 //#region src/adapter.ts
@@ -2310,18 +2345,21 @@ const adapterOas = defineExtension({
 						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
+								description,
+								...declared
 							};
 						} catch {
 							return {
 								url,
-								description
+								description,
+								...declared
 							};
 						}
 					}),
@@ -2338,7 +2376,8 @@ const adapterOas = defineExtension({
 						}] : [];
 					}),
 					circularNames,
-					enumNames
+					enumNames,
+					extensions: pickExtensions(document)
 				}
 			});
 		}