@reckona/mreact-compiler 0.0.81 → 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,

package/src/index.ts

@@ -18,6 +18,7 @@ export {
 } from "./internal.js";
 export type {
   StaticExportReference,
+  StaticExportSpecifierReference,
   FormActionExpressionReference,
   FormActionReference,
   StaticImportReference,
@@ -26,6 +27,21 @@ export type {
   ClientRouteStaticImportReference,
   TopLevelExportRenderInfo,
 } from "./internal.js";
+export { analyzeBoundaryGraph } from "./boundary-graph.js";
+export type {
+  BoundaryClassification,
+  BoundaryGraphClientBoundary,
+  BoundaryGraphEntry,
+  BoundaryGraphEntryKind,
+  BoundaryGraphExport,
+  BoundaryGraphInput,
+  BoundaryGraphModule,
+  BoundaryGraphResult,
+  BoundaryGraphServerActionSite,
+  BoundaryGraphTraceEvent,
+  BoundaryGraphTraceKind,
+  BoundaryGraphTraceReason,
+} from "./boundary-graph.js";
 export { formatDiagnostic } from "./diagnostics.js";
 export { transform } from "./transform.js";
 export type {

package/src/internal.ts

@@ -48,9 +48,15 @@ export interface ClientRouteStaticImportReference extends StaticImportReference
 export interface StaticExportReference {
   exportedNames: string[];
   exportAll: boolean;
+  specifiers: StaticExportSpecifierReference[];
   source: string;
 }
 
+export interface StaticExportSpecifierReference {
+  exportedName: string;
+  localName: string;
+}
+
 export interface TopLevelExportRenderInfo {
   calledComponentRoots: string[];
   clientRuntime: boolean;
@@ -1179,7 +1185,7 @@ function staticExportReference(statement: Record<string, unknown>): StaticExport
     const source = sourceValue(statement)[0];
     return source === undefined
       ? []
-      : [{ exportedNames: [], exportAll: true, source }];
+      : [{ exportedNames: [], exportAll: true, specifiers: [], source }];
   }
 
   if (statement.type !== "ExportNamedDeclaration" || statement.exportKind === "type") {
@@ -1195,11 +1201,29 @@ function staticExportReference(statement: Record<string, unknown>): StaticExport
     {
       exportedNames: exportedNames(statement),
       exportAll: false,
+      specifiers: staticExportSpecifierReferences(statement),
       source,
     },
   ];
 }
 
+function staticExportSpecifierReferences(
+  statement: Record<string, unknown>,
+): StaticExportSpecifierReference[] {
+  const specifiers = Array.isArray(statement.specifiers)
+    ? statement.specifiers.map(readObject)
+    : [];
+
+  return specifiers.flatMap((specifier) => {
+    const exportedName = exportedNameForSpecifier(specifier);
+    const localName = localNameForExportSpecifier(specifier);
+
+    return exportedName === undefined || localName === undefined
+      ? []
+      : [{ exportedName, localName }];
+  });
+}
+
 function sourceValue(statement: Record<string, unknown>): string[] {
   const source = readOptionalObject(statement.source);
   const value = source?.value;