@kubb/ast 5.0.0-alpha.32 → 5.0.0-alpha.34

package/src/nodes/code.ts

@@ -14,7 +14,7 @@ export type JSDocNode = {
 /**
  * AST node representing a TypeScript `const` declaration.
  *
- * Mirrors the props of the `Const` component from `@kubb/react-fabric`.
+ * Mirrors the props of the `Const` component from `@kubb/renderer-jsx`.
  * The `children` prop of the component is represented as `nodes`.
  *
  * @example
@@ -53,15 +53,15 @@ export type ConstNode = BaseNode & {
   asConst?: boolean
   /**
    * Child nodes representing the value of the constant (children of the `Const` component).
-   * Each entry is either a structured {@link CodeNode} or a raw string expression.
+   * Each entry is a {@link CodeNode}; use {@link TextNode} for raw string content.
    */
-  nodes?: Array<CodeNode | string>
+  nodes?: Array<CodeNode>
 }
 
 /**
  * AST node representing a TypeScript `type` alias declaration.
  *
- * Mirrors the props of the `Type` component from `@kubb/react-fabric`.
+ * Mirrors the props of the `Type` component from `@kubb/renderer-jsx`.
  * The `children` prop of the component is represented as `nodes`.
  *
  * @example
@@ -90,9 +90,9 @@ export type TypeNode = BaseNode & {
   JSDoc?: JSDocNode
   /**
    * Child nodes representing the type body (children of the `Type` component).
-   * Each entry is either a structured {@link CodeNode} or a raw string expression.
+   * Each entry is a {@link CodeNode}; use {@link TextNode} for raw string content.
    */
-  nodes?: Array<CodeNode | string>
+  nodes?: Array<CodeNode>
 }
 
 /**
@@ -104,7 +104,7 @@ export type TypeDeclarationNode = TypeNode
 /**
  * AST node representing a TypeScript `function` declaration.
  *
- * Mirrors the props of the `Function` component from `@kubb/react-fabric`.
+ * Mirrors the props of the `Function` component from `@kubb/renderer-jsx`.
  * The `children` prop of the component is represented as `nodes`.
  *
  * @example
@@ -157,15 +157,15 @@ export type FunctionNode = BaseNode & {
   JSDoc?: JSDocNode
   /**
    * Child nodes representing the function body (children of the `Function` component).
-   * Each entry is either a structured {@link CodeNode} or a raw string statement.
+   * Each entry is a {@link CodeNode}; use {@link TextNode} for raw string content.
    */
-  nodes?: Array<CodeNode | string>
+  nodes?: Array<CodeNode>
 }
 
 /**
  * AST node representing a TypeScript arrow function (`const name = () => { ... }`).
  *
- * Mirrors the props of the `Function.Arrow` component from `@kubb/react-fabric`.
+ * Mirrors the props of the `Function.Arrow` component from `@kubb/renderer-jsx`.
  * The `children` prop of the component is represented as `nodes`.
  *
  * @example
@@ -223,15 +223,82 @@ export type ArrowFunctionNode = BaseNode & {
   singleLine?: boolean
   /**
    * Child nodes representing the function body (children of the `Function.Arrow` component).
-   * Each entry is either a structured {@link CodeNode} or a raw string statement.
+   * Each entry is a {@link CodeNode}; use {@link TextNode} for raw string content.
    */
