reroute-js 0.20.2 → 0.20.3

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.20.2
+ * reroute-js v0.20.3
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v0.20.2
+ * reroute-js v0.20.3
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.20.2";
+    return "0.20.3";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "16c343b";
+    return "71a926d";
   }
   return "dev";
 }
@@ -944,9 +944,13 @@ async function computeLayoutData(pathname, clientDir, _cwd, isWatchMode, options
       if (typeof layout?.path !== "string")
         continue;
       try {
-        const abs = join2(clientDir, "routes", String(layout.path));
-        const mod = await dynamicImport(abs, isWatchMode);
-        const dataFn = mod?.ssr?.data;
+        let ssrExport = layout?.ssr;
+        if (!ssrExport) {
+          const abs = join2(clientDir, "routes", String(layout.path));
+          const mod = await dynamicImport(abs, isWatchMode);
+          ssrExport = mod?.ssr;
+        }
+        const dataFn = ssrExport?.data;
         if (typeof dataFn !== "function")
           continue;
         const pattern = String(layout.pattern || "/");
@@ -1042,9 +1046,13 @@ async function computeRouteData(pathname, clientDir, _cwd, isWatchMode, options2
     if (!route || typeof route.path !== "string") {
       return { data: ssrData, pendingTasks };
     }
-    const abs = join2(clientDir, "routes", String(route.path));
-    const mod = await dynamicImport(abs, isWatchMode);
-    const dataFn = mod?.ssr?.data;
+    let ssrExport = route?.ssr;
+    if (!ssrExport) {
+      const abs = join2(clientDir, "routes", String(route.path));
+      const mod = await dynamicImport(abs, isWatchMode);
+      ssrExport = mod?.ssr;
+    }
+    const dataFn = ssrExport?.data;
     if (typeof dataFn !== "function") {
       return { data: ssrData, pendingTasks };
     }
@@ -1176,6 +1184,24 @@ var init_routes = __esm(() => {
 });
 
 // packages/core/src/ssr/lib/compute/index.ts
+function matchPatternUtil(pattern, pathname) {
+  const patternParts = pattern.split("/").filter(Boolean);
+  const pathnameParts = pathname.split("/").filter(Boolean);
+  if (patternParts.length !== pathnameParts.length) {
+    return null;
+  }
+  const params = {};
+  for (let i = 0;i < patternParts.length; i++) {
+    const patternPart = patternParts[i];
+    const pathnamePart = pathnameParts[i];
+    if (patternPart.startsWith(":")) {
+      params[patternPart.slice(1)] = pathnamePart;
+    } else if (patternPart !== pathnamePart) {
+      return null;
+    }
+  }
+  return params;
+}
 async function computeSSRData(pathname, clientDir, cwd, isWatchMode, options2 = {}, searchParams) {
   const ssrData = {};
   let error;
@@ -1184,8 +1210,27 @@ async function computeSSRData(pathname, clientDir, cwd, isWatchMode, options2 =
   const streaming = options2.streaming === true;
   let routesModule;
   try {
-    const routesPath = join2(cwd, ".reroute", "routes.ts");
-    routesModule = await dynamicImport(routesPath, isWatchMode);
+    const bundledRoutes = globalThis.__REROUTE_ROUTES__;
+    const bundledLayouts = globalThis.__REROUTE_LAYOUTS__;
+    if (bundledRoutes && bundledLayouts) {
+      routesModule = {
+        routes: bundledRoutes,
+        layouts: bundledLayouts,
+        matchRoute: (pathname2) => {
+          for (const route of bundledRoutes) {
+            const pattern = String(route?.pattern || "");
+            const match = matchPatternUtil(pattern, pathname2);
+            if (match) {
+              return { route, params: match };
+            }
+          }
+          return null;
+        }
+      };
+    } else {
+      const routesPath = join2(cwd, ".reroute", "routes.ts");
+      routesModule = await dynamicImport(routesPath, isWatchMode);
+    }
   } catch {
     return {
       data: ssrData,
@@ -1373,6 +1418,24 @@ var init_seed = __esm(() => {
 });
 
 // packages/core/src/ssr/lib/data.ts
+function matchPattern(pattern, pathname) {
+  const patternParts = pattern.split("/").filter(Boolean);
+  const pathnameParts = pathname.split("/").filter(Boolean);
+  if (patternParts.length !== pathnameParts.length) {
+    return null;
+  }
+  const params = {};
+  for (let i = 0;i < patternParts.length; i++) {
+    const patternPart = patternParts[i];
+    const pathnamePart = pathnameParts[i];
+    if (patternPart.startsWith(":")) {
+      params[patternPart.slice(1)] = pathnamePart;
+    } else if (patternPart !== pathnamePart) {
+      return null;
+    }
+  }
+  return params;
+}
 async function computeSSRDataForPath(params) {
   const { pathname, clientDir, cwd, isWatchMode, searchParams } = params;
   const allData = {};
@@ -1380,16 +1443,24 @@ async function computeSSRDataForPath(params) {
     await seedSSRModuleForPath(pathname, clientDir, cwd, isWatchMode);
   } catch {}
   try {
-    const routesPath = join2(cwd, ".reroute", "routes.ts");
-    const m = await dynamicImport(routesPath, isWatchMode);
-    const matchingLayouts = getMatchingLayouts(pathname, m?.layouts);
+    let layouts = globalThis.__REROUTE_LAYOUTS__;
+    if (!layouts) {
+      const routesPath = join2(cwd, ".reroute", "routes.ts");
+      const m = await dynamicImport(routesPath, isWatchMode);
+      layouts = m?.layouts;
+    }
+    const matchingLayouts = getMatchingLayouts(pathname, layouts);
     for (const layout of matchingLayouts) {
       if (typeof layout?.path !== "string")
         continue;
       try {
-        const abs = join2(clientDir, "routes", String(layout.path));
-        const mod = await dynamicImport(abs, isWatchMode);
-        const dataFn = mod?.ssr?.data;
+        let ssrExport = layout?.ssr;
+        if (!ssrExport) {
+          const abs = join2(clientDir, "routes", String(layout.path));
+          const mod = await dynamicImport(abs, isWatchMode);
+          ssrExport = mod?.ssr;
+        }
+        const dataFn = ssrExport?.data;
         if (typeof dataFn !== "function")
           continue;
         const pattern = String(layout.pattern || "/");
@@ -1425,16 +1496,37 @@ async function computeSSRDataForPath(params) {
     }
   } catch {}
   try {
-    const routesPath = join2(cwd, ".reroute", "routes.ts");
-    const m = await dynamicImport(routesPath, isWatchMode);
+    let routes = globalThis.__REROUTE_ROUTES__;
+    let matchRouteFn;
+    if (!routes) {
+      const routesPath = join2(cwd, ".reroute", "routes.ts");
+      const m = await dynamicImport(routesPath, isWatchMode);
+      routes = m?.routes;
+      matchRouteFn = m?.matchRoute;
+    } else {
+      matchRouteFn = (pathname2) => {
+        for (const route of routes || []) {
+          const pattern = String(route?.pattern || "");
+          const match2 = matchPattern(pattern, pathname2);
+          if (match2) {
+            return { route, params: match2 };
+          }
+        }
+        return null;
+      };
+    }
     const pathnameOnly = pathname.split("?")[0];
-    const match = typeof m.matchRoute === "function" ? m.matchRoute(pathnameOnly) : null;
+    const match = typeof matchRouteFn === "function" ? matchRouteFn(pathnameOnly) : null;
     const r = match?.route;
     const paramsValue = match?.params || {};
     if (r && typeof r.path === "string") {
-      const abs = join2(clientDir, "routes", String(r.path));
-      const mod = await dynamicImport(abs, isWatchMode);
-      const dataFn = mod?.ssr?.data;
+      let ssrExport = r?.ssr;
+      if (!ssrExport) {
+        const abs = join2(clientDir, "routes", String(r.path));
+        const mod = await dynamicImport(abs, isWatchMode);
+        ssrExport = mod?.ssr;
+      }
+      const dataFn = ssrExport?.data;
       if (typeof dataFn === "function") {
         const rawResult = dataFn({
           pathname,
@@ -2189,6 +2281,11 @@ var init_scripts = __esm(() => {
 // packages/core/src/ssr/lib/styles.ts
 async function inlineTailwindCSS(clientDir, minify = false) {
   try {
+    const bundledCss = globalThis.__REROUTE_THEME_CSS__;
+    if (bundledCss) {
+      const css2 = minify ? minifyCSS(bundledCss) : bundledCss;
+      return `<style data-reroute="tailwind">${css2}</style>`;
+    }
     const candidates = [
       join2(clientDir, "..", ".reroute", "theme.css"),
       join2(clientDir, "..", "..", ".reroute", "theme.css"),
@@ -2743,10 +2840,13 @@ import { pathToFileURL as pathToFileURL6 } from "node:url";
 async function discoverStaticRoutes(cwd, isWatchMode) {
   const routes = [];
   try {
-    const routesPath = join2(cwd, ".reroute", "routes.ts");
-    const url = pathToFileURL6(routesPath).href;
-    const mod = await import(`${url}${isWatchMode ? `?t=${Date.now()}` : ""}`);
-    const routesList = mod?.routes;
+    let routesList = globalThis.__REROUTE_ROUTES__;
+    if (!routesList) {
+      const routesPath = join2(cwd, ".reroute", "routes.ts");
+      const url = pathToFileURL6(routesPath).href;
+      const mod = await import(`${url}${isWatchMode ? `?t=${Date.now()}` : ""}`);
+      routesList = mod?.routes;
+    }
     if (Array.isArray(routesList)) {
       for (const route of routesList) {
         const pattern = String(route?.pattern || "");
@@ -3219,10 +3319,13 @@ var init_og = __esm(() => {
 async function discoverRoutesForRobots(cwd, isWatchMode) {
   const routes = [];
   try {
-    const routesPath = join2(cwd, ".reroute", "routes.ts");
-    const url = Bun.pathToFileURL(routesPath).href;
-    const mod = await import(`${url}${isWatchMode ? `?t=${Date.now()}` : ""}`);
-    const routesArray = mod?.routes;
+    let routesArray = globalThis.__REROUTE_ROUTES__;
+    if (!routesArray) {
+      const routesPath = join2(cwd, ".reroute", "routes.ts");
+      const url = Bun.pathToFileURL(routesPath).href;
+      const mod = await import(`${url}${isWatchMode ? `?t=${Date.now()}` : ""}`);
+      routesArray = mod?.routes;
+    }
     if (Array.isArray(routesArray)) {
       for (const route of routesArray) {
         const pattern = String(route?.pattern || "");
@@ -3403,10 +3506,13 @@ async function discoverRoutes(cwd, isWatchMode) {
   const staticRoutes = [];
   const dynamicRoutes = [];
   try {
-    const routesPath = join2(cwd, ".reroute", "routes.ts");
-    const url = Bun.pathToFileURL(routesPath).href;
-    const mod = await import(`${url}${isWatchMode ? `?t=${Date.now()}` : ""}`);
-    const routes = mod?.routes;
+    let routes = globalThis.__REROUTE_ROUTES__;
+    if (!routes) {
+      const routesPath = join2(cwd, ".reroute", "routes.ts");
+      const url = Bun.pathToFileURL(routesPath).href;
+      const mod = await import(`${url}${isWatchMode ? `?t=${Date.now()}` : ""}`);
+      routes = mod?.routes;
+    }
     if (Array.isArray(routes)) {
       for (const route of routes) {
         const pattern = String(route?.pattern || "");
@@ -3880,10 +3986,13 @@ async function discoverRSSData(cwd, clientDir, collections2, baseUrl, isWatchMod
 async function discoverLayoutFeedItems(cwd, clientDir, isWatchMode, baseUrl, rssConfig) {
   const layoutFeeds = new Map;
   try {
-    const routesPath = join2(cwd, ".reroute", "routes.ts");
-    const url = pathToFileURL7(routesPath).href;
-    const mod = await import(`${url}${isWatchMode ? `?t=${Date.now()}` : ""}`);
-    const layouts2 = mod?.layouts;
+    let layouts2 = globalThis.__REROUTE_LAYOUTS__;
+    if (!layouts2) {
+      const routesPath = join2(cwd, ".reroute", "routes.ts");
+      const url = pathToFileURL7(routesPath).href;
+      const mod = await import(`${url}${isWatchMode ? `?t=${Date.now()}` : ""}`);
+      layouts2 = mod?.layouts;
+    }
     if (Array.isArray(layouts2)) {
       for (const layout of layouts2) {
         const pattern = String(layout?.pattern || "/");
@@ -4231,8 +4340,9 @@ async function streamSSRContent(writer, encoder, ctx) {
   try {
     const combinedHead = deduplicateMetaTags([ctx.inlineStyleTag, ctx.head, ctx.extraHead].filter(Boolean).join(`
 `));
-    const headContent = `${ctx.headWithLang.replace(/<html([^>]*)>/i, `<html$1 lang="${ctx.pageLang}">`)}${combinedHead ? `
-${combinedHead}` : ""}</head><body>`;
+    const headWithLangAndContent = ctx.headWithLang.replace(/<html([^>]*)>/i, `<html$1 lang="${ctx.pageLang}">`).replace(/<\/head>/i, `${combinedHead ? `${combinedHead}
+` : ""}</head>`);
+    const headContent = `${headWithLangAndContent}<body>`;
     await writer.write(encoder.encode(headContent));
     await writer.write(encoder.encode(ctx.rootStart));
     const componentWithPathname = cloneElement2(ctx.rootComponent, {
@@ -8751,6 +8861,31 @@ import { watch } from "node:fs";
 import { mkdir as mkdir2, readdir as readdir5, rm } from "node:fs/promises";
 import { dirname as dirname5, join as join9 } from "node:path";
 import { pathToFileURL as pathToFileURL8 } from "node:url";
+async function bundleThemeCssIntoArtifacts(cwd) {
+  const themeCssPath = join9(cwd, ".reroute", "theme.css");
+  const artifactsPath = join9(cwd, OUTPUT_ARTIFACTS);
+  try {
+    const cssContent = await Bun.file(themeCssPath).text();
+    if (!cssContent)
+      return;
+    let artifactsContent = await Bun.file(artifactsPath).text();
+    if (artifactsContent.includes("__REROUTE_THEME_CSS__")) {
+      return;
+    }
+    const cssLine = `
+// Bundled theme.css for compiled binary support
+(globalThis as any).__REROUTE_THEME_CSS__ = ${JSON.stringify(cssContent)};
+`;
+    const exportIndex = artifactsContent.lastIndexOf("export type RerouteBundle");
+    if (exportIndex !== -1) {
+      artifactsContent = artifactsContent.slice(0, exportIndex) + cssLine + `
+` + artifactsContent.slice(exportIndex);
+    } else {
+      artifactsContent += cssLine;
+    }
+    await Bun.write(artifactsPath, artifactsContent);
+  } catch {}
+}
 async function ensureOutputDir(cwd, options2 = {}) {
   const { clean = true } = options2;
   try {
@@ -8824,6 +8959,7 @@ export * from './artifacts';
 // @ts-nocheck
 
 import './artifacts';
+import './routes'; // Import routes (bundles all route components)
 import '../src/index';
 `;
   await Bun.write(join9(cwd, OUTPUT_ROUTES), STUB_ROUTES);
@@ -8966,9 +9102,14 @@ function getImportPath(filePath, streamingMap) {
 }
 function generateTypeScript(tree, streamingMap) {
   const helperImport = "import { createLazyRoute } from 'reroute-js/react';";
+  const ssrHelper = "const _ssr = (m: any) => m.ssr;";
   const eagerImports = [
-    ...tree.routes.map((r, i) => `import Route${i}Eager from '${getImportPath(r.filePath, streamingMap)}';`),
-    ...tree.layouts.map((l, i) => `import Layout${i}Eager from '${getImportPath(l.filePath, streamingMap)}';`),
+    ...tree.routes.map((r, i) => `import * as Route${i}Module from '${getImportPath(r.filePath, streamingMap)}';
+const Route${i}Eager = Route${i}Module.default;
+const Route${i}SSR = _ssr(Route${i}Module);`),
+    ...tree.layouts.map((l, i) => `import * as Layout${i}Module from '${getImportPath(l.filePath, streamingMap)}';
+const Layout${i}Eager = Layout${i}Module.default;
+const Layout${i}SSR = _ssr(Layout${i}Module);`),
     ...tree.notFoundRoutes.map((nf, i) => `import NotFound${i}Eager from '${getImportPath(nf.filePath, streamingMap)}';`)
   ].join(`
 `);
@@ -8994,6 +9135,7 @@ function generateTypeScript(tree, streamingMap) {
     component: Route${i},
     params: ${JSON.stringify(r.params)},
     isDynamic: ${r.isDynamic},
+    ssr: Route${i}SSR,
   } as const`;
   }).join(`,
 `);
@@ -9009,6 +9151,7 @@ function generateTypeScript(tree, streamingMap) {
     pattern: "${l.pattern}",
     path: "${l.path}",
     component: Layout${i},
+    ssr: Layout${i}SSR,
   } as const`;
   }).join(`,
 `);
@@ -9026,6 +9169,8 @@ function generateTypeScript(tree, streamingMap) {
 
 ${helperImport}
 
+${ssrHelper}
+
 ${eagerImports}
 
 ${lazyWrappers}
@@ -9090,6 +9235,10 @@ function matchPattern(pattern: string, pathname: string): Record<string, string>
 
   return params;
 }
+
+// Set globals for compiled binary support (sitemap/RSS/robots discovery)
+(globalThis as any).__REROUTE_ROUTES__ = routes;
+(globalThis as any).__REROUTE_LAYOUTS__ = layouts;
 `;
 }
 async function buildStreamingWrappersForTree(cwd, routesPath, tree, config2) {
@@ -9648,6 +9797,7 @@ async function generate(cwd, args = [], options2 = {}) {
     "// @ts-nocheck",
     "",
     "import './artifacts'; // Import artifacts (sets globals for SSR)",
+    "import './routes'; // Import routes (bundles all route components)",
     "import '../src/index'; // Import user's server entry"
   ];
   await Bun.write(join9(cwd, ".reroute/entry.ts"), entryLines.join(`
@@ -9677,6 +9827,7 @@ async function gen(args) {
   if (!watchMode) {
     await generate(cwd, args);
     await buildTailwindIfConfigured(cwd, isProd);
+    await bundleThemeCssIntoArtifacts(cwd);
     checkMarkdownIfConfigured(cwd);
     const genEndTime2 = performance.now();
     const totalDuration2 = ((genEndTime2 - genStartTime) / 1000).toFixed(2);
@@ -9690,6 +9841,7 @@ async function gen(args) {
   await generate(cwd, args);
   try {
     await buildTailwindIfConfigured(cwd, isProd);
+    await bundleThemeCssIntoArtifacts(cwd);
     checkMarkdownIfConfigured(cwd);
   } catch {}
   const genEndTime = performance.now();
@@ -10490,8 +10642,14 @@ __export(exports_build, {
   default: () => build
 });
 import { spawn as spawn4 } from "node:child_process";
-import { existsSync as existsSync8, readFileSync as readFileSync5 } from "node:fs";
-import { join as join12 } from "node:path";
+import {
+  cpSync,
+  existsSync as existsSync8,
+  mkdirSync,
+  readdirSync,
+  readFileSync as readFileSync5
+} from "node:fs";
+import { dirname as dirname6, join as join12 } from "node:path";
 function getRerouteCommand3() {
   const binPath = join12(import.meta.dir, "..", "..", "bin.ts");
   const isBunDev = existsSync8(binPath);
@@ -10603,7 +10761,7 @@ async function build(args) {
       return arg !== "--outfile" && arg !== "-o" && arg !== "--minify" && arg !== "--no-minify" && arg !== "--prod";
     });
     buildArgs.push(...filteredArgs, "--outfile", outputPath);
-    await new Promise((resolve2, reject) => {
+    await new Promise((_resolve, reject) => {
       const buildProcess = spawn4("bun", buildArgs, {
         stdio: "inherit"
       });
@@ -10613,13 +10771,42 @@ async function build(args) {
         } else {
           process.stdout.write(colorizeLogPrefixAnsi(`[reroute/build] Build complete: ${outputPath}
 `));
-          resolve2();
+          process.exit(0);
         }
       });
       buildProcess.on("error", (error) => {
         reject(error);
       });
     });
+    const cwd = process.cwd();
+    const config2 = await loadConfig(cwd);
+    const assetsPath = config2.options?.assets || "src/client";
+    const sourceAssetsDir = join12(cwd, assetsPath, "assets");
+    const distDir = dirname6(outputPath);
+    const destAssetsDir = join12(distDir, "assets");
+    if (existsSync8(sourceAssetsDir)) {
+      process.stdout.write(colorizeLogPrefixAnsi(`[reroute/build] Copying assets...
+`));
+      if (!existsSync8(distDir)) {
+        mkdirSync(distDir, { recursive: true });
+      }
+      cpSync(sourceAssetsDir, destAssetsDir, { recursive: true });
+      const countFiles = (dir) => {
+        let count = 0;
+        const entries = readdirSync(dir, { withFileTypes: true });
+        for (const entry of entries) {
+          if (entry.isDirectory()) {
+            count += countFiles(join12(dir, entry.name));
+          } else {
+            count++;
+          }
+        }
+        return count;
+      };
+      const fileCount = countFiles(destAssetsDir);
+      process.stdout.write(colorizeLogPrefixAnsi(`[reroute/build] Copied ${fileCount} assets to ${destAssetsDir}
+`));
+    }
   } catch (error) {
     process.stderr.write(`${colorizeLogPrefixAnsi("[reroute/build] Error: ") + String(error)}
 `);
@@ -10627,6 +10814,7 @@ async function build(args) {
   }
 }
 var init_build = __esm(() => {
+  init_core();
   init_log();
 });
 
@@ -13201,7 +13389,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.20.2";
+    return "0.20.3";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -13218,10 +13406,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "16c343b";
+    return "71a926d";
   }
   return "dev";
 }
 main();
 
-//# debugId=15E81E873286047B64756E2164756E21
+//# debugId=92865B18E2048CEB64756E2164756E21