reroute-js 0.40.2 → 0.41.1

package/core/index.js

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.40.2
+ * reroute-js v0.41.1
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -168,7 +168,7 @@ async function getContentMeta(absPath, isWatchMode) {
     }
   }
 }
-function buildHeadFromMeta(meta) {
+function buildHeadFromMeta(meta, ogConfig) {
   if (!meta || typeof meta !== "object")
     return "";
   const parts = [];
@@ -178,6 +178,23 @@ function buildHeadFromMeta(meta) {
     parts.push(`<title>${escapeHtml(title)}</title>`);
   if (description)
     parts.push(`<meta name="description" content="${escapeHtml(description)}" />`);
+  const ogType = typeof meta.ogType === "string" ? meta.ogType : ogConfig?.defaultType || "website";
+  parts.push(`<meta property="og:type" content="${escapeHtml(ogType)}" />`);
+  if (title) {
+    parts.push(`<meta property="og:title" content="${escapeHtml(title)}" />`);
+  }
+  const finalDescription = description || ogConfig?.siteDescription;
+  if (finalDescription) {
+    parts.push(`<meta property="og:description" content="${escapeHtml(finalDescription)}" />`);
+  }
+  const twitterCard = ogConfig?.twitterCard || "summary_large_image";
+  parts.push(`<meta name="twitter:card" content="${twitterCard}" />`);
+  if (title) {
+    parts.push(`<meta name="twitter:title" content="${escapeHtml(title)}" />`);
+  }
+  if (finalDescription) {
+    parts.push(`<meta name="twitter:description" content="${escapeHtml(finalDescription)}" />`);
+  }
   return parts.length ? `
 ${parts.join(`
 `)}` : "";
@@ -1640,6 +1657,28 @@ function removeDefaultMetaTags(templateHtml) {
   } catch {}
   return result;
 }
+function removeOverriddenMetaTags(templateHtml, injectedHead) {
+  let result = templateHtml;
+  try {
+    const injectedOgProps = [
+      ...injectedHead.matchAll(/<meta\s+property\s*=\s*['"]([^'"]+)['"][^>]*>/gi)
+    ].map((m) => m[1].toLowerCase());
+    const injectedNameMetas = [
+      ...injectedHead.matchAll(/<meta\s+name\s*=\s*['"]([^'"]+)['"][^>]*>/gi)
+    ].map((m) => m[1].toLowerCase());
+    for (const prop of injectedOgProps) {
+      const escapedProp = prop.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const regex = new RegExp(`<meta\\s+property\\s*=\\s*['"]${escapedProp}['"][^>]*>`, "gi");
+      result = result.replace(regex, "");
+    }
+    for (const name of injectedNameMetas) {
+      const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const regex = new RegExp(`<meta\\s+name\\s*=\\s*['"]${escapedName}['"][^>]*>`, "gi");
+      result = result.replace(regex, "");
+    }
+  } catch {}
+  return result;
+}
 function deduplicateHeadContent(templateHtml, headToInject) {
   let cleanedTemplate = templateHtml;
   let cleanedHead = headToInject;
@@ -1650,6 +1689,7 @@ function deduplicateHeadContent(templateHtml, headToInject) {
     } else if (/<meta\s+name\s*=\s*['"]description['"][^>]*>/i.test(cleanedHead)) {
       cleanedTemplate = cleanedTemplate.replace(/<meta\s+name\s*=\s*['"]description['"][^>]*>/i, "");
     }
+    cleanedTemplate = removeOverriddenMetaTags(cleanedTemplate, cleanedHead);
   } catch {}
   return { cleanedTemplate, cleanedHead };
 }
@@ -1768,7 +1808,6 @@ async function generateOGImageMetaTags(pathname, clientDir, ogConfig) {
   return `<meta property="og:image" content="${ogImagePath}" />
 <meta property="og:image:width" content="${width}" />
 <meta property="og:image:height" content="${height}" />
-<meta name="twitter:card" content="summary_large_image" />
 <meta name="twitter:image" content="${ogImagePath}" />`;
 }
 var init_meta = __esm(() => {
@@ -1806,7 +1845,25 @@ function generateOgUrl(baseUrl, pathname) {
   const ogUrl = `${cleanBaseUrl}${normalizedPath}`;
   return `<meta property="og:url" content="${ogUrl}" />`;
 }
-async function extractPageMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ogConfig, baseUrl, autoCanonical, ssrData) {
+function generateGlobalOGTags(ogConfig) {
+  const tags = [];
+  if (ogConfig.siteName) {
+    tags.push(`<meta property="og:site_name" content="${escapeHtml2(ogConfig.siteName)}" />`);
+  }
+  if (ogConfig.locale) {
+    tags.push(`<meta property="og:locale" content="${escapeHtml2(ogConfig.locale)}" />`);
+  }
+  if (ogConfig.twitterSite) {
+    const handle = ogConfig.twitterSite.startsWith("@") ? ogConfig.twitterSite : `@${ogConfig.twitterSite}`;
+    tags.push(`<meta name="twitter:site" content="${escapeHtml2(handle)}" />`);
+  }
+  return tags.length ? tags.join(`
+`) : "";
+}
+function escapeHtml2(input) {
+  return input.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+}
+async function extractPageMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ogImageConfig, ogConfig, baseUrl, autoCanonical, ssrData) {
   let perPageHead = "";
   let pageLang;
   let statusOverride = currentStatusOverride;
@@ -1815,7 +1872,7 @@ async function extractPageMetadata(pathname, clientDir, cwd, isWatchMode, curren
   }, (lang) => {
     if (!pageLang)
       pageLang = lang;
-  });
+  }, ogConfig);
   const shouldGenerateCanonical = autoCanonical !== false && baseUrl !== undefined;
   if (shouldGenerateCanonical) {
     const canonicalTag = generateCanonicalUrl(baseUrl, pathname);
@@ -1825,8 +1882,15 @@ ${canonicalTag}`;
     perPageHead += `
 ${ogUrlTag}`;
   }
+  if (ogConfig) {
+    const ogGlobalTags = generateGlobalOGTags(ogConfig);
+    if (ogGlobalTags) {
+      perPageHead += `
+${ogGlobalTags}`;
+    }
+  }
   try {
-    const ogMetaTags = await generateOGImageMetaTags(pathname, clientDir, ogConfig);
+    const ogMetaTags = await generateOGImageMetaTags(pathname, clientDir, ogImageConfig);
     if (ogMetaTags) {
       perPageHead += `
 ${ogMetaTags}`;
@@ -1838,22 +1902,22 @@ ${ogMetaTags}`;
     perPageHead += head;
   }, (lang) => {
     pageLang = lang;
-  });
-  const routeResult = await extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ssrData);
+  }, ogConfig);
+  const routeResult = await extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ssrData, ogConfig);
   perPageHead += routeResult.head;
   if (routeResult.lang)
     pageLang = routeResult.lang;
   statusOverride = routeResult.statusOverride;
   return { perPageHead, pageLang, statusOverride };
 }
