unhead 1.1.28 → 1.1.30

package/dist/index.cjs

@@ -262,15 +262,17 @@ function DedupesTagsPlugin() {
   });
 }
 
-function processTemplateParams(s, config) {
+function processTemplateParams(s, p) {
+  if (typeof s !== "string")
+    return s;
   function sub(token) {
     if (["s", "pageTitle"].includes(token))
-      return config.pageTitle;
+      return p.pageTitle;
     let val;
     if (token.includes(".")) {
-      val = token.split(".").reduce((acc, key) => acc ? acc[key] || void 0 : void 0, config);
+      val = token.split(".").reduce((acc, key) => acc ? acc[key] || void 0 : void 0, p);
     } else {
-      val = config[token];
+      val = p[token];
     }
     return typeof val !== "undefined" ? val || "" : false;
   }
@@ -286,12 +288,13 @@ function processTemplateParams(s, config) {
       s = s.replace(new RegExp(`\\${token}(\\W|$)`, "g"), `${re}$1`).trim();
     }
   });
-  if (config.separator) {
-    if (s.endsWith(config.separator))
-      s = s.slice(0, -config.separator.length).trim();
-    if (s.startsWith(config.separator))
-      s = s.slice(config.separator.length).trim();
-    s = s.replace(new RegExp(`\\${config.separator}\\s*\\${config.separator}`, "g"), config.separator);
+  const sep = p.separator;
+  if (s.includes(sep)) {
+    if (s.endsWith(sep))
+      s = s.slice(0, -sep.length).trim();
+    if (s.startsWith(sep))
+      s = s.slice(sep.length).trim();
+    s = s.replace(new RegExp(`\\${sep}\\s*\\${sep}`, "g"), sep);
   }
   return s;
 }
