reroute-js 1.0.0-alpha.33 → 1.0.0-alpha.35

package/README.md

@@ -130,6 +130,7 @@ Reroute is a feature-rich file-based routing framework for building fullstack Re
   - `<Link>` - Client-side navigation with automatic prefetching (localizes content hrefs)
   - `<Image>` - Optimized images with automatic format negotiation and lazy loading
   - `<Outlet>` - Render nested route components
+  - Route groups - `routes/(app)/[layout].tsx` wraps the routes in `(app)/` with one layout, no URL segment
   - `<ContentRoute>` - Dynamic content rendering with metadata injection
   - `<ClientOnly>` - Client-side only rendering with optional layout preservation (className/style props)
 - 🎭 **Providers**:

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.33
+ * reroute-js v1.0.0-alpha.35
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v1.0.0-alpha.33
+ * reroute-js v1.0.0-alpha.35
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -68,7 +68,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "1.0.0-alpha.33";
+    return "1.0.0-alpha.35";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -86,7 +86,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "04f6516";
+    return "bb512b2";
   }
   return "dev";
 }
@@ -1908,10 +1908,17 @@ function layoutCovers(pattern, pathname) {
     return true;
   return pathname === base || pathname.startsWith(`${base}/`);
 }
-function getMatchingLayouts(pathname, layouts) {
+function layoutWraps(layout, pathname, routePattern) {
+  if (Array.isArray(layout?.routes)) {
+    return routePattern !== undefined && layout.routes.includes(routePattern);
+  }
+  return layoutCovers(String(layout?.pattern || "/"), pathname);
+}
+function getMatchingLayouts(pathname, layouts, routes) {
   if (!Array.isArray(layouts))
     return [];
-  return layouts.filter((layout) => layoutCovers(String(layout?.pattern || "/"), pathname)).sort((a, b) => {
+  const routePattern = Array.isArray(routes) ? matchRoutes(routes, pathname)?.route.pattern : undefined;
+  return layouts.filter((layout) => layoutWraps(layout, pathname, routePattern)).sort((a, b) => {
     const aDepth = getPatternDepth(a?.pattern);
     const bDepth = getPatternDepth(b?.pattern);
     return aDepth - bDepth;
@@ -1926,6 +1933,7 @@ function createLayoutCacheKey(pattern, pathname) {
 function createLayoutDataKey(pattern) {
   return `__layout:${pattern}`;
 }
+var init_layouts = () => {};
 
 // packages/core/src/ssr/lib/compute/layouts.ts
 async function loadLayoutSSRExport(layout, clientDir, isWatchMode) {
@@ -2025,7 +2033,8 @@ async function computeLayoutData(pathname, clientDir, _cwd, isWatchMode, options
   const maxAgeMs = maxAge * 1000;
   try {
     const layouts = routesModule?.layouts;
-    const matchingLayouts = getMatchingLayouts(pathname, layouts);
+    const routes = routesModule?.routes;
+    const matchingLayouts = getMatchingLayouts(pathname, layouts, routes);
     for (const layout of matchingLayouts) {
       try {
         const layoutStatus = await processLayout(layout, pathname, clientDir, isWatchMode, streaming, maxAgeMs, searchParams, ssrData, pendingTasks, options.headers);
@@ -2052,9 +2061,10 @@ function mergeLayoutData(ssrData, pathname) {
     ssrData[pathname] = layoutData;
   }
 }
-var init_layouts = __esm(() => {
+var init_layouts2 = __esm(() => {
   init_cache();
   init_imports();
+  init_layouts();
 });
 
 // packages/core/src/ssr/lib/compute/routes.ts
@@ -2346,10 +2356,10 @@ function setGlobalSSRData(data) {
 var init_compute = __esm(() => {
   init_imports();
   init_content2();
-  init_layouts();
+  init_layouts2();
   init_routes();
   init_content2();
-  init_layouts();
+  init_layouts2();
   init_routes();
 });
 
@@ -2661,12 +2671,14 @@ async function loadLayoutData(pathname, clientDir, cwd, isWatchMode, searchParam
   const allData = {};
   try {
     let layouts = globalThis.__REROUTE_LAYOUTS__;
+    let routes = globalThis.__REROUTE_ROUTES__;
     if (!layouts) {
       const routesPath = join2(cwd, ".reroute", "routes.ts");
       const m = await dynamicImport(routesPath, isWatchMode);
       layouts = m?.layouts;
+      routes = m?.routes;
     }
-    const matchingLayouts = getMatchingLayouts(pathname, layouts);
+    const matchingLayouts = getMatchingLayouts(pathname, layouts, routes);
     for (const layout of matchingLayouts) {
       const result = await processLayout2(layout, pathname, clientDir, isWatchMode, searchParams);
       if (result) {
@@ -2688,6 +2700,7 @@ function createLazyMarker(pathname, key) {
 var init_data = __esm(() => {
   init_content_path();
   init_imports();
+  init_layouts();
   init_seed();
 });
 
@@ -3153,7 +3166,7 @@ ${ssrHead}`);
 async function extractLayoutMetadata(pathname, clientDir, cwd, isWatchMode, addHead, setLang, ogConfig, titleSuffix) {
   try {
     const m = await loadRoutesModule(cwd, isWatchMode);
-    const matchingLayouts = getMatchingLayouts(pathname, m?.layouts);
+    const matchingLayouts = getMatchingLayouts(pathname, m?.layouts, m?.routes);
     for (const layout of matchingLayouts) {
       await processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang, ogConfig, titleSuffix);
     }
@@ -3472,10 +3485,11 @@ var init_metadata2 = __esm(() => {
   init_compute();
   init_content_path();
   init_imports();
+  init_layouts();
 });
 
 // packages/core/src/ssr/lib/preload.ts
-import { readdir as readdir6, stat as stat5 } from "node:fs/promises";
+import { readdir as readdir6, readFile, stat as stat5 } from "node:fs/promises";
 async function preloadContentModule(pathname, clientDir, cwd, isWatchMode) {
   let extraHead = "";
   let hydrationScript = "";
@@ -3578,15 +3592,37 @@ function resetSSRAccessTracking() {
     globalThis.__REROUTE_SSR_ACCESSED__ = {};
   } catch {}
 }
-function createBundlePreload(bundleUrl) {
+async function bundleImports(cwd, bundleUrl) {
+  const key = `${cwd}:${bundleUrl}`;
+  if (bundleImportsCache?.key === key)
+    return bundleImportsCache.hrefs;
+  const slash = bundleUrl.lastIndexOf("/");
+  const base = bundleUrl.slice(0, slash + 1);
+  const entry = bundleUrl.slice(slash + 1);
+  let hrefs = [];
+  try {
+    const raw = await readFile(bundlePreloadPath(join2(cwd, ".reroute", "bundles")), "utf8");
+    const manifest = JSON.parse(raw);
+    if (manifest.entry === entry && Array.isArray(manifest.imports)) {
+      hrefs = manifest.imports.filter((file) => typeof file === "string").map((file) => `${base}${file}`);
+    }
+  } catch {}
+  bundleImportsCache = { key, hrefs };
+  return hrefs;
+}
+function createBundlePreload(bundleUrl, imports = []) {
   try {
     if (typeof bundleUrl === "string" && bundleUrl.endsWith(".js")) {
-      return `
-<link rel="modulepreload" href="${bundleUrl}" />`;
+      return [bundleUrl, ...imports].map((href) => `
+<link rel="modulepreload" href="${href}" />`).join("");
     }
   } catch {}
   return "";
 }
+function bundlePreloadPath(bundlesDir) {
+  return join2(bundlesDir, "preload.json");
+}
+var bundleImportsCache = null;
 var init_preload = __esm(() => {
   init_imports();
 });
@@ -4057,7 +4093,7 @@ async function performSSRSetupInternal(options, streaming, timeoutState) {
   assertNotTimedOut();
   resetSSRAccessTracking();
   resetSSRContentResults();
-  const bundlePreload = createBundlePreload(bundleUrl);
+  const bundlePreload = createBundlePreload(bundleUrl, await bundleImports(cwd, bundleUrl));
   const preloadResult = await withSpan("ssr.preload", async (span) => {
     span.setAttribute("pathname", pathname);
     const result = await preloadContentModule(pathname, clientDir, cwd, isWatchMode);
@@ -4196,6 +4232,7 @@ var init_lib = __esm(() => {
   init_compute();
   init_html();
   init_imports();
+  init_layouts();
   init_metadata2();
   init_modules();
   init_preload();
@@ -7035,6 +7072,8 @@ __export(exports_core, {
   buildLlmsDiscovery: () => buildLlmsDiscovery,
   buildLocaleCookie: () => buildLocaleCookie,
   buildSitemapLoc: () => buildSitemapLoc,
+  bundleImports: () => bundleImports,
+  bundlePreloadPath: () => bundlePreloadPath,
   cleanupPathScopedSSRData: () => cleanupPathScopedSSRData,
   clearSSRModuleStores: () => clearSSRModuleStores,
   clearWatchImportCache: () => clearWatchImportCache,
@@ -7113,6 +7152,7 @@ __export(exports_core, {
   isThenable: () => isThenable,
   join: () => join2,
   layoutCovers: () => layoutCovers,
+  layoutWraps: () => layoutWraps,
   listContentFiles: () => listContentFiles,
   llmsAlternateLinkTag: () => llmsAlternateLinkTag,
   loadCollections: () => loadCollections,
@@ -7187,6 +7227,27 @@ function getNamingConfig(options) {
 function shouldRebuildClientBundle(filename) {
   return filename.endsWith(".ts") || filename.endsWith(".tsx") || filename.endsWith(".md") || filename.endsWith(".mdx");
 }
+function entryStaticImports(metafile, entryFile) {
+  if (typeof metafile !== "object" || metafile === null || !("outputs" in metafile) || typeof metafile.outputs !== "object" || metafile.outputs === null) {
+    return [];
+  }
+  const outputs = new Map(Object.entries(metafile.outputs).map(([path3, output]) => [fileNameOf(path3), output]));
+  const found = [];
+  const queue = [entryFile];
+  for (let file = queue.shift();file !== undefined; file = queue.shift()) {
+    for (const item of outputs.get(file)?.imports ?? []) {
+      if (item.kind !== "import-statement" || typeof item.path !== "string")
+        continue;
+      const chunk = fileNameOf(item.path);
+      if (chunk === entryFile || found.includes(chunk))
+        continue;
+      found.push(chunk);
+      queue.push(chunk);
+    }
+  }
+  return found;
+}
+var fileNameOf = (path3) => path3.split(/[\\/]/).pop() ?? path3;
 
 // packages/cli/src/commands/lib/env.ts
 import { existsSync as existsSync2, readFileSync } from "node:fs";
@@ -8070,6 +8131,109 @@ function isProductionMode(args = []) {
   return hasProdFlag(args);
 }
 
+// packages/cli/src/commands/lib/routes.ts
+function isRouteGroup(segment) {
+  return groupSegment.test(segment);
+}
+function withoutGroups(routePath) {
+  return routePath.split("/").filter((segment) => segment !== "" && !isRouteGroup(segment)).join("/");
+}
+function dirOf(filePath) {
+  return filePath.split("/").slice(0, -1).join("/");
+}
+function inGroup(dir) {
+  return dir.split("/").some(isRouteGroup);
+}
+function fileToRoute(filePath) {
+  const isLayout = filePath.endsWith("[layout].tsx") || filePath.endsWith("[layout].ts") || filePath.endsWith("[layout].md") || filePath.endsWith("[layout].mdx");
+  const dir = dirOf(filePath);
+  let routePath = filePath.replace(/\.(tsx|ts|md|mdx)$/, "");
+  if (isLayout) {
+    const pattern2 = routePath.replace(/\[layout\]$/, "").replace(/\/$/, "");
+    const normalizedPattern2 = pattern2 === "" ? "/" : `/${pattern2}`;
+    return {
+      path: routePath,
+      pattern: normalizedPattern2,
+      filePath,
+      isLayout,
+      isDynamic: false,
+      params: [],
+      isNotFound: false,
+      dir
+    };
+  }
+  routePath = routePath.replace(/\/index$/, "").replace(/^index$/, "");
+  const params = [];
+  const pattern = withoutGroups(routePath).replace(/\[([^\]]+)\]/g, (_, param) => {
+    params.push(param);
+    return `:${param}`;
+  });
+  const normalizedPattern = pattern === "" ? "/" : `/${pattern}`;
+  const isNotFound = /(^|\/)\[404\]$/.test(routePath);
+  let notFoundBasePattern;
+  if (isNotFound) {
+    const base = withoutGroups(routePath.replace(/(^|\/)\[404\]$/, ""));
+    notFoundBasePattern = base ? `/${base}` : "/";
+  }
+  return {
+    path: routePath,
+    pattern: normalizedPattern,
+    filePath,
+    isLayout: false,
+    isDynamic: params.length > 0,
+    params,
+    isNotFound,
+    notFoundBasePattern,
+    dir
+  };
+}
+function sortRoutes(routes) {
+  return routes.sort((a, b) => compareRouteSpecificity(a, b));
+}
+function assertUniquePatterns(routes) {
+  const seen = new Map;
+  for (const route of routes) {
+    const other = seen.get(route.pattern);
+    if (other) {
+      throw new Error(`Routes ${other} and ${route.filePath} both serve ${route.pattern}`);
+    }
+    seen.set(route.pattern, route.filePath);
+  }
+}
+function routesUnder(dir, routes) {
+  return routes.filter((route) => route.dir === dir || route.dir.startsWith(`${dir}/`)).map((route) => route.pattern);
+}
+function generateRouteTree(files) {
+  const routes = [];
+  const layouts2 = [];
+  const notFoundRoutes = [];
+  for (const file of files) {
+    const route = fileToRoute(file);
+    if (route.isLayout) {
+      layouts2.push(route);
+    } else if (route.isNotFound) {
+      notFoundRoutes.push(route);
+    } else {
+      routes.push(route);
+    }
+  }
+  assertUniquePatterns(routes);
+  for (const layout of layouts2) {
+    if (inGroup(layout.dir))
+      layout.routes = routesUnder(layout.dir, routes);
+  }
+  return {
+    routes: sortRoutes(routes),
+    layouts: layouts2,
+    notFoundRoutes
+  };
+}
+var groupSegment;
+var init_routes2 = __esm(() => {
+  init_core();
+  groupSegment = /^\(.+\)$/;
+});
+
 // packages/cli/src/commands/lib/streaming/analyzer.ts
 import { dirname as dirname4, join as join10 } from "node:path";
 function hasSSRDataExport(source) {
@@ -8309,7 +8473,7 @@ var init_theme = __esm(() => {
 
 // packages/cli/src/commands/lib/watch.ts
 import { createHash as createHash3 } from "node:crypto";
-import { readFile } from "node:fs/promises";
+import { readFile as readFile2 } from "node:fs/promises";
 import { dirname as dirname7, isAbsolute as isAbsolute2, join as join13, resolve as resolve4, sep } from "node:path";
 function isWatchNoise(name) {
   return name.split(/[/\\]/).some((part) => part.startsWith(".")) || /\.bust-[^/\\]+$/.test(name);
@@ -8332,7 +8496,7 @@ function createContentFingerprint(options) {
     async changed(absPath) {
       const settling = Date.now() - startedAt < settleMs;
       try {
-        const buf = await readFile(absPath);
+        const buf = await readFile2(absPath);
         gone.delete(absPath);
         const hash2 = createHash3("sha1").update(buf).digest("hex");
         const prev = hashes.get(absPath);
@@ -8606,69 +8770,6 @@ async function scanOgFiles(dir, base = "") {
   }
   return files;
 }
-function fileToRoute(filePath) {
-  const isLayout = filePath.endsWith("[layout].tsx") || filePath.endsWith("[layout].ts") || filePath.endsWith("[layout].md") || filePath.endsWith("[layout].mdx");
-  let routePath = filePath.replace(/\.(tsx|ts|md|mdx)$/, "");
-  if (isLayout) {
-    const pattern2 = routePath.replace(/\[layout\]$/, "").replace(/\/$/, "");
-    const normalizedPattern2 = pattern2 === "" ? "/" : `/${pattern2}`;
-    return {
-      path: routePath,
-      pattern: normalizedPattern2,
-      filePath,
-      isLayout,
-      isDynamic: false,
-      params: [],
-      isNotFound: false
-    };
-  }
-  routePath = routePath.replace(/\/index$/, "").replace(/^index$/, "");
-  const params = [];
-  const pattern = routePath.replace(/\[([^\]]+)\]/g, (_, param) => {
-    params.push(param);
-    return `:${param}`;
-  });
-  const normalizedPattern = pattern === "" ? "/" : `/${pattern}`;
-  const isNotFound = /(^|\/)\[404\]$/.test(routePath);
-  let notFoundBasePattern;
-  if (isNotFound) {
-    const base = routePath.replace(/(^|\/)\[404\]$/, "").replace(/\/$/, "");
-    notFoundBasePattern = base ? `/${base}` : "/";
-  }
-  return {
-    path: routePath,
-    pattern: normalizedPattern,
-    filePath,
-    isLayout: false,
-    isDynamic: params.length > 0,
-    params,
-    isNotFound,
-    notFoundBasePattern
-  };
-}
-function sortRoutes(routes) {
-  return routes.sort((a, b) => compareRouteSpecificity(a, b));
-}
-function generateRouteTree(files) {
-  const routes = [];
-  const layouts2 = [];
-  const notFoundRoutes = [];
-  for (const file of files) {
-    const route = fileToRoute(file);
-    if (route.isLayout) {
-      layouts2.push(route);
-    } else if (route.isNotFound) {
-      notFoundRoutes.push(route);
-    } else {
-      routes.push(route);
-    }
-  }
-  return {
-    routes: sortRoutes(routes),
-    layouts: layouts2,
-    notFoundRoutes
-  };
-}
 function getImportPath(filePath, streamingMap, routesImportBase) {
   const isMarkdown = /\.(md|mdx)$/.test(filePath);
   if (isMarkdown) {
@@ -8746,9 +8847,11 @@ const Layout${i}Meta = _meta(Layout${i}Module);`)
   }).join(`
 `);
   const layoutsArray = tree.layouts.map((l, i) => {
+    const scope = l.routes ? `
+    routes: ${JSON.stringify(l.routes)},` : "";
     return `  {
     pattern: "${l.pattern}",
-    path: "${l.path}",
+    path: "${l.path}",${scope}
     component: Layout${i},
     ssr: Layout${i}SSR,
     meta: Layout${i}Meta,
@@ -9527,6 +9630,10 @@ async function buildEntrypointBundle(cwd, args = []) {
       }
     }
   }));
+  await Bun.write(bundlePreloadPath(bundlesDir), JSON.stringify({
+    entry: entryFile,
+    imports: entryStaticImports("metafile" in result ? result.metafile : undefined, entryFile)
+  }));
   if (shouldPreCompress && compressionCount > 0) {
     const compressionDuration = performance.now() - compressionStartTime;
     const timeStr = compressionDuration < 1000 ? `${compressionDuration.toFixed(0)}ms` : `${(compressionDuration / 1000).toFixed(2)}s`;
@@ -10266,6 +10373,7 @@ var init_gen = __esm(() => {
   init_env();
   init_images();
   init_markdown();
+  init_routes2();
   init_analyzer();
   init_suspense();
   init_theme();
@@ -105638,7 +105746,7 @@ __export(exports_analyze, {
   default: () => analyze
 });
 import { existsSync as existsSync14, statSync } from "node:fs";
-import { readdir as readdir9, readFile as readFile2, stat as stat6, writeFile as writeFile2 } from "node:fs/promises";
+import { readdir as readdir9, readFile as readFile3, stat as stat6, writeFile as writeFile2 } from "node:fs/promises";
 import { basename as basename4, join as join20, relative as relative4 } from "node:path";
 import Table from "cli-table3";
 async function findChunkBundles(cwd) {
@@ -105900,7 +106008,7 @@ async function buildDependencyTree(entryPath, cwd) {
         }
         return node.size;
       };
-      const content2 = await readFile2(entryPath, "utf-8");
+      const content2 = await readFile3(entryPath, "utf-8");
       const modulePattern = /\/\/\s*(.+?\.(?:ts|tsx|js|jsx|mjs|cjs))\s*$/gm;
       const nodeModulesNode = {
         name: "node_modules",
@@ -105981,8 +106089,8 @@ async function buildTreeFromSourceMap(bundlePath, cwd) {
     if (!existsSync14(mapPath))
       return null;
     const [bundle, mapJson] = await Promise.all([
-      readFile2(bundlePath, "utf-8"),
-      readFile2(mapPath, "utf-8")
+      readFile3(bundlePath, "utf-8"),
+      readFile3(mapPath, "utf-8")
     ]);
     const map = JSON.parse(mapJson);
     const sourceRoot = map.sourceRoot || "";
@@ -106141,7 +106249,7 @@ async function generateHTMLReport(stats, depTree, mainInfo, browserDepTree, brow
         const stats2 = statSync(filePath);
         if (stats2.isFile() && !file.includes(".")) {
           actualServerBinarySize = stats2.size;
-          const content2 = await readFile2(filePath);
+          const content2 = await readFile3(filePath);
           actualServerBinaryGzipped = Bun.gzipSync(content2).length;
           break;
         }
@@ -107627,7 +107735,7 @@ async function printConsoleReport(stats, depTree, mainInfo, browserDepTree, brow
         const stats2 = statSync(filePath);
         if (stats2.isFile() && !file.includes(".")) {
           actualServerBinarySize = stats2.size;
-          const content2 = await readFile2(filePath);
+          const content2 = await readFile3(filePath);
           actualServerBinaryGzipped = Bun.gzipSync(content2).length;
           break;
         }
@@ -107705,7 +107813,7 @@ async function analyze(args) {
       }
       try {
         const browserStat = await stat6(browserEntry);
-        const browserContent = await readFile2(browserEntry);
+        const browserContent = await readFile3(browserEntry);
         const browserGzipped = Bun.gzipSync(browserContent).length;
         browserInfo = {
           name: basename4(browserEntry),
@@ -107759,7 +107867,7 @@ async function analyze(args) {
         const packageJsonPath = join20(cwd, "package.json");
         if (existsSync14(packageJsonPath)) {
           try {
-            const packageJson = JSON.parse(await readFile2(packageJsonPath, "utf-8"));
+            const packageJson = JSON.parse(await readFile3(packageJsonPath, "utf-8"));
             const runtimeDeps = packageJson.dependencies || {};
             const nodeModulesNode = depTree.root.children?.find((c) => c.name === "node_modules");
             if (nodeModulesNode) {
@@ -107787,7 +107895,7 @@ async function analyze(args) {
       }
       try {
         const entryStat = await stat6(entry);
-        const entryContent = await readFile2(entry);
+        const entryContent = await readFile3(entry);
         const entryGzipped = Bun.gzipSync(entryContent).length;
         mainInfo = {
           name: basename4(entry),
@@ -108620,7 +108728,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "1.0.0-alpha.33";
+    return "1.0.0-alpha.35";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -108637,10 +108745,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "04f6516";
+    return "bb512b2";
   }
   return "dev";
 }
 main();
 
-//# debugId=24B3FF39BB270EF564756E2164756E21
+//# debugId=85223BABEE11283064756E2164756E21