reroute-js 0.34.7 → 0.34.9

package/cli/bin.d.ts

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

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v0.34.7
+ * reroute-js v0.34.9
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.34.7";
+    return "0.34.9";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "0701908";
+    return "58d33f1";
   }
   return "dev";
 }
@@ -1352,9 +1352,11 @@ function matchPatternUtil(pattern, pathname) {
   return params;
 }
 function createBundledRoutesModule(bundledRoutes, bundledLayouts) {
+  const bundledNotFoundRoutes = globalThis.__REROUTE_NOT_FOUND_ROUTES__;
   return {
     routes: bundledRoutes,
     layouts: bundledLayouts,
+    notFoundRoutes: bundledNotFoundRoutes,
     matchRoute: (pathname) => {
       for (const route of bundledRoutes) {
         const pattern = String(route?.pattern || "");
@@ -2179,8 +2181,10 @@ async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, curre
   let lang;
   let statusOverride = currentStatusOverride;
   try {
-    const routesPath = join2(cwd, ".reroute", "routes.ts");
-    const m = await dynamicImport(routesPath, isWatchMode);
+    const m = await loadRoutesModule(cwd, isWatchMode);
+    if (!m) {
+      return { head, lang, statusOverride: statusOverride || 404 };
+    }
     const pathnameOnly = pathname.split("?")[0];
     const match = typeof m.matchRoute === "function" ? m.matchRoute(pathnameOnly) : null;
     const r = match?.route;
@@ -2261,6 +2265,7 @@ function extractSSRLang(ssr) {
 var init_metadata2 = __esm(() => {
   init_metadata();
   init_meta();
+  init_compute();
   init_imports();
 });
 
@@ -2298,6 +2303,16 @@ async function preloadContentModule(pathname, clientDir, cwd, isWatchMode) {
 }
 async function isContentCollection(clientDir, collection) {
   try {
+    const isProduction = clientDir.endsWith(".reroute");
+    if (isProduction) {
+      const collectionFile = join2(clientDir, "collections", `${collection}.js`);
+      try {
+        const s2 = await stat4(collectionFile);
+        return s2?.isFile() ?? false;
+      } catch {
+        return false;
+      }
+    }
     const maybeDir = join2(clientDir, "routes", collection, "content");
     const s = await stat4(maybeDir);
     return typeof s?.isDirectory === "function" ? s.isDirectory() : true;
@@ -2748,7 +2763,7 @@ async function performSSRSetupInternal(options, streaming) {
     return css;
   });
   let statusOverride = preloadResult.statusOverride;
-  if (computeResult.statusContainer.value) {
+  if (computeResult.statusContainer.value !== undefined) {
     statusOverride = computeResult.statusContainer.value;
   }
   const metadataResult = await withSpan("ssr.extract.metadata", async (span) => {
@@ -2956,10 +2971,10 @@ async function renderSSRDocument(options) {
     return script;
   });
   let statusOverride = setup2.preloadStatusOverride;
-  if (setup2.statusContainer.value) {
+  if (setup2.statusContainer.value !== undefined) {
     statusOverride = setup2.statusContainer.value;
   }
-  if (setup2.metadataResult.statusOverride) {
+  if (setup2.metadataResult.statusOverride !== undefined) {
     statusOverride = setup2.metadataResult.statusOverride;
   }
   const extraHead = setup2.bundlePreload + setup2.preloadExtraHead;
@@ -3409,9 +3424,9 @@ async function discoverCollectionRoutes(cwd, collections2, isWatchMode, llmsConf
   }
   return collectionsMap;
 }
-async function loadRouteModule(clientDir, routePath, isWatchMode) {
+async function loadRouteModule(cwd, routePath, isWatchMode) {
   try {
-    const abs = join2(clientDir, "routes", routePath);
+    const abs = join2(cwd, "src", "client", "routes", routePath);
     const modUrl = `${pathToFileURL6(abs).href}${isWatchMode ? `?t=${Date.now()}` : ""}`;
     return await import(modUrl);
   } catch {
@@ -3444,24 +3459,47 @@ function createEntriesFromArray(array, routePath) {
   }
   return entries;
 }
-async function discoverSSRDataRoutes(_cwd, clientDir, staticRoutes, isWatchMode) {
+async function discoverSSRDataRoutes(cwd, staticRoutes, isWatchMode) {
   const ssrDataRoutes = new Map;
-  for (const route of staticRoutes) {
-    const mod = await loadRouteModule(clientDir, route.path, isWatchMode);
-    if (!mod)
-      continue;
-    const ssr = mod?.ssr;
-    const dataFn = ssr?.data;
-    if (typeof dataFn !== "function")
-      continue;
-    const result = await callDataFunction(dataFn, route.path);
-    const arrays = findArraysInData(result);
-    for (const array of arrays) {
-      if (array.length === 0)
+  const bundledRoutes = globalThis.__REROUTE_ROUTES__;
+  if (bundledRoutes && Array.isArray(bundledRoutes)) {
+    for (const route of staticRoutes) {
+      const bundledRoute = bundledRoutes.find((r) => r?.path === route.path);
+      if (!bundledRoute)
         continue;
-      const entries = createEntriesFromArray(array, route.path);
-      if (entries.length > 0) {
-        ssrDataRoutes.set(route.path, entries);
+      const ssr = bundledRoute?.ssr;
+      const dataFn = ssr?.data;
+      if (typeof dataFn !== "function")
+        continue;
+      const result = await callDataFunction(dataFn, route.path);
+      const arrays = findArraysInData(result);
+      for (const array of arrays) {
+        if (array.length === 0)
+          continue;
+        const entries = createEntriesFromArray(array, route.path);
+        if (entries.length > 0) {
+          ssrDataRoutes.set(route.path, entries);
+        }
+      }
+    }
+  } else {
+    for (const route of staticRoutes) {
+      const mod = await loadRouteModule(cwd, route.path, isWatchMode);
+      if (!mod)
+        continue;
+      const ssr = mod?.ssr;
+      const dataFn = ssr?.data;
+      if (typeof dataFn !== "function")
+        continue;
+      const result = await callDataFunction(dataFn, route.path);
+      const arrays = findArraysInData(result);
+      for (const array of arrays) {
+        if (array.length === 0)
+          continue;
+        const entries = createEntriesFromArray(array, route.path);
+        if (entries.length > 0) {
+          ssrDataRoutes.set(route.path, entries);
+        }
       }
     }
   }
@@ -3584,12 +3622,12 @@ function addStaticSection(parts, section, routes, baseUrl, isSingleCollection, t
   parts.push("");
 }
 async function generateLLMsIndex(options) {
-  const { cwd, clientDir, collections: collections2, baseUrl, isWatchMode, llmsConfig } = options;
+  const { cwd, collections: collections2, baseUrl, isWatchMode, llmsConfig } = options;
   const parts = [];
   addIndexHeader(parts, llmsConfig);
   const staticRoutes = await discoverStaticRoutes(cwd, isWatchMode);
   const collectionsMap = await discoverCollectionRoutes(cwd, collections2, isWatchMode, llmsConfig);
-  const ssrDataRoutes = await discoverSSRDataRoutes(cwd, clientDir, staticRoutes, isWatchMode);
+  const ssrDataRoutes = await discoverSSRDataRoutes(cwd, staticRoutes, isWatchMode);
   const isSingleCollection = collections2.length === 1;
   const targetCollection = isSingleCollection ? collections2[0] : null;
   const { sections, rootRoutes } = groupStaticRoutes(staticRoutes, llmsConfig);
@@ -3638,7 +3676,7 @@ function buildHeader(baseUrl, llmsConfig) {
   }
   return parts;
 }
-async function discoverAllRoutes(cwd, clientDir, collections2, isWatchMode, llmsConfig) {
+async function discoverAllRoutes(cwd, collections2, isWatchMode, llmsConfig) {
   const {
     discoverStaticRoutes: discoverStaticRoutes2,
     discoverCollectionRoutes: discoverCollectionRoutes2,
@@ -3646,7 +3684,7 @@ async function discoverAllRoutes(cwd, clientDir, collections2, isWatchMode, llms
   } = await Promise.resolve().then(() => (init_index_generator(), exports_index_generator));
   const staticRoutes = await discoverStaticRoutes2(cwd, isWatchMode);
   const collectionsMap = await discoverCollectionRoutes2(cwd, collections2, isWatchMode, llmsConfig);
-  const ssrDataRoutes = await discoverSSRDataRoutes2(cwd, clientDir, staticRoutes, isWatchMode);
+  const ssrDataRoutes = await discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode);
   const allRoutes = [];
   for (const route of staticRoutes) {
     if (!shouldExcludeRoute(route.path, llmsConfig?.excludeRoutes)) {
@@ -3736,9 +3774,9 @@ function buildFooter(parts) {
   parts.push("Formats: .txt | .md | Accept: text/plain | Accept: text/markdown");
 }
 async function generateLLMsFullContent(options) {
-  const { cwd, clientDir, collections: collections2, baseUrl, isWatchMode, llmsConfig } = options;
+  const { cwd, collections: collections2, baseUrl, isWatchMode, llmsConfig } = options;
   const parts = buildHeader(baseUrl, llmsConfig);
-  const allRoutes = await discoverAllRoutes(cwd, clientDir, collections2, isWatchMode, llmsConfig);
+  const allRoutes = await discoverAllRoutes(cwd, collections2, isWatchMode, llmsConfig);
   const maxItems = llmsConfig?.maxItems || 1e4;
   const routesToProcess = allRoutes.slice(0, maxItems);
   const extracted = await extractRouteContents(routesToProcess, options);
@@ -4155,30 +4193,58 @@ async function discoverCollectionContent(cwd, collection, isWatchMode, baseUrl)
   }
   return entries;
 }
-async function discoverSSRDataRoutes2(_cwd, clientDir, staticRoutes, isWatchMode, baseUrl, sitemapConfig) {
+async function discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode, baseUrl, sitemapConfig) {
   const ssrDataRoutes = new Map;
-  for (const route of staticRoutes) {
-    if (sitemapConfig?.excludeDiscovery?.includes(route.pattern)) {
-      continue;
-    }
-    try {
-      const abs = join2(clientDir, "routes", route.path);
-      const mod = await import(Bun.pathToFileURL(abs).href + (isWatchMode ? `?t=${Date.now()}` : ""));
-      const ssr = mod?.ssr;
+  const bundledRoutes = globalThis.__REROUTE_ROUTES__;
+  if (bundledRoutes && Array.isArray(bundledRoutes)) {
+    for (const route of staticRoutes) {
+      if (sitemapConfig?.excludeDiscovery?.includes(route.pattern)) {
+        continue;
+      }
+      const bundledRoute = bundledRoutes.find((r) => r?.pattern === route.pattern);
+      if (!bundledRoute)
+        continue;
+      const ssr = bundledRoute?.ssr;
       const dataFn = ssr?.data;
       if (typeof dataFn === "function") {
-        const mockSet = { status: 200 };
-        const result = await dataFn({
-          pathname: route.pattern,
-          params: {},
-          set: mockSet
-        });
-        const entries = extractEntriesFromData(result, route.pattern, baseUrl, sitemapConfig);
-        if (entries.length > 0) {
-          ssrDataRoutes.set(route.pattern, entries);
-        }
+        try {
+          const mockSet = { status: 200 };
+          const result = await dataFn({
+            pathname: route.pattern,
+            params: {},
+            set: mockSet
+          });
+          const entries = extractEntriesFromData(result, route.pattern, baseUrl, sitemapConfig);
+          if (entries.length > 0) {
+            ssrDataRoutes.set(route.pattern, entries);
+          }
+        } catch {}
       }
-    } catch {}
+    }
+  } else {
+    for (const route of staticRoutes) {
+      if (sitemapConfig?.excludeDiscovery?.includes(route.pattern)) {
+        continue;
+      }
+      try {
+        const routeModulePath = join2(cwd, "src", "client", "routes", route.path);
+        const mod = await import(Bun.pathToFileURL(routeModulePath).href + (isWatchMode ? `?t=${Date.now()}` : ""));
+        const ssr = mod?.ssr;
+        const dataFn = ssr?.data;
+        if (typeof dataFn === "function") {
+          const mockSet = { status: 200 };
+          const result = await dataFn({
+            pathname: route.pattern,
+            params: {},
+            set: mockSet
+          });
+          const entries = extractEntriesFromData(result, route.pattern, baseUrl, sitemapConfig);
+          if (entries.length > 0) {
+            ssrDataRoutes.set(route.pattern, entries);
+          }
+        }
+      } catch {}
+    }
   }
   return ssrDataRoutes;
 }
@@ -4288,7 +4354,7 @@ function createEntryFromItem(item, routePattern, baseUrl, sitemapConfig) {
   }
   return entry;
 }
-async function discoverSitemapData(cwd, clientDir, collections2, baseUrl, isWatchMode, sitemapConfig) {
+async function discoverSitemapData(cwd, collections2, baseUrl, isWatchMode, sitemapConfig) {
   const { staticRoutes, dynamicRoutes } = await discoverRoutes(cwd, isWatchMode);
   const collectionsMap = new Map;
   for (const collection of collections2) {
@@ -4297,7 +4363,7 @@ async function discoverSitemapData(cwd, clientDir, collections2, baseUrl, isWatc
       collectionsMap.set(collection, entries);
     }
   }
-  const ssrDataRoutes = await discoverSSRDataRoutes2(cwd, clientDir, staticRoutes, isWatchMode, baseUrl, sitemapConfig);
+  const ssrDataRoutes = await discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode, baseUrl, sitemapConfig);
   return {
     staticRoutes,
     dynamicRoutes,
@@ -4412,10 +4478,10 @@ async function discoverCollectionFeedItems(cwd, collection, isWatchMode, baseUrl
   sortByPubDate(items);
   return items;
 }
-async function discoverSSRDataFeedItems(_cwd, clientDir, routePattern, routePath, isWatchMode, baseUrl, rssConfig) {
+async function discoverSSRDataFeedItems(cwd, routePattern, routePath, isWatchMode, baseUrl, rssConfig) {
   const items = [];
   try {
-    const abs = join2(clientDir, "routes", routePath);
+    const abs = join2(cwd, "src", "client", "routes", routePath);
     const mod = await import(pathToFileURL7(abs).href + (isWatchMode ? `?t=${Date.now()}` : ""));
     const ssr = mod?.ssr;
     const dataFn = ssr?.data;
@@ -4551,7 +4617,7 @@ function createRSSItemFromData(item, routePattern, baseUrl, rssConfig) {
   }
   return rssItem;
 }
-async function discoverRSSData(cwd, clientDir, collections2, baseUrl, isWatchMode, rssConfig) {
+async function discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfig) {
   const collectionsMap = new Map;
   for (const collection of collections2) {
     const items = await discoverCollectionFeedItems(cwd, collection, isWatchMode, baseUrl, rssConfig);
@@ -4560,18 +4626,48 @@ async function discoverRSSData(cwd, clientDir, collections2, baseUrl, isWatchMod
     }
   }
   const ssrDataFeeds = new Map;
-  const { discoverRoutes: discoverRoutes2 } = await Promise.resolve().then(() => (init_discovery4(), exports_discovery));
-  const { staticRoutes } = await discoverRoutes2(cwd, isWatchMode);
-  for (const route of staticRoutes) {
-    if (rssConfig?.excludeDiscovery?.includes(route.pattern)) {
-      continue;
+  const bundledRoutes = globalThis.__REROUTE_ROUTES__;
+  if (bundledRoutes && Array.isArray(bundledRoutes)) {
+    const { discoverRoutes: discoverRoutes2 } = await Promise.resolve().then(() => (init_discovery4(), exports_discovery));
+    const { staticRoutes } = await discoverRoutes2(cwd, isWatchMode);
+    for (const route of staticRoutes) {
+      if (rssConfig?.excludeDiscovery?.includes(route.pattern)) {
+        continue;
+      }
+      const bundledRoute = bundledRoutes.find((r) => r?.pattern === route.pattern);
+      if (!bundledRoute)
+        continue;
+      const ssr = bundledRoute?.ssr;
+      const dataFn = ssr?.data;
+      if (typeof dataFn === "function") {
+        try {
+          const mockSet = { status: 200 };
+          const result = await dataFn({
+            pathname: route.pattern,
+            params: {},
+            set: mockSet
+          });
+          const items = extractRSSItemsFromData(result, route.pattern, baseUrl, rssConfig);
+          if (items.length > 0) {
+            ssrDataFeeds.set(route.pattern, items);
+          }
+        } catch {}
+      }
     }
-    const items = await discoverSSRDataFeedItems(cwd, clientDir, route.pattern, route.path, isWatchMode, baseUrl, rssConfig);
-    if (items.length > 0) {
-      ssrDataFeeds.set(route.pattern, items);
+  } else {
+    const { discoverRoutes: discoverRoutes2 } = await Promise.resolve().then(() => (init_discovery4(), exports_discovery));
+    const { staticRoutes } = await discoverRoutes2(cwd, isWatchMode);
+    for (const route of staticRoutes) {
+      if (rssConfig?.excludeDiscovery?.includes(route.pattern)) {
+        continue;
+      }
+      const items = await discoverSSRDataFeedItems(cwd, route.pattern, route.path, isWatchMode, baseUrl, rssConfig);
+      if (items.length > 0) {
+        ssrDataFeeds.set(route.pattern, items);
+      }
     }
   }
-  const layoutFeeds = await discoverLayoutFeedItems(cwd, clientDir, isWatchMode, baseUrl, rssConfig);
+  const layoutFeeds = await discoverLayoutFeedItems(cwd, isWatchMode, baseUrl, rssConfig);
   for (const [pattern, items] of layoutFeeds.entries()) {
     const existing = ssrDataFeeds.get(pattern) || [];
     ssrDataFeeds.set(pattern, [...existing, ...items]);
@@ -4595,13 +4691,13 @@ async function loadLayouts(cwd, isWatchMode) {
     return;
   }
 }
-async function processLayoutForRSS(layout, clientDir, isWatchMode, baseUrl, rssConfig) {
+async function processLayoutForRSS(layout, cwd, isWatchMode, baseUrl, rssConfig) {
   const pattern = String(layout?.pattern || "/");
   const path3 = String(layout?.path || "");
   if (!path3)
     return null;
   try {
-    const abs = join2(clientDir, "routes", path3);
+    const abs = join2(cwd, "src", "client", "routes", path3);
     const layoutMod = await import(pathToFileURL7(abs).href + (isWatchMode ? `?t=${Date.now()}` : ""));
     const ssr = layoutMod?.ssr;
     const dataFn = ssr?.data;
@@ -4620,16 +4716,39 @@ async function processLayoutForRSS(layout, clientDir, isWatchMode, baseUrl, rssC
   } catch {}
   return null;
 }
-async function discoverLayoutFeedItems(cwd, clientDir, isWatchMode, baseUrl, rssConfig) {
+async function discoverLayoutFeedItems(cwd, isWatchMode, baseUrl, rssConfig) {
   const layoutFeeds = new Map;
   const layouts2 = await loadLayouts(cwd, isWatchMode);
   if (!Array.isArray(layouts2)) {
     return layoutFeeds;
   }
-  for (const layout of layouts2) {
-    const result = await processLayoutForRSS(layout, clientDir, isWatchMode, baseUrl, rssConfig);
-    if (result) {
-      layoutFeeds.set(result.pattern, result.items);
+  const bundledLayouts = globalThis.__REROUTE_LAYOUTS__;
+  if (bundledLayouts && Array.isArray(bundledLayouts)) {
+    for (const layout of bundledLayouts) {
+      const pattern = String(layout?.pattern || "/");
+      const ssr = layout?.ssr;
+      const dataFn = ssr?.data;
+      if (typeof dataFn === "function") {
+        try {
+          const mockSet = { status: 200 };
+          const result = await dataFn({
+            pathname: pattern,
+            params: {},
+            set: mockSet
+          });
+          const items = extractRSSItemsFromData(result, pattern, baseUrl, rssConfig);
+          if (items.length > 0) {
+            layoutFeeds.set(pattern, items);
+          }
+        } catch {}
+      }
+    }
+  } else {
+    for (const layout of layouts2) {
+      const result = await processLayoutForRSS(layout, cwd, isWatchMode, baseUrl, rssConfig);
+      if (result) {
+        layoutFeeds.set(result.pattern, result.items);
+      }
     }
   }
   return layoutFeeds;
@@ -4933,10 +5052,10 @@ async function renderSSRDocumentStream(options) {
   if (debug)
     console.log(`[renderStream] ${pathname} - performSSRSetup: ${(performance.now() - t0).toFixed(2)}ms`);
   let statusOverride = setup2.preloadStatusOverride;
-  if (setup2.statusContainer.value) {
+  if (setup2.statusContainer.value !== undefined) {
     statusOverride = setup2.statusContainer.value;
   }
-  if (setup2.metadataResult.statusOverride) {
+  if (setup2.metadataResult.statusOverride !== undefined) {
     statusOverride = setup2.metadataResult.statusOverride;
   }
   const encoder = new TextEncoder;
@@ -5156,6 +5275,7 @@ __export(exports_core, {
   preloadContentModule: () => preloadContentModule,
   performSSRSetup: () => performSSRSetup,
   mergeLayoutData: () => mergeLayoutData,
+  loadRoutesModule: () => loadRoutesModule,
   loadOGImageComponent: () => loadOGImageComponent,
   loadIndexHtml: () => loadIndexHtml,
   loadConfig: () => loadConfig,
@@ -6491,6 +6611,7 @@ function matchPattern(pattern: string, pathname: string): Record<string, string>
 // Set globals for compiled binary support (sitemap/RSS/robots discovery)
 (globalThis as any).__REROUTE_ROUTES__ = routes;
 (globalThis as any).__REROUTE_LAYOUTS__ = layouts;
+(globalThis as any).__REROUTE_NOT_FOUND_ROUTES__ = notFoundRoutes;
 `;
 }
 async function buildStreamingWrappersForTree(cwd, routesPath, tree, config2) {
@@ -105460,7 +105581,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.34.7";
+    return "0.34.9";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -105477,10 +105598,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "0701908";
+    return "58d33f1";
   }
   return "dev";
 }
 main();
 
-//# debugId=12904D83AF99E59064756E2164756E21
+//# debugId=D0C606DE313168C464756E2164756E21