reroute-js 0.43.3 → 0.43.5

package/elysia/index.js

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.43.3
+ * reroute-js v0.43.5
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -4634,92 +4634,11 @@ async function discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfi
       }
     }
   }
-  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]);
-  }
   return {
     collections: collectionsMap,
     ssrDataFeeds
   };
 }
-async function loadLayouts(cwd, isWatchMode) {
-  const bundledLayouts = globalThis.__REROUTE_LAYOUTS__;
-  if (bundledLayouts) {
-    return bundledLayouts;
-  }
-  try {
-    const routesPath = join(cwd, ".reroute", "routes.ts");
-    const url = pathToFileURL7(routesPath).href;
-    const mod = await import(`${url}${isWatchMode ? `?t=${Date.now()}` : ""}`);
-    return mod?.layouts;
-  } catch {
-    return;
-  }
-}
-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(cwd, "src", "client", "routes", path2);
-    const layoutMod = await import(pathToFileURL7(abs).href + (isWatchMode ? `?t=${Date.now()}` : ""));
-    const ssr = layoutMod?.ssr;
-    const dataFn = ssr?.data;
-    if (typeof dataFn === "function") {
-      const mockSet = { status: 200 };
-      const result = await dataFn({
-        pathname: pattern,
-        params: {},
-        set: mockSet
-      });
-      const items = extractRSSItemsFromData(result, pattern, baseUrl, rssConfig);
-      if (items.length > 0) {
-        return { pattern, items };
-      }
-    }
-  } catch {}
-  return null;
-}
-async function discoverLayoutFeedItems(cwd, isWatchMode, baseUrl, rssConfig) {
-  const layoutFeeds = new Map;
-  const layouts2 = await loadLayouts(cwd, isWatchMode);
-  if (!Array.isArray(layouts2)) {
-    return layoutFeeds;
-  }
-  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;
-}
 var init_discovery5 = () => {};
 
 // packages/core/src/rss/generator.ts
@@ -5392,7 +5311,6 @@ __export(exports_core, {
   discoverRoutes: () => discoverRoutes,
   discoverRobotsData: () => discoverRobotsData,
   discoverRSSData: () => discoverRSSData,
-  discoverLayoutFeedItems: () => discoverLayoutFeedItems,
   discoverCollections: () => discoverCollections,
   discoverCollectionContent: () => discoverCollectionContent,
   defineConfig: () => defineConfig,
@@ -6163,25 +6081,43 @@ function registerInternalRoutes(app, opts) {
       }
     });
   });
+  const cacheTtlMs = maxAge * 1000;
+  function getCacheEntry(key) {
+    if (maxAge <= 0)
+      return;
+    const entry = dataCache?.get(key);
+    if (!entry)
+      return;
+    if (entry.exp <= Date.now()) {
+      return;
+    }
+    return entry.data;
+  }
+  function setCacheEntry(key, data) {
+    if (maxAge <= 0)
+      return;
+    dataCache?.set(key, {
+      data,
+      exp: Date.now() + cacheTtlMs
+    });
+  }
   async function handleKeyRequest(pathname, dataKey, headers2) {
     const { computeSSRData: computeSSRData2 } = await Promise.resolve().then(() => (init_core(), exports_core));
     const cacheKey = `${pathname}:promises`;
-    let promiseData = maxAge > 0 ? dataCache?.get(cacheKey) : undefined;
+    let promiseData = getCacheEntry(cacheKey);
     const promiseDataCached = promiseData !== undefined;
     if (!promiseData) {
       const sp = extractSearchParams(pathname);
       const { data } = await computeSSRData2(pathname, clientDir, cwd, isWatchMode, { streaming: true, maxAge }, sp);
       promiseData = data;
-      if (maxAge > 0) {
-        dataCache?.set(cacheKey, promiseData);
-      }
+      setCacheEntry(cacheKey, promiseData);
     }
     if (promiseData && typeof promiseData === "object") {
       const value = promiseData[dataKey];
       if (value instanceof Promise) {
         const resolved = await value;
         const resolvedCacheKey = `${pathname}:${dataKey}:resolved`;
-        dataCache?.set(resolvedCacheKey, resolved);
+        setCacheEntry(resolvedCacheKey, resolved);
         return jsonWithCache({ data: resolved }, dataCacheControl || "no-cache", headers2, promiseDataCached ? "HIT" : "MISS");
       }
       if (value !== undefined) {
@@ -6193,7 +6129,7 @@ function registerInternalRoutes(app, opts) {
   async function handleFullDataRequest(pathname) {
     const { computeSSRData: computeSSRData2 } = await Promise.resolve().then(() => (init_core(), exports_core));
     const cacheKey = `${pathname}:streaming`;
-    let data = dataCache?.get(cacheKey);
+    let data = getCacheEntry(cacheKey);
     const cacheHit = data !== undefined;
     if (data === undefined) {
       const sp = extractSearchParams(pathname);
@@ -6204,7 +6140,7 @@ function registerInternalRoutes(app, opts) {
         console.error("[__reroute_data] Error computing data:", error);
         data = null;
       }
-      dataCache?.set(cacheKey, data);
+      setCacheEntry(cacheKey, data);
     }
     return { data, cacheHit };
   }
@@ -8683,4 +8619,4 @@ export {
   reroute
 };
 
-//# debugId=4DF5E22AD46EEE6D64756E2164756E21
+//# debugId=5A7719554EA87CE164756E2164756E21