unhead 1.1.19 → 1.1.21

package/dist/index.cjs

@@ -50,13 +50,6 @@ function SortTagsPlugin() {
   });
 }
 
-const renderTitleTemplate = (template, title) => {
-  if (template == null)
-    return title || null;
-  if (typeof template === "function")
-    return template(title);
-  return template.replace("%s", title ?? "");
-};
 const TitleTemplatePlugin = () => {
   return shared.defineHeadPlugin({
     hooks: {
@@ -65,7 +58,7 @@ const TitleTemplatePlugin = () => {
         let titleTemplateIdx = tags.findIndex((i) => i.tag === "titleTemplate");
         const titleIdx = tags.findIndex((i) => i.tag === "title");
         if (titleIdx !== -1 && titleTemplateIdx !== -1) {
-          const newTitle = renderTitleTemplate(
+          const newTitle = shared.resolveTitleTemplate(
             tags[titleTemplateIdx].textContent,
             tags[titleIdx].textContent
           );
@@ -75,7 +68,7 @@ const TitleTemplatePlugin = () => {
             delete tags[titleIdx];
           }
         } else if (titleTemplateIdx !== -1) {
-          const newTitle = renderTitleTemplate(
+          const newTitle = shared.resolveTitleTemplate(
             tags[titleTemplateIdx].textContent
           );
           if (newTitle !== null) {
@@ -308,12 +301,20 @@ function TemplateParamsPlugin() {
         const params = idx !== -1 ? tags[idx].textContent : {};
         params.pageTitle = params.pageTitle || title || "";
         for (const tag of tags) {
-          if (["titleTemplate", "title"].includes(tag.tag) && typeof tag.textContent === "string")
+          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")
+          } else if (tag.tag === "meta" && typeof tag.props.content === "string") {
             tag.props.content = processTemplateParams(tag.props.content, params);
-          else if (tag.tag === "script" && ["application/json", "application/ld+json"].includes(tag.props.type) && typeof tag.innerHTML === "string")
-            tag.innerHTML = processTemplateParams(tag.innerHTML, 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) => {
+                if (typeof val === "string")
+                  return processTemplateParams(val, params);
+                return val;
+              });
+            } catch {
+            }
+          }
         }
         ctx.tags = tags.filter((tag) => tag.tag !== "templateParams");
       }
@@ -1012,7 +1013,6 @@ exports.normaliseEntryTags = normaliseEntryTags;
 exports.normaliseProps = normaliseProps;
 exports.normaliseTag = normaliseTag;
 exports.packMeta = packMeta;
-exports.renderTitleTemplate = renderTitleTemplate;
 exports.resolveMetaKeyType = resolveMetaKeyType;
 exports.resolveMetaKeyValue = resolveMetaKeyValue;
 exports.resolvePackedMetaObjectValue = resolvePackedMetaObjectValue;

package/dist/index.d.ts

@@ -17,7 +17,6 @@ declare const SortModifiers: {
 }[];
 declare function SortTagsPlugin(): _unhead_schema.HeadPlugin;
 
-declare const renderTitleTemplate: (template: string | ((title?: string) => string | null) | null, title?: string) => string | null;
 declare const TitleTemplatePlugin: () => _unhead_schema.HeadPlugin;
 
 declare const DeprecatedTagAttrPlugin: () => _unhead_schema.HeadPlugin;
@@ -188,4 +187,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, renderTitleTemplate, 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, 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 };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { createHooks } from 'hookable';
 import { PatchDomOnEntryUpdatesPlugin, maybeGetSSRHash } from '@unhead/dom';
-import { defineHeadPlugin, hashTag, HasElementTags, tagDedupeKey, asArray as asArray$1, hashCode, TagConfigKeys, TagsWithInnerContent, ValidHeadTags } from '@unhead/shared';
+import { defineHeadPlugin, resolveTitleTemplate, hashTag, HasElementTags, tagDedupeKey, asArray as asArray$1, hashCode, TagConfigKeys, TagsWithInnerContent, ValidHeadTags } from '@unhead/shared';
 
 const TAG_WEIGHTS = {
   // aliases
@@ -48,13 +48,6 @@ function SortTagsPlugin() {
   });
 }
 
-const renderTitleTemplate = (template, title) => {
-  if (template == null)
-    return title || null;
-  if (typeof template === "function")
-    return template(title);
-  return template.replace("%s", title ?? "");
-};
 const TitleTemplatePlugin = () => {
   return defineHeadPlugin({
     hooks: {
@@ -63,7 +56,7 @@ const TitleTemplatePlugin = () => {
         let titleTemplateIdx = tags.findIndex((i) => i.tag === "titleTemplate");
         const titleIdx = tags.findIndex((i) => i.tag === "title");
         if (titleIdx !== -1 && titleTemplateIdx !== -1) {
-          const newTitle = renderTitleTemplate(
+          const newTitle = resolveTitleTemplate(
             tags[titleTemplateIdx].textContent,
             tags[titleIdx].textContent
           );
@@ -73,7 +66,7 @@ const TitleTemplatePlugin = () => {
             delete tags[titleIdx];
           }
         } else if (titleTemplateIdx !== -1) {
-          const newTitle = renderTitleTemplate(
+          const newTitle = resolveTitleTemplate(
             tags[titleTemplateIdx].textContent
           );
           if (newTitle !== null) {
@@ -306,12 +299,20 @@ function TemplateParamsPlugin() {
         const params = idx !== -1 ? tags[idx].textContent : {};
         params.pageTitle = params.pageTitle || title || "";
         for (const tag of tags) {
-          if (["titleTemplate", "title"].includes(tag.tag) && typeof tag.textContent === "string")
+          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")
+          } else if (tag.tag === "meta" && typeof tag.props.content === "string") {
             tag.props.content = processTemplateParams(tag.props.content, params);
-          else if (tag.tag === "script" && ["application/json", "application/ld+json"].includes(tag.props.type) && typeof tag.innerHTML === "string")
-            tag.innerHTML = processTemplateParams(tag.innerHTML, 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) => {
+                if (typeof val === "string")
+                  return processTemplateParams(val, params);
+                return val;
+              });
+            } catch {
+            }
+          }
         }
         ctx.tags = tags.filter((tag) => tag.tag !== "templateParams");
       }
@@ -988,4 +989,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, renderTitleTemplate, 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, 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,7 +1,7 @@
 {
   "name": "unhead",
   "type": "module",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "packageManager": "pnpm@7.28.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -31,9 +31,9 @@
   ],
   "dependencies": {
     "hookable": "^5.4.2",
-    "@unhead/dom": "1.1.19",
-    "@unhead/schema": "1.1.19",
-    "@unhead/shared": "1.1.19"
+    "@unhead/dom": "1.1.21",
+    "@unhead/schema": "1.1.21",
+    "@unhead/shared": "1.1.21"
   },
   "devDependencies": {
     "packrup": "^0.1.0"