-async function processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang) {
+async function processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang, ogConfig) {
   if (typeof layout?.path !== "string")
     return;
   try {
     const abs = join(clientDir, "routes", String(layout.path));
     const { meta, ssr } = await loadModuleMetaAndSSR(layout, abs, isWatchMode);
     if (meta)
-      addHead(buildHeadFromMeta(meta));
+      addHead(buildHeadFromMeta(meta, ogConfig));
     if (ssr) {
       const ssrHead = extractSSRHead(ssr);
       if (ssrHead)
@@ -1865,16 +1929,16 @@ ${ssrHead}`);
     }
   } catch {}
 }
-async function extractLayoutMetadata(pathname, clientDir, cwd, isWatchMode, addHead, setLang) {
+async function extractLayoutMetadata(pathname, clientDir, cwd, isWatchMode, addHead, setLang, ogConfig) {
   try {
     const m = await loadRoutesModule(cwd, isWatchMode);
     const matchingLayouts = getMatchingLayouts(pathname, m?.layouts);
     for (const layout of matchingLayouts) {
-      await processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang);
+      await processLayoutForMetadata(layout, clientDir, isWatchMode, addHead, setLang, ogConfig);
     }
   } catch {}
 }
-function extractContentMetadata(pathname, addHead, setLang) {
+function extractContentMetadata(pathname, addHead, setLang, ogConfig) {
   try {
     const parts = pathname.split("/").filter(Boolean);
     if (parts.length < 2)
@@ -1884,7 +1948,7 @@ function extractContentMetadata(pathname, addHead, setLang) {
     const exp = g.__REROUTE_SSR_EXPORTS__?.[key];
     const meta = exp?.meta;
     const ssr = exp?.ssr;
-    addHead(buildHeadFromMeta(meta));
+    addHead(buildHeadFromMeta(meta, ogConfig));
     const ssrHead = extractSSRHead(ssr);
     if (ssrHead)
       addHead(`
@@ -1894,7 +1958,7 @@ ${ssrHead}`);
       setLang(lang);
   } catch {}
 }
-async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData) {
+async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData, ogConfig) {
   const pathnameOnly = pathname.split("?")[0];
   const match = typeof m.matchRoute === "function" ? m.matchRoute(pathnameOnly) : null;
   const r = match?.route;
@@ -1907,7 +1971,7 @@ async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode,
       const { meta, ssr } = await loadModuleMetaAndSSR(r, abs, isWatchMode);
       let head = "";
       if (meta)
-        head += buildHeadFromMeta(meta);
+        head += buildHeadFromMeta(meta, ogConfig);
       if (ssr) {
         const routeData = ssrData && typeof ssrData === "object" ? ssrData[pathname] : undefined;
         const ssrHead = extractSSRHead(ssr, routeData);
@@ -1921,7 +1985,7 @@ ${ssrHead}`;
   }
   return { head: "", statusOverride };
 }
-async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ssrData) {
+async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, currentStatusOverride, ssrData, ogConfig) {
   let head = "";
   let lang;
   let statusOverride = currentStatusOverride;
@@ -1937,14 +2001,14 @@ async function extractRouteMetadata(pathname, clientDir, cwd, isWatchMode, curre
       statusOverride = statusOverride || 404;
     }
     if (r && typeof r.path === "string") {
-      const result = await extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData);
+      const result = await extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode, statusOverride, ssrData, ogConfig);
       head = result.head;
       lang = result.lang;
       statusOverride = result.statusOverride;
     } else {
       head += await extractNotFoundMetadata(pathname, clientDir, m, isWatchMode, (l) => {
         lang = l;
-      });
+      }, ogConfig);
     }
   } catch {}
   return { head, lang, statusOverride };
