unhead 1.1.22 → 1.1.25

package/dist/index.cjs

@@ -99,31 +99,18 @@ const DeprecatedTagAttrPlugin = () => {
   });
 };
 
-const IsBrowser = typeof window !== "undefined";
-
+const DupeableTags = ["link", "style", "script", "noscript"];
 const ProvideTagHashPlugin = () => {
   return shared.defineHeadPlugin({
     hooks: {
-      "tag:normalise": (ctx) => {
-        const { tag, entry, resolvedOptions } = ctx;
+      "tag:normalise": ({ tag, resolvedOptions }) => {
         if (resolvedOptions.experimentalHashHydration === true) {
           tag._h = shared.hashTag(tag);
         }
-        const isDynamic = typeof tag.props._dynamic !== "undefined";
-        if (!shared.HasElementTags.includes(tag.tag) || !tag.key)
-          return;
-        if (IsBrowser || getActiveHead()?.resolvedOptions?.document)
-          return;
-        if (entry._m === "server" || isDynamic) {
-          tag._h = tag._h || shared.hashTag(tag);
+        if (tag.key && DupeableTags.includes(tag.tag)) {
+          tag._h = shared.hashCode(tag.key);
           tag.props[`data-h-${tag._h}`] = "";
         }
-      },
-      "tags:resolve": (ctx) => {
-        ctx.tags = ctx.tags.map((t) => {
-          delete t.props._dynamic;
-          return t;
-        });
       }
     }
   });
@@ -203,13 +190,11 @@ const EventHandlersPlugin = () => {
 };
 
 const UsesMergeStrategy = ["templateParams", "htmlAttrs", "bodyAttrs"];
-const DedupesTagsPlugin = (options) => {
-  options = options || {};
-  const dedupeKeys = options.dedupeKeys || ["hid", "vmid", "key"];
+const DedupesTagsPlugin = () => {
   return shared.defineHeadPlugin({
     hooks: {
       "tag:normalise": function({ tag }) {
-        dedupeKeys.forEach((key) => {
+        ["hid", "vmid", "key"].forEach((key) => {
           if (tag.props[key]) {
             tag.key = tag.props[key];
             delete tag.props[key];
@@ -271,25 +256,37 @@ const DedupesTagsPlugin = (options) => {
 };
 
 function processTemplateParams(s, config) {
-  const sub = (_, token) => {
+  function sub(token) {
+    if (["s", "pageTitle"].includes(token))
+      return config.pageTitle;
     let val;
-    if (token === "pageTitle" || token === "s")
-      val = config.pageTitle;
-    else if (token.includes("."))
-      val = token.split(".").reduce((acc, key) => acc[key] || "", config);
-    else
+    if (token.includes(".")) {
+      val = token.split(".").reduce((acc, key) => acc ? acc[key] || void 0 : void 0, config);
+    } else {
       val = config[token];
-    return val || "";
-  };
-  let template = s.replace(/%(\w+\.+\w+)/g, sub).replace(/%(\w+)/g, sub).trim();
+    }
+    return typeof val !== "undefined" ? val || "" : false;
+  }
+  let decoded = s;
+  try {
+    decoded = decodeURI(s);
+  } catch {
+  }
+  const tokens = (decoded.match(/%(\w+\.+\w+)|%(\w+)/g) || []).sort().reverse();
+  tokens.forEach((token) => {
+    const re = sub(token.slice(1));
+    if (typeof re === "string") {
+      s = s.replaceAll(new RegExp(`\\${token}(\\W|$)`, "g"), `${re}$1`).trim();
+    }
+  });
   if (config.separator) {
-    if (template.endsWith(config.separator))
-      template = template.slice(0, -config.separator.length).trim();
-    if (template.startsWith(config.separator))
-      template = template.slice(config.separator.length).trim();
-    template = template.replace(new RegExp(`\\${config.separator}\\s*\\${config.separator}`, "g"), 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);
   }
-  return template;
+  return s;
 }
 function TemplateParamsPlugin() {
   return shared.defineHeadPlugin({
@@ -298,13 +295,15 @@ function TemplateParamsPlugin() {
         const { tags } = ctx;
         const title = tags.find((tag) => tag.tag === "title")?.textContent;
         const idx = tags.findIndex((tag) => tag.tag === "templateParams");
-        const params = idx !== -1 ? tags[idx].textContent : {};
+        const params = idx !== -1 ? tags[idx].props : {};
         params.pageTitle = params.pageTitle || title || "";
         for (const tag of tags) {
           if (["titleTemplate", "title"].includes(tag.tag) && typeof tag.textContent === "string") {
             tag.textContent = processTemplateParams(tag.textContent, params);
           } else if (tag.tag === "meta" && typeof tag.props.content === "string") {
             tag.props.content = processTemplateParams(tag.props.content, params);
+          } else if (tag.tag === "link" && typeof tag.props.href === "string") {
+            tag.props.href = processTemplateParams(tag.props.href, params);
           } else if (tag.tag === "script" && ["application/json", "application/ld+json"].includes(tag.props.type) && typeof tag.innerHTML === "string") {
             try {
               tag.innerHTML = JSON.stringify(JSON.parse(tag.innerHTML), (key, val) => {
@@ -322,6 +321,8 @@ function TemplateParamsPlugin() {
   });
 }
 
+const IsBrowser = typeof window !== "undefined";
+
 exports.activeHead = void 0;
 const setActiveHead = (head) => exports.activeHead = head;
 const getActiveHead = () => exports.activeHead;
@@ -649,19 +650,21 @@ function resolvePackedMetaObjectValue(value, key) {
 
 async function normaliseTag(tagName, input) {
   const tag = { tag: tagName, props: {} };
-  if (["title", "titleTemplate", "templateParams"].includes(tagName)) {
+  if (tagName === "templateParams") {
+    tag.props = input;
+    return tag;
+  }
+  if (["title", "titleTemplate"].includes(tagName)) {
     tag.textContent = input instanceof Promise ? await input : input;
     return tag;
   }
   if (typeof input === "string") {
     if (!["script", "noscript", "style"].includes(tagName))
       return false;
-    if (tagName === "script" && (/^(https?:)?\/\//.test(input) || input.startsWith("/"))) {
+    if (tagName === "script" && (/^(https?:)?\/\//.test(input) || input.startsWith("/")))
       tag.props.src = input;
-    } else {
+    else
       tag.innerHTML = input;
-      tag.key = shared.hashCode(input);
-    }
     return tag;
   }
   tag.props = await normaliseProps(tagName, { ...input });
@@ -930,10 +933,12 @@ function createHeadCore(options = {}) {
       for (const entry of resolveCtx.entries) {
         const transformer = entry._t || ((i) => i);
         entry.resolvedInput = transformer(entry.resolvedInput || entry.input);
-        for (const tag of await normaliseEntryTags(entry)) {
-          const tagCtx = { tag, entry, resolvedOptions: head.resolvedOptions };
-          await hooks.callHook("tag:normalise", tagCtx);
-          resolveCtx.tags.push(tagCtx.tag);
+        if (entry.resolvedInput) {
+          for (const tag of await normaliseEntryTags(entry)) {
+            const tagCtx = { tag, entry, resolvedOptions: head.resolvedOptions };
+            await hooks.callHook("tag:normalise", tagCtx);
+            resolveCtx.tags.push(tagCtx.tag);
+          }
         }
       }
       await hooks.callHook("tags:resolve", resolveCtx);
@@ -1013,6 +1018,7 @@ exports.normaliseEntryTags = normaliseEntryTags;
 exports.normaliseProps = normaliseProps;
 exports.normaliseTag = normaliseTag;
 exports.packMeta = packMeta;
+exports.processTemplateParams = processTemplateParams;
 exports.resolveMetaKeyType = resolveMetaKeyType;
 exports.resolveMetaKeyValue = resolveMetaKeyValue;
 exports.resolvePackedMetaObjectValue = resolvePackedMetaObjectValue;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _unhead_schema from '@unhead/schema';
-import { HeadTag, Head, HeadEntryOptions, ActiveHeadEntry, HeadSafe, MetaFlatInput, Title, TitleTemplate, Base, Meta, Link, Script, Style, Noscript, HtmlAttributes, BodyAttributes, Unhead, HeadPlugin, CreateHeadOptions, HeadEntry, MaybeArray } from '@unhead/schema';
+import { HeadTag, TemplateParams, Head, HeadEntryOptions, ActiveHeadEntry, HeadSafe, MetaFlatInput, Title, TitleTemplate, Base, Meta, Link, Script, Style, Noscript, HtmlAttributes, BodyAttributes, Unhead, HeadPlugin, CreateHeadOptions, HeadEntry, MaybeArray } from '@unhead/schema';
 import { Arrayable } from '@unhead/shared';
 
 declare const TAG_WEIGHTS: {
@@ -30,11 +30,9 @@ declare const ProvideTagHashPlugin: () => _unhead_schema.HeadPlugin;
  */
 declare const EventHandlersPlugin: () => _unhead_schema.HeadPlugin;
 
-interface DedupesTagsPluginOptions {
-    dedupeKeys?: string[];
-}
-declare const DedupesTagsPlugin: (options?: DedupesTagsPluginOptions) => _unhead_schema.HeadPlugin;
+declare const DedupesTagsPlugin: () => _unhead_schema.HeadPlugin;
 
+declare function processTemplateParams(s: string, config: TemplateParams): string;
 declare function TemplateParamsPlugin(): _unhead_schema.HeadPlugin;
 
 declare function useHead<T extends Head>(input: T, options?: HeadEntryOptions): ActiveHeadEntry<T> | void;
@@ -187,4 +185,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, DedupesTagsPluginOptions, DeprecatedTagAttrPlugin, EventHandlersPlugin, ProvideTagHashPlugin, SortModifiers, SortTagsPlugin, TAG_WEIGHTS, TagEntityBits, TemplateParamsPlugin, TitleTemplatePlugin, UseSeoMetaInput, activeHead, composableNames, createHead, createHeadCore, createServerHead, getActiveHead, normaliseClassProp, normaliseEntryTags, normaliseProps, normaliseTag, packMeta, 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_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

@@ -1,6 +1,6 @@
 import { createHooks } from 'hookable';
 import { PatchDomOnEntryUpdatesPlugin, maybeGetSSRHash } from '@unhead/dom';
-import { defineHeadPlugin, resolveTitleTemplate, hashTag, HasElementTags, tagDedupeKey, asArray as asArray$1, hashCode, TagConfigKeys, TagsWithInnerContent, ValidHeadTags } from '@unhead/shared';
+import { defineHeadPlugin, resolveTitleTemplate, hashTag, hashCode, tagDedupeKey, asArray as asArray$1, TagConfigKeys, TagsWithInnerContent, ValidHeadTags } from '@unhead/shared';
 
 const TAG_WEIGHTS = {
   // aliases
@@ -97,31 +97,18 @@ const DeprecatedTagAttrPlugin = () => {
   });
 };
 
-const IsBrowser = typeof window !== "undefined";
-
+const DupeableTags = ["link", "style", "script", "noscript"];
 const ProvideTagHashPlugin = () => {
   return defineHeadPlugin({
     hooks: {
-      "tag:normalise": (ctx) => {
-        const { tag, entry, resolvedOptions } = ctx;
+      "tag:normalise": ({ tag, resolvedOptions }) => {
         if (resolvedOptions.experimentalHashHydration === true) {
           tag._h = hashTag(tag);
         }
-        const isDynamic = typeof tag.props._dynamic !== "undefined";
-        if (!HasElementTags.includes(tag.tag) || !tag.key)
-          return;
-        if (IsBrowser || getActiveHead()?.resolvedOptions?.document)
-          return;
-        if (entry._m === "server" || isDynamic) {
-          tag._h = tag._h || hashTag(tag);
+        if (tag.key && DupeableTags.includes(tag.tag)) {
+          tag._h = hashCode(tag.key);
           tag.props[`data-h-${tag._h}`] = "";
         }
-      },
-      "tags:resolve": (ctx) => {
-        ctx.tags = ctx.tags.map((t) => {
-          delete t.props._dynamic;
-          return t;
-        });
       }
     }
   });
@@ -201,13 +188,11 @@ const EventHandlersPlugin = () => {
 };
 
 const UsesMergeStrategy = ["templateParams", "htmlAttrs", "bodyAttrs"];
-const DedupesTagsPlugin = (options) => {
-  options = options || {};
-  const dedupeKeys = options.dedupeKeys || ["hid", "vmid", "key"];
+const DedupesTagsPlugin = () => {
   return defineHeadPlugin({
     hooks: {
       "tag:normalise": function({ tag }) {
-        dedupeKeys.forEach((key) => {
+        ["hid", "vmid", "key"].forEach((key) => {
           if (tag.props[key]) {
             tag.key = tag.props[key];
             delete tag.props[key];
@@ -269,25 +254,37 @@ const DedupesTagsPlugin = (options) => {
 };
 
 function processTemplateParams(s, config) {
-  const sub = (_, token) => {
+  function sub(token) {
+    if (["s", "pageTitle"].includes(token))
+      return config.pageTitle;
     let val;
-    if (token === "pageTitle" || token === "s")
-      val = config.pageTitle;
-    else if (token.includes("."))
-      val = token.split(".").reduce((acc, key) => acc[key] || "", config);
-    else
+    if (token.includes(".")) {
+      val = token.split(".").reduce((acc, key) => acc ? acc[key] || void 0 : void 0, config);
+    } else {
       val = config[token];
-    return val || "";
-  };
-  let template = s.replace(/%(\w+\.+\w+)/g, sub).replace(/%(\w+)/g, sub).trim();
+    }
+    return typeof val !== "undefined" ? val || "" : false;
+  }
+  let decoded = s;
+  try {
+    decoded = decodeURI(s);
+  } catch {
+  }
+  const tokens = (decoded.match(/%(\w+\.+\w+)|%(\w+)/g) || []).sort().reverse();
+  tokens.forEach((token) => {
+    const re = sub(token.slice(1));
+    if (typeof re === "string") {
+      s = s.replaceAll(new RegExp(`\\${token}(\\W|$)`, "g"), `${re}$1`).trim();
+    }
+  });
   if (config.separator) {
-    if (template.endsWith(config.separator))
-      template = template.slice(0, -config.separator.length).trim();
-    if (template.startsWith(config.separator))
-      template = template.slice(config.separator.length).trim();
-    template = template.replace(new RegExp(`\\${config.separator}\\s*\\${config.separator}`, "g"), 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);
   }
-  return template;
+  return s;
 }
 function TemplateParamsPlugin() {
   return defineHeadPlugin({
@@ -296,13 +293,15 @@ function TemplateParamsPlugin() {
         const { tags } = ctx;
         const title = tags.find((tag) => tag.tag === "title")?.textContent;
         const idx = tags.findIndex((tag) => tag.tag === "templateParams");
-        const params = idx !== -1 ? tags[idx].textContent : {};
+        const params = idx !== -1 ? tags[idx].props : {};
         params.pageTitle = params.pageTitle || title || "";
         for (const tag of tags) {
           if (["titleTemplate", "title"].includes(tag.tag) && typeof tag.textContent === "string") {
             tag.textContent = processTemplateParams(tag.textContent, params);
           } else if (tag.tag === "meta" && typeof tag.props.content === "string") {
             tag.props.content = processTemplateParams(tag.props.content, params);
+          } else if (tag.tag === "link" && typeof tag.props.href === "string") {
+            tag.props.href = processTemplateParams(tag.props.href, params);
           } else if (tag.tag === "script" && ["application/json", "application/ld+json"].includes(tag.props.type) && typeof tag.innerHTML === "string") {
             try {
               tag.innerHTML = JSON.stringify(JSON.parse(tag.innerHTML), (key, val) => {
@@ -320,6 +319,8 @@ function TemplateParamsPlugin() {
   });
 }
 
+const IsBrowser = typeof window !== "undefined";
+
 let activeHead;
 const setActiveHead = (head) => activeHead = head;
 const getActiveHead = () => activeHead;
@@ -647,19 +648,21 @@ function resolvePackedMetaObjectValue(value, key) {
 
 async function normaliseTag(tagName, input) {
   const tag = { tag: tagName, props: {} };
-  if (["title", "titleTemplate", "templateParams"].includes(tagName)) {
+  if (tagName === "templateParams") {
+    tag.props = input;
+    return tag;
+  }
+  if (["title", "titleTemplate"].includes(tagName)) {
     tag.textContent = input instanceof Promise ? await input : input;
     return tag;
   }
   if (typeof input === "string") {
     if (!["script", "noscript", "style"].includes(tagName))
       return false;
-    if (tagName === "script" && (/^(https?:)?\/\//.test(input) || input.startsWith("/"))) {
+    if (tagName === "script" && (/^(https?:)?\/\//.test(input) || input.startsWith("/")))
       tag.props.src = input;
-    } else {
+    else
       tag.innerHTML = input;
-      tag.key = hashCode(input);
-    }
     return tag;
   }
   tag.props = await normaliseProps(tagName, { ...input });
@@ -928,10 +931,12 @@ function createHeadCore(options = {}) {
       for (const entry of resolveCtx.entries) {
         const transformer = entry._t || ((i) => i);
         entry.resolvedInput = transformer(entry.resolvedInput || entry.input);
-        for (const tag of await normaliseEntryTags(entry)) {
-          const tagCtx = { tag, entry, resolvedOptions: head.resolvedOptions };
-          await hooks.callHook("tag:normalise", tagCtx);
-          resolveCtx.tags.push(tagCtx.tag);
+        if (entry.resolvedInput) {
+          for (const tag of await normaliseEntryTags(entry)) {
+            const tagCtx = { tag, entry, resolvedOptions: head.resolvedOptions };
+            await hooks.callHook("tag:normalise", tagCtx);
+            resolveCtx.tags.push(tagCtx.tag);
+          }
         }
       }
       await hooks.callHook("tags:resolve", resolveCtx);
@@ -989,4 +994,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, 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_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.22",
-  "packageManager": "pnpm@7.28.0",
+  "version": "1.1.25",
+  "packageManager": "pnpm@7.30.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -30,10 +30,10 @@
     "dist"
   ],
   "dependencies": {
-    "hookable": "^5.4.2",
-    "@unhead/dom": "1.1.22",
-    "@unhead/schema": "1.1.22",
-    "@unhead/shared": "1.1.22"
+    "hookable": "^5.5.1",
+    "@unhead/dom": "1.1.25",
+    "@unhead/schema": "1.1.25",
+    "@unhead/shared": "1.1.25"
   },
   "devDependencies": {
     "packrup": "^0.1.0"