@mandujs/core 0.54.31 → 0.55.0-beta.1

package/src/router/client-entry.ts

@@ -1,11 +1,11 @@
-import { readFile } from "fs/promises";
-import path from "path";
-import type { RouteSpec } from "../spec/schema";
-import {
-  formatClientBoundaryDiagnostics,
-  validateClientBoundaryServerOnlyImports,
-} from "../bundler/client-boundary-transform";
-import { analyzeRouteSource, type RouteSourceImportRecord } from "./route-source-analyzer";
+import { readFile } from "fs/promises";
+import path from "path";
+import type { RouteSpec } from "../spec/schema";
+import {
+  formatClientBoundaryDiagnostics,
+  validateClientBoundaryServerOnlyImports,
+} from "../bundler/client-boundary-transform";
+import { analyzeRouteSource, type RouteSourceImportRecord } from "./route-source-analyzer";
 
 export interface ClientComponentImport {
   module: string;
@@ -13,35 +13,35 @@ export interface ClientComponentImport {
   names: string[];
 }
 
-export interface RouteLevelClientComponentImport {
-  module: string;
-  localName: string;
-  exportName: string;
-}
-
-const CLIENT_ENTRY_SPECIFIER_PATTERN = /\.(?:client|island)(?:\.[tj]sx?)?$/;
-const DEFAULT_EXPORT_NAME = "default";
-
-interface ComponentImportSpecifier {
-  importedName: string;
-  localName: string;
-}
-
-interface ComponentImportRecord extends ClientComponentImport {
-  specifiers: ComponentImportSpecifier[];
-}
+export interface RouteLevelClientComponentImport {
+  module: string;
+  localName: string;
+  exportName: string;
+}
+
+const CLIENT_ENTRY_SPECIFIER_PATTERN = /\.(?:client|island)(?:\.[tj]sx?)?$/;
+const DEFAULT_EXPORT_NAME = "default";
+
+interface ComponentImportSpecifier {
+  importedName: string;
+  localName: string;
+}
+
+interface ComponentImportRecord extends ClientComponentImport {
+  specifiers: ComponentImportSpecifier[];
+}
 
 export function normalizeRouteModulePath(value: string | undefined): string {
   return (value ?? "").replace(/\\/g, "/").replace(/^\.\//, "");
 }
 
-export function hasUseClientDirective(source: string): boolean {
-  return analyzeRouteSource(source).directives.useClient;
-}
-
-export function hasUseServerDirective(source: string): boolean {
-  return analyzeRouteSource(source).directives.useServer;
-}
+export function hasUseClientDirective(source: string): boolean {
+  return analyzeRouteSource(source).directives.useClient;
+}
+
+export function hasUseServerDirective(source: string): boolean {
+  return analyzeRouteSource(source).directives.useServer;
+}
 
 export function clientModuleIsRouteComponent(route: RouteSpec, clientModule = route.clientModule): boolean {
   if (route.kind !== "page" || !clientModule) return false;
@@ -61,94 +61,94 @@ async function readRouteModule(rootDir: string, modulePath: string): Promise<str
   }
 }
 
-export function findClientComponentImports(source: string): ClientComponentImport[] {
-  return findComponentImportRecords(source)
-    .filter((entry) => clientSpecifierLooksBrowserOnly(entry.module))
-    .map(toPublicClientComponentImport);
-}
-
-function toPublicClientComponentImport(entry: ComponentImportRecord): ClientComponentImport {
-  return {
-    module: entry.module,
-    kind: entry.kind,
-    names: entry.names,
-  };
-}
-
-function findComponentImportRecords(source: string): ComponentImportRecord[] {
-  return findComponentImportRecordsFromAnalysis(analyzeRouteSource(source).imports);
-}
-
-function findComponentImportRecordsFromAnalysis(imports: RouteSourceImportRecord[]): ComponentImportRecord[] {
-  return imports.flatMap(toComponentImportRecord);
-}
-
-function toComponentImportRecord(entry: RouteSourceImportRecord): ComponentImportRecord[] {
-  if (entry.isSideEffectOnly) {
-    return [{ module: entry.source, kind: "side-effect", names: [], specifiers: [] }];
-  }
-  if (entry.isTypeOnly) return [];
-
-  const names: string[] = [];
-  const specifiers: ComponentImportSpecifier[] = [];
-  let hasDefault = false;
-  let hasNamed = false;
-  let hasNamespace = false;
-
-  if (entry.defaultName) {
-    hasDefault = true;
-    names.push(entry.defaultName);
-    specifiers.push({ importedName: DEFAULT_EXPORT_NAME, localName: entry.defaultName });
-  }
-
-  if (entry.namespaceName) {
-    hasNamespace = true;
-    names.push(entry.namespaceName);
-    specifiers.push({ importedName: "*", localName: entry.namespaceName });
-  }
-
-  for (const named of entry.named) {
-    if (named.isTypeOnly) continue;
-    hasNamed = true;
-    names.push(named.local);
-    specifiers.push({ importedName: named.imported, localName: named.local });
-  }
-
-  if (names.length === 0) return [];
-
-  const kind =
-    (hasDefault && (hasNamed || hasNamespace))
-      ? "mixed"
-      : hasNamed
-        ? "named"
-        : hasNamespace
-          ? "namespace"
-          : "default";
-
-  return [{ module: entry.source, kind, names, specifiers }];
-}
+export function findClientComponentImports(source: string): ClientComponentImport[] {
+  return findComponentImportRecords(source)
+    .filter((entry) => clientSpecifierLooksBrowserOnly(entry.module))
+    .map(toPublicClientComponentImport);
+}
+
+function toPublicClientComponentImport(entry: ComponentImportRecord): ClientComponentImport {
+  return {
+    module: entry.module,
+    kind: entry.kind,
+    names: entry.names,
+  };
+}
+
+function findComponentImportRecords(source: string): ComponentImportRecord[] {
+  return findComponentImportRecordsFromAnalysis(analyzeRouteSource(source).imports);
+}
+
+function findComponentImportRecordsFromAnalysis(imports: RouteSourceImportRecord[]): ComponentImportRecord[] {
+  return imports.flatMap(toComponentImportRecord);
+}
+
+function toComponentImportRecord(entry: RouteSourceImportRecord): ComponentImportRecord[] {
+  if (entry.isSideEffectOnly) {
+    return [{ module: entry.source, kind: "side-effect", names: [], specifiers: [] }];
+  }
+  if (entry.isTypeOnly) return [];
+
+  const names: string[] = [];
+  const specifiers: ComponentImportSpecifier[] = [];
+  let hasDefault = false;
+  let hasNamed = false;
+  let hasNamespace = false;
+
+  if (entry.defaultName) {
+    hasDefault = true;
+    names.push(entry.defaultName);
+    specifiers.push({ importedName: DEFAULT_EXPORT_NAME, localName: entry.defaultName });
+  }
+
+  if (entry.namespaceName) {
+    hasNamespace = true;
+    names.push(entry.namespaceName);
+    specifiers.push({ importedName: "*", localName: entry.namespaceName });
+  }
+
+  for (const named of entry.named) {
+    if (named.isTypeOnly) continue;
+    hasNamed = true;
+    names.push(named.local);
+    specifiers.push({ importedName: named.imported, localName: named.local });
+  }
+
+  if (names.length === 0) return [];
+
+  const kind =
+    (hasDefault && (hasNamed || hasNamespace))
+      ? "mixed"
+      : hasNamed
+        ? "named"
+        : hasNamespace
+          ? "namespace"
+          : "default";
+
+  return [{ module: entry.source, kind, names, specifiers }];
+}
 
 export function findRouteLevelClientComponentImport(source: string): RouteLevelClientComponentImport | null {
   return findRouteLevelClientComponentImports(source)[0] ?? null;
 }
 
-export function findRouteLevelClientComponentImports(source: string): RouteLevelClientComponentImport[] {
-  const analysis = analyzeRouteSource(source);
-  const candidates = findComponentImportRecordsFromAnalysis(analysis.imports).flatMap((entry) =>
-    isRouteLevelClientEntrySpecifier(entry.module)
-      ? entry.specifiers
-          .filter((specifier) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(specifier.localName))
-          .map((specifier) => ({
-            module: entry.module,
-            localName: specifier.localName,
-            exportName: specifier.importedName,
-          }))
-      : []
-  );
-
-  if (candidates.length === 0) return [];
-  return defaultExportRendersClientComponents(analysis.defaultExport.renderedJsxNames, candidates);
-}
+export function findRouteLevelClientComponentImports(source: string): RouteLevelClientComponentImport[] {
+  const analysis = analyzeRouteSource(source);
+  const candidates = findComponentImportRecordsFromAnalysis(analysis.imports).flatMap((entry) =>
+    isRouteLevelClientEntrySpecifier(entry.module)
+      ? entry.specifiers
+          .filter((specifier) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(specifier.localName))
+          .map((specifier) => ({
+            module: entry.module,
+            localName: specifier.localName,
+            exportName: specifier.importedName,
+          }))
+      : []
+  );
+
+  if (candidates.length === 0) return [];
+  return defaultExportRendersClientComponents(analysis.defaultExport.renderedJsxNames, candidates);
+}
 
 function isRouteLevelClientEntrySpecifier(specifier: string): boolean {
   const normalized = specifier.replace(/\\/g, "/");
@@ -179,58 +179,58 @@ export async function resolveClientImportModulePath(
   return null;
 }
 
-export async function resolveRouteLevelClientEntryPath(
-  rootDir: string,
-  routeModule: string,
-  source: string,
-): Promise<string | null> {
-  return (await resolveRouteLevelClientEntry(rootDir, routeModule, source))?.modulePath ?? null;
-}
-
-export async function resolveRouteLevelClientEntry(
-  rootDir: string,
-  routeModule: string,
-  source: string,
-): Promise<{ modulePath: string; exportName: string } | null> {
-  const routeLevelClientImports = findRouteLevelClientComponentImports(source);
-  for (const routeLevelClientImport of routeLevelClientImports) {
-    const resolved = await resolveClientImportModulePath(rootDir, routeModule, routeLevelClientImport.module);
-    if (!resolved) continue;
-    if (clientSpecifierLooksBrowserOnly(routeLevelClientImport.module)) {
-      return { modulePath: resolved, exportName: routeLevelClientImport.exportName };
-    }
-
-    const importedSource = await readRouteModule(rootDir, resolved);
-    if (importedSource !== null && hasUseClientDirective(importedSource)) {
-      return { modulePath: resolved, exportName: routeLevelClientImport.exportName };
-    }
-  }
-
-  return null;
-}
-
-export async function shouldPreserveExistingClientModule(
-  route: RouteSpec,
-  clientModule: string,
-  rootDir: string,
-): Promise<boolean> {
-  if (!isRouteLevelClientEntrySpecifier(clientModule)) return false;
-  const source = await readRouteModule(rootDir, clientModule);
-  if (source === null) return false;
-  if (hasUseServerDirective(source)) return false;
-  if (clientModuleIsRouteComponent(route, clientModule)) {
-    if (hasUseClientDirective(source)) return true;
-    return await routeComponentHasResolvableClientEntry(rootDir, clientModule, source);
-  }
-
-  if (route.kind !== "page" || !route.componentModule) return false;
-
-  const routeSource = await readRouteModule(rootDir, route.componentModule);
-  if (routeSource === null) return false;
-
-  const currentEntry = await resolveRouteLevelClientEntry(rootDir, route.componentModule, routeSource);
-  return normalizeRouteModulePath(currentEntry?.modulePath) === normalizeRouteModulePath(clientModule);
-}
+export async function resolveRouteLevelClientEntryPath(
+  rootDir: string,
+  routeModule: string,
+  source: string,
+): Promise<string | null> {
+  return (await resolveRouteLevelClientEntry(rootDir, routeModule, source))?.modulePath ?? null;
+}
+
+export async function resolveRouteLevelClientEntry(
+  rootDir: string,
+  routeModule: string,
+  source: string,
+): Promise<{ modulePath: string; exportName: string } | null> {
+  const routeLevelClientImports = findRouteLevelClientComponentImports(source);
+  for (const routeLevelClientImport of routeLevelClientImports) {
+    const resolved = await resolveClientImportModulePath(rootDir, routeModule, routeLevelClientImport.module);
+    if (!resolved) continue;
+    if (clientSpecifierLooksBrowserOnly(routeLevelClientImport.module)) {
+      return { modulePath: resolved, exportName: routeLevelClientImport.exportName };
+    }
+
+    const importedSource = await readRouteModule(rootDir, resolved);
+    if (importedSource !== null && hasUseClientDirective(importedSource)) {
+      return { modulePath: resolved, exportName: routeLevelClientImport.exportName };
+    }
+  }
+
+  return null;
+}
+
+export async function shouldPreserveExistingClientModule(
+  route: RouteSpec,
+  clientModule: string,
+  rootDir: string,
+): Promise<boolean> {
+  if (!isRouteLevelClientEntrySpecifier(clientModule)) return false;
+  const source = await readRouteModule(rootDir, clientModule);
+  if (source === null) return false;
+  if (hasUseServerDirective(source)) return false;
+  if (clientModuleIsRouteComponent(route, clientModule)) {
+    if (hasUseClientDirective(source)) return true;
+    return await routeComponentHasResolvableClientEntry(rootDir, clientModule, source);
+  }
+
+  if (route.kind !== "page" || !route.componentModule) return false;
+
+  const routeSource = await readRouteModule(rootDir, route.componentModule);
+  if (routeSource === null) return false;
+
+  const currentEntry = await resolveRouteLevelClientEntry(rootDir, route.componentModule, routeSource);
+  return normalizeRouteModulePath(currentEntry?.modulePath) === normalizeRouteModulePath(clientModule);
+}
 
 function resolveImportBasePath(rootDir: string, importerModule: string, specifier: string): string | null {
   const normalized = specifier.replace(/\\/g, "/");
@@ -261,29 +261,29 @@ function clientSpecifierLooksBrowserOnly(specifier: string): boolean {
   return CLIENT_ENTRY_SPECIFIER_PATTERN.test(specifier.replace(/\\/g, "/"));
 }
 
-function defaultExportRendersClientComponents(
-  renderedJsxNames: string[],
-  candidates: RouteLevelClientComponentImport[],
-): RouteLevelClientComponentImport[] {
-  const renderedNames = new Set(renderedJsxNames);
-  const seen = new Set<string>();
-  const rendered: RouteLevelClientComponentImport[] = [];
-
-  for (const candidate of candidates) {
-    const key = `${candidate.module}\0${candidate.localName}`;
-    if (seen.has(key)) continue;
-    if (!renderedNames.has(candidate.localName)) continue;
-    seen.add(key);
-    rendered.push(candidate);
-  }
-
-  return rendered;
-}
-
-export async function validateClientModuleForBrowserBundle(
-  route: RouteSpec,
-  rootDir: string,
-): Promise<string | null> {
+function defaultExportRendersClientComponents(
+  renderedJsxNames: string[],
+  candidates: RouteLevelClientComponentImport[],
+): RouteLevelClientComponentImport[] {
+  const renderedNames = new Set(renderedJsxNames);
+  const seen = new Set<string>();
+  const rendered: RouteLevelClientComponentImport[] = [];
+
+  for (const candidate of candidates) {
+    const key = `${candidate.module}\0${candidate.localName}`;
+    if (seen.has(key)) continue;
+    if (!renderedNames.has(candidate.localName)) continue;
+    seen.add(key);
+    rendered.push(candidate);
+  }
+
+  return rendered;
+}
+
+export async function validateClientModuleForBrowserBundle(
+  route: RouteSpec,
+  rootDir: string,
+): Promise<string | null> {
   if (!route.clientModule) return null;
 
   const source = await readRouteModule(rootDir, route.clientModule);
@@ -293,39 +293,39 @@ export async function validateClientModuleForBrowserBundle(
     return `[${route.id}] Client module "${route.clientModule}" has a "use server" directive and cannot be bundled for the browser.`;
   }
 
-  if (clientModuleIsRouteComponent(route) && !hasUseClientDirective(source)) {
-    const realClientEntry = await resolveRouteLevelClientEntry(rootDir, route.clientModule, source);
-    if (realClientEntry) {
-      route.clientModule = realClientEntry.modulePath;
-      route.clientExportName = realClientEntry.exportName;
-      const realSource = await readRouteModule(rootDir, route.clientModule);
-      return realSource === null ? null : formatClientModuleBrowserDiagnostics(route, realSource);
-    }
+  if (clientModuleIsRouteComponent(route) && !hasUseClientDirective(source)) {
+    const realClientEntry = await resolveRouteLevelClientEntry(rootDir, route.clientModule, source);
+    if (realClientEntry) {
+      route.clientModule = realClientEntry.modulePath;
+      route.clientExportName = realClientEntry.exportName;
+      const realSource = await readRouteModule(rootDir, route.clientModule);
+      return realSource === null ? null : formatClientModuleBrowserDiagnostics(route, realSource);
+    }
     return (
       `[${route.id}] Route component "${route.clientModule}" is configured as clientModule, ` +
       `but it is a server page (missing "use client"). Mandu will not bundle server pages into client islands. ` +
       `Remove the stale clientModule from .mandu/routes.manifest.json or use a *.partial.tsx / spec/slots/${route.id}.client.tsx client entry.`
     );
-  }
-
-  return formatClientModuleBrowserDiagnostics(route, source);
-}
-
-function formatClientModuleBrowserDiagnostics(route: RouteSpec, source: string): string | null {
-  if (!route.clientModule) return null;
-  const diagnostics = validateClientBoundaryServerOnlyImports(
-    source,
-    {
-      id: `${route.id}--client-module`,
-      routeId: route.id,
-      module: route.clientModule,
-      exportName: route.clientExportName ?? "default",
-    },
-    route.clientModule,
-  );
-  if (diagnostics.length === 0) return null;
-  return formatClientBoundaryDiagnostics(diagnostics);
-}
+  }
+
+  return formatClientModuleBrowserDiagnostics(route, source);
+}
+
+function formatClientModuleBrowserDiagnostics(route: RouteSpec, source: string): string | null {
+  if (!route.clientModule) return null;
+  const diagnostics = validateClientBoundaryServerOnlyImports(
+    source,
+    {
+      id: `${route.id}--client-module`,
+      routeId: route.id,
+      module: route.clientModule,
+      exportName: route.clientExportName ?? "default",
+    },
+    route.clientModule,
+  );
+  if (diagnostics.length === 0) return null;
+  return formatClientBoundaryDiagnostics(diagnostics);
+}
 
 async function routeComponentHasResolvableClientEntry(
   rootDir: string,