@kubb/adapter-oas 5.0.0-alpha.24 → 5.0.0-alpha.26

package/dist/index.js

@@ -70,7 +70,8 @@ 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`, `ipv6`, and `hostname` map to `'url'` as the closest supported scalar.
+* 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
 * ```ts
@@ -88,8 +89,8 @@ const formatMap = {
 	uri: "url",
 	"uri-reference": "url",
 	url: "url",
-	ipv4: "url",
-	ipv6: "url",
+	ipv4: "ipv4",
+	ipv6: "ipv6",
 	hostname: "url",
 	"idn-hostname": "url",
 	binary: "blob",
@@ -528,10 +529,11 @@ async function parseDocument(pathOrApi, { canBundle = true, enablePaths = true }
 * ```
 */
 async function mergeDocuments(pathOrApi) {
-	const documents = await Promise.all(pathOrApi.map((p) => parseDocument(p, {
+	const documents = [];
+	for (const p of pathOrApi) documents.push(await parseDocument(p, {
 		enablePaths: false,
 		canBundle: false
-	})));
+	}));
 	if (documents.length === 0) throw new Error("No OAS documents provided for merging.");
 	const seed = {
 		openapi: MERGE_OPENAPI_VERSION,
@@ -997,21 +999,35 @@ function normalizeArrayEnum(schema) {
 function createSchemaParser(ctx) {
 	const document = ctx.document;
 	/**
+	* Tracks `$ref` paths that are currently being resolved to prevent infinite
+	* recursion when schemas contain circular references (e.g. `Pet → parent → Pet`).
+	*/
+	const resolvingRefs = /* @__PURE__ */ new Set();
+	/**
 	* Converts a `$ref` schema into a `RefSchemaNode`.
+	*
+	* The resolved schema is stored in `node.schema`. Usage-site sibling fields
+	* (description, readOnly, nullable, etc.) are stored directly on the ref node.
+	* Use `syncSchemaRef(node)` in printers to get a merged view of both.
+	* Circular refs are detected via `resolvingRefs` and leave `schema` as `undefined`.
 	*/
-	function convertRef({ schema, nullable, defaultValue }) {
+	function convertRef({ schema, name, nullable, defaultValue, rawOptions }) {
+		let resolvedSchema;
+		const refPath = schema.$ref;
+		if (refPath && !resolvingRefs.has(refPath)) try {
+			const referenced = resolveRef(document, refPath);
+			if (referenced) {
+				resolvingRefs.add(refPath);
+				resolvedSchema = parseSchema({ schema: referenced }, rawOptions);
+				resolvingRefs.delete(refPath);
+			}
+		} catch {}
 		return createSchema({
+			...buildSchemaNode(schema, name, nullable, defaultValue),
 			type: "ref",
 			name: extractRefName(schema.$ref),
 			ref: schema.$ref,
-			nullable,
-			description: schema.description,
-			deprecated: schema.deprecated,
-			readOnly: schema.readOnly,
-			writeOnly: schema.writeOnly,
-			pattern: schema.type === "string" ? schema.pattern : void 0,
-			example: schema.example,
-			default: defaultValue
+			schema: resolvedSchema
 		});
 	}
 	/**
@@ -1219,7 +1235,26 @@ function createSchemaParser(ctx) {
 		if (specialType === "url") return createSchema({
 			...base,
 			primitive: "string",
-			type: "url"
+			type: "url",
+			min: schema.minLength,
+			max: schema.maxLength
+		});
+		if (specialType === "ipv4") return createSchema({
+			...base,
+			primitive: "string",
+			type: "ipv4"
+		});
+		if (specialType === "ipv6") return createSchema({
+			...base,
+			primitive: "string",
+			type: "ipv6"
+		});
+		if (specialType === "uuid" || specialType === "email") return createSchema({
+			...base,
+			primitive: "string",
+			type: specialType,
+			min: schema.minLength,
+			max: schema.maxLength
 		});
 		return createSchema({
 			...base,
@@ -1305,7 +1340,7 @@ function createSchemaParser(ctx) {
 		let additionalPropertiesNode;
 		if (additionalProperties === true) additionalPropertiesNode = true;
 		else if (additionalProperties && Object.keys(additionalProperties).length > 0) additionalPropertiesNode = parseSchema({ schema: additionalProperties }, rawOptions);
-		else if (additionalProperties === false) additionalPropertiesNode = void 0;
+		else if (additionalProperties === false) additionalPropertiesNode = false;
 		else if (additionalProperties) additionalPropertiesNode = 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 ? createSchema({ type: typeOptionMap.get(options.unknownType) }) : parseSchema({ schema: patternSchema }, rawOptions)])) : void 0;
@@ -1315,6 +1350,8 @@ function createSchemaParser(ctx) {
 			properties,
 			additionalProperties: additionalPropertiesNode,
 			patternProperties,
+			minProperties: schema.minProperties,
+			maxProperties: schema.maxProperties,
 			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
 		if (isDiscriminator(schema) && schema.discriminator.mapping) {
@@ -1385,6 +1422,7 @@ function createSchemaParser(ctx) {
 			max: schema.maximum,
 			exclusiveMinimum: typeof schema.exclusiveMinimum === "number" ? schema.exclusiveMinimum : void 0,
 			exclusiveMaximum: typeof schema.exclusiveMaximum === "number" ? schema.exclusiveMaximum : void 0,
+			multipleOf: schema.multipleOf,
 			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
 	}