@kubb/adapter-oas 5.0.0-beta.30 → 5.0.0-beta.31

package/dist/index.cjs

@@ -1510,6 +1510,15 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 		}, rawOptions);
 		const nullInEnum = schema.enum.includes(null);
 		const filteredValues = nullInEnum ? schema.enum.filter((v) => v !== null) : schema.enum;
+		if (nullInEnum && filteredValues.length === 0) return _kubb_core.ast.createSchema({
+			type: "null",
+			primitive: "null",
+			name,
+			title: schema.title,
+			description: schema.description,
+			deprecated: schema.deprecated,
+			format: schema.format
+		});
 		const enumNullable = nullable || nullInEnum || void 0;
 		const enumDefault = schema.default === null && enumNullable ? void 0 : schema.default;
 		const enumPrimitive = getPrimitiveType(type);
@@ -2091,6 +2100,36 @@ function patchDiscriminatorNode(node, entry) {
 //#endregion
 //#region src/stream.ts
 /**
+* Builds the deduplication plan from the already-parsed top-level schema nodes plus a
+* single extra parse pass over operations (so duplicates in request/response bodies are seen).
+*
+* Only enums and objects are candidates, and object shapes that reference a circular schema are
+* rejected to avoid hoisting recursive structures. Inline shapes reuse their context-derived
+* name (collision-resolved against existing component names); shapes without a name stay inline.
+*/
+function createDedupePlan({ schemaNodes, operationNodes, schemaNames, circularNames }) {
+	const circularSchemas = new Set(circularNames);
+	const usedNames = new Set(schemaNames);
+	return _kubb_core.ast.buildDedupePlan([...schemaNodes, ...operationNodes], {
+		isCandidate: (node) => {
+			if (node.type === "enum") return true;
+			if (node.type !== "object") return false;
+			if (node.name && circularSchemas.has(node.name)) return false;
+			return !_kubb_core.ast.containsCircularRef(node, { circularSchemas });
+		},
+		nameFor: (node) => {
+			const base = node.name;
+			if (!base) return null;
+			let name = base;
+			let counter = 2;
+			while (usedNames.has(name)) name = `${base}${counter++}`;
+			usedNames.add(name);
+			return name;
+		},
+		refFor: (name) => `${SCHEMA_REF_PREFIX}${name}`
+	});
+}
+/**
 * Reads the server URL from the document's `servers` array at `serverIndex`,
 * interpolating any `serverVariables` into the URL template.
 *
@@ -2131,7 +2170,7 @@ function resolveBaseUrl({ document, serverIndex, serverVariables }) {
 * })
 * ```
 */
-function preScan({ schemas, parseSchema, parserOptions, discriminator }) {
+function preScan({ schemas, parseSchema, parseOperation, baseOas, parserOptions, discriminator, dedupe }) {
 	const allNodes = [];
 	const refAliasMap = /* @__PURE__ */ new Map();
 	const enumNames = [];
@@ -2146,11 +2185,30 @@ function preScan({ schemas, parseSchema, parserOptions, discriminator }) {
 		if (_kubb_core.ast.narrowSchema(node, _kubb_core.ast.schemaTypes.enum) && node.name) enumNames.push(node.name);
 		if (discriminator === "inherit" && (schema.oneOf ?? schema.anyOf) && schema.discriminator?.propertyName) discriminatorParentNodes.push(node);
 	}
+	const circularNames = [..._kubb_core.ast.findCircularSchemas(allNodes)];
+	const discriminatorChildMap = discriminatorParentNodes.length > 0 ? buildDiscriminatorChildMap(discriminatorParentNodes) : null;
+	let dedupePlan = null;
+	if (dedupe) {
+		const operationNodes = [];
+		for (const methods of Object.values(baseOas.getPaths())) for (const operation of Object.values(methods)) {
+			if (!operation) continue;
+			const operationNode = parseOperation(parserOptions, operation);
+			if (operationNode) operationNodes.push(operationNode);
+		}
+		dedupePlan = createDedupePlan({
+			schemaNodes: allNodes,
+			operationNodes,
+			schemaNames: Object.keys(schemas),
+			circularNames
+		});
+		for (const definition of dedupePlan.hoisted) if (definition.type === "enum" && definition.name) enumNames.push(definition.name);
+	}
 	return {
 		refAliasMap,
 		enumNames,
-		circularNames: [..._kubb_core.ast.findCircularSchemas(allNodes)],
-		discriminatorChildMap: discriminatorParentNodes.length > 0 ? buildDiscriminatorChildMap(discriminatorParentNodes) : null
+		circularNames,
+		discriminatorChildMap,
+		dedupePlan
 	};
 }
 /**
@@ -2171,26 +2229,39 @@ function preScan({ schemas, parseSchema, parserOptions, discriminator }) {
 * }
 * ```
 */
-function createInputStream({ schemas, parseSchema, parseOperation, baseOas, parserOptions, refAliasMap, discriminatorChildMap, meta }) {
+function createInputStream({ schemas, parseSchema, parseOperation, baseOas, parserOptions, refAliasMap, discriminatorChildMap, dedupePlan, meta }) {
+	const rewriteTopLevelSchema = (node) => {
+		if (!dedupePlan) return node;
+		const canonical = dedupePlan.canonicalBySignature.get(_kubb_core.ast.schemaSignature(node));
+		if (canonical && canonical.name !== node.name) return _kubb_core.ast.createSchema({
+			type: "ref",
+			name: node.name ?? null,
+			ref: canonical.ref,
+			description: node.description,
+			deprecated: node.deprecated
+		});
+		return _kubb_core.ast.applyDedupe(node, dedupePlan.canonicalBySignature, true);
+	};
 	const schemasIterable = { [Symbol.asyncIterator]() {
 		return (async function* () {
+			if (dedupePlan) for (const definition of dedupePlan.hoisted) yield definition;
 			for (const [name, schema] of Object.entries(schemas)) {
 				const alias = refAliasMap.get(name);
 				if (alias?.name && schemas[alias.name]) {
-					yield {
+					yield rewriteTopLevelSchema({
 						...parseSchema({
 							schema: schemas[alias.name],
 							name: alias.name
 						}, parserOptions),
 						name
-					};
+					});
 					continue;
 				}
 				const parsed = parseSchema({
 					schema,
 					name
 				}, parserOptions);
-				yield discriminatorChildMap?.get(name) ? patchDiscriminatorNode(parsed, discriminatorChildMap.get(name)) : parsed;
+				yield rewriteTopLevelSchema(discriminatorChildMap?.get(name) ? patchDiscriminatorNode(parsed, discriminatorChildMap.get(name)) : parsed);
 			}
 		})();
 	} };
@@ -2199,7 +2270,7 @@ function createInputStream({ schemas, parseSchema, parseOperation, baseOas, pars
 			for (const methods of Object.values(baseOas.getPaths())) for (const operation of Object.values(methods)) {
 				if (!operation) continue;
 				const node = parseOperation(parserOptions, operation);
-				if (node) yield node;
+				if (node) yield dedupePlan ? _kubb_core.ast.applyDedupe(node, dedupePlan.canonicalBySignature) : node;
 			}
 		})();
 	} };
@@ -2239,7 +2310,7 @@ const adapterOasName = "oas";
 * ```
 */
 const adapterOas = (0, _kubb_core.createAdapter)((options) => {
-	const { validate = true, contentType, serverIndex, serverVariables, discriminator = "strict", dateType = DEFAULT_PARSER_OPTIONS.dateType, integerType = DEFAULT_PARSER_OPTIONS.integerType, unknownType = DEFAULT_PARSER_OPTIONS.unknownType, enumSuffix = DEFAULT_PARSER_OPTIONS.enumSuffix, emptySchemaType = unknownType || DEFAULT_PARSER_OPTIONS.emptySchemaType } = options;
+	const { validate = true, contentType, serverIndex, serverVariables, discriminator = "strict", dedupe = true, dateType = DEFAULT_PARSER_OPTIONS.dateType, integerType = DEFAULT_PARSER_OPTIONS.integerType, unknownType = DEFAULT_PARSER_OPTIONS.unknownType, enumSuffix = DEFAULT_PARSER_OPTIONS.enumSuffix, emptySchemaType = unknownType || DEFAULT_PARSER_OPTIONS.emptySchemaType } = options;
 	const parserOptions = {
 		...DEFAULT_PARSER_OPTIONS,
 		dateType,
@@ -2266,25 +2337,30 @@ const adapterOas = (0, _kubb_core.createAdapter)((options) => {
 		document,
 		contentType
 	}));
-	const ensurePreScan = once((schemas, parseSchema) => preScan({
+	const ensurePreScan = once((schemas, parseSchema, parseOperation, baseOas) => preScan({
 		schemas,
 		parseSchema,
+		parseOperation,
+		baseOas,
 		parserOptions,
-		discriminator
+		discriminator,
+		dedupe
 	}));
 	async function createStream(source) {
 		const document = await ensureDocument(source);
 		const schemas = await ensureSchemas(document);
 		const { parseSchema, parseOperation } = ensureSchemaParser(document);
-		const { refAliasMap, enumNames, circularNames, discriminatorChildMap } = ensurePreScan(schemas, parseSchema);
+		const baseOas = ensureBaseOas(document);
+		const { refAliasMap, enumNames, circularNames, discriminatorChildMap, dedupePlan } = ensurePreScan(schemas, parseSchema, parseOperation, baseOas);
 		return createInputStream({
 			schemas,
 			parseSchema,
 			parseOperation,
-			baseOas: ensureBaseOas(document),
+			baseOas,
 			parserOptions,
 			refAliasMap,
 			discriminatorChildMap,
+			dedupePlan,
 			meta: {
 				title: document.info?.title,
 				description: document.info?.description,
@@ -2308,6 +2384,7 @@ const adapterOas = (0, _kubb_core.createAdapter)((options) => {
 				serverIndex,
 				serverVariables,
 				discriminator,
+				dedupe,
 				dateType,
 				integerType,
 				unknownType,