what-compiler 0.8.4 → 0.10.0

package/src/file-router.js

@@ -206,6 +206,20 @@ export function extractPageConfig(source) {
   }
 }
 
+/**
+ * Detect which named exports a page module declares. Functions (loader,
+ * getStaticPaths) cannot live in `export const page` (JSON-only), so the codegen
+ * imports them as live bindings instead. \b anchors avoid false positives like
+ * `loaderState` or `getStaticPathsHelper`.
+ */
+export function detectPageExports(source) {
+  return {
+    hasLoader: /export\s+(?:async\s+)?(?:const|let|var|function)\s+loader\b/.test(source),
+    hasGetStaticPaths: /export\s+(?:async\s+)?(?:const|let|var|function)\s+getStaticPaths\b/.test(source),
+    hasPageConfig: /export\s+const\s+page\b/.test(source),
+  };
+}
+
 /**
  * Generate the virtual routes module source code.
  * This is what gets imported as 'virtual:what-routes'.
@@ -231,11 +245,13 @@ export function generateRoutesModule(pagesDir, rootDir) {
     const relPath = toImportPath(page.filePath, rootDir);
     imports.push(`import ${varName} from '${relPath}';`);
 
-    // Read file to extract page config
+    // Read file to extract page config + detect loader/getStaticPaths exports
     let pageConfig = { mode: 'client' };
+    let detected = { hasLoader: false, hasGetStaticPaths: false, hasPageConfig: false };
     try {
       const source = fs.readFileSync(page.filePath, 'utf-8');
       pageConfig = extractPageConfig(source);
+      detected = detectPageExports(source);
     } catch {}
 
     // Find matching layout (closest parent)
@@ -246,6 +262,7 @@ export function generateRoutesModule(pagesDir, rootDir) {
       component: varName,
       mode: pageConfig.mode || 'client',
       layout: layoutVar || null,
+      hasLoader: detected.hasLoader,
     };
 
     routeEntries.push(entry);
@@ -272,7 +289,7 @@ export function generateRoutesModule(pagesDir, rootDir) {
     '',
     'export const routes = [',
     ...routeEntries.map(r =>
-      `  { path: '${r.path}', component: ${r.component}, mode: '${r.mode}'${r.layout ? `, layout: ${r.layout}` : ''} },`
+      `  { path: '${r.path}', component: ${r.component}, mode: '${r.mode}'${r.layout ? `, layout: ${r.layout}` : ''}${r.hasLoader ? ', hasLoader: true' : ''} },`
     ),
     '];',
     '',
@@ -293,6 +310,91 @@ export function generateRoutesModule(pagesDir, rootDir) {
   return lines.join('\n');
 }
 
+/**
+ * Generate the SERVER routes module ('virtual:what-routes/server'). Same routes
+ * as the client module PLUS live bindings for loader / getStaticPaths / page so
+ * the deploy adapter can run them. The client module (above) deliberately omits
+ * these so server loaders are never bundled into the browser.
+ */
+export function generateServerRoutesModule(pagesDir, rootDir) {
+  const { pages, layouts, apiRoutes } = scanPages(pagesDir);
+
+  const imports = [];
+  const routeEntries = [];
+
+  const layoutMap = new Map();
+  layouts.forEach((layout, i) => {
+    const varName = `_layout${i}`;
+    imports.push(`import ${varName} from '${toImportPath(layout.filePath, rootDir)}';`);
+    layoutMap.set(layout.urlPrefix, varName);
+  });
+
+  pages.forEach((page, i) => {
+    const def = `_page${i}`;
+    const ns = `_page${i}_ns`;
+    const relPath = toImportPath(page.filePath, rootDir);
+
+    let pageConfig = { mode: 'client' };
+    let detected = { hasLoader: false, hasGetStaticPaths: false, hasPageConfig: false };
+    try {
+      const source = fs.readFileSync(page.filePath, 'utf-8');
+      pageConfig = extractPageConfig(source);
+      detected = detectPageExports(source);
+    } catch {}
+
+    const needsNs = detected.hasLoader || detected.hasGetStaticPaths || detected.hasPageConfig;
+    if (needsNs) {
+      imports.push(`import ${def}, * as ${ns} from '${relPath}';`);
+    } else {
+      imports.push(`import ${def} from '${relPath}';`);
+    }
+
+    routeEntries.push({
+      path: page.routePath,
+      component: def,
+      ns,
+      mode: pageConfig.mode || 'client',
+      layout: findLayout(page.routePath, layoutMap) || null,
+      ...detected,
+    });
+  });
+
+  const apiEntries = [];
+  apiRoutes.forEach((route, i) => {
+    const varName = `_api${i}`;
+    imports.push(`import * as ${varName} from '${toImportPath(route.filePath, rootDir)}';`);
+    apiEntries.push({ path: route.routePath, handlers: varName });
+  });
+
+  const routeLine = (r) =>
+    `  { path: '${r.path}', component: ${r.component}, mode: '${r.mode}'` +
+    `${r.layout ? `, layout: ${r.layout}` : ''}` +
+    `${r.hasLoader ? `, loader: ${r.ns}.loader` : ''}` +
+    `${r.hasGetStaticPaths ? `, getStaticPaths: ${r.ns}.getStaticPaths` : ''}` +
+    `${r.hasPageConfig ? `, page: ${r.ns}.page` : ''} },`;
+
+  const lines = [
+    '// Auto-generated by What Framework file router (server)',
+    '// Do not edit — changes will be overwritten',
+    '',
+    ...imports,
+    '',
+    'export const routes = [',
+    ...routeEntries.map(routeLine),
+    '];',
+    '',
+    'export const apiRoutes = [',
+    ...apiEntries.map(r => `  { path: '${r.path}', handlers: ${r.handlers} },`),
+    '];',
+    '',
+    'export const pageModes = {',
+    ...routeEntries.map(r => `  '${r.path}': '${r.mode}',`),
+    '};',
+  ];
+
+  return lines.join('\n');
+}
+
 /**
  * Convert absolute file path to a root-relative import path.
  */