-  nodes?: Array<CodeNode | string>
+  nodes?: Array<CodeNode>
+}
+
+/**
+ * AST node representing a raw text/string fragment in the source output.
+ *
+ * Used instead of bare `string` values so that all entries in `nodes` arrays
+ * are typed `CodeNode` objects rather than a mixed `CodeNode | string` union.
+ *
+ * @example
+ * ```ts
+ * createText('return fetch(id)')
+ * // { kind: 'Text', value: 'return fetch(id)' }
+ * ```
+ */
+export type TextNode = BaseNode & {
+  /**
+   * Node kind.
+   */
+  kind: 'Text'
+  /**
+   * The raw string content.
+   */
+  value: string
+}
+
+/**
+ * AST node representing a line break in the source output.
+ *
+ * Corresponds to `<br/>` in JSX components. When printed, produces an empty
+ * string that — joined with `\n` by `printNodes` — creates a blank line
+ * between surrounding code nodes.
+ *
+ * @example
+ * ```ts
+ * createBreak()
+ * // { kind: 'Break' }
+ * // prints as '' → blank line when surrounded by other nodes
+ * ```
+ */
+export type BreakNode = BaseNode & {
+  /**
+   * Node kind.
+   */
+  kind: 'Break'
+}
+
+/**
+ * AST node representing a raw JSX fragment in the source output.
+ *
+ * Mirrors the `Jsx` component from `@kubb/renderer-jsx`. Use this to embed raw
+ * JSX/TSX markup (including fragments `<>…</>`) directly in generated code.
+ *
+ * @example
+ * ```ts
+ * createJsx('<>\n  <a href={href}>Open</a>\n</>')
+ * // { kind: 'Jsx', value: '<>\n  <a href={href}>Open</a>\n</>' }
+ * ```
+ */
+export type JsxNode = BaseNode & {
+  /**
+   * Node kind.
+   */
+  kind: 'Jsx'
+  /**
+   * The raw JSX string content.
+   */
+  value: string
 }
 
 /**
  * Union of all code-generation AST nodes.
  *
- * These nodes mirror the JSX components from `@kubb/react-fabric` and are used as
+ * These nodes mirror the JSX components from `@kubb/renderer-jsx` and are used as
  * structured children in {@link SourceNode.nodes}.
  */
-export type CodeNode = ConstNode | TypeNode | FunctionNode | ArrowFunctionNode
+export type CodeNode = ConstNode | TypeNode | FunctionNode | ArrowFunctionNode | TextNode | BreakNode | JsxNode

package/src/nodes/file.ts

