@kubb/ast 5.12.8 → 5.13.0

package/dist/index.cjs

@@ -241,24 +241,26 @@ function isNodeRecord(value) {
 * // returns parameters, the request body, and responses
 * ```
 */
-function* getChildren(node, recurse) {
+function getChildren(node, recurse) {
+	const children = [];
 	const keys = node.kind === "Schema" && !recurse ? void 0 : VISITOR_KEYS[node.kind];
-	if (!keys) return;
+	if (!keys) return children;
 	const record = node;
 	for (const key of keys) {
 		const value = record[key];
 		if (Array.isArray(value)) {
-			for (const item of value) if (isNode(item)) yield item;
+			for (const item of value) if (isNode(item)) children.push(item);
 			continue;
 		}
 		if (isNode(value)) {
-			yield value;
+			children.push(value);
 			continue;
 		}
 		if (isNodeRecord(value)) {
-			for (const item of Object.values(value)) if (isNode(item)) yield item;
+			for (const item of Object.values(value)) if (isNode(item)) children.push(item);
 		}
 	}
+	return children;
 }
 /**
 * Runs the visitor callback that matches `node.kind` with the traversal
@@ -395,7 +397,15 @@ function* collectNode(node, visitor, recurse, parent) {
 * ```
 */
 function collectSync(node, options) {
-	return Array.from(collect(node, options));
+	const { depth, parent, ...visitor } = options;
+	const result = [];
+	collectInto(node, visitor, (depth ?? "deep") === "deep", parent, result);
+	return result;
+}
+function collectInto(node, visitor, recurse, parent, result) {
+	const v = applyVisitor(node, visitor, parent);
+	if (v != null) result.push(v);
+	for (const child of getChildren(node, recurse)) collectInto(child, visitor, recurse, node, result);
 }
 //#endregion
 //#region src/defineMacro.ts
@@ -634,6 +644,14 @@ function resolveRefName(node) {
 	if (node.ref) return refName(node.ref);
 	return node.name ?? node.schema?.name ?? null;
 }
+/** Fields of a ref node that describe the ref itself, so they never override the resolved schema. */
+const REF_OWN_KEYS = /* @__PURE__ */ new Set([
+	"kind",
+	"type",
+	"name",
+	"ref",
+	"schema"
+]);
 /**
 * Merges a ref node with its resolved schema, giving the fields set at the usage site precedence.
 *
@@ -650,12 +668,12 @@ function resolveRefName(node) {
 */
 function mergeRefWithSchema(node) {
 	if (!node.schema) return node;
-	const { kind: _kind, type: _type, name: _name, ref: _ref, schema: _schema, ...overrides } = node;
-	const definedOverrides = Object.fromEntries(Object.entries(overrides).filter(([, value]) => value !== void 0));
-	return {
-		...node.schema,
-		...definedOverrides
-	};
+	const merged = { ...node.schema };
+	for (const key of Object.keys(node)) {
+		const value = node[key];
+		if (value !== void 0 && !REF_OWN_KEYS.has(key)) merged[key] = value;
+	}
+	return merged;
 }
 /**
 * Returns `true` when a schema is a bare ref without modifiers, metadata, or omit keys.
@@ -1109,16 +1127,23 @@ function mergeByPath(result) {
 	return ({ node, names }) => {
 		const key = `${node.path}:${node.isTypeOnly ?? false}`;
 		const existing = byPath.get(key);
-		if (existing && Array.isArray(existing.name)) {
-			existing.name = [.../* @__PURE__ */ new Set([...existing.name, ...names])];
+		if (existing) {
+			for (const name of names) {
+				if (existing.seen.has(name)) continue;
+				existing.seen.add(name);
+				existing.names.push(name);
+			}
 			return;
 		}
 		const item = {
 			...node,
-			name: names
+			name: [...names]
 		};
 		result.push(item);
-		byPath.set(key, item);
+		byPath.set(key, {
+			names: item.name,
+			seen: new Set(names)
+		});
 	};
 }
 /**