reroute-js 0.42.1 → 0.43.1

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.42.1
+ * reroute-js v0.43.1
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v0.42.1
+ * reroute-js v0.43.1
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.42.1";
+    return "0.43.1";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "9c8c128";
+    return "ef42e38";
   }
   return "dev";
 }
@@ -2215,7 +2215,12 @@ ${ogMetaTags}`;
   if (routeResult.lang)
     pageLang = routeResult.lang;
   statusOverride = routeResult.statusOverride;
-  return { perPageHead, pageLang, statusOverride };
+  return {
+    perPageHead,
+    pageLang,
+    statusOverride,
+    ssrExport: routeResult.ssrExport
+  };
 }
 async function processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang, ogConfig) {
   if (typeof layout?.path !== "string")
@@ -2285,7 +2290,12 @@ async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode,
         if (ssrHead)
           head += `
 ${ssrHead}`;
-        return { head, lang: extractSSRLang(ssr), statusOverride };
+        return {
+          head,
+          lang: extractSSRLang(ssr),
+          statusOverride,
+          ssrExport: ssr
+        };
       }
       return { head, statusOverride };
     } catch {}
@@ -2296,6 +2306,7 @@ async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, curre
   let head = "";
   let lang;
   let statusOverride = currentStatusOverride;
+  let ssrExport;
   try {
     const m = await loadRoutesModule(cwd, isWatchMode);
     if (!m) {
@@ -2312,13 +2323,14 @@ async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, curre
       head = result.head;
       lang = result.lang;
       statusOverride = result.statusOverride;
+      ssrExport = result.ssrExport;
     } else {
       head += await extractNotFoundMetadata(pathname, clientDir, m, isWatchMode, (l) => {
         lang = l;
       }, ogConfig);
     }
   } catch {}
-  return { head, lang, statusOverride };
+  return { head, lang, statusOverride, ssrExport };
 }
 function findBestNotFoundRoute(list, pathname) {
   let chosen;
@@ -5380,7 +5392,8 @@ async function renderSSRDocumentStream(options) {
     browserTelemetryConfig,
     traceContext,
     parentSpan: options.parentSpan,
-    timeout: options.timeout
+    timeout: options.timeout,
+    ssrExport: setup2.metadataResult.ssrExport
   });
   if (debug)
     console.log(`[renderStream] ${pathname} - returning stream: ${(performance.now() - t0).toFixed(2)}ms`);
@@ -5488,12 +5501,100 @@ function buildStreamingScripts(ctx) {
   const feedsScript = createFeedsScript();
   const llmsScript = createLlmsScript();
   let allScripts = dataScript + feedsScript + llmsScript + collectionScripts + ctx.preloadHydrationScript;
+  const metaUpdateScript = generateMetaUpdateScript(ctx, ssrDataSnapshot);
+  if (metaUpdateScript) {
+    allScripts += metaUpdateScript;
+  }
   allScripts += `<script type="module" src="${ctx.bundleUrl}"></script>`;
   if (ctx.isWatchMode) {
     allScripts += `<script type="module" src="/__reroute_watch.js"></script>`;
   }
   return allScripts;
 }
+function generateMetaUpdateScript(ctx, ssrDataSnapshot) {
+  if (typeof ctx.ssrExport?.head !== "function") {
+    return "";
+  }
+  const routeData = ssrDataSnapshot[ctx.pathname];
+  if (!routeData) {
+    return "";
+  }
+  let headResult;
+  try {
+    headResult = ctx.ssrExport.head({ data: routeData });
+  } catch (err) {
+    console.error("[reroute] Error calling ssr.head() at stream end:", err);
+    return "";
+  }
+  if (!headResult) {
+    return "";
+  }
+  const headHtml = Array.isArray(headResult) ? headResult.join(`
+`) : headResult;
+  if (!headHtml) {
+    return "";
+  }
+  const metaUpdates = parseHeadForMetaUpdates(headHtml);
+  if (Object.keys(metaUpdates).length === 0) {
+    return "";
+  }
+  const updatesJson = JSON.stringify(metaUpdates);
+  return `<script>(function(){var u=${updatesJson};if(u.title){document.title=u.title}Object.keys(u).forEach(function(k){if(k==='title')return;var s=k.split(':');var isOg=s[0]==='og'||s[0]==='twitter';var el=isOg?document.querySelector('meta[property="'+k+'"]')||document.querySelector('meta[name="'+k+'"]'):document.querySelector('meta[name="'+k+'"]');if(el){el.setAttribute('content',u[k])}else{var m=document.createElement('meta');m.setAttribute(isOg?'property':'name',k);m.setAttribute('content',u[k]);document.head.appendChild(m)}})})()</script>`;
+}
+function parseHeadForMetaUpdates(headHtml) {
+  const updates = {};
+  const titleMatch = headHtml.match(/<title[^>]*>(.*?)<\/title>/is);
+  if (titleMatch?.[1]) {
+    updates.title = unescapeHtmlEntities(titleMatch[1].trim());
+  }
+  let descMatch = headHtml.match(/<meta\s+name=["']description["']\s+content=["'](.+?)["']/i);
+  if (!descMatch) {
+    descMatch = headHtml.match(/<meta\s+content=["'](.+?)["']\s+name=["']description["']/i);
+  }
+  if (descMatch?.[1]) {
+    updates.description = unescapeHtmlEntities(descMatch[1].trim());
+  }
+  let ogTitleMatch = headHtml.match(/<meta\s+property=["']og:title["']\s+content=["'](.+?)["']/i);
+  if (!ogTitleMatch) {
+    ogTitleMatch = headHtml.match(/<meta\s+content=["'](.+?)["']\s+property=["']og:title["']/i);
+  }
+  if (ogTitleMatch?.[1]) {
+    updates["og:title"] = unescapeHtmlEntities(ogTitleMatch[1].trim());
+  } else if (updates.title) {
+    updates["og:title"] = updates.title;
+  }
+  let ogDescMatch = headHtml.match(/<meta\s+property=["']og:description["']\s+content=["'](.+?)["']/i);
+  if (!ogDescMatch) {
+    ogDescMatch = headHtml.match(/<meta\s+content=["'](.+?)["']\s+property=["']og:description["']/i);
+  }
+  if (ogDescMatch?.[1]) {
+    updates["og:description"] = unescapeHtmlEntities(ogDescMatch[1].trim());
+  } else if (updates.description) {
+    updates["og:description"] = updates.description;
+  }
+  let twitterTitleMatch = headHtml.match(/<meta\s+name=["']twitter:title["']\s+content=["'](.+?)["']/i);
+  if (!twitterTitleMatch) {
+    twitterTitleMatch = headHtml.match(/<meta\s+content=["'](.+?)["']\s+name=["']twitter:title["']/i);
+  }
+  if (twitterTitleMatch?.[1]) {
+    updates["twitter:title"] = unescapeHtmlEntities(twitterTitleMatch[1].trim());
+  } else if (updates.title) {
+    updates["twitter:title"] = updates.title;
+  }
+  let twitterDescMatch = headHtml.match(/<meta\s+name=["']twitter:description["']\s+content=["'](.+?)["']/i);
+  if (!twitterDescMatch) {
+    twitterDescMatch = headHtml.match(/<meta\s+content=["'](.+?)["']\s+name=["']twitter:description["']/i);
+  }
+  if (twitterDescMatch?.[1]) {
+    updates["twitter:description"] = unescapeHtmlEntities(twitterDescMatch[1].trim());
+  } else if (updates.description) {
+    updates["twitter:description"] = updates.description;
+  }
+  return updates;
+}
+function unescapeHtmlEntities(str) {
+  return str.replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
+}
 var init_stream = __esm(() => {
   init_server2();
   init_config();
@@ -6311,7 +6412,7 @@ async function resolveSkeletonBlock(args) {
     const importPath = toImportPath(wrapperDir, removeExtension(configuredSkeleton));
     return `import Skeleton from '${importPath}';`;
   }
-  return BUILT_IN_SKELETON;
+  return "const Skeleton = () => null;";
 }
 function resolveConfiguredSkeletonPath(value, cwd) {
   if (typeof value === "string" && value.trim().length > 0) {
@@ -6346,16 +6447,7 @@ function toComponentName(filePath) {
 var AUTO_HEADER = `// \uD83D\uDEA8 Auto-generated streaming wrapper by Reroute - DO NOT EDIT \uD83D\uDEA8
 /* eslint-disable */
 // @ts-nocheck