@@ -121,12 +121,12 @@ export type ExportNode = BaseNode & {
  *
  * @example Named exportable source
  * ```ts
- * createSource({ name: 'Pet', value: 'export type Pet = { id: number }', isExportable: true, isIndexable: true })
+ * createSource({ name: 'Pet', nodes: [createText('export type Pet = { id: number }')], isExportable: true, isIndexable: true })
  * ```
  *
  * @example Inline unnamed code block
  * ```ts
- * createSource({ value: 'const x = 1' })
+ * createSource({ nodes: [createText('const x = 1')] })
  * ```
  */
 export type SourceNode = BaseNode & {
@@ -135,10 +135,6 @@ export type SourceNode = BaseNode & {
    * Optional name identifying this source (used for deduplication and barrel generation).
    */
   name?: string
-  /**
-   * The source code value.
-   */
-  value?: string
   /**
    * Mark this source as a type-only export.
    * @default false
@@ -155,9 +151,8 @@ export type SourceNode = BaseNode & {
    */
   isIndexable?: boolean
   /**
-   * Structured child nodes representing the content of this source fragment.
-   * These correspond to the children of the `File.Source` component from `@kubb/react-fabric`
-   * (e.g. `ConstNode`, `TypeDeclarationNode`, `FunctionDeclarationNode`, `ArrowFunctionDeclarationNode`).
+   * Structured child nodes representing the content of this source fragment, in DOM order.
+   * Each entry is a {@link CodeNode}; use {@link TextNode} for raw string content.
    */
   nodes?: Array<CodeNode>
 }
@@ -173,7 +168,7 @@ export type SourceNode = BaseNode & {
  * const file = createFile({
  *   baseName: 'petStore.ts',
  *   path: 'src/models/petStore.ts',
- *   sources: [createSource({ name: 'Pet', value: 'export type Pet = { id: number }', isExportable: true })],
+ *   sources: [createSource({ name: 'Pet', nodes: [createText('export type Pet = { id: number }')], isExportable: true })],
  *   imports: [createImport({ name: ['z'], path: 'zod' })],
  *   exports: [createExport({ name: ['Pet'], path: './petStore' })],
  * })

package/src/nodes/index.ts

@@ -10,7 +10,7 @@ import type { InputNode } from './root.ts'
 import type { SchemaNode } from './schema.ts'
 
 export type { BaseNode, NodeKind } from './base.ts'
-export type { ArrowFunctionNode, CodeNode, ConstNode, FunctionNode, JSDocNode, TypeDeclarationNode, TypeNode } from './code.ts'
+export type { ArrowFunctionNode, BreakNode, CodeNode, ConstNode, FunctionNode, JSDocNode, JsxNode, TextNode, TypeDeclarationNode, TypeNode } from './code.ts'
 export type { ExportNode, FileNode, ImportNode, SourceNode } from './file.ts'
 export type { FunctionNodeType, FunctionParameterNode, FunctionParametersNode, FunctionParamNode, ParameterGroupNode, ParamsTypeNode } from './function.ts'
 export type { HttpStatusCode, MediaType, StatusCode } from './http.ts'

package/src/types.ts

@@ -5,6 +5,7 @@ export type {
   ArraySchemaNode,
   ArrowFunctionNode,
   BaseNode,
+  BreakNode,
   CodeNode,
   ComplexSchemaType,
   ConstNode,
@@ -29,6 +30,7 @@ export type {
   Ipv4SchemaNode,
   Ipv6SchemaNode,
   JSDocNode,
+  JsxNode,
   MediaType,
   Node,
   NodeKind,
@@ -53,6 +55,7 @@ export type {
   SpecialSchemaType,
   StatusCode,
   StringSchemaNode,
+  TextNode,
   TimeSchemaNode,
   TypeDeclarationNode,
   TypeNode,

package/src/utils.ts

@@ -3,6 +3,7 @@ import { camelCase, isValidVarName } from '@internals/utils'
 import { createFunctionParameter, createFunctionParameters, createParameterGroup, createParamsType, createProperty, createSchema } from './factory.ts'
 import { narrowSchema } from './guards.ts'
 import type {
+  CodeNode,
   ExportNode,
   FunctionParameterNode,
   FunctionParametersNode,
@@ -470,7 +471,8 @@ function toStructType({
 }
 
 function sourceKey(source: SourceNode): string {
-  return `${source.name ?? source.value ?? ''}:${source.isExportable ?? false}:${source.isTypeOnly ?? false}`
+  const nameKey = source.name ?? extractStringsFromNodes(source.nodes)
+  return `${nameKey}:${source.isExportable ?? false}:${source.isTypeOnly ?? false}`
 }
 
 function pathTypeKey(path: string, isTypeOnly: boolean | undefined): string {
@@ -500,7 +502,7 @@ function sortKey(node: { name?: string | Array<unknown>; isTypeOnly?: boolean; p
 /**
  * Deduplicates an array of `SourceNode` objects.
  * Named sources are deduplicated by `name + isExportable + isTypeOnly`.
- * Unnamed sources are deduplicated by `value`.
+ * Unnamed sources are deduplicated by object reference.
  */
 export function combineSources(sources: Array<SourceNode>): Array<SourceNode> {
   const seen = new Map<string, SourceNode>()
@@ -607,3 +609,32 @@ export function combineImports(imports: Array<ImportNode>, exports: Array<Export
 
   return result
 }
+
+/**
+ * Recursively extracts all string content embedded in a {@link CodeNode} tree.
+ *
+ * Includes text node values, and string attribute fields (`params`, `generics`,
+ * `returnType`, `type`) that may reference identifiers needing imports.
+ * Used by `createFile` to build the full source string for import filtering.
+ */
+export function extractStringsFromNodes(nodes: Array<CodeNode> | undefined): string {
+  if (!nodes?.length) return ''
+  return nodes
+    .map((node) => {
+      // Backward-compat: compiled plugins may still pass bare strings at runtime
+      if (typeof node === 'string') return node as string
+      if (node.kind === 'Text') return node.value
+      if (node.kind === 'Break') return ''
+      if (node.kind === 'Jsx') return node.value
+      const parts: string[] = []
+      if ('params' in node && node.params) parts.push(node.params)
+      if ('generics' in node && node.generics) parts.push(Array.isArray(node.generics) ? node.generics.join(', ') : node.generics)
+      if ('returnType' in node && node.returnType) parts.push(node.returnType)
+      if ('type' in node && typeof node.type === 'string') parts.push(node.type)
+      const nested = extractStringsFromNodes(node.nodes)
+      if (nested) parts.push(nested)
+      return parts.join('\n')
+    })
+    .filter(Boolean)
+    .join('\n')
+}