unhead 1.1.26 → 1.1.28

package/dist/index.cjs

@@ -5,29 +5,33 @@ const dom = require('@unhead/dom');
 const shared = require('@unhead/shared');
 
 const TAG_WEIGHTS = {
-  // aliases
-  critical: 2,
-  high: 9,
-  low: 12,
   // tags
   base: -1,
-  title: 1,
-  meta: 10
+  title: 1
+};
+const TAG_ALIASES = {
+  // relative scores to their default values
+  critical: -8,
+  high: -1,
+  low: 2
 };
 function tagWeight(tag) {
-  if (typeof tag.tagPriority === "number")
-    return tag.tagPriority;
+  let weight = 10;
+  const priority = tag.tagPriority;
+  if (typeof priority === "number")
+    return priority;
   if (tag.tag === "meta") {
     if (tag.props.charset)
-      return -2;
+      weight = -2;
     if (tag.props["http-equiv"] === "content-security-policy")
-      return 0;
+      weight = 0;
+  } else if (tag.tag in TAG_WEIGHTS) {
+    weight = TAG_WEIGHTS[tag.tag];
   }
-  const key = tag.tagPriority || tag.tag;
-  if (key in TAG_WEIGHTS) {
-    return TAG_WEIGHTS[key];
+  if (typeof priority === "string" && priority in TAG_ALIASES) {
+    return weight + TAG_ALIASES[priority];
   }
-  return 10;
+  return weight;
 }
 const SortModifiers = [{ prefix: "before:", offset: -1 }, { prefix: "after:", offset: 1 }];
 function SortTagsPlugin() {
@@ -233,6 +237,8 @@ function DedupesTagsPlugin() {
               tag._d = `${dupedTag._d}:${dupedTag._duped.length + 1}`;
               dupedTag._duped.push(tag);
               return;
+            } else if (tagWeight(tag) > tagWeight(dupedTag)) {
+              return;
             }
           }
           const propCount = Object.keys(tag.props).length + (tag.innerHTML ? 1 : 0) + (tag.textContent ? 1 : 0);
@@ -277,7 +283,7 @@ function processTemplateParams(s, config) {
   tokens.forEach((token) => {
     const re = sub(token.slice(1));
     if (typeof re === "string") {
-      s = s.replaceAll(new RegExp(`\\${token}(\\W|$)`, "g"), `${re}$1`).trim();
+      s = s.replace(new RegExp(`\\${token}(\\W|$)`, "g"), `${re}$1`).trim();
     }
   });
   if (config.separator) {
@@ -603,7 +609,8 @@ function packMeta(inputs) {
   });
 }
 
-const ArrayableInputs = ["Image", "Video", "Audio"];
+const OpenGraphInputs = ["Image", "Video", "Audio"];
+const SimpleArrayUnpackMetas = ["themeColor"];
 const ColonPrefixKeys = /^(og|twitter|fb)/;
 const PropertyPrefixKeys = /^(og|fb)/;
 function resolveMetaKeyType(key) {
@@ -632,7 +639,7 @@ function changeKeyCasingDeep(input) {
 }
 function unpackMeta(input) {
   const extras = [];
-  ArrayableInputs.forEach((key) => {
+  OpenGraphInputs.forEach((key) => {
     const ogKey = `og:${key.toLowerCase()}`;
     const inputKey = `og${key}`;
     const val = input[inputKey];
@@ -657,6 +664,18 @@ function unpackMeta(input) {
       delete input[inputKey];
     }
   });
+  SimpleArrayUnpackMetas.forEach((meta2) => {
+    if (input[meta2]) {
+      const val = Array.isArray(input[meta2]) ? input[meta2] : [input[meta2]];
+      delete input[meta2];
+      val.forEach((entry) => {
+        extras.push({
+          name: fixKeyCase(meta2),
+          ...entry
+        });
+      });
+    }
+  });
   const meta = unpackToArray(input, {
     key({ key }) {
       return resolveMetaKeyType(key);
@@ -699,12 +718,20 @@ function resolvePackedMetaObjectValue(value, key) {
 
 async function normaliseTag(tagName, input) {
   const tag = { tag: tagName, props: {} };
+  if (input instanceof Promise)
+    input = await input;
   if (tagName === "templateParams") {
     tag.props = input;
     return tag;
   }
   if (["title", "titleTemplate"].includes(tagName)) {
-    tag.textContent = input instanceof Promise ? await input : input;
+    if (input && typeof input === "object") {
+      tag.textContent = input.textContent;
+      if (input.tagPriority)
+        tag.tagPriority = input.tagPriority;
+    } else {
+      tag.textContent = input;
+    }
     return tag;
   }
   if (typeof input === "string") {
@@ -830,18 +857,15 @@ function whitelistSafeInput(input) {
           filtered[key] = tagValue.map((meta) => {
             const link = {};
             WhitelistAttributes.link.forEach((key2) => {
-              if (key2 === "rel" && ["stylesheet", "canonical", "modulepreload", "prerender", "preload", "prefetch"].includes(meta[key2]))
+              const val = meta[key2];
+              if (key2 === "rel" && ["stylesheet", "canonical", "modulepreload", "prerender", "preload", "prefetch"].includes(val))
                 return;
               if (key2 === "href") {
-                try {
-                  const url = new URL(meta[key2]);
-                  if (["javascript:", "data:"].includes(url.protocol))
-                    return;
-                  link[key2] = meta[key2];
-                } catch (e) {
-                }
-              } else if (meta[key2] || key2.startsWith("data-")) {
-                link[key2] = meta[key2];
+                if (val.includes("javascript:") || val.includes("data:"))
+                  return;
+                link[key2] = val;
+              } else if (val || key2.startsWith("data-")) {
+                link[key2] = val;
               }
             });
             return link;
@@ -1057,6 +1081,7 @@ exports.EventHandlersPlugin = EventHandlersPlugin;
 exports.ProvideTagHashPlugin = ProvideTagHashPlugin;
 exports.SortModifiers = SortModifiers;
 exports.SortTagsPlugin = SortTagsPlugin;
+exports.TAG_ALIASES = TAG_ALIASES;
 exports.TAG_WEIGHTS = TAG_WEIGHTS;
 exports.TagEntityBits = TagEntityBits;
 exports.TemplateParamsPlugin = TemplateParamsPlugin;

package/dist/index.d.ts

@@ -3,12 +3,13 @@ import { HeadTag, TemplateParams, Head, HeadEntryOptions, ActiveHeadEntry, HeadS
 import { Arrayable } from '@unhead/shared';
 
 declare const TAG_WEIGHTS: {
-    readonly critical: 2;
-    readonly high: 9;
-    readonly low: 12;
     readonly base: -1;
     readonly title: 1;
-    readonly meta: 10;
+};
+declare const TAG_ALIASES: {
+    readonly critical: -8;
+    readonly high: -1;
+    readonly low: 2;
 };
 declare function tagWeight<T extends HeadTag>(tag: T): any;
 declare const SortModifiers: {
@@ -185,4 +186,4 @@ declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promi
 
 declare function whitelistSafeInput(input: Record<string, MaybeArray<Record<string, string>>>): HeadSafe;
 
-export { CorePlugins, DOMPlugins, DedupesTagsPlugin, DeprecatedTagAttrPlugin, EventHandlersPlugin, ProvideTagHashPlugin, SortModifiers, SortTagsPlugin, TAG_WEIGHTS, TagEntityBits, TemplateParamsPlugin, TitleTemplatePlugin, UseSeoMetaInput, activeHead, composableNames, createHead, createHeadCore, createServerHead, getActiveHead, normaliseClassProp, normaliseEntryTags, normaliseProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, setActiveHead, tagWeight, unheadComposablesImports, unpackMeta, useBodyAttrs, useHead, useHeadSafe, useHtmlAttrs, useSeoMeta, useServerBodyAttrs, useServerHead, useServerHeadSafe, useServerHtmlAttrs, useServerSeoMeta, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate, whitelistSafeInput };
+export { CorePlugins, DOMPlugins, DedupesTagsPlugin, DeprecatedTagAttrPlugin, EventHandlersPlugin, ProvideTagHashPlugin, SortModifiers, SortTagsPlugin, TAG_ALIASES, TAG_WEIGHTS, TagEntityBits, TemplateParamsPlugin, TitleTemplatePlugin, UseSeoMetaInput, activeHead, composableNames, createHead, createHeadCore, createServerHead, getActiveHead, normaliseClassProp, normaliseEntryTags, normaliseProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, setActiveHead, tagWeight, unheadComposablesImports, unpackMeta, useBodyAttrs, useHead, useHeadSafe, useHtmlAttrs, useSeoMeta, useServerBodyAttrs, useServerHead, useServerHeadSafe, useServerHtmlAttrs, useServerSeoMeta, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate, whitelistSafeInput };

package/dist/index.mjs

@@ -3,29 +3,33 @@ import { PatchDomOnEntryUpdatesPlugin, maybeGetSSRHash } from '@unhead/dom';
 import { defineHeadPlugin, resolveTitleTemplate, hashTag, hashCode, tagDedupeKey, HasElementTags, asArray as asArray$1, TagConfigKeys, TagsWithInnerContent, ValidHeadTags } from '@unhead/shared';
 
 const TAG_WEIGHTS = {
-  // aliases
-  critical: 2,
-  high: 9,
-  low: 12,
   // tags
   base: -1,
-  title: 1,
-  meta: 10
+  title: 1
+};
+const TAG_ALIASES = {
+  // relative scores to their default values
+  critical: -8,
+  high: -1,
+  low: 2
 };
 function tagWeight(tag) {
-  if (typeof tag.tagPriority === "number")
-    return tag.tagPriority;
+  let weight = 10;
+  const priority = tag.tagPriority;
+  if (typeof priority === "number")
+    return priority;
   if (tag.tag === "meta") {
     if (tag.props.charset)
-      return -2;
+      weight = -2;
     if (tag.props["http-equiv"] === "content-security-policy")
-      return 0;
+      weight = 0;
+  } else if (tag.tag in TAG_WEIGHTS) {
+    weight = TAG_WEIGHTS[tag.tag];
   }
-  const key = tag.tagPriority || tag.tag;
-  if (key in TAG_WEIGHTS) {
-    return TAG_WEIGHTS[key];
+  if (typeof priority === "string" && priority in TAG_ALIASES) {
+    return weight + TAG_ALIASES[priority];
   }
-  return 10;
+  return weight;
 }
 const SortModifiers = [{ prefix: "before:", offset: -1 }, { prefix: "after:", offset: 1 }];
 function SortTagsPlugin() {
@@ -231,6 +235,8 @@ function DedupesTagsPlugin() {
               tag._d = `${dupedTag._d}:${dupedTag._duped.length + 1}`;
               dupedTag._duped.push(tag);
               return;
+            } else if (tagWeight(tag) > tagWeight(dupedTag)) {
+              return;
             }
           }
           const propCount = Object.keys(tag.props).length + (tag.innerHTML ? 1 : 0) + (tag.textContent ? 1 : 0);
@@ -275,7 +281,7 @@ function processTemplateParams(s, config) {
   tokens.forEach((token) => {
     const re = sub(token.slice(1));
     if (typeof re === "string") {
-      s = s.replaceAll(new RegExp(`\\${token}(\\W|$)`, "g"), `${re}$1`).trim();
+      s = s.replace(new RegExp(`\\${token}(\\W|$)`, "g"), `${re}$1`).trim();
     }
   });
   if (config.separator) {
@@ -601,7 +607,8 @@ function packMeta(inputs) {
   });
 }
 
-const ArrayableInputs = ["Image", "Video", "Audio"];
+const OpenGraphInputs = ["Image", "Video", "Audio"];
+const SimpleArrayUnpackMetas = ["themeColor"];
 const ColonPrefixKeys = /^(og|twitter|fb)/;
 const PropertyPrefixKeys = /^(og|fb)/;
 function resolveMetaKeyType(key) {
@@ -630,7 +637,7 @@ function changeKeyCasingDeep(input) {
 }
 function unpackMeta(input) {
   const extras = [];
-  ArrayableInputs.forEach((key) => {
+  OpenGraphInputs.forEach((key) => {
     const ogKey = `og:${key.toLowerCase()}`;
     const inputKey = `og${key}`;
     const val = input[inputKey];
@@ -655,6 +662,18 @@ function unpackMeta(input) {
       delete input[inputKey];
     }
   });
+  SimpleArrayUnpackMetas.forEach((meta2) => {
+    if (input[meta2]) {
+      const val = Array.isArray(input[meta2]) ? input[meta2] : [input[meta2]];
+      delete input[meta2];
+      val.forEach((entry) => {
+        extras.push({
+          name: fixKeyCase(meta2),
+          ...entry
+        });
+      });
+    }
+  });
   const meta = unpackToArray(input, {
     key({ key }) {
       return resolveMetaKeyType(key);
@@ -697,12 +716,20 @@ function resolvePackedMetaObjectValue(value, key) {
 
 async function normaliseTag(tagName, input) {
   const tag = { tag: tagName, props: {} };
+  if (input instanceof Promise)
+    input = await input;
   if (tagName === "templateParams") {
     tag.props = input;
     return tag;
   }
   if (["title", "titleTemplate"].includes(tagName)) {
-    tag.textContent = input instanceof Promise ? await input : input;
+    if (input && typeof input === "object") {
+      tag.textContent = input.textContent;
+      if (input.tagPriority)
+        tag.tagPriority = input.tagPriority;
+    } else {
+      tag.textContent = input;
+    }
     return tag;
   }
   if (typeof input === "string") {
@@ -828,18 +855,15 @@ function whitelistSafeInput(input) {
           filtered[key] = tagValue.map((meta) => {
             const link = {};
             WhitelistAttributes.link.forEach((key2) => {
-              if (key2 === "rel" && ["stylesheet", "canonical", "modulepreload", "prerender", "preload", "prefetch"].includes(meta[key2]))
+              const val = meta[key2];
+              if (key2 === "rel" && ["stylesheet", "canonical", "modulepreload", "prerender", "preload", "prefetch"].includes(val))
                 return;
               if (key2 === "href") {
-                try {
-                  const url = new URL(meta[key2]);
-                  if (["javascript:", "data:"].includes(url.protocol))
-                    return;
-                  link[key2] = meta[key2];
-                } catch (e) {
-                }
-              } else if (meta[key2] || key2.startsWith("data-")) {
-                link[key2] = meta[key2];
+                if (val.includes("javascript:") || val.includes("data:"))
+                  return;
+                link[key2] = val;
+              } else if (val || key2.startsWith("data-")) {
+                link[key2] = val;
               }
             });
             return link;
@@ -1047,4 +1071,4 @@ const unheadComposablesImports = [
   }
 ];
 
-export { CorePlugins, DOMPlugins, DedupesTagsPlugin, DeprecatedTagAttrPlugin, EventHandlersPlugin, ProvideTagHashPlugin, SortModifiers, SortTagsPlugin, TAG_WEIGHTS, TagEntityBits, TemplateParamsPlugin, TitleTemplatePlugin, activeHead, composableNames, createHead, createHeadCore, createServerHead, getActiveHead, normaliseClassProp, normaliseEntryTags, normaliseProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, setActiveHead, tagWeight, unheadComposablesImports, unpackMeta, useBodyAttrs, useHead, useHeadSafe, useHtmlAttrs, useSeoMeta, useServerBodyAttrs, useServerHead, useServerHeadSafe, useServerHtmlAttrs, useServerSeoMeta, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate, whitelistSafeInput };
+export { CorePlugins, DOMPlugins, DedupesTagsPlugin, DeprecatedTagAttrPlugin, EventHandlersPlugin, ProvideTagHashPlugin, SortModifiers, SortTagsPlugin, TAG_ALIASES, TAG_WEIGHTS, TagEntityBits, TemplateParamsPlugin, TitleTemplatePlugin, activeHead, composableNames, createHead, createHeadCore, createServerHead, getActiveHead, normaliseClassProp, normaliseEntryTags, normaliseProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, setActiveHead, tagWeight, unheadComposablesImports, unpackMeta, useBodyAttrs, useHead, useHeadSafe, useHtmlAttrs, useSeoMeta, useServerBodyAttrs, useServerHead, useServerHeadSafe, useServerHtmlAttrs, useServerSeoMeta, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate, whitelistSafeInput };

package/package.json

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