@kubb/adapter-oas 5.0.0-beta.56 → 5.0.0-beta.58

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, findDiscriminator } from "@kubb/ast/utils";
 import { collect, narrowSchema } from "@kubb/ast";
 //#region src/constants.ts
 /**
@@ -1495,7 +1495,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 +1516,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 +1580,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(ast.factory.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 +1597,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 +1632,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 ?? ast.factory.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 +1666,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 +1676,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 +1689,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 +1701,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 +1718,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 +1763,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 +1795,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 +1809,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 				})
 			});
 		}
-		return ast.createSchema({
+		return ast.factory.createSchema({
 			...enumBase,
 			enumValues: [...new Set(filteredValues)]
 		});
@@ -1838,7 +1838,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 				}
 				return node;
 			})();
-			return ast.createProperty({
+			return ast.factory.createProperty({
 				name: propName,
 				schema: {
 					...schemaNode,
@@ -1852,11 +1852,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 +1884,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 +1905,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 +1919,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 +1932,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 +1947,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 +1957,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 +1973,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 +1990,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 +2133,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 +2151,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 +2239,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 +2254,7 @@ function createSchemaParser(ctx, dialect = oasDialect) {
 				}) || "application/json",
 				...parseEntrySchema(ctx.contentType)
 			});
-			return ast.createResponse({
+			return ast.factory.createResponse({
 				statusCode,
 				description,
 				content
@@ -2268,7 +2268,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(),
@@ -2350,11 +2350,11 @@ function patchDiscriminatorNode(node, entry) {
 	const objectNode = ast.narrowSchema(node, "object");
 	if (!objectNode) return node;
 	const { propertyName, enumValues } = entry;
-	const enumSchema = ast.createSchema({
+	const enumSchema = ast.factory.createSchema({
 		type: "enum",
 		enumValues
 	});
-	const newProp = ast.createProperty({
+	const newProp = ast.factory.createProperty({
 		name: propertyName,
 		required: true,
 		schema: enumSchema
@@ -2439,7 +2439,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 +2513,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 +2561,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 +2602,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 +2766,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 +2775,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