@@ -1964,7 +2028,7 @@ function findBestNotFoundRoute(list, pathname) {
   }
   return chosen;
 }
-async function extractNotFoundMetadata(pathname, clientDir, routesModule, isWatchMode, setLang) {
+async function extractNotFoundMetadata(pathname, clientDir, routesModule, isWatchMode, setLang, ogConfig) {
   let head = "";
   try {
     const list = routesModule?.notFoundRoutes;
@@ -1975,7 +2039,7 @@ async function extractNotFoundMetadata(pathname, clientDir, routesModule, isWatc
       const abs = join(clientDir, "routes", String(chosen.path));
       const { meta, ssr } = await loadModuleMetaAndSSR(chosen, abs, isWatchMode);
       if (meta)
-        head += buildHeadFromMeta(meta);
+        head += buildHeadFromMeta(meta, ogConfig);
       const ssrHead = extractSSRHead(ssr);
       if (ssrHead)
         head += `
@@ -2562,7 +2626,7 @@ async function performSSRSetupInternal(options, streaming) {
     statusOverride = computeResult.statusContainer.value;
   }
   const metadataResult = await withSpan("ssr.extract.metadata", async (span) => {
-    const result = await extractPageMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ogConfig, options.baseUrl, options.autoCanonical, computeResult.data);
+    const result = await extractPageMetadata(pathname, clientDir, cwd, isWatchMode, statusOverride, ogConfig, options.ogMetaConfig, options.baseUrl, options.autoCanonical, computeResult.data);
     span.setAttributes({
       "reroute.pathname": pathname,
       "reroute.metadata.exists": !!result.perPageHead
@@ -2732,6 +2796,7 @@ async function renderSSRDocument(options) {
     maxAge,
     searchParams,
     ogConfig,
+    ogMetaConfig: options.ogMetaConfig,
     baseUrl: options.baseUrl,
     autoCanonical: options.autoCanonical,
     cachedCollections: options.cachedCollections,
@@ -3996,13 +4061,13 @@ async function discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode, baseUrl, s
   const ssrDataRoutes = new Map;
   const bundledRoutes = globalThis.__REROUTE_ROUTES__;
   if (bundledRoutes && Array.isArray(bundledRoutes)) {
-    for (const route of staticRoutes) {
+    const routePromises = staticRoutes.map(async (route) => {
       if (sitemapConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
-        continue;
+        return null;
       }
       const bundledRoute = bundledRoutes.find((r) => r?.pattern === route.pattern);
       if (!bundledRoute)
-        continue;
+        return null;
       const ssr = bundledRoute?.ssr;
       const dataFn = ssr?.data;
       if (typeof dataFn === "function") {
@@ -4015,15 +4080,22 @@ async function discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode, baseUrl, s
           });
           const entries = extractEntriesFromData(result, route.pattern, baseUrl, sitemapConfig);
           if (entries.length > 0) {
-            ssrDataRoutes.set(route.pattern, entries);
+            return { pattern: route.pattern, entries };
           }
         } catch {}
       }
+      return null;
+    });
+    const results = await Promise.all(routePromises);
+    for (const result of results) {
+      if (result) {
+        ssrDataRoutes.set(result.pattern, result.entries);
+      }
     }
   } else {
-    for (const route of staticRoutes) {
+    const routePromises = staticRoutes.map(async (route) => {
       if (sitemapConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
-        continue;
+        return null;
       }
       try {
         const routeModulePath = join(cwd, "src", "client", "routes", route.path);
@@ -4039,10 +4111,17 @@ async function discoverSSRDataRoutes2(cwd, staticRoutes, isWatchMode, baseUrl, s
           });
           const entries = extractEntriesFromData(result, route.pattern, baseUrl, sitemapConfig);
           if (entries.length > 0) {
-            ssrDataRoutes.set(route.pattern, entries);
+            return { pattern: route.pattern, entries };
           }
         }
       } catch {}
+      return null;
+    });
+    const results = await Promise.all(routePromises);
+    for (const result of results) {
+      if (result) {
+        ssrDataRoutes.set(result.pattern, result.entries);
+      }
     }
   }
   return ssrDataRoutes;
@@ -4418,24 +4497,28 @@ function createRSSItemFromData(item, routePattern, baseUrl, rssConfig) {
 }
 async function discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfig) {
   const collectionsMap = new Map;
-  for (const collection of collections2) {
+  const collectionPromises = collections2.map(async (collection) => {
     const items = await discoverCollectionFeedItems(cwd, collection, isWatchMode, baseUrl, rssConfig);
-    if (items.length > 0) {
-      collectionsMap.set(collection, items);
+    return items.length > 0 ? { collection, items } : null;
+  });
+  const collectionResults = await Promise.all(collectionPromises);
+  for (const result of collectionResults) {
+    if (result) {
+      collectionsMap.set(result.collection, result.items);
     }
   }
   const ssrDataFeeds = new Map;
   const bundledRoutes = globalThis.__REROUTE_ROUTES__;
+  const { discoverRoutes: discoverRoutes2 } = await Promise.resolve().then(() => (init_discovery4(), exports_discovery));
+  const { staticRoutes } = await discoverRoutes2(cwd, isWatchMode);
   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) {
+    const routePromises = staticRoutes.map(async (route) => {
       if (rssConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
-        continue;
+        return null;
       }
       const bundledRoute = bundledRoutes.find((r) => r?.pattern === route.pattern);
       if (!bundledRoute)
-        continue;
+        return null;
       const ssr = bundledRoute?.ssr;
       const dataFn = ssr?.data;
       if (typeof dataFn === "function") {
@@ -4448,21 +4531,33 @@ async function discoverRSSData(cwd, collections2, baseUrl, isWatchMode, rssConfi
           });
           const items = extractRSSItemsFromData(result, route.pattern, baseUrl, rssConfig);
           if (items.length > 0) {
-            ssrDataFeeds.set(route.pattern, items);
+            return { pattern: route.pattern, items };
           }
         } catch {}
       }
+      return null;
+    });
+    const results = await Promise.all(routePromises);
+    for (const result of results) {
+      if (result) {
+        ssrDataFeeds.set(result.pattern, result.items);
+      }
     }
   } else {
-    const { discoverRoutes: discoverRoutes2 } = await Promise.resolve().then(() => (init_discovery4(), exports_discovery));
-    const { staticRoutes } = await discoverRoutes2(cwd, isWatchMode);
-    for (const route of staticRoutes) {
+    const routePromises = staticRoutes.map(async (route) => {
       if (rssConfig?.excludeDiscovery?.some((excluded) => route.pattern.startsWith(excluded))) {
-        continue;
+        return null;
       }
       const items = await discoverSSRDataFeedItems(cwd, route.pattern, route.path, isWatchMode, baseUrl, rssConfig);
       if (items.length > 0) {
-        ssrDataFeeds.set(route.pattern, items);
+        return { pattern: route.pattern, items };
+      }
+      return null;
+    });
+    const results = await Promise.all(routePromises);
+    for (const result of results) {
+      if (result) {
+        ssrDataFeeds.set(result.pattern, result.items);
       }
     }
   }
@@ -4842,6 +4937,7 @@ async function renderSSRDocumentStream(options) {
     maxAge,
     searchParams,
     ogConfig,
+    ogMetaConfig: options.ogMetaConfig,
     baseUrl: options.baseUrl,
     autoCanonical: options.autoCanonical,
     cachedCollections: options.cachedCollections,
@@ -4876,7 +4972,11 @@ async function renderSSRDocumentStream(options) {
     };
   });
   const pageLang = setup2.metadataResult.pageLang || lang;
-  let headWithLang = htmlHead.replace(/<html([^>]*)>/i, `<html$1 lang="${pageLang}">`);
+  let headWithLang = htmlHead.replace(/<html([^>]*)>/i, (_m, attrs) => {
+    const hasLang = /(^|\s)lang\s*=/.test(attrs);
+    const newAttrs = hasLang ? attrs.replace(/lang\s*=\s*("[^"]*"|'[^']*'|[^\s>]+)/i, `lang="${pageLang}"`) : `${attrs} lang="${pageLang}"`;
+    return `<html${newAttrs}>`;
+  });
   const extraHead = setup2.bundlePreload + setup2.preloadExtraHead + setup2.metadataResult.perPageHead;
   if (/<title[\s\S]*?<\/title>/i.test(extraHead)) {
     headWithLang = headWithLang.replace(/<title[\s\S]*?<\/title>/i, "");
@@ -4884,6 +4984,7 @@ async function renderSSRDocumentStream(options) {
   if (/<meta\s+name\s*=\s*['"]description['"][^>]*>/i.test(extraHead)) {
     headWithLang = headWithLang.replace(/<meta\s+name\s*=\s*['"]description['"][^>]*>/i, "");
   }
+  headWithLang = removeOverriddenMetaTags(headWithLang, extraHead);
   const config = await loadConfig(cwd);
   const browserTelemetryConfigRaw = config.telemetry?.browser;
   const { serializeBrowserTelemetryConfig: serializeBrowserTelemetryConfig2 } = await Promise.resolve().then(() => exports_serialize);
@@ -4932,7 +5033,7 @@ async function streamSSRContent(writer, encoder, ctx) {
     try {
       const combinedHead = deduplicateMetaTags([ctx.inlineStyleTag, ctx.head, ctx.extraHead].filter(Boolean).join(`
 `));
-      const headWithLangAndContent = ctx.headWithLang.replace(/<html([^>]*)>/i, `<html$1 lang="${ctx.pageLang}">`).replace(/<\/head>/i, `${combinedHead ? `${combinedHead}
+      const headWithLangAndContent = ctx.headWithLang.replace(/<\/head>/i, `${combinedHead ? `${combinedHead}
 ` : ""}</head>`);
       const headContent = `${headWithLangAndContent}`;
       await writer.write(encoder.encode(headContent));
@@ -5076,6 +5177,7 @@ export {
   renderSSRDocumentStream,
   renderSSRDocument,
   renderOGImageToPNG,
+  removeOverriddenMetaTags,
   processCollections,
   preloadContentModule,
   performSSRSetup,
@@ -5167,4 +5269,4 @@ export {
   AI_CRAWLERS
 };
 
-//# debugId=2457A368184804D064756E2164756E21
+//# debugId=DE3402C7BA2E034A64756E2164756E21