@kubb/ast 5.0.0-beta.31 → 5.0.0-beta.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/ast",
-  "version": "5.0.0-beta.31",
+  "version": "5.0.0-beta.32",
   "description": "Spec-agnostic AST layer for Kubb. Defines the node tree, visitor pattern, factory functions, and type guards used across all code generation plugins.",
   "keywords": [
     "ast",

package/src/dedupe.ts

@@ -101,12 +101,11 @@ export function applyDedupe(node: OperationNode, canonicalBySignature: ReadonlyM
 export function applyDedupe(node: Node, canonicalBySignature: ReadonlyMap<string, DedupeCanonical>, skipRootMatch = false): Node {
   if (canonicalBySignature.size === 0) return node
 
-  const signatures = new Map<SchemaNode, string>()
   const root = node
 
   return transform(node, {
     schema(schemaNode) {
-      const signature = signatureOf(schemaNode, signatures)
+      const signature = signatureOf(schemaNode)
       if (skipRootMatch && schemaNode === root) return undefined
 
       const canonical = canonicalBySignature.get(signature)
@@ -145,7 +144,6 @@ function cleanDefinition(node: SchemaNode, name: string): SchemaNode {
 export function buildDedupePlan(roots: ReadonlyArray<Node>, options: BuildDedupePlanOptions): DedupePlan {
   const { isCandidate, nameFor, refFor, minOccurrences = 2 } = options
 
-  const signatures = new Map<SchemaNode, string>()
   const topLevelNodes = new Set<SchemaNode>()
 
   type Group = {
@@ -156,7 +154,7 @@ export function buildDedupePlan(roots: ReadonlyArray<Node>, options: BuildDedupe
   const groups = new Map<string, Group>()
 
   function record(schemaNode: SchemaNode): void {
-    const signature = signatureOf(schemaNode, signatures)
+    const signature = signatureOf(schemaNode)
     if (!isCandidate(schemaNode)) return
 
     const isTopLevel = topLevelNodes.has(schemaNode) && !!schemaNode.name

package/src/guards.ts

@@ -1,19 +1,4 @@
-import type {
-  FunctionParameterNode,
-  FunctionParametersNode,
-  HttpOperationNode,
-  InputNode,
-  Node,
-  NodeKind,
-  OperationNode,
-  OutputNode,
-  ParameterGroupNode,
-  ParameterNode,
-  PropertyNode,
-  ResponseNode,
-  SchemaNode,
-  SchemaNodeByType,
-} from './nodes/index.ts'
+import type { HttpOperationNode, InputNode, Node, NodeKind, OperationNode, OutputNode, SchemaNode, SchemaNodeByType } from './nodes/index.ts'
 
 /**
  * Narrows a `SchemaNode` to the variant that matches `type`.
@@ -93,33 +78,3 @@ export function isHttpOperationNode(node: OperationNode): node is HttpOperationN
  * ```
  */
 export const isSchemaNode = isKind<SchemaNode>('Schema')
-
-/**
- * Returns `true` when the input is a `PropertyNode`.
- */
-export const isPropertyNode = isKind<PropertyNode>('Property')
-
-/**
- * Returns `true` when the input is a `ParameterNode`.
- */
-export const isParameterNode = isKind<ParameterNode>('Parameter')
-
-/**
- * Returns `true` when the input is a `ResponseNode`.
- */
-export const isResponseNode = isKind<ResponseNode>('Response')
-
-/**
- * Returns `true` when the input is a `FunctionParameterNode`.
- */
-export const isFunctionParameterNode = isKind<FunctionParameterNode>('FunctionParameter')
-
-/**
- * Returns `true` when the input is a `ParameterGroupNode`.
- */
-export const isParameterGroupNode = isKind<ParameterGroupNode>('ParameterGroup')
-
-/**
- * Returns `true` when the input is a `FunctionParametersNode`.
- */
-export const isFunctionParametersNode = isKind<FunctionParametersNode>('FunctionParameters')

package/src/refs.ts

@@ -1,4 +1,3 @@
-import type { InputNode } from './nodes/root.ts'
 import type { SchemaNode } from './nodes/schema.ts'
 
 /**
@@ -19,51 +18,3 @@ export type RefMap = Map<string, SchemaNode>
 export function extractRefName(ref: string): string {
   return ref.split('/').at(-1) ?? ref
 }
-
-/**
- * Builds a `RefMap` from `input.schemas` using each schema's `name`.
- *
- * Unnamed schemas are skipped.
- *
- * @example
- * ```ts
- * const refMap = buildRefMap(input)
- * const pet = refMap.get('Pet')
- * ```
- */
-export function buildRefMap(input: InputNode): RefMap {
-  const map: RefMap = new Map()
-
-  for (const schema of input.schemas) {
-    if (schema.name) {
-      map.set(schema.name, schema)
-    }
-  }
-  return map
-}
-
-/**
- * Resolves a schema by name from a `RefMap`.
- *
- * Returns `null` when the ref is not found.
- *
- * @example
- * ```ts
- * const petSchema = resolveRef(refMap, 'Pet')
- * ```
- */
-export function resolveRef(refMap: RefMap, ref: string): SchemaNode | null {
-  return refMap.get(ref) ?? null
-}
-
-/**
- * Converts a `RefMap` into a plain object.
- *
- * @example
- * ```ts
- * const refsObject = refMapToObject(refMap)
- * ```
- */
-export function refMapToObject(refMap: RefMap): Record<string, SchemaNode> {
-  return Object.fromEntries(refMap)
-}

package/src/signature.ts

@@ -16,90 +16,187 @@ function refTargetName(node: Extract<SchemaNode, { type: 'ref' }>): string {
   return node.name ?? ''
 }
 
+type ScalarField = { kind: 'scalar'; key: string; prefix: string }
+type BoolField = { kind: 'bool'; key: string; prefix: string }
+type ChildField = { kind: 'child'; key: string; prefix: string }
+type ChildrenField = { kind: 'children'; key: string; prefix: string }
+type ObjectPropsField = { kind: 'objectProps' }
+type AdditionalPropsField = { kind: 'additionalProps' }
+type PatternPropsField = { kind: 'patternProps' }
+type EnumValuesField = { kind: 'enumValues' }
+type RefTargetField = { kind: 'refTarget' }
+
+type ShapeField =
+  | ScalarField
+  | BoolField
+  | ChildField
+  | ChildrenField
+  | ObjectPropsField
+  | AdditionalPropsField
+  | PatternPropsField
+  | EnumValuesField
+  | RefTargetField
+
+const arrayTupleFields: ReadonlyArray<ShapeField> = [
+  { kind: 'children', key: 'items', prefix: 'i' },
+  { kind: 'child', key: 'rest', prefix: 'r' },
+  { kind: 'scalar', key: 'min', prefix: 'mn' },
+  { kind: 'scalar', key: 'max', prefix: 'mx' },
+  { kind: 'bool', key: 'unique', prefix: 'u' },
+]
+
+const numericFields: ReadonlyArray<ShapeField> = [
+  { kind: 'scalar', key: 'min', prefix: 'mn' },
+  { kind: 'scalar', key: 'max', prefix: 'mx' },
+  { kind: 'scalar', key: 'exclusiveMinimum', prefix: 'emn' },
+  { kind: 'scalar', key: 'exclusiveMaximum', prefix: 'emx' },
+  { kind: 'scalar', key: 'multipleOf', prefix: 'mo' },
+]
+
+const rangeFields: ReadonlyArray<ShapeField> = [
+  { kind: 'scalar', key: 'min', prefix: 'mn' },
+  { kind: 'scalar', key: 'max', prefix: 'mx' },
+]
+
 /**
- * Builds the local, shape-only descriptor for a node: its kind, flags, constraints, and its
- * children's signatures. {@link signatureOf} hashes this string; children contribute their
- * fixed-length signature rather than their own full descriptor, which keeps the result bounded.
+ * Maps each schema node `type` to the ordered list of shape-contributing fields.
+ * Node types absent from this map (scalar types like boolean, null, any, etc.) fall
+ * back to `${type}|${flags}` with no additional fields.
  */
-function describeShape(node: SchemaNode, signatures: Map<SchemaNode, string>): string {
-  const flags = flagsDescriptor(node)
+const SHAPE_KEYS: Partial<Record<SchemaNode['type'], ReadonlyArray<ShapeField>>> = {
+  object: [
+    { kind: 'objectProps' },
+    { kind: 'additionalProps' },
+    { kind: 'patternProps' },
+    { kind: 'scalar', key: 'minProperties', prefix: 'mn' },
+    { kind: 'scalar', key: 'maxProperties', prefix: 'mx' },
+  ],
+  array: arrayTupleFields,
+  tuple: arrayTupleFields,
+  union: [
+    { kind: 'scalar', key: 'strategy', prefix: 's' },
+    { kind: 'scalar', key: 'discriminatorPropertyName', prefix: 'd' },
+    { kind: 'children', key: 'members', prefix: 'm' },
+  ],
+  intersection: [{ kind: 'children', key: 'members', prefix: 'm' }],
+  enum: [{ kind: 'enumValues' }],
+  ref: [{ kind: 'refTarget' }],
+  string: [
+    { kind: 'scalar', key: 'min', prefix: 'mn' },
+    { kind: 'scalar', key: 'max', prefix: 'mx' },
+    { kind: 'scalar', key: 'pattern', prefix: 'pt' },
+  ],
+  number: numericFields,
+  integer: numericFields,
+  bigint: numericFields,
+  url: [
+    { kind: 'scalar', key: 'path', prefix: 'path' },
+    { kind: 'scalar', key: 'min', prefix: 'mn' },
+    { kind: 'scalar', key: 'max', prefix: 'mx' },
+  ],
+  uuid: rangeFields,
+  email: rangeFields,
+  datetime: [
+    { kind: 'bool', key: 'offset', prefix: 'o' },
+    { kind: 'bool', key: 'local', prefix: 'l' },
+  ],
+  date: [{ kind: 'scalar', key: 'representation', prefix: 'rep' }],
+  time: [{ kind: 'scalar', key: 'representation', prefix: 'rep' }],
+}
 
-  switch (node.type) {
-    case 'object': {
-      const props = (node.properties ?? []).map((prop) => `${prop.name}${prop.required ? '!' : '?'}${signatureOf(prop.schema, signatures)}`).join(',')
-      let additional = ''
-      if (typeof node.additionalProperties === 'boolean') {
-        additional = `ab:${node.additionalProperties}`
-      } else if (node.additionalProperties) {
-        additional = `as:${signatureOf(node.additionalProperties, signatures)}`
-      }
-      const pattern = node.patternProperties
-        ? Object.keys(node.patternProperties)
-            .sort()
-            .map((key) => `${key}=${signatureOf(node.patternProperties![key]!, signatures)}`)
-            .join(',')
-        : ''
-      return `object|${flags}|p[${props}]|${additional}|pp[${pattern}]|mn:${node.minProperties ?? ''}|mx:${node.maxProperties ?? ''}`
+function serializeShapeField(field: ShapeField, node: SchemaNode, record: Record<string, unknown>): string {
+  switch (field.kind) {
+    case 'scalar':
+      return `${field.prefix}:${record[field.key] ?? ''}`
+    case 'bool':
+      return `${field.prefix}:${record[field.key] ? 1 : 0}`
+    case 'child': {
+      const child = record[field.key] as SchemaNode | undefined
+      return `${field.prefix}:${child ? signatureOf(child) : ''}`
     }
-    case 'array':
-    case 'tuple': {
-      const items = (node.items ?? []).map((item) => signatureOf(item, signatures)).join(',')
-      const rest = node.rest ? signatureOf(node.rest, signatures) : ''
-      return `${node.type}|${flags}|i[${items}]|r:${rest}|mn:${node.min ?? ''}|mx:${node.max ?? ''}|u:${node.unique ? 1 : 0}`
+    case 'children': {
+      const children = (record[field.key] as Array<SchemaNode> | undefined) ?? []
+      return `${field.prefix}[${children.map((c) => signatureOf(c)).join(',')}]`
     }
-    case 'union': {
-      const members = (node.members ?? []).map((member) => signatureOf(member, signatures)).join(',')
-      return `union|${flags}|s:${node.strategy ?? ''}|d:${node.discriminatorPropertyName ?? ''}|m[${members}]`
+    case 'objectProps': {
+      const obj = node as Extract<SchemaNode, { type: 'object' }>
+      const props = (obj.properties ?? []).map((prop) => `${prop.name}${prop.required ? '!' : '?'}${signatureOf(prop.schema)}`).join(',')
+      return `p[${props}]`
     }
-    case 'intersection': {
-      const members = (node.members ?? []).map((member) => signatureOf(member, signatures)).join(',')
-      return `intersection|${flags}|m[${members}]`
+    case 'additionalProps': {
+      const obj = node as Extract<SchemaNode, { type: 'object' }>
+      if (typeof obj.additionalProperties === 'boolean') return `ab:${obj.additionalProperties}`
+      if (obj.additionalProperties) return `as:${signatureOf(obj.additionalProperties)}`
+      return ''
     }
-    case 'enum': {
+    case 'patternProps': {
+      const obj = node as Extract<SchemaNode, { type: 'object' }>
+      const pattern = obj.patternProperties
+        ? Object.keys(obj.patternProperties)
+            .sort()
+            .map((key) => `${key}=${signatureOf(obj.patternProperties![key]!)}`)
+            .join(',')
+        : ''
+      return `pp[${pattern}]`
+    }
+    case 'enumValues': {
+      const en = node as Extract<SchemaNode, { type: 'enum' }>
       let values = ''
-      if (node.namedEnumValues?.length) {
-        values = node.namedEnumValues.map((entry) => `${entry.name}=${entry.primitive}:${String(entry.value)}`).join(',')
-      } else if (node.enumValues?.length) {
-        values = node.enumValues.map((value) => `${value === null ? 'null' : typeof value}:${String(value)}`).join(',')
+      if (en.namedEnumValues?.length) {
+        values = en.namedEnumValues.map((entry) => `${entry.name}=${entry.primitive}:${String(entry.value)}`).join(',')
+      } else if (en.enumValues?.length) {
+        values = en.enumValues.map((value) => `${value === null ? 'null' : typeof value}:${String(value)}`).join(',')
       }
-      return `enum|${flags}|v[${values}]`
+      return `v[${values}]`
+    }
+    case 'refTarget': {
+      return `->${refTargetName(node as Extract<SchemaNode, { type: 'ref' }>)}`
     }
-    case 'ref':
-      return `ref|${flags}|->${refTargetName(node)}`
-    case 'string':
-      return `string|${flags}|mn:${node.min ?? ''}|mx:${node.max ?? ''}|pt:${node.pattern ?? ''}`
-    case 'number':
-    case 'integer':
-    case 'bigint':
-      return `${node.type}|${flags}|mn:${node.min ?? ''}|mx:${node.max ?? ''}|emn:${node.exclusiveMinimum ?? ''}|emx:${node.exclusiveMaximum ?? ''}|mo:${node.multipleOf ?? ''}`
-    case 'url':
-      return `url|${flags}|path:${node.path ?? ''}|mn:${node.min ?? ''}|mx:${node.max ?? ''}`
-    case 'uuid':
-    case 'email':
-      return `${node.type}|${flags}|mn:${node.min ?? ''}|mx:${node.max ?? ''}`
-    case 'datetime':
-      return `datetime|${flags}|o:${node.offset ? 1 : 0}|l:${node.local ? 1 : 0}`
-    case 'date':
-    case 'time':
-      return `${node.type}|${flags}|rep:${node.representation}`
-    default:
-      return `${node.type}|${flags}`
   }
 }
 
+/**
+ * Builds the local, shape-only descriptor for a node: its kind, flags, constraints, and its
+ * children's signatures. {@link signatureOf} hashes this string; children contribute their
+ * fixed-length signature rather than their own full descriptor, which keeps the result bounded.
+ */
+function describeShape(node: SchemaNode): string {
+  const flags = flagsDescriptor(node)
+  const fields = SHAPE_KEYS[node.type]
+  if (!fields) return `${node.type}|${flags}`
+
+  const record = node as unknown as Record<string, unknown>
+  const parts: Array<string> = [`${node.type}|${flags}`]
+  for (const field of fields) {
+    parts.push(serializeShapeField(field, node, record))
+  }
+  return parts.join('|')
+}
+
+/**
+ * Persistent hash-consing cache: `SchemaNode` → signature digest, keyed by node identity.
+ *
+ * A `WeakMap` so entries are released once the node is garbage-collected, and so a node hashed
+ * during dedupe planning is not re-hashed when the same tree is rewritten during streaming
+ * (where `schemaSignature` and `applyDedupe` would otherwise each walk it from scratch). Reuse
+ * across calls is sound because a signature depends only on a node's content, and schema nodes
+ * are immutable once created — transforms allocate new objects rather than mutating in place.
+ */
+const signatureCache = new WeakMap<SchemaNode, string>()
+
 /**
  * Hash-consing: each node's signature is a fixed-length digest of its local shape plus its
  * children's digests (a Merkle hash). Children contribute their 64-char hash instead of their
  * full nested descriptor, so a signature stays bounded regardless of subtree depth, and the
  * digest is identical across calls because it depends only on content — never on traversal
  * order. This keeps the keys built during planning consistent with the ones recomputed later
- * during streaming. `signatures` memoizes node → digest within a single computation.
+ * during streaming. {@link signatureCache} memoizes node → digest across every computation.
  */
-export function signatureOf(node: SchemaNode, signatures: Map<SchemaNode, string>): string {
-  const cached = signatures.get(node)
+export function signatureOf(node: SchemaNode): string {
+  const cached = signatureCache.get(node)
   if (cached !== undefined) return cached
-  const signature = createHash('sha256').update(describeShape(node, signatures)).digest('hex')
-  signatures.set(node, signature)
+  const signature = createHash('sha256').update(describeShape(node)).digest('hex')
+  signatureCache.set(node, signature)
   return signature
 }
 
@@ -119,7 +216,7 @@ export function signatureOf(node: SchemaNode, signatures: Map<SchemaNode, string
  * ```
  */
 export function schemaSignature(node: SchemaNode): string {
-  return signatureOf(node, new Map())
+  return signatureOf(node)
 }
 
 /**