package/src/vite-plugin.js

@@ -172,8 +172,34 @@ export default function whatVitePlugin(options = {}) {
           jsx: 'preserve',
         },
         optimizeDeps: {
-          // Pre-bundle the framework
-          include: ['what-framework']
+          // Exclude framework packages from Vite's dependency pre-bundling.
+          //
+          // Bug class this prevents — "dual module instance":
+          //   The compiler emits `import { ... } from 'what-framework/render'`
+          //   (a subpath resolved to the source file). Meanwhile user code
+          //   imports `'what-framework'` (the package entry). If Vite
+          //   pre-bundles `'what-framework'` into an esbuild chunk under
+          //   node_modules/.vite, those two import paths resolve to two
+          //   *different* module instances. Module-scoped state — the
+          //   `componentStack` used by createComponent, effect ownership,
+          //   the signal subscriber registry — is duplicated, so a signal
+          //   created in user code never notifies effects created via the
+          //   compiler-emitted path, and `getCurrentComponent()` returns
+          //   undefined inside components mounted through compiler output.
+          //
+          // Why `exclude` is the right knob:
+          //   `include` would force pre-bundling of the package entry, which
+          //   does not resolve the subpath import the compiler emits — so the
+          //   split persists. Using `exclude` tells Vite to skip the optimizer
+          //   for these packages and serve them via the normal module graph,
+          //   where both the package entry and the `/render` subpath share
+          //   a single ESM module record.
+          //
+          // Regression symptom if this is removed:
+          //   Components mount but lifecycle hooks (onMount, onCleanup) and
+          //   shared store state silently no-op; effects don't re-run on
+          //   signal writes from user code; SSR/CSR hydration mismatches.
+          exclude: ['what-framework', 'what-core', 'what-compiler', 'what-router'],
         }
       };
     }