-`, BUILT_IN_SKELETON = `const Skeleton = () => (
-  <div className="animate-pulse p-8">
-    <div className="h-8 bg-gray-200 rounded w-3/4 mb-4" />
-    <div className="space-y-3">
-      <div className="h-4 bg-gray-200 rounded" />
-      <div className="h-4 bg-gray-200 rounded" />
-      <div className="h-4 bg-gray-200 rounded w-5/6" />
-    </div>
-  </div>
-);`, warnedSkeletonType = false;
+`, warnedSkeletonType = false;
 var init_suspense = () => {};
 
 // packages/cli/src/commands/lib/tailwind.ts
@@ -6705,10 +6797,10 @@ function sortRoutes(routes) {
     const bDepth = b.pattern.split("/").length;
     if (aDepth !== bDepth)
       return bDepth - aDepth;
-    if (!a.isDynamic && b.isDynamic)
-      return -1;
-    if (a.isDynamic && !b.isDynamic)
-      return 1;
+    const aDynamicCount = a.params.length;
+    const bDynamicCount = b.params.length;
+    if (aDynamicCount !== bDynamicCount)
+      return aDynamicCount - bDynamicCount;
     return a.pattern.localeCompare(b.pattern);
   });
 }
@@ -6858,16 +6950,16 @@ export interface Route {
 
 export function matchRoute(pathname: string): { route: Route; params: Record<string, string> } | null {
   for (const route of routes) {
-    const match = matchPattern(route.pattern, pathname);
-    if (match) {
-      return { route, params: match };
+    const result = matchPattern(route, pathname);
+    if (result) {
+      return { route, params: result };
     }
   }
   return null;
 }
 
-function matchPattern(pattern: string, pathname: string): Record<string, string> | null {
-  const patternParts = pattern.split('/').filter(Boolean);
+function matchPattern(route: Route, pathname: string): Record<string, string> | null {
+  const patternParts = route.pattern.split('/').filter(Boolean);
   const pathnameParts = pathname.split('/').filter(Boolean);
 
   if (patternParts.length !== pathnameParts.length) {
@@ -6881,7 +6973,8 @@ function matchPattern(pattern: string, pathname: string): Record<string, string>
     const pathnamePart = pathnameParts[i];
 
     if (patternPart.startsWith(':')) {
-      params[patternPart.slice(1)] = pathnamePart;
+      const paramName = patternPart.slice(1);
+      params[paramName] = pathnamePart;
     } else if (patternPart !== pathnamePart) {
       return null;
     }
@@ -105896,7 +105989,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.42.1";
+    return "0.43.1";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -105913,10 +106006,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "9c8c128";
+    return "ef42e38";
   }
   return "dev";
 }
 main();
 
-//# debugId=EC8E02CE3A67EA5F64756E2164756E21
+//# debugId=750CB7621F8B74C264756E2164756E21