reroute-js 0.41.1 → 0.42.1

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v0.41.1
+ * reroute-js v0.42.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.41.1
+ * reroute-js v0.42.1
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -48,7 +48,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "0.41.1";
+    return "0.42.1";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -66,7 +66,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "3909689";
+    return "9c8c128";
   }
   return "dev";
 }
@@ -2226,7 +2226,7 @@ async function processLayoutForMetadata(layout, clientDir, isWatchMode, addHead,
     if (meta)
       addHead(buildHeadFromMeta(meta, ogConfig));
     if (ssr) {
-      const ssrHead = extractSSRHead(ssr);
+      const ssrHead = extractSSRHead(ssr, undefined, ogConfig);
       if (ssrHead)
         addHead(`
 ${ssrHead}`);
@@ -2256,7 +2256,7 @@ function extractContentMetadata(pathname, addHead, setLang, ogConfig) {
     const meta = exp?.meta;
     const ssr = exp?.ssr;
     addHead(buildHeadFromMeta(meta, ogConfig));
-    const ssrHead = extractSSRHead(ssr);
+    const ssrHead = extractSSRHead(ssr, undefined, ogConfig);
     if (ssrHead)
       addHead(`
 ${ssrHead}`);
@@ -2281,7 +2281,7 @@ async function extractMatchedRouteMetadata(pathname, clientDir, m, isWatchMode,
         head += buildHeadFromMeta(meta, ogConfig);
       if (ssr) {
         const routeData = ssrData && typeof ssrData === "object" ? ssrData[pathname] : undefined;
-        const ssrHead = extractSSRHead(ssr, routeData);
+        const ssrHead = extractSSRHead(ssr, routeData, ogConfig, head);
         if (ssrHead)
           head += `
 ${ssrHead}`;
@@ -2347,7 +2347,7 @@ async function extractNotFoundMetadata(pathname, clientDir, routesModule, isWatc
       const { meta, ssr } = await loadModuleMetaAndSSR(chosen, abs, isWatchMode);
       if (meta)
         head += buildHeadFromMeta(meta, ogConfig);
-      const ssrHead = extractSSRHead(ssr);
+      const ssrHead = extractSSRHead(ssr, undefined, ogConfig);
       if (ssrHead)
         head += `
 ${ssrHead}`;
@@ -2358,29 +2358,86 @@ ${ssrHead}`;
   } catch {}
   return head;
 }
-function extractSSRHead(ssr, data) {
+function parseTitleFromHead(head) {
+  const match = head.match(/<title[^>]*>(.*?)<\/title>/is);
+  if (match?.[1])
+    return unescapeHtml(match[1].trim());
+  return;
+}
+function parseDescriptionFromHead(head) {
+  let match = head.match(/<meta\s+name=["']description["']\s+content=["'](.+?)["']\s*\/?>/i);
+  if (match?.[1])
+    return unescapeHtml(match[1].trim());
+  match = head.match(/<meta\s+content=["'](.+?)["']\s+name=["']description["']\s*\/?>/i);
+  if (match?.[1])
+    return unescapeHtml(match[1].trim());
+  return;
+}
+function unescapeHtml(input) {
+  return input.replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
+}
+function hasMetaTag(head, property) {
+  const propRegex = new RegExp(`<meta\\s+(?:property|name)=["']${property}["']`, "i");
+  const contentFirstRegex = new RegExp(`<meta\\s+content=["'][^"']*["']\\s+(?:property|name)=["']${property}["']`, "i");
+  return propRegex.test(head) || contentFirstRegex.test(head);
+}
+function generateMissingOGTags(head, ogConfig) {
+  const title = parseTitleFromHead(head);
+  const description = parseDescriptionFromHead(head);
+  const additionalTags = [];
+  if (title && !hasMetaTag(head, "og:title")) {
+    additionalTags.push(`<meta property="og:title" content="${escapeHtml2(title)}" />`);
+  }
+  const finalDescription = description || ogConfig?.siteDescription;
+  if (finalDescription && !hasMetaTag(head, "og:description")) {
+    additionalTags.push(`<meta property="og:description" content="${escapeHtml2(finalDescription)}" />`);
+  }
+  if (title && !hasMetaTag(head, "twitter:title")) {
+    additionalTags.push(`<meta name="twitter:title" content="${escapeHtml2(title)}" />`);
+  }
+  if (finalDescription && !hasMetaTag(head, "twitter:description")) {
+    additionalTags.push(`<meta name="twitter:description" content="${escapeHtml2(finalDescription)}" />`);
+  }
+  if (!hasMetaTag(head, "og:type")) {
+    const ogType = ogConfig?.defaultType || "website";
+    additionalTags.push(`<meta property="og:type" content="${escapeHtml2(ogType)}" />`);
+  }
+  if (!hasMetaTag(head, "twitter:card")) {
+    const twitterCard = ogConfig?.twitterCard || "summary_large_image";
+    additionalTags.push(`<meta name="twitter:card" content="${twitterCard}" />`);
+  }
+  return additionalTags.length > 0 ? `
+${additionalTags.join(`
+`)}` : "";
+}
+function extractSSRHead(ssr, data, ogConfig, existingHead) {
   if (!ssr)
     return "";
+  let headContent = "";
   if (typeof ssr.head === "function") {
     try {
       const result = ssr.head({ data });
       if (typeof result === "string")
-        return result;
-      if (Array.isArray(result))
-        return String(result.join(`
+        headContent = result;
+      else if (Array.isArray(result))
+        headContent = String(result.join(`
 `));
-      return "";
     } catch (err) {
       console.error("[extractSSRHead] Error calling head function:", err);
       return "";
     }
-  }
-  if (typeof ssr.head === "string")
-    return ssr.head;
-  if (Array.isArray(ssr.head))
-    return String(ssr.head.join(`
+  } else if (typeof ssr.head === "string") {
+    headContent = ssr.head;
+  } else if (Array.isArray(ssr.head)) {
+    headContent = String(ssr.head.join(`
 `));
-  return "";
+  }
+  if (!headContent)
+    return "";
+  const combinedHead = existingHead ? `${existingHead}
+${headContent}` : headContent;
+  const additionalOGTags = generateMissingOGTags(combinedHead, ogConfig);
+  return headContent + additionalOGTags;
 }
 function extractSSRLang(ssr) {
   if (!ssr)
@@ -4491,6 +4548,8 @@ function extractIdentifierFromItem(item, routePattern, sitemapConfig) {
   if (sitemapConfig?.extractUrl) {
     try {
       const identifier2 = sitemapConfig.extractUrl(item, routePattern);
+      if (identifier2 === false)
+        return null;
       if (identifier2)
         return identifier2;
     } catch (error) {
@@ -4746,6 +4805,8 @@ function extractIdentifier2(item, routePattern, rssConfig) {
   if (rssConfig?.extractUrl) {
     try {
       const identifier = rssConfig.extractUrl(item, routePattern);
+      if (identifier === false)
+        return null;
       if (identifier)
         return String(identifier);
     } catch (error) {
@@ -105835,7 +105896,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "0.41.1";
+    return "0.42.1";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -105852,10 +105913,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "3909689";
+    return "9c8c128";
   }
   return "dev";
 }
 main();
 
-//# debugId=6B4BD5CD88C5BCB064756E2164756E21
+//# debugId=EC8E02CE3A67EA5F64756E2164756E21