reroute-js 0.34.8 → 0.34.9

package/elysia/index.js

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.34.8
+ * reroute-js v0.34.9
  *
  * @license MIT
  * @copyright 2025 stewones <hi@stewan.io>
@@ -3117,9 +3117,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 = join(clientDir, "routes", routePath);
+    const abs = join(cwd, "src", "client", "routes", routePath);
     const modUrl = `${pathToFileURL6(abs).href}${isWatchMode ? `?t=${Date.now()}` : ""}`;
     return await import(modUrl);
   } catch {
@@ -3152,24 +3152,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);
+        }
       }
     }
   }
@@ -3292,12 +3315,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);
@@ -3346,7 +3369,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,
@@ -3354,7 +3377,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)) {
@@ -3444,9 +3467,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);
@@ -3863,30 +3886,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 = join(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 = join(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;
 }
@@ -3996,7 +4047,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) {
@@ -4005,7 +4056,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,
@@ -4120,10 +4171,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 = join(clientDir, "routes", routePath);
+    const abs = join(cwd, "src", "client", "routes", routePath);
     const mod = await import(pathToFileURL7(abs).href + (isWatchMode ? `?t=${Date.now()}` : ""));
     const ssr = mod?.ssr;
     const dataFn = ssr?.data;
@@ -4259,7 +4310,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);
@@ -4268,18 +4319,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]);
@@ -4303,13 +4384,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 path2 = String(layout?.path || "");
   if (!path2)
     return null;
   try {
-    const abs = join(clientDir, "routes", path2);
+    const abs = join(cwd, "src", "client", "routes", path2);
     const layoutMod = await import(pathToFileURL7(abs).href + (isWatchMode ? `?t=${Date.now()}` : ""));
     const ssr = layoutMod?.ssr;
     const dataFn = ssr?.data;
@@ -4328,16 +4409,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;
@@ -6108,7 +6212,6 @@ function registerLLMsRoutes(app, options) {
         }
         const content2 = await generateLLMsIndex({
           cwd,
-          clientDir,
           collections: collections2,
           baseUrl,
           isWatchMode,
@@ -6175,7 +6278,6 @@ function registerLLMsRoutes(app, options) {
           }
           const content2 = await generateLLMsIndex({
             cwd,
-            clientDir,
             collections: [collection],
             baseUrl,
             isWatchMode,
@@ -6749,7 +6851,7 @@ function createFeedTitle(configTitle, name) {
 async function discoverSSRRoutes(cwd, isWatchMode) {
   try {
     const { discoverSitemapData: discoverSitemapData2 } = await Promise.resolve().then(() => (init_core(), exports_core));
-    const sitemapData = await discoverSitemapData2(cwd, "", [], "", isWatchMode);
+    const sitemapData = await discoverSitemapData2(cwd, [], "", isWatchMode);
     const staticRoutes = sitemapData.staticRoutes.filter((r) => !r.pattern.includes(":")).map((r) => ({ pattern: r.pattern, path: r.path }));
     const routesPath = join(cwd, ".reroute", "routes.ts");
     const routesMod = await import(`${Bun.pathToFileURL(routesPath).href}${isWatchMode ? `?t=${Date.now()}` : ""}`);
@@ -6766,14 +6868,14 @@ async function discoverSSRRoutes(cwd, isWatchMode) {
     return [];
   }
 }
-async function registerMainFeedRoute(app, cwd, clientDir, collections2, baseUrl, isWatchMode, rssCache, format, limit, maxAge, ttlMs, feedTitle, feedDescription, rssConfig) {
+async function registerMainFeedRoute(app, cwd, collections2, baseUrl, isWatchMode, rssCache, format, limit, maxAge, ttlMs, feedTitle, feedDescription, rssConfig) {
   app.get("/feed.xml", async () => {
     try {
       const cached = getIfValid(rssCache, "rss:main");
       if (cached) {
         return feedResponse(cached.xml, format, { maxAge, cacheStatus: "HIT" });
       }
-      const discovery5 = await discoverRSSData(cwd, clientDir, collections2, baseUrl, isWatchMode, rssConfig);
+      const discovery5 = await discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfig);
       const allItems = [
         ...Array.from(discovery5.collections.values()).flat(),
         ...Array.from(discovery5.ssrDataFeeds.values()).flat()
@@ -6812,7 +6914,7 @@ function registerCollectionFeedRoutes(app, collections2, options) {
             cacheStatus: "HIT"
           });
         }
-        const discovery5 = await discoverRSSData(options.cwd, options.clientDir, [collection], options.baseUrl, options.isWatchMode, options.rssConfig);
+        const discovery5 = await discoverRSSData(options.cwd, [collection], options.baseUrl, options.isWatchMode, options.rssConfig);
         const items = discovery5.collections.get(collection) ?? [];
         if (items.length === 0)
           throw new NotFoundError9;
@@ -6852,7 +6954,7 @@ async function discoverRoutesWithFeeds(ssrDataRoutes, collections2, options) {
     if (options.rssConfig?.excludeRoutes?.includes(route.pattern))
       continue;
     try {
-      const items = await discoverSSRDataFeedItems(options.cwd, options.clientDir, route.pattern, route.path, options.isWatchMode, options.baseUrl, options.rssConfig);
+      const items = await discoverSSRDataFeedItems(options.cwd, route.pattern, route.path, options.isWatchMode, options.baseUrl, options.rssConfig);
       if (items.length > 0) {
         routesWithFeeds.push(route);
         options.availableFeeds.push(`${route.pattern}/feed.xml`);
@@ -6871,9 +6973,9 @@ async function generateSSRDataFeed(route, options) {
       cacheStatus: "HIT"
     });
   }
-  let items = await discoverSSRDataFeedItems(options.cwd, options.clientDir, route.pattern, route.path, options.isWatchMode, options.baseUrl, options.rssConfig);
+  let items = await discoverSSRDataFeedItems(options.cwd, route.pattern, route.path, options.isWatchMode, options.baseUrl, options.rssConfig);
   if (items.length === 0 && route.isLayout) {
-    const discovery5 = await discoverRSSData(options.cwd, options.clientDir, [], options.baseUrl, options.isWatchMode, options.rssConfig);
+    const discovery5 = await discoverRSSData(options.cwd, [], options.baseUrl, options.isWatchMode, options.rssConfig);
     items = discovery5.ssrDataFeeds.get(route.pattern) ?? [];
   }
   if (items.length === 0)
@@ -6929,7 +7031,7 @@ async function registerRSSRoutes(app, options) {
   const feedTitle = rssConfig?.title ?? "Feed";
   const feedDescription = rssConfig?.description ?? "Latest updates";
   const availableFeeds = ["/feed.xml"];
-  registerMainFeedRoute(app, cwd, clientDir, collections2, baseUrl, isWatchMode, rssCache, format, limit, maxAge, ttlMs, feedTitle, feedDescription, rssConfig);
+  registerMainFeedRoute(app, cwd, collections2, baseUrl, isWatchMode, rssCache, format, limit, maxAge, ttlMs, feedTitle, feedDescription, rssConfig);
   const ssrDataRoutes = await discoverSSRRoutes(cwd, isWatchMode);
   registerCollectionFeedRoutes(app, collections2, {
     cwd,
@@ -6954,7 +7056,6 @@ async function registerRSSRoutes(app, options) {
   });
   registerSSRDataFeedRoutes(app, routesWithFeeds, {
     cwd,
-    clientDir,
     baseUrl,
     isWatchMode,
     rssCache,
@@ -7096,8 +7197,8 @@ function registerSearchRoute(app, cwd, directive, maxAge, searchConfig) {
 init_core();
 import { NotFoundError as NotFoundError10 } from "elysia";
 async function generateAndCacheSitemap(options, _ttlMs) {
-  const { cwd, clientDir, collections: collections2, baseUrl, isWatchMode, sitemapConfig } = options;
-  const discovery5 = await discoverSitemapData(cwd, clientDir, collections2, baseUrl, isWatchMode, sitemapConfig);
+  const { cwd, collections: collections2, baseUrl, isWatchMode, sitemapConfig } = options;
+  const discovery5 = await discoverSitemapData(cwd, collections2, baseUrl, isWatchMode, sitemapConfig);
   const result = await generateSitemap(discovery5, baseUrl, {
     changefreq: sitemapConfig?.changefreq,
     priority: sitemapConfig?.priority,
@@ -7987,7 +8088,6 @@ var reroute = () => async (app) => {
         try {
           registerSitemapRoutes(app, {
             cwd,
-            clientDir,
             collections: collections2,
             baseUrl: sitemapBaseUrl,
             maxAge,
@@ -8051,4 +8151,4 @@ export {
   reroute
 };
 
-//# debugId=794C5B3C9776FAC764756E2164756E21
+//# debugId=93E7F00FB12AB24D64756E2164756E21