@@ -303,7 +306,8 @@ function TemplateParamsPlugin() {
         const title = tags.find((tag) => tag.tag === "title")?.textContent;
         const idx = tags.findIndex((tag) => tag.tag === "templateParams");
         const params = idx !== -1 ? tags[idx].props : {};
-        params.pageTitle = params.pageTitle || title || "";
+        params.separator = params.separator || "|";
+        params.pageTitle = processTemplateParams(params.pageTitle || title || "", params);
         for (const tag of tags) {
           if (["titleTemplate", "title"].includes(tag.tag) && typeof tag.textContent === "string") {
             tag.textContent = processTemplateParams(tag.textContent, params);
@@ -609,7 +613,7 @@ function packMeta(inputs) {
   });
 }
 
-const OpenGraphInputs = ["Image", "Video", "Audio"];
+const OpenGraphInputs = ["og:Image", "og:Video", "og:Audio", "twitter:Image"];
 const SimpleArrayUnpackMetas = ["themeColor"];
 const ColonPrefixKeys = /^(og|twitter|fb)/;
 const PropertyPrefixKeys = /^(og|fb)/;
@@ -640,32 +644,32 @@ function changeKeyCasingDeep(input) {
 function unpackMeta(input) {
   const extras = [];
   OpenGraphInputs.forEach((key) => {
-    const ogKey = `og:${key.toLowerCase()}`;
-    const inputKey = `og${key}`;
+    const propKey = key.toLowerCase();
+    const inputKey = `${key.replace(":", "")}`;
     const val = input[inputKey];
     if (typeof val === "object") {
       (Array.isArray(val) ? val : [val]).forEach((entry) => {
         if (!entry)
           return;
         const unpackedEntry = unpackToArray(entry, {
-          key: "property",
+          key: key.startsWith("og") ? "property" : "name",
           value: "content",
           resolveKeyData({ key: key2 }) {
-            return fixKeyCase(`${ogKey}${key2 !== "url" ? `:${key2}` : ""}`);
+            return fixKeyCase(`${propKey}${key2 !== "url" ? `:${key2}` : ""}`);
           },
           resolveValueData({ value }) {
             return typeof value === "number" ? value.toString() : value;
           }
         });
         extras.push(
-          ...unpackedEntry.sort((a, b) => a.property === ogKey ? -1 : b.property === ogKey ? 1 : 0)
+          ...unpackedEntry.sort((a, b) => a.property === propKey ? -1 : b.property === propKey ? 1 : 0)
         );
       });
       delete input[inputKey];
     }
   });
   SimpleArrayUnpackMetas.forEach((meta2) => {
-    if (input[meta2]) {
+    if (input[meta2] && typeof input[meta2] !== "string") {
       const val = Array.isArray(input[meta2]) ? input[meta2] : [input[meta2]];
       delete input[meta2];
       val.forEach((entry) => {

package/dist/index.d.ts

@@ -33,7 +33,7 @@ declare function EventHandlersPlugin(): _unhead_schema.HeadPlugin;
 
 declare function DedupesTagsPlugin(): _unhead_schema.HeadPlugin;
 
-declare function processTemplateParams(s: string, config: TemplateParams): string;
+declare function processTemplateParams(s: string, p: TemplateParams): string;
 declare function TemplateParamsPlugin(): _unhead_schema.HeadPlugin;
 
 declare function useHead<T extends Head>(input: T, options?: HeadEntryOptions): ActiveHeadEntry<T> | void;

package/dist/index.mjs

@@ -260,15 +260,17 @@ function DedupesTagsPlugin() {
   });
 }
 
-function processTemplateParams(s, config) {
+function processTemplateParams(s, p) {
+  if (typeof s !== "string")
+    return s;
   function sub(token) {
     if (["s", "pageTitle"].includes(token))
-      return config.pageTitle;
+      return p.pageTitle;
     let val;
     if (token.includes(".")) {
-      val = token.split(".").reduce((acc, key) => acc ? acc[key] || void 0 : void 0, config);
+      val = token.split(".").reduce((acc, key) => acc ? acc[key] || void 0 : void 0, p);
     } else {
-      val = config[token];
+      val = p[token];
     }
     return typeof val !== "undefined" ? val || "" : false;
   }
@@ -284,12 +286,13 @@ function processTemplateParams(s, config) {
       s = s.replace(new RegExp(`\\${token}(\\W|$)`, "g"), `${re}$1`).trim();
     }
   });
-  if (config.separator) {
-    if (s.endsWith(config.separator))
-      s = s.slice(0, -config.separator.length).trim();
-    if (s.startsWith(config.separator))
-      s = s.slice(config.separator.length).trim();
-    s = s.replace(new RegExp(`\\${config.separator}\\s*\\${config.separator}`, "g"), config.separator);
+  const sep = p.separator;
+  if (s.includes(sep)) {
+    if (s.endsWith(sep))
+      s = s.slice(0, -sep.length).trim();
+    if (s.startsWith(sep))
+      s = s.slice(sep.length).trim();
+    s = s.replace(new RegExp(`\\${sep}\\s*\\${sep}`, "g"), sep);
   }
   return s;
 }
@@ -301,7 +304,8 @@ function TemplateParamsPlugin() {
         const title = tags.find((tag) => tag.tag === "title")?.textContent;
         const idx = tags.findIndex((tag) => tag.tag === "templateParams");
         const params = idx !== -1 ? tags[idx].props : {};
-        params.pageTitle = params.pageTitle || title || "";
+        params.separator = params.separator || "|";
+        params.pageTitle = processTemplateParams(params.pageTitle || title || "", params);
         for (const tag of tags) {
           if (["titleTemplate", "title"].includes(tag.tag) && typeof tag.textContent === "string") {
             tag.textContent = processTemplateParams(tag.textContent, params);
@@ -607,7 +611,7 @@ function packMeta(inputs) {
   });
 }
 
-const OpenGraphInputs = ["Image", "Video", "Audio"];
+const OpenGraphInputs = ["og:Image", "og:Video", "og:Audio", "twitter:Image"];
 const SimpleArrayUnpackMetas = ["themeColor"];
 const ColonPrefixKeys = /^(og|twitter|fb)/;
 const PropertyPrefixKeys = /^(og|fb)/;
@@ -638,32 +642,32 @@ function changeKeyCasingDeep(input) {
 function unpackMeta(input) {
   const extras = [];
   OpenGraphInputs.forEach((key) => {
-    const ogKey = `og:${key.toLowerCase()}`;
-    const inputKey = `og${key}`;
+    const propKey = key.toLowerCase();
+    const inputKey = `${key.replace(":", "")}`;
     const val = input[inputKey];
     if (typeof val === "object") {
       (Array.isArray(val) ? val : [val]).forEach((entry) => {
         if (!entry)
           return;
         const unpackedEntry = unpackToArray(entry, {
-          key: "property",
+          key: key.startsWith("og") ? "property" : "name",
           value: "content",
           resolveKeyData({ key: key2 }) {
-            return fixKeyCase(`${ogKey}${key2 !== "url" ? `:${key2}` : ""}`);
+            return fixKeyCase(`${propKey}${key2 !== "url" ? `:${key2}` : ""}`);
           },
           resolveValueData({ value }) {
             return typeof value === "number" ? value.toString() : value;
           }
         });
         extras.push(
-          ...unpackedEntry.sort((a, b) => a.property === ogKey ? -1 : b.property === ogKey ? 1 : 0)
+          ...unpackedEntry.sort((a, b) => a.property === propKey ? -1 : b.property === propKey ? 1 : 0)
         );
       });
       delete input[inputKey];
     }
   });
   SimpleArrayUnpackMetas.forEach((meta2) => {
-    if (input[meta2]) {
+    if (input[meta2] && typeof input[meta2] !== "string") {
       const val = Array.isArray(input[meta2]) ? input[meta2] : [input[meta2]];
       delete input[meta2];
       val.forEach((entry) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unhead",
   "type": "module",
-  "version": "1.1.28",
+  "version": "1.1.30",
   "packageManager": "pnpm@8.6.2",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -31,9 +31,9 @@
   ],
   "dependencies": {
     "hookable": "^5.5.3",
-    "@unhead/dom": "1.1.28",
-    "@unhead/schema": "1.1.28",
-    "@unhead/shared": "1.1.28"
+    "@unhead/dom": "1.1.30",
+    "@unhead/schema": "1.1.30",
+    "@unhead/shared": "1.1.30"
   },
   "devDependencies": {
     "packrup": "^0.1.0"