@reckona/mreact-compiler 0.0.82 → 0.0.83

package/dist/types.d.ts

@@ -1,8 +1,9 @@
-export type CompileTarget = "client" | "server";
-export type ServerOutputMode = "string" | "stream";
-export type ServerBootstrapMode = "none" | "out-of-order-reorder";
+import type { ClientReferenceMetadata as SharedClientReferenceMetadata, CompileTarget as SharedCompileTarget, CompilerFrontend as SharedCompilerFrontend, ComponentMetadata as SharedComponentMetadata, Diagnostic as SharedDiagnostic, DiagnosticSuggestion as SharedDiagnosticSuggestion, EventHydrationEntryMetadata as SharedEventHydrationEntryMetadata, EventHydrationManifestMetadata as SharedEventHydrationManifestMetadata, ModuleMetadata as SharedModuleMetadata, RuntimeImport as SharedRuntimeImport, ServerBootstrapMode as SharedServerBootstrapMode, ServerOutputMode as SharedServerOutputMode, SourceLocation as SharedSourceLocation, TransformOutput as SharedTransformOutput } from "@reckona/mreact-shared/compiler-contract";
+export type CompileTarget = SharedCompileTarget;
+export type ServerOutputMode = SharedServerOutputMode;
+export type ServerBootstrapMode = SharedServerBootstrapMode;
 export type ParserMode = "oxc";
-export type CompilerFrontend = "oxc";
+export type CompilerFrontend = SharedCompilerFrontend;
 export type BodyStatementJsxMode = "dom-node" | "compat-object" | "server-string" | "unsupported";
 export interface AnalyzeModuleOptions {
     topLevelJsx?: "diagnostic" | "compat-object" | "server-string";
@@ -35,69 +36,15 @@ export interface ServerEscapeOptions {
     batchImportName: string;
     batchImportSource: string;
 }
-export interface TransformOutput {
-    code: string;
-    map?: string | null;
-    diagnostics: Diagnostic[];
-    metadata: ModuleMetadata;
-}
-export interface Diagnostic {
-    level: "info" | "warn" | "error";
-    code: string;
-    message: string;
-    loc?: SourceLocation;
-    suggestion?: DiagnosticSuggestion;
-}
-export interface DiagnosticSuggestion {
-    title: string;
-    replacement?: string;
-    link?: string;
-}
-export interface SourceLocation {
-    line: number;
-    column: number;
-}
-export interface ModuleMetadata {
-    filename: string;
-    target: CompileTarget;
-    compiler: CompilerMetadata;
-    serverOutput?: ServerOutputMode;
-    serverBootstrap?: ServerBootstrapMode;
-    serverBootstrapNonce?: string;
-    serverBootstrapSrc?: string;
-    serverHydration?: boolean;
-    reactSuspenseRevealScriptSrc?: string;
-    components: ComponentMetadata[];
-    imports: RuntimeImport[];
-    clientReferences?: string[];
-    clientReferenceManifest?: ClientReferenceMetadata[];
-    serverReferences?: string[];
-    eventHydrationManifest?: EventHydrationManifestMetadata;
-}
-export interface CompilerMetadata {
-    frontend: CompilerFrontend;
-    typescriptFallback: boolean;
-}
-export interface ClientReferenceMetadata {
-    name: string;
-    moduleId: string;
-    exportName: string;
-}
-export interface ComponentMetadata {
-    name: string;
-    exportName: string;
-}
-export interface RuntimeImport {
-    source: string;
-    specifiers: string[];
-}
-export interface EventHydrationManifestMetadata {
-    version: 1;
-    events: EventHydrationEntryMetadata[];
-}
-export interface EventHydrationEntryMetadata {
-    id: string;
-    event: string;
-    handler: string;
-}
+export type TransformOutput = SharedTransformOutput;
+export type Diagnostic = SharedDiagnostic;
+export type DiagnosticSuggestion = SharedDiagnosticSuggestion;
+export type SourceLocation = SharedSourceLocation;
+export type ModuleMetadata = SharedModuleMetadata;
+export type CompilerMetadata = SharedModuleMetadata["compiler"];
+export type ClientReferenceMetadata = SharedClientReferenceMetadata;
+export type ComponentMetadata = SharedComponentMetadata;
+export type RuntimeImport = SharedRuntimeImport;
+export type EventHydrationManifestMetadata = SharedEventHydrationManifestMetadata;
+export type EventHydrationEntryMetadata = SharedEventHydrationEntryMetadata;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["export type CompileTarget = \"client\" | \"server\";\nexport type ServerOutputMode = \"string\" | \"stream\";\nexport type ServerBootstrapMode = \"none\" | \"out-of-order-reorder\";\nexport type ParserMode = \"oxc\";\nexport type CompilerFrontend = \"oxc\";\n\nexport type BodyStatementJsxMode = \"dom-node\" | \"compat-object\" | \"server-string\" | \"unsupported\";\n\nexport interface AnalyzeModuleOptions {\n  topLevelJsx?: \"diagnostic\" | \"compat-object\" | \"server-string\";\n  bodyStatementJsx?: BodyStatementJsxMode;\n  serverOutput?: ServerOutputMode;\n  awaitCompatComponents?: \"diagnostic\" | \"lower\";\n  clientBoundaryImports?: readonly string[];\n  compatReactNodeReturn?: boolean;\n  compatReactNodeReturnRenderMode?: \"react-node\";\n}\n\nexport interface TransformInput {\n  code: string;\n  filename: string;\n  target: CompileTarget;\n  dev: boolean;\n  sourceMap?: boolean;\n  mode?: \"auto\" | \"reactive\" | \"compat\";\n  parser?: ParserMode;\n  serverOutput?: ServerOutputMode;\n  serverBootstrap?: ServerBootstrapMode;\n  serverBootstrapNonce?: string;\n  serverBootstrapSrc?: string;\n  serverHydration?: boolean;\n  serverAwaitHydration?: boolean;\n  clientBoundaryImports?: readonly string[];\n  serverEscape?: ServerEscapeOptions;\n  reactSuspenseRevealScriptSrc?: string;\n}\n\nexport interface ServerEscapeOptions {\n  batchImportName: string;\n  batchImportSource: string;\n}\n\nexport interface TransformOutput {\n  code: string;\n  map?: string | null;\n  diagnostics: Diagnostic[];\n  metadata: ModuleMetadata;\n}\n\nexport interface Diagnostic {\n  level: \"info\" | \"warn\" | \"error\";\n  code: string;\n  message: string;\n  loc?: SourceLocation;\n  suggestion?: DiagnosticSuggestion;\n}\n\nexport interface DiagnosticSuggestion {\n  title: string;\n  replacement?: string;\n  link?: string;\n}\n\nexport interface SourceLocation {\n  line: number;\n  column: number;\n}\n\nexport interface ModuleMetadata {\n  filename: string;\n  target: CompileTarget;\n  compiler: CompilerMetadata;\n  serverOutput?: ServerOutputMode;\n  serverBootstrap?: ServerBootstrapMode;\n  serverBootstrapNonce?: string;\n  serverBootstrapSrc?: string;\n  serverHydration?: boolean;\n  reactSuspenseRevealScriptSrc?: string;\n  components: ComponentMetadata[];\n  imports: RuntimeImport[];\n  clientReferences?: string[];\n  clientReferenceManifest?: ClientReferenceMetadata[];\n  serverReferences?: string[];\n  eventHydrationManifest?: EventHydrationManifestMetadata;\n}\n\nexport interface CompilerMetadata {\n  frontend: CompilerFrontend;\n  typescriptFallback: boolean;\n}\n\nexport interface ClientReferenceMetadata {\n  name: string;\n  moduleId: string;\n  exportName: string;\n}\n\nexport interface ComponentMetadata {\n  name: string;\n  exportName: string;\n}\n\nexport interface RuntimeImport {\n  source: string;\n  specifiers: string[];\n}\n\nexport interface EventHydrationManifestMetadata {\n  version: 1;\n  events: EventHydrationEntryMetadata[];\n}\n\nexport interface EventHydrationEntryMetadata {\n  id: string;\n  event: string;\n  handler: string;\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  ClientReferenceMetadata as SharedClientReferenceMetadata,\n  CompileTarget as SharedCompileTarget,\n  CompilerFrontend as SharedCompilerFrontend,\n  ComponentMetadata as SharedComponentMetadata,\n  Diagnostic as SharedDiagnostic,\n  DiagnosticSuggestion as SharedDiagnosticSuggestion,\n  EventHydrationEntryMetadata as SharedEventHydrationEntryMetadata,\n  EventHydrationManifestMetadata as SharedEventHydrationManifestMetadata,\n  ModuleMetadata as SharedModuleMetadata,\n  RuntimeImport as SharedRuntimeImport,\n  ServerBootstrapMode as SharedServerBootstrapMode,\n  ServerOutputMode as SharedServerOutputMode,\n  SourceLocation as SharedSourceLocation,\n  TransformOutput as SharedTransformOutput,\n} from \"@reckona/mreact-shared/compiler-contract\";\n\nexport type CompileTarget = SharedCompileTarget;\nexport type ServerOutputMode = SharedServerOutputMode;\nexport type ServerBootstrapMode = SharedServerBootstrapMode;\nexport type ParserMode = \"oxc\";\nexport type CompilerFrontend = SharedCompilerFrontend;\n\nexport type BodyStatementJsxMode = \"dom-node\" | \"compat-object\" | \"server-string\" | \"unsupported\";\n\nexport interface AnalyzeModuleOptions {\n  topLevelJsx?: \"diagnostic\" | \"compat-object\" | \"server-string\";\n  bodyStatementJsx?: BodyStatementJsxMode;\n  serverOutput?: ServerOutputMode;\n  awaitCompatComponents?: \"diagnostic\" | \"lower\";\n  clientBoundaryImports?: readonly string[];\n  compatReactNodeReturn?: boolean;\n  compatReactNodeReturnRenderMode?: \"react-node\";\n}\n\nexport interface TransformInput {\n  code: string;\n  filename: string;\n  target: CompileTarget;\n  dev: boolean;\n  sourceMap?: boolean;\n  mode?: \"auto\" | \"reactive\" | \"compat\";\n  parser?: ParserMode;\n  serverOutput?: ServerOutputMode;\n  serverBootstrap?: ServerBootstrapMode;\n  serverBootstrapNonce?: string;\n  serverBootstrapSrc?: string;\n  serverHydration?: boolean;\n  serverAwaitHydration?: boolean;\n  clientBoundaryImports?: readonly string[];\n  serverEscape?: ServerEscapeOptions;\n  reactSuspenseRevealScriptSrc?: string;\n}\n\nexport interface ServerEscapeOptions {\n  batchImportName: string;\n  batchImportSource: string;\n}\n\nexport type TransformOutput = SharedTransformOutput;\nexport type Diagnostic = SharedDiagnostic;\nexport type DiagnosticSuggestion = SharedDiagnosticSuggestion;\nexport type SourceLocation = SharedSourceLocation;\nexport type ModuleMetadata = SharedModuleMetadata;\nexport type CompilerMetadata = SharedModuleMetadata[\"compiler\"];\nexport type ClientReferenceMetadata = SharedClientReferenceMetadata;\nexport type ComponentMetadata = SharedComponentMetadata;\nexport type RuntimeImport = SharedRuntimeImport;\nexport type EventHydrationManifestMetadata = SharedEventHydrationManifestMetadata;\nexport type EventHydrationEntryMetadata = SharedEventHydrationEntryMetadata;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reckona/mreact-compiler",
-  "version": "0.0.82",
+  "version": "0.0.83",
   "description": "Compiler passes and OXC-backed JSX analysis for mreact.",
   "keywords": [
     "compiler",
@@ -50,6 +50,6 @@
   "dependencies": {
     "oxc-parser": "0.129.0",
     "oxc-transform": "0.129.0",
-    "@reckona/mreact-shared": "0.0.82"
+    "@reckona/mreact-shared": "0.0.83"
   }
 }

package/src/emit-boundary-lowering.ts

@@ -0,0 +1,165 @@
+export type NestedAppendEmitter<Part> = (
+  parts: readonly Part[],
+  sinkName: string,
+  compatRenderToStringHelperName: string,
+) => string;
+
+export interface BoundaryLoweringContext<Part> {
+  compatRenderToStringHelperName: string;
+  emitNestedAppendStatements: NestedAppendEmitter<Part>;
+  sinkName: string;
+}
+
+export interface AsyncBoundaryPart<Part> {
+  awaitId?: string;
+  catchName?: string;
+  catchParts?: readonly Part[];
+  parts: readonly Part[];
+  valueCode: string;
+  valueName: string;
+}
+
+export interface OutOfOrderBoundaryPart<Part> extends AsyncBoundaryPart<Part> {
+  id: string;
+  hydration: boolean;
+  placeholderParts: readonly Part[];
+  placeholderTagCode?: string;
+}
+
+export interface ReactSuspenseBoundaryPart<Part> {
+  parts: readonly Part[];
+}
+
+export interface ReactSuspenseOutOfOrderBoundaryPart<Part> extends AsyncBoundaryPart<Part> {
+  boundaryId: string;
+  fallbackParts: readonly Part[];
+  nonce?: string;
+  scriptSrc?: string;
+  segmentId: string;
+}
+
+export function emitAsyncBoundary<Part>(
+  part: AsyncBoundaryPart<Part>,
+  context: BoundaryLoweringContext<Part> & {
+    asyncBoundaryHelperName: string;
+  },
+): string {
+  const optionFields: string[] = [];
+
+  if (part.catchName !== undefined && part.catchParts !== undefined) {
+    optionFields.push(
+      `catch: (${context.sinkName}, ${part.catchName}) => {\n${context.emitNestedAppendStatements(part.catchParts, context.sinkName, context.compatRenderToStringHelperName)}\n  }`,
+    );
+  }
+
+  if (part.awaitId !== undefined) {
+    optionFields.push(`hydrationAwaitId: ${JSON.stringify(part.awaitId)}`);
+  }
+
+  const optionsExpression = optionFields.length === 0 ? "" : `, { ${optionFields.join(", ")} }`;
+
+  return [
+    `  await ${context.asyncBoundaryHelperName}(${context.sinkName}, (${part.valueCode}), async (${context.sinkName}, ${part.valueName}) => {`,
+    context.emitNestedAppendStatements(
+      part.parts,
+      context.sinkName,
+      context.compatRenderToStringHelperName,
+    ),
+    `  }${optionsExpression});`,
+  ].join("\n");
+}
+
+export function emitOutOfOrderBoundary<Part>(
+  part: OutOfOrderBoundaryPart<Part>,
+  context: BoundaryLoweringContext<Part> & {
+    outOfOrderBoundaryHelperName: string;
+  },
+): string {
+  const catchOption =
+    part.catchName === undefined || part.catchParts === undefined
+      ? ""
+      : `,\n  catch: (${context.sinkName}, ${part.catchName}) => {\n${context.emitNestedAppendStatements(part.catchParts, context.sinkName, context.compatRenderToStringHelperName)}\n  }`;
+
+  const hydrationAwaitIdOption =
+    part.awaitId === undefined ? "" : `,\n  hydrationAwaitId: ${JSON.stringify(part.awaitId)}`;
+  const placeholderTagOption =
+    part.placeholderTagCode === undefined ? "" : `,\n  placeholderTag: (${part.placeholderTagCode})`;
+
+  return [
+    `  ${context.outOfOrderBoundaryHelperName}(${context.sinkName}, ${JSON.stringify(part.id)}, (${part.valueCode}), async (${context.sinkName}, ${part.valueName}) => {`,
+    context.emitNestedAppendStatements(
+      part.parts,
+      context.sinkName,
+      context.compatRenderToStringHelperName,
+    ),
+    `  }, {`,
+    ...(part.hydration ? [`  hydration: true,`] : []),
+    `  placeholder: (${context.sinkName}) => {`,
+    context.emitNestedAppendStatements(
+      part.placeholderParts,
+      context.sinkName,
+      context.compatRenderToStringHelperName,
+    ),
+    `  }${catchOption}${hydrationAwaitIdOption}${placeholderTagOption}`,
+    `  });`,
+  ].join("\n");
+}
+
+export function emitReactSuspenseBoundary<Part>(
+  part: ReactSuspenseBoundaryPart<Part>,
+  context: BoundaryLoweringContext<Part> & {
+    reactSuspenseBoundaryHelperName: string;
+  },
+): string {
+  return [
+    `  await ${context.reactSuspenseBoundaryHelperName}(${context.sinkName}, async (${context.sinkName}) => {`,
+    context.emitNestedAppendStatements(
+      part.parts,
+      context.sinkName,
+      context.compatRenderToStringHelperName,
+    ),
+    `  });`,
+  ].join("\n");
+}
+
+export function emitReactSuspenseOutOfOrderBoundary<Part>(
+  part: ReactSuspenseOutOfOrderBoundaryPart<Part>,
+  context: BoundaryLoweringContext<Part> & {
+    reactSuspenseOutOfOrderBoundaryHelperName: string;
+  },
+): string {
+  const options = [
+    `  fallback: (${context.sinkName}) => {`,
+    context.emitNestedAppendStatements(
+      part.fallbackParts,
+      context.sinkName,
+      context.compatRenderToStringHelperName,
+    ),
+    `  },`,
+    ...(part.catchName === undefined || part.catchParts === undefined
+      ? []
+      : [
+          `  catch: (${context.sinkName}, ${part.catchName}) => {`,
+          context.emitNestedAppendStatements(
+            part.catchParts,
+            context.sinkName,
+            context.compatRenderToStringHelperName,
+          ),
+          `  },`,
+        ]),
+    ...(part.nonce === undefined ? [] : [`  nonce: ${JSON.stringify(part.nonce)},`]),
+    ...(part.scriptSrc === undefined ? [] : [`  src: ${JSON.stringify(part.scriptSrc)},`]),
+  ];
+
+  return [
+    `  ${context.reactSuspenseOutOfOrderBoundaryHelperName}(${context.sinkName}, ${JSON.stringify(part.boundaryId)}, ${JSON.stringify(part.segmentId)}, (${part.valueCode}), async (${context.sinkName}, ${part.valueName}) => {`,
+    context.emitNestedAppendStatements(
+      part.parts,
+      context.sinkName,
+      context.compatRenderToStringHelperName,
+    ),
+    `  }, {`,
+    ...options,
+    `  });`,
+  ].join("\n");
+}

package/src/emit-code-builder.ts

@@ -0,0 +1,27 @@
+export interface CodeBuilder {
+  section(code: string | undefined, options?: CodeBuilderSectionOptions): void;
+  toString(): string;
+}
+
+export interface CodeBuilderSectionOptions {
+  leadingBlankLines?: number;
+}
+
+export function createCodeBuilder(): CodeBuilder {
+  const sections: string[] = [];
+
+  return {
+    section(code, options = {}) {
+      if (code === undefined || code === "") {
+        return;
+      }
+
+      const leadingBlankLines = options.leadingBlankLines ?? 1;
+      const prefix = sections.length === 0 ? "" : "\n".repeat(leadingBlankLines + 1);
+      sections.push(`${prefix}${code}`);
+    },
+    toString() {
+      return sections.length === 0 ? "\n" : `${sections.join("")}\n`;
+    },
+  };
+}

package/src/emit-server-stream.ts

@@ -8,6 +8,13 @@ import type {
 } from "./ir.js";
 import type { RuntimeImport, ServerBootstrapMode, ServerEscapeOptions } from "./types.js";
 import { emitEscapeHtmlHelper } from "./emit-escape-helper.js";
+import { createCodeBuilder } from "./emit-code-builder.js";
+import {
+  emitAsyncBoundary as emitLoweredAsyncBoundary,
+  emitOutOfOrderBoundary as emitLoweredOutOfOrderBoundary,
+  emitReactSuspenseBoundary as emitLoweredReactSuspenseBoundary,
+  emitReactSuspenseOutOfOrderBoundary as emitLoweredReactSuspenseOutOfOrderBoundary,
+} from "./emit-boundary-lowering.js";
 import { escapeHtmlAttribute as escapeHtml } from "@reckona/mreact-shared/html-escape";
 import {
   htmlAttributeName,
@@ -160,22 +167,28 @@ export function emitServerStream(
   const importsBlock = [importLine, escapeImport, userImports, moduleStatements].filter(Boolean).join("\n");
   const needsSpreadAttributesHelper = components.includes(spreadAttributesHelperName);
   const urlSafeBlock =
-    components.includes(urlSafeHelperName) || needsSpreadAttributesHelper
-      ? `\n\n${urlSafeHelper}`
-      : "";
+    components.includes(urlSafeHelperName) || needsSpreadAttributesHelper ? urlSafeHelper : "";
   const clientBoundaryBlock =
     clientBoundaryHelperName === undefined || !components.includes(clientBoundaryHelperName)
       ? ""
-      : `\n\n${emitClientBoundaryHelper(clientBoundaryHelperName)}`;
+      : emitClientBoundaryHelper(clientBoundaryHelperName);
   const spreadAttributesBlock = needsSpreadAttributesHelper
-    ? `\n\n${emitSpreadAttributesHelper(spreadAttributesHelperName, escapeHelperName, urlSafeHelperName)}`
+    ? emitSpreadAttributesHelper(spreadAttributesHelperName, escapeHelperName, urlSafeHelperName)
     : "";
   const streamNodeBlock = components.includes(streamNodeHelperName)
-    ? `\n\n${emitStreamNodeHelper(streamNodeHelperName)}`
+    ? emitStreamNodeHelper(streamNodeHelperName)
     : "";
+  const code = createCodeBuilder();
+  code.section(importsBlock);
+  code.section(helper);
+  code.section(urlSafeBlock);
+  code.section(clientBoundaryBlock);
+  code.section(spreadAttributesBlock);
+  code.section(streamNodeBlock);
+  code.section(components);
 
   return {
-    code: `${importsBlock === "" ? "" : `${importsBlock}\n\n`}${helper}${urlSafeBlock}${clientBoundaryBlock}${spreadAttributesBlock}${streamNodeBlock}\n\n${components}\n`,
+    code: code.toString(),
     imports,
   };
 }
@@ -532,39 +545,39 @@ function emitAppendStatements(
   try {
     return coalesceAdjacentStaticParts(collected).map((part) => {
       if (part.kind === "async-boundary") {
-        return emitAsyncBoundary(
-          part,
-          sinkName,
+        return emitLoweredAsyncBoundary(part, {
           asyncBoundaryHelperName,
           compatRenderToStringHelperName,
-        );
+          emitNestedAppendStatements,
+          sinkName,
+        });
       }
 
       if (part.kind === "out-of-order-boundary") {
-        return emitOutOfOrderBoundary(
-          part,
-          sinkName,
-          outOfOrderBoundaryHelperName,
+        return emitLoweredOutOfOrderBoundary(part, {
           compatRenderToStringHelperName,
-        );
+          emitNestedAppendStatements,
+          outOfOrderBoundaryHelperName,
+          sinkName,
+        });
       }
 
       if (part.kind === "react-suspense-boundary") {
-        return emitReactSuspenseBoundary(
-          part,
-          sinkName,
-          reactSuspenseBoundaryHelperName,
+        return emitLoweredReactSuspenseBoundary(part, {
           compatRenderToStringHelperName,
-        );
+          emitNestedAppendStatements,
+          reactSuspenseBoundaryHelperName,
+          sinkName,
+        });
       }
 
       if (part.kind === "react-suspense-out-of-order-boundary") {
-        return emitReactSuspenseOutOfOrderBoundary(
-          part,
-          sinkName,
-          reactSuspenseOutOfOrderBoundaryHelperName,
+        return emitLoweredReactSuspenseOutOfOrderBoundary(part, {
           compatRenderToStringHelperName,
-        );
+          emitNestedAppendStatements,
+          reactSuspenseOutOfOrderBoundaryHelperName,
+          sinkName,
+        });
       }
 
       if (part.kind === "component") {
@@ -852,116 +865,12 @@ function emitListPartAsStringExpression(
   return `(() => { const _arr = (${part.itemsCode}); let _listOut = ""; for (let _i = 0, _len = _arr.length; _i < _len; _i++) { const ${part.itemName} = _arr[_i];${part.indexName === undefined ? "" : ` const ${part.indexName} = _i;`}${part.arrayName === undefined ? "" : ` const ${part.arrayName} = _arr;`}${part.bodyStatements.length === 0 ? "" : ` ${part.bodyStatements.join(" ")}`} ${concatLines.join(" ")} } return _listOut; })()`;
 }
 
-function emitAsyncBoundary(
-  part: Extract<HtmlPart, { kind: "async-boundary" }>,
-  sinkName: string,
-  asyncBoundaryHelperName: string,
-  compatRenderToStringHelperName: string,
-): string {
-  const optionFields: string[] = [];
-
-  if (part.catchName !== undefined && part.catchParts !== undefined) {
-    optionFields.push(
-      `catch: (${sinkName}, ${part.catchName}) => {\n${emitNestedAppendStatements(part.catchParts, sinkName, compatRenderToStringHelperName)}\n  }`,
-    );
-  }
-
-  if (part.awaitId !== undefined) {
-    optionFields.push(`hydrationAwaitId: ${JSON.stringify(part.awaitId)}`);
-  }
-
-  const optionsExpression = optionFields.length === 0
-    ? ""
-    : `, { ${optionFields.join(", ")} }`;
-
-  return [
-    `  await ${asyncBoundaryHelperName}(${sinkName}, (${part.valueCode}), async (${sinkName}, ${part.valueName}) => {`,
-    emitNestedAppendStatements(part.parts, sinkName, compatRenderToStringHelperName),
-    `  }${optionsExpression});`,
-  ].join("\n");
-}
-
-function emitOutOfOrderBoundary(
-  part: Extract<HtmlPart, { kind: "out-of-order-boundary" }>,
-  sinkName: string,
-  outOfOrderBoundaryHelperName: string,
-  compatRenderToStringHelperName: string,
-): string {
-  const catchOption =
-    part.catchName === undefined || part.catchParts === undefined
-      ? ""
-      : `,\n  catch: (${sinkName}, ${part.catchName}) => {\n${emitNestedAppendStatements(part.catchParts, sinkName, compatRenderToStringHelperName)}\n  }`;
-
-  const hydrationAwaitIdOption =
-    part.awaitId === undefined
-      ? ""
-      : `,\n  hydrationAwaitId: ${JSON.stringify(part.awaitId)}`;
-  const placeholderTagOption =
-    part.placeholderTagCode === undefined
-      ? ""
-      : `,\n  placeholderTag: (${part.placeholderTagCode})`;
-
-  return [
-    `  ${outOfOrderBoundaryHelperName}(${sinkName}, ${JSON.stringify(part.id)}, (${part.valueCode}), async (${sinkName}, ${part.valueName}) => {`,
-    emitNestedAppendStatements(part.parts, sinkName, compatRenderToStringHelperName),
-    `  }, {`,
-    ...(part.hydration ? [`  hydration: true,`] : []),
-    `  placeholder: (${sinkName}) => {`,
-    emitNestedAppendStatements(part.placeholderParts, sinkName, compatRenderToStringHelperName),
-    `  }${catchOption}${hydrationAwaitIdOption}${placeholderTagOption}`,
-    `  });`,
-  ].join("\n");
-}
-
-function emitReactSuspenseBoundary(
-  part: Extract<HtmlPart, { kind: "react-suspense-boundary" }>,
-  sinkName: string,
-  reactSuspenseBoundaryHelperName: string,
-  compatRenderToStringHelperName: string,
-): string {
-  return [
-    `  await ${reactSuspenseBoundaryHelperName}(${sinkName}, async (${sinkName}) => {`,
-    emitNestedAppendStatements(part.parts, sinkName, compatRenderToStringHelperName),
-    `  });`,
-  ].join("\n");
-}
-
-function emitReactSuspenseOutOfOrderBoundary(
-  part: Extract<HtmlPart, { kind: "react-suspense-out-of-order-boundary" }>,
-  sinkName: string,
-  reactSuspenseOutOfOrderBoundaryHelperName: string,
-  compatRenderToStringHelperName: string,
-): string {
-  const options = [
-    `  fallback: (${sinkName}) => {`,
-    emitNestedAppendStatements(part.fallbackParts, sinkName, compatRenderToStringHelperName),
-    `  },`,
-    ...(part.catchName === undefined || part.catchParts === undefined
-      ? []
-      : [
-          `  catch: (${sinkName}, ${part.catchName}) => {`,
-          emitNestedAppendStatements(part.catchParts, sinkName, compatRenderToStringHelperName),
-          `  },`,
-        ]),
-    ...(part.nonce === undefined ? [] : [`  nonce: ${stringLiteral(part.nonce)},`]),
-    ...(part.scriptSrc === undefined ? [] : [`  src: ${stringLiteral(part.scriptSrc)},`]),
-  ];
-
-  return [
-    `  ${reactSuspenseOutOfOrderBoundaryHelperName}(${sinkName}, ${JSON.stringify(part.boundaryId)}, ${JSON.stringify(part.segmentId)}, (${part.valueCode}), async (${sinkName}, ${part.valueName}) => {`,
-    emitNestedAppendStatements(part.parts, sinkName, compatRenderToStringHelperName),
-    `  }, {`,
-    ...options,
-    `  });`,
-  ].join("\n");
-}
-
 function emitNestedAppendStatements(
-  parts: HtmlSyncPart[],
+  parts: readonly HtmlSyncPart[],
   sinkName: string,
   compatRenderToStringHelperName: string,
 ): string {
-  return coalesceAdjacentStaticParts(parts)
+  return coalesceAdjacentStaticParts([...parts])
     .map((part) => emitSyncPartAsAppendStatement(part, sinkName, compatRenderToStringHelperName, "    "))
     .join("\n");
 }
@@ -974,39 +883,39 @@ function emitNestedStreamAppendStatements(
   return coalesceAdjacentStaticParts(parts)
     .map((part) => {
       if (part.kind === "async-boundary") {
-        return emitAsyncBoundary(
-          part,
-          sinkName,
-          currentAsyncBoundaryHelperName,
+        return emitLoweredAsyncBoundary(part, {
+          asyncBoundaryHelperName: currentAsyncBoundaryHelperName,
           compatRenderToStringHelperName,
-        ).replace(/^/gm, "    ");
+          emitNestedAppendStatements,
+          sinkName,
+        }).replace(/^/gm, "    ");
       }
 
       if (part.kind === "out-of-order-boundary") {
-        return emitOutOfOrderBoundary(
-          part,
-          sinkName,
-          currentOutOfOrderBoundaryHelperName,
+        return emitLoweredOutOfOrderBoundary(part, {
           compatRenderToStringHelperName,
-        ).replace(/^/gm, "    ");
+          emitNestedAppendStatements,
+          outOfOrderBoundaryHelperName: currentOutOfOrderBoundaryHelperName,
+          sinkName,
+        }).replace(/^/gm, "    ");
       }
 
       if (part.kind === "react-suspense-boundary") {
-        return emitReactSuspenseBoundary(
-          part,
-          sinkName,
-          currentReactSuspenseBoundaryHelperName,
+        return emitLoweredReactSuspenseBoundary(part, {
           compatRenderToStringHelperName,
-        ).replace(/^/gm, "    ");
+          emitNestedAppendStatements,
+          reactSuspenseBoundaryHelperName: currentReactSuspenseBoundaryHelperName,
+          sinkName,
+        }).replace(/^/gm, "    ");
       }
 
       if (part.kind === "react-suspense-out-of-order-boundary") {
-        return emitReactSuspenseOutOfOrderBoundary(
-          part,
-          sinkName,
-          currentReactSuspenseOutOfOrderBoundaryHelperName,
+        return emitLoweredReactSuspenseOutOfOrderBoundary(part, {
           compatRenderToStringHelperName,
-        ).replace(/^/gm, "    ");
+          emitNestedAppendStatements,
+          reactSuspenseOutOfOrderBoundaryHelperName: currentReactSuspenseOutOfOrderBoundaryHelperName,
+          sinkName,
+        }).replace(/^/gm, "    ");
       }
 
       return emitSyncPartAsAppendStatement(

package/src/emit-server.ts

@@ -7,6 +7,7 @@ import type {
 } from "./ir.js";
 import type { RuntimeImport, ServerEscapeOptions } from "./types.js";
 import { emitEscapeHtmlHelper } from "./emit-escape-helper.js";
+import { createCodeBuilder } from "./emit-code-builder.js";
 import { escapeHtmlAttribute as escapeHtml } from "@reckona/mreact-shared/html-escape";
 import {
   htmlAttributeName,
@@ -131,9 +132,19 @@ export function emitServer(
     reactNodeRenderHelperName,
   );
   const moduleStatements = emitModuleStatements(ir);
+  const code = createCodeBuilder();
+  code.section(userImports);
+  code.section(escapeImport);
+  code.section(contextImport);
+  code.section(moduleStatements);
+  code.section(helper);
+  code.section(urlSafeBlock);
+  code.section(clientBoundaryBlock);
+  code.section(spreadAttributesBlock);
+  code.section(components);
 
   return {
-    code: `${[userImports, escapeImport, contextImport, moduleStatements, helper, urlSafeBlock, clientBoundaryBlock, spreadAttributesBlock].filter(Boolean).join("\n\n")}\n\n${components}\n`,
+    code: code.toString(),
     imports: collectContextImports(
       contextProviderHelperName,
       contextConsumerHelperName,