@kubb/adapter-oas 5.0.0-beta.57 → 5.0.0-beta.59

package/dist/index.js

@@ -5,7 +5,7 @@ import { access, readFile } from "node:fs/promises";
 import { compileErrors, validate } from "@readme/openapi-parser";
 import { parse } from "yaml";
 import { bundle } from "api-ref-bundler";
-import { childName, enumPropName, extractRefName, findDiscriminator } from "@kubb/ast/utils";
+import { childName, containsCircularRef, enumPropName, extractRefName, findCircularSchemas } from "@kubb/ast/utils";
 import { collect, narrowSchema } from "@kubb/ast";
 //#region src/constants.ts
 /**
@@ -91,7 +91,7 @@ const structuralKeys = new Set([
 *
 * Only formats whose AST type differs from the OAS `type` field appear here.
 * Formats that depend on runtime options (`int64`, `date-time`, `date`, `time`) are handled separately
-* in the parser. `ipv4` and `ipv6` map to their own dedicated schema types; `hostname` and
+* in the parser. `ipv4` and `ipv6` map to their own dedicated schema types. `hostname` and
 * `idn-hostname` map to `'url'` as the closest generic string-format type.
 *
 * @example
@@ -144,8 +144,8 @@ const formatMap = {
 */
 const enumExtensionKeys = ["x-enumNames", "x-enum-varnames"];
 /**
-* Maps `'any' | 'unknown' | 'void'` option strings to their `ScalarSchemaType` constant.
-* Replaces a plain object lookup with a `Map` for explicit key membership testing via `.has()`.
+* Maps the `unknownType`/`emptySchemaType` option string to its `ScalarSchemaType` constant.
+* A `Map` (over a plain object) lets callers test key membership with `.has()`.
 */
 const typeOptionMap = new Map([
 	["any", ast.schemaTypes.any],
@@ -840,6 +840,120 @@ const oasDialect = ast.defineSchemaDialect({
 	resolveRef
 });
 //#endregion
+//#region src/discriminator.ts
+/**
+* Builds a map of child schema names → discriminator patch data by scanning the given
+* top-level AST schema nodes for union schemas that carry a `discriminatorPropertyName`.
+*
+* The streaming path calls this on a small pre-parsed subset of schemas (only the
+* discriminator parents) rather than on all schemas at once.
+*/
+function buildDiscriminatorChildMap(schemas) {
+	const childMap = /* @__PURE__ */ new Map();
+	for (const schema of schemas) {
+		let unionNode = ast.narrowSchema(schema, "union");
+		if (!unionNode) {
+			const intersectionMembers = ast.narrowSchema(schema, "intersection")?.members;
+			if (intersectionMembers) for (const m of intersectionMembers) {
+				const u = ast.narrowSchema(m, "union");
+				if (u) {
+					unionNode = u;
+					break;
+				}
+			}
+		}
+		if (!unionNode?.discriminatorPropertyName || !unionNode.members) continue;
+		const { discriminatorPropertyName, members } = unionNode;
+		for (const member of members) {
+			const intersectionNode = ast.narrowSchema(member, "intersection");
+			if (!intersectionNode?.members) continue;
+			let refNode = null;
+			let objNode = null;
+			for (const m of intersectionNode.members) {
+				refNode ??= ast.narrowSchema(m, "ref");
+				objNode ??= ast.narrowSchema(m, "object");
+			}
+			if (!refNode?.name || !objNode) continue;
+			const prop = objNode.properties.find((p) => p.name === discriminatorPropertyName);
+			const enumNode = prop ? ast.narrowSchema(prop.schema, "enum") : null;
+			if (!enumNode?.enumValues?.length) continue;
+			const enumValues = enumNode.enumValues.filter((v) => v !== null);
+			if (!enumValues.length) continue;
+			const existing = childMap.get(refNode.name);
+			if (!existing) {
+				childMap.set(refNode.name, {
+					propertyName: discriminatorPropertyName,
+					enumValues: [...enumValues]
+				});
+				continue;
+			}
+			existing.enumValues.push(...enumValues);
+		}
+	}
+	return childMap;
+}
+/**
+* Patches a single top-level `SchemaNode` with its discriminator entry (adds or replaces
+* the discriminant property). Used by the streaming path to apply patches inline per yield
+* without buffering all schemas.
+*/
+function patchDiscriminatorNode(node, entry) {
+	const objectNode = ast.narrowSchema(node, "object");
+	if (!objectNode) return node;
+	const { propertyName, enumValues } = entry;
+	const enumSchema = ast.factory.createSchema({
+		type: "enum",
+		enumValues
+	});
+	const newProp = ast.factory.createProperty({
+		name: propertyName,
+		required: true,
+		schema: enumSchema
+	});
+	const existingIdx = objectNode.properties.findIndex((p) => p.name === propertyName);
+	const newProperties = existingIdx >= 0 ? objectNode.properties.map((p, i) => i === existingIdx ? newProp : p) : [...objectNode.properties, newProp];
+	return {
+		...objectNode,
+		properties: newProperties
+	};
+}
+/**
+* Creates a single-property object schema used as a discriminator literal.
+*
+* @example
+* ```ts
+* createDiscriminantNode({ propertyName: 'type', value: 'dog' })
+* // -> { type: 'object', properties: [{ name: 'type', required: true, schema: enum('dog') }] }
+* ```
+*/
+function createDiscriminantNode({ propertyName, value }) {
+	return ast.factory.createSchema({
+		type: "object",
+		primitive: "object",
+		properties: [ast.factory.createProperty({
+			name: propertyName,
+			schema: ast.factory.createSchema({
+				type: "enum",
+				primitive: "string",
+				enumValues: [value]
+			}),
+			required: true
+		})]
+	});
+}
+/**
+* Returns the discriminator key whose mapping value matches `ref`, or `null` when there is no match.
+*
+* @example
+* ```ts
+* findDiscriminator({ dog: '#/components/schemas/Dog' }, '#/components/schemas/Dog') // 'dog'
+* ```
+*/
+function findDiscriminator(mapping, ref) {
+	if (!mapping || !ref) return null;
+	return Object.entries(mapping).find(([, value]) => value === ref)?.[0] ?? null;
+}
+//#endregion
 //#region src/mime.ts
 /**
 * MIME type fragments that mark a media type as JSON-like.
@@ -1328,7 +1442,7 @@ function getSchemas(document, { contentType }) {
 }
 /**
 * Resolves the AST type descriptor for a date/time format, honoring the `dateType` option.
-* Returns `null` when `dateType: false`, signalling the format should fall through to `string`.
+* Returns `null` when `dateType: false`, so the format falls through to `string`.
 */
 function getDateType(options, format) {
 	if (!options.dateType) return null;
@@ -1430,9 +1544,9 @@ function getResponseBodyContentTypes(document, operation, statusCode) {
 * Normalizes malformed `{ type: 'array', enum: [...] }` schemas by moving enum values into items.
 *
 * This pattern violates the OpenAPI spec but appears in real specs. The fix moves enum values
-* from the array to its items sub-schema, making them valid for downstream processing.
+* from the array to its items sub-schema, so they are valid for downstream processing.
 *
-* @note This is a defensive measure for robustness with non-compliant specs.
+* @note A defensive measure for non-compliant specs.
 */
 function normalizeArrayEnum(schema) {
 	const normalizedItems = {
@@ -1450,7 +1564,7 @@ function normalizeArrayEnum(schema) {
 *
 * Returns closures that share mutable state (`resolvingRefs` set for cycle detection).
 * Each converter branch (`convertRef`, `convertAllOf`, etc.) mutually recursively calls `parseSchema`,
-* made possible by hoisting of function declarations.
+* which works because function declarations hoist.
 *
 * @internal
 */
@@ -1495,7 +1609,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			}
 			resolvedSchema = resolvedRefCache.get(refPath) ?? null;
 		}
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			...buildSchemaNode(schema, name, nullable, defaultValue),
 			type: "ref",
 			name: extractRefName(schema.$ref),
@@ -1516,7 +1630,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			const { kind: _kind, ...memberNodeProps } = memberNode;
 			const mergedNullable = nullable || memberNode.nullable || void 0;
 			const mergedDefault = schema.default === null && mergedNullable ? void 0 : schema.default ?? memberNode.default;
-			return ast.createSchema({
+			return ast.factory.createSchema({
 				...memberNodeProps,
 				name,
 				title: schema.title ?? memberNode.title,
@@ -1580,11 +1694,11 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			const { allOf: _allOf, ...schemaWithoutAllOf } = schema;
 			allOfMembers.push(parseSchema({ schema: schemaWithoutAllOf }, rawOptions));
 		}
-		for (const { propertyName, value } of filteredDiscriminantValues) allOfMembers.push(ast.createDiscriminantNode({
+		for (const { propertyName, value } of filteredDiscriminantValues) allOfMembers.push(createDiscriminantNode({
 			propertyName,
 			value
 		}));
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type: "intersection",
 			members: [...ast.mergeAdjacentObjectsLazy(allOfMembers.slice(0, syntheticStart)), ...ast.mergeAdjacentObjectsLazy(allOfMembers.slice(syntheticStart))],
 			...buildSchemaNode(schema, name, nullable, defaultValue)
@@ -1597,7 +1711,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 		function pickDiscriminatorPropertyNode(node, propertyName) {
 			const discriminatorProperty = ast.narrowSchema(node, "object")?.properties?.find((property) => property.name === propertyName);
 			if (!discriminatorProperty) return null;
-			return ast.createSchema({
+			return ast.factory.createSchema({
 				type: "object",
 				primitive: "object",
 				properties: [discriminatorProperty]
@@ -1632,27 +1746,27 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 					propertyName: discriminator.propertyName,
 					values: [discriminatorValue]
 				}), discriminator.propertyName) : void 0;
-				return ast.createSchema({
+				return ast.factory.createSchema({
 					type: "intersection",
-					members: [memberNode, narrowedDiscriminatorNode ?? ast.createDiscriminantNode({
+					members: [memberNode, narrowedDiscriminatorNode ?? createDiscriminantNode({
 						propertyName: discriminator.propertyName,
 						value: discriminatorValue
 					})]
 				});
 			});
-			const unionNode = ast.createSchema({
+			const unionNode = ast.factory.createSchema({
 				type: "union",
 				...unionBase,
 				members
 			});
 			if (!sharedPropertiesNode) return unionNode;
-			return ast.createSchema({
+			return ast.factory.createSchema({
 				type: "intersection",
 				...buildSchemaNode(schema, name, nullable, defaultValue),
 				members: [unionNode, sharedPropertiesNode]
 			});
 		}
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type: "union",
 			...unionBase,
 			members: ast.simplifyUnion(unionMembers.map((s) => parseSchema({
@@ -1666,7 +1780,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 	*/
 	function convertConst({ schema, name, nullable, defaultValue }) {
 		const constValue = schema.const;
-		if (constValue === null) return ast.createSchema({
+		if (constValue === null) return ast.factory.createSchema({
 			type: "null",
 			primitive: "null",
 			name,
@@ -1676,7 +1790,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			format: schema.format
 		});
 		const constPrimitive = getPrimitiveType(typeof constValue === "number" ? "number" : typeof constValue === "boolean" ? "boolean" : "string");
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type: "enum",
 			primitive: constPrimitive,
 			enumValues: [constValue],
@@ -1689,7 +1803,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 	*/
 	function convertFormat({ schema, name, nullable, defaultValue, options }) {
 		const base = buildSchemaNode(schema, name, nullable, defaultValue);
-		if (schema.format === "int64") return ast.createSchema({
+		if (schema.format === "int64") return ast.factory.createSchema({
 			type: options.integerType === "bigint" ? "bigint" : "integer",
 			primitive: "integer",
 			...base,
@@ -1701,14 +1815,14 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 		if (schema.format === "date-time" || schema.format === "date" || schema.format === "time") {
 			const dateType = getDateType(options, schema.format);
 			if (!dateType) return null;
-			if (dateType.type === "datetime") return ast.createSchema({
+			if (dateType.type === "datetime") return ast.factory.createSchema({
 				...base,
 				primitive: "string",
 				type: "datetime",
 				offset: dateType.offset,
 				local: dateType.local
 			});
-			return ast.createSchema({
+			return ast.factory.createSchema({
 				...base,
 				primitive: "string",
 				type: dateType.type,
@@ -1718,36 +1832,36 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 		const specialType = getSchemaType(schema.format);
 		if (!specialType) return null;
 		const specialPrimitive = specialType === "number" || specialType === "integer" || specialType === "bigint" ? specialType : "string";
-		if (specialType === "number" || specialType === "integer" || specialType === "bigint") return ast.createSchema({
+		if (specialType === "number" || specialType === "integer" || specialType === "bigint") return ast.factory.createSchema({
 			...base,
 			primitive: specialPrimitive,
 			type: specialType
 		});
-		if (specialType === "url") return ast.createSchema({
+		if (specialType === "url") return ast.factory.createSchema({
 			...base,
 			primitive: "string",
 			type: "url",
 			min: schema.minLength,
 			max: schema.maxLength
 		});
-		if (specialType === "ipv4") return ast.createSchema({
+		if (specialType === "ipv4") return ast.factory.createSchema({
 			...base,
 			primitive: "string",
 			type: "ipv4"
 		});
-		if (specialType === "ipv6") return ast.createSchema({
+		if (specialType === "ipv6") return ast.factory.createSchema({
 			...base,
 			primitive: "string",
 			type: "ipv6"
 		});
-		if (specialType === "uuid" || specialType === "email") return ast.createSchema({
+		if (specialType === "uuid" || specialType === "email") return ast.factory.createSchema({
 			...base,
 			primitive: "string",
 			type: specialType,
 			min: schema.minLength,
 			max: schema.maxLength
 		});
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			...base,
 			primitive: specialPrimitive,
 			type: specialType
@@ -1763,7 +1877,7 @@ 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 ast.createSchema({
+		if (nullInEnum && filteredValues.length === 0) return ast.factory.createSchema({
 			type: "null",
 			primitive: "null",
 			name,
@@ -1795,7 +1909,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			const rawEnumNames = extensionKey ? schema[extensionKey] : void 0;
 			const uniqueValues = [...new Set(filteredValues)];
 			const seenNames = /* @__PURE__ */ new Set();
-			return ast.createSchema({
+			return ast.factory.createSchema({
 				...enumBase,
 				primitive: enumPrimitiveType,
 				namedEnumValues: uniqueValues.map((value, index) => ({
@@ -1809,7 +1923,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 				})
 			});
 		}
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			...enumBase,
 			enumValues: [...new Set(filteredValues)]
 		});
@@ -1838,7 +1952,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 				}
 				return node;
 			})();
-			return ast.createProperty({
+			return ast.factory.createProperty({
 				name: propName,
 				schema: {
 					...schemaNode,
@@ -1852,11 +1966,11 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			if (additionalProperties === true) return true;
 			if (additionalProperties === false) return false;
 			if (additionalProperties && Object.keys(additionalProperties).length > 0) return parseSchema({ schema: additionalProperties }, rawOptions);
-			if (additionalProperties) return ast.createSchema({ type: typeOptionMap.get(options.unknownType) });
+			if (additionalProperties) return ast.factory.createSchema({ type: typeOptionMap.get(options.unknownType) });
 		})();
 		const rawPatternProperties = "patternProperties" in schema ? schema.patternProperties : void 0;
-		const patternProperties = rawPatternProperties ? Object.fromEntries(Object.entries(rawPatternProperties).map(([pattern, patternSchema]) => [pattern, patternSchema === true || typeof patternSchema === "object" && Object.keys(patternSchema).length === 0 ? ast.createSchema({ type: typeOptionMap.get(options.unknownType) }) : parseSchema({ schema: patternSchema }, rawOptions)])) : void 0;
-		const objectNode = ast.createSchema({
+		const patternProperties = rawPatternProperties ? Object.fromEntries(Object.entries(rawPatternProperties).map(([pattern, patternSchema]) => [pattern, patternSchema === true || typeof patternSchema === "object" && Object.keys(patternSchema).length === 0 ? ast.factory.createSchema({ type: typeOptionMap.get(options.unknownType) }) : parseSchema({ schema: patternSchema }, rawOptions)])) : void 0;
+		const objectNode = ast.factory.createSchema({
 			type: "object",
 			primitive: "object",
 			properties,
@@ -1884,8 +1998,8 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 	*/
 	function convertTuple({ schema, name, nullable, defaultValue, rawOptions }) {
 		const tupleItems = (schema.prefixItems ?? []).map((item) => parseSchema({ schema: item }, rawOptions));
-		const rest = schema.items ? parseSchema({ schema: schema.items }, rawOptions) : ast.createSchema({ type: "any" });
-		return ast.createSchema({
+		const rest = schema.items ? parseSchema({ schema: schema.items }, rawOptions) : ast.factory.createSchema({ type: "any" });
+		return ast.factory.createSchema({
 			type: "tuple",
 			primitive: "array",
 			items: tupleItems,
@@ -1905,7 +2019,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			schema: rawItems,
 			name: itemName
 		}, rawOptions)] : [];
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type: "array",
 			primitive: "array",
 			items,
@@ -1919,7 +2033,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 	* Converts a `type: 'string'` schema into a `StringSchemaNode`.
 	*/
 	function convertString({ schema, name, nullable, defaultValue }) {
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type: "string",
 			primitive: "string",
 			min: schema.minLength,
@@ -1932,7 +2046,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 	* Converts a `type: 'number'` or `type: 'integer'` schema.
 	*/
 	function convertNumeric({ schema, name, nullable, defaultValue }, type) {
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type,
 			primitive: type,
 			min: schema.minimum,
@@ -1947,7 +2061,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 	* Converts a `type: 'boolean'` schema.
 	*/
 	function convertBoolean({ schema, name, nullable, defaultValue }) {
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type: "boolean",
 			primitive: "boolean",
 			...buildSchemaNode(schema, name, nullable, defaultValue)
@@ -1957,7 +2071,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 	* Converts an explicit `type: 'null'` schema.
 	*/
 	function convertNull({ schema, name, nullable }) {
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type: "null",
 			primitive: "null",
 			name,
@@ -1973,7 +2087,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 	* into a `blob` node.
 	*/
 	function convertBlob({ schema, name, nullable, defaultValue }) {
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type: "blob",
 			primitive: "string",
 			...buildSchemaNode(schema, name, nullable, defaultValue)
@@ -1990,7 +2104,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 		const nonNullTypes = types.filter((t) => t !== "null");
 		if (nonNullTypes.length <= 1) return null;
 		const arrayNullable = types.includes("null") || nullable || void 0;
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type: "union",
 			members: nonNullTypes.map((t) => parseSchema({
 				schema: {
@@ -2133,7 +2247,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			if (node) return node;
 		}
 		const emptyType = typeOptionMap.get(options.emptySchemaType);
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			type: emptyType,
 			name,
 			title: schema.title,
@@ -2151,8 +2265,8 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 		const schema = param["schema"] ? parseSchema({
 			schema: param["schema"],
 			name: schemaName
-		}, options) : ast.createSchema({ type: typeOptionMap.get(options.unknownType) });
-		return ast.createParameter({
+		}, options) : ast.factory.createSchema({ type: typeOptionMap.get(options.unknownType) });
+		return ast.factory.createParameter({
 			name: paramName,
 			in: param["in"],
 			schema: {
@@ -2239,7 +2353,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 					schema: raw && Object.keys(raw).length > 0 ? parseSchema({
 						schema: raw,
 						name: responseName
-					}, options) : ast.createSchema({ type: typeOptionMap.get(options.emptySchemaType) }),
+					}, options) : ast.factory.createSchema({ type: typeOptionMap.get(options.emptySchemaType) }),
 					keysToOmit: collectPropertyKeysByFlag(raw, "writeOnly")
 				};
 			};
@@ -2254,7 +2368,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 				}) || "application/json",
 				...parseEntrySchema(ctx.contentType)
 			});
-			return ast.createResponse({
+			return ast.factory.createResponse({
 				statusCode,
 				description,
 				content
@@ -2268,7 +2382,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 			const fallback = pathItemDoc?.[key];
 			return typeof fallback === "string" ? fallback : void 0;
 		};
-		return ast.createOperation({
+		return ast.factory.createOperation({
 			operationId,
 			protocol: "http",
 			method: operation.method.toUpperCase(),
@@ -2289,84 +2403,6 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 	};
 }
 //#endregion
-//#region src/discriminator.ts
-/**
-* Builds a map of child schema names → discriminator patch data by scanning the given
-* top-level AST schema nodes for union schemas that carry a `discriminatorPropertyName`.
-*
-* The streaming path calls this on a small pre-parsed subset of schemas (only the
-* discriminator parents) rather than on all schemas at once.
-*/
-function buildDiscriminatorChildMap(schemas) {
-	const childMap = /* @__PURE__ */ new Map();
-	for (const schema of schemas) {
-		let unionNode = ast.narrowSchema(schema, "union");
-		if (!unionNode) {
-			const intersectionMembers = ast.narrowSchema(schema, "intersection")?.members;
-			if (intersectionMembers) for (const m of intersectionMembers) {
-				const u = ast.narrowSchema(m, "union");
-				if (u) {
-					unionNode = u;
-					break;
-				}
-			}
-		}
-		if (!unionNode?.discriminatorPropertyName || !unionNode.members) continue;
-		const { discriminatorPropertyName, members } = unionNode;
-		for (const member of members) {
-			const intersectionNode = ast.narrowSchema(member, "intersection");
-			if (!intersectionNode?.members) continue;
-			let refNode = null;
-			let objNode = null;
-			for (const m of intersectionNode.members) {
-				refNode ??= ast.narrowSchema(m, "ref");
-				objNode ??= ast.narrowSchema(m, "object");
-			}
-			if (!refNode?.name || !objNode) continue;
-			const prop = objNode.properties.find((p) => p.name === discriminatorPropertyName);
-			const enumNode = prop ? ast.narrowSchema(prop.schema, "enum") : null;
-			if (!enumNode?.enumValues?.length) continue;
-			const enumValues = enumNode.enumValues.filter((v) => v !== null);
-			if (!enumValues.length) continue;
-			const existing = childMap.get(refNode.name);
-			if (!existing) {
-				childMap.set(refNode.name, {
-					propertyName: discriminatorPropertyName,
-					enumValues: [...enumValues]
-				});
-				continue;
-			}
-			existing.enumValues.push(...enumValues);
-		}
-	}
-	return childMap;
-}
-/**
-* Patches a single top-level `SchemaNode` with its discriminator entry (adds or replaces
-* the discriminant property). Used by the streaming path to apply patches inline per yield
-* without buffering all schemas.
-*/
-function patchDiscriminatorNode(node, entry) {
-	const objectNode = ast.narrowSchema(node, "object");
-	if (!objectNode) return node;
-	const { propertyName, enumValues } = entry;
-	const enumSchema = ast.createSchema({
-		type: "enum",
-		enumValues
-	});
-	const newProp = ast.createProperty({
-		name: propertyName,
-		required: true,
-		schema: enumSchema
-	});
-	const existingIdx = objectNode.properties.findIndex((p) => p.name === propertyName);
-	const newProperties = existingIdx >= 0 ? objectNode.properties.map((p, i) => i === existingIdx ? newProp : p) : [...objectNode.properties, newProp];
-	return {
-		...objectNode,
-		properties: newProperties
-	};
-}
-//#endregion
 //#region src/schemaDiagnostics.ts
 /**
 * Reports the advisory diagnostics (`KUBB_UNSUPPORTED_FORMAT`, `KUBB_DEPRECATED`) for one
@@ -2429,7 +2465,7 @@ function visit(node, pointer) {
 *
 * 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.
+* name (collision-resolved against existing component names). Shapes without a name stay inline.
 */
 function createDedupePlan({ schemaNodes, operationNodes, schemaNames, circularNames }) {
 	const circularSchemas = new Set(circularNames);
@@ -2439,7 +2475,7 @@ function createDedupePlan({ schemaNodes, operationNodes, schemaNames, circularNa
 			if (node.type === "enum") return true;
 			if (node.type !== "object") return false;
 			if (node.name && circularSchemas.has(node.name)) return false;
-			return !ast.containsCircularRef(node, { circularSchemas });
+			return !containsCircularRef(node, { circularSchemas });
 		},
 		nameFor: (node) => {
 			const base = node.name;
@@ -2513,7 +2549,7 @@ function preScan({ schemas, parseSchema, parseOperation, document, parserOptions
 		if (ast.narrowSchema(node, ast.schemaTypes.enum) && node.name) enumNames.push(node.name);
 		if (discriminator === "inherit" && (schema.oneOf ?? schema.anyOf) && schema.discriminator?.propertyName) discriminatorParentNodes.push(node);
 	}
-	const circularNames = [...ast.findCircularSchemas(allNodes)];
+	const circularNames = [...findCircularSchemas(allNodes)];
 	const discriminatorChildMap = discriminatorParentNodes.length > 0 ? buildDiscriminatorChildMap(discriminatorParentNodes) : null;
 	let dedupePlan = null;
 	if (dedupe) {
@@ -2561,7 +2597,7 @@ function createInputStream({ schemas, parseSchema, parseOperation, document, par
 	const rewriteTopLevelSchema = (node) => {
 		if (!dedupePlan) return node;
 		const canonical = dedupePlan.canonicalBySignature.get(ast.signatureOf(node));
-		if (canonical && canonical.name !== node.name) return ast.createSchema({
+		if (canonical && canonical.name !== node.name) return ast.factory.createSchema({
 			type: "ref",
 			name: node.name ?? null,
 			ref: canonical.ref,
@@ -2602,7 +2638,12 @@ function createInputStream({ schemas, parseSchema, parseOperation, document, par
 			}
 		})();
 	} };
-	return ast.createStreamInput(schemasIterable, operationsIterable, meta);
+	return ast.factory.createInput({
+		stream: true,
+		schemas: schemasIterable,
+		operations: operationsIterable,
+		meta
+	});
 }
 //#endregion
 //#region src/adapter.ts
@@ -2761,7 +2802,7 @@ const adapterOas = createAdapter((options) => {
 				const rawName = extractRefName(schemaRef.ref);
 				const result = resolve(nameMapping.get(rawName) ?? rawName);
 				if (!result) return null;
-				return ast.createImport({
+				return ast.factory.createImport({
 					name: [result.name],
 					path: result.path
 				});
@@ -2770,7 +2811,7 @@ const adapterOas = createAdapter((options) => {
 		async parse(source) {
 			const streamNode = await createStream(source);
 			const [schemas, operations] = await Promise.all([Array.fromAsync(streamNode.schemas), Array.fromAsync(streamNode.operations)]);
-			return ast.createInput({
+			return ast.factory.createInput({
 				schemas,
 				operations,
 				meta: streamNode.meta