@unhead/shared 1.6.1 → 1.6.2

package/dist/index.cjs

@@ -5,7 +5,7 @@ function asArray$1(value) {
 }
 
 const SelfClosingTags = ["meta", "link", "base"];
-const TagsWithInnerContent = ["title", "script", "style", "noscript"];
+const TagsWithInnerContent = ["title", "titleTemplate", "script", "style", "noscript"];
 const HasElementTags = [
   "base",
   "meta",
@@ -28,7 +28,7 @@ const ValidHeadTags = [
   "noscript"
 ];
 const UniqueTags = ["base", "title", "titleTemplate", "bodyAttrs", "htmlAttrs", "templateParams"];
-const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy", "innerHTML", "textContent"];
+const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy", "innerHTML", "textContent", "processTemplateParams"];
 const IsBrowser = typeof window !== "undefined";
 const composableNames = [
   "getActiveHead",
@@ -555,57 +555,40 @@ function whitelistSafeInput(input) {
 }
 
 async function normaliseTag(tagName, input, e) {
-  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)) {
-    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") {
-    if (!["script", "noscript", "style"].includes(tagName))
-      return false;
-    if (tagName === "script" && (/^(https?:)?\/\//.test(input) || input.startsWith("/")))
-      tag.props.src = input;
-    else
-      tag.innerHTML = input;
-    return tag;
-  }
-  if (input.body) {
-    input.tagPosition = "bodyClose";
-    delete input.body;
-  }
-  if (input.children) {
-    input.innerHTML = input.children;
-    delete input.children;
-  }
-  tag.props = await normaliseProps({ ...input });
-  Object.keys(tag.props).filter((k) => TagConfigKeys.includes(k)).forEach((k) => {
-    if (!["innerHTML", "textContent"].includes(k) || TagsWithInnerContent.includes(tag.tag)) {
-      tag[k] = tag.props[k];
-    }
-    delete tag.props[k];
-  });
+  const tag = {
+    tag: tagName,
+    props: await normaliseProps(
+      // explicitly check for an object
+      // @ts-expect-error untyped
+      typeof input === "object" && typeof input !== "function" && !(input instanceof Promise) ? { ...input } : { [["script", "noscript", "style"].includes(tagName) ? "innerHTML" : "textContent"]: input },
+      ["templateParams", "titleTemplate"].includes(tagName)
+    )
+  };
   TagConfigKeys.forEach((k) => {
-    if (!tag[k] && e[k]) {
-      tag[k] = e[k];
+    const val = typeof tag.props[k] !== "undefined" ? tag.props[k] : e[k];
+    if (typeof val !== "undefined") {
+      if (!["innerHTML", "textContent"].includes(k) || TagsWithInnerContent.includes(tag.tag)) {
+        tag[k] = val;
+      }
+      delete tag.props[k];
     }
   });
-  if (tag.tag === "script" && typeof tag.innerHTML === "object")
+  if (tag.props.body) {
+    tag.tagPosition = "bodyClose";
+    delete tag.props.body;
+  }
+  if (tag.props.children) {
+    tag.innerHTML = tag.props.children;
+    delete tag.props.children;
+  }
+  if (tag.tag === "script" && typeof tag.innerHTML === "object") {
     tag.innerHTML = JSON.stringify(tag.innerHTML);
-  if (tag.props.content && Array.isArray(tag.props.content))
-    return tag.props.content.map((v) => ({ ...tag, props: { ...tag.props, content: v } }));
-  return tag;
+    tag.props.type = tag.props.type || "application/json";
+  } else if (tag.tag === "script" && tag.innerHTML && (/^(https?:)?\/\//.test(tag.innerHTML) || tag.innerHTML.startsWith("/"))) {
+    tag.props.src = tag.innerHTML;
+    delete tag.innerHTML;
+  }
+  return Array.isArray(tag.props.content) ? tag.props.content.map((v) => ({ ...tag, props: { ...tag.props, content: v } })) : tag;
 }
 function normaliseClassProp(v) {
   if (typeof v === "object" && !Array.isArray(v)) {
@@ -613,7 +596,7 @@ function normaliseClassProp(v) {
   }
   return (Array.isArray(v) ? v.join(" ") : v).split(" ").filter((c) => c.trim()).filter(Boolean).join(" ");
 }
-async function normaliseProps(props) {
+async function normaliseProps(props, virtual) {
   for (const k of Object.keys(props)) {
     if (k === "class") {
       props[k] = normaliseClassProp(props[k]);
@@ -621,15 +604,17 @@ async function normaliseProps(props) {
     }
     if (props[k] instanceof Promise)
       props[k] = await props[k];
-    const v = String(props[k]);
-    const isDataKey = k.startsWith("data-");
-    if (v === "true" || v === "") {
-      props[k] = isDataKey ? "true" : true;
-    } else if (!props[k]) {
-      if (isDataKey && v === "false")
-        props[k] = "false";
-      else
-        delete props[k];
+    if (!virtual && !TagConfigKeys.includes(k)) {
+      const v = String(props[k]);
+      const isDataKey = k.startsWith("data-");
+      if (v === "true" || v === "") {
+        props[k] = isDataKey ? "true" : true;
+      } else if (!props[k]) {
+        if (isDataKey && v === "false")
+          props[k] = "false";
+        else
+          delete props[k];
+      }
     }
   }
   return props;

package/dist/index.d.cts

@@ -40,7 +40,7 @@ declare function whitelistSafeInput(input: Record<string, MaybeArray<Record<stri
 
 declare function normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>): Promise<T | T[] | false>;
 declare function normaliseClassProp(v: Required<Required<Head>['htmlAttrs']['class']>): string;
-declare function normaliseProps<T extends HeadTag>(props: T['props']): Promise<T['props']>;
+declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): Promise<T['props']>;
 declare const TagEntityBits = 10;
 declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promise<HeadTag[]>;
 

package/dist/index.d.mts

@@ -40,7 +40,7 @@ declare function whitelistSafeInput(input: Record<string, MaybeArray<Record<stri
 
 declare function normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>): Promise<T | T[] | false>;
 declare function normaliseClassProp(v: Required<Required<Head>['htmlAttrs']['class']>): string;
-declare function normaliseProps<T extends HeadTag>(props: T['props']): Promise<T['props']>;
+declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): Promise<T['props']>;
 declare const TagEntityBits = 10;
 declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promise<HeadTag[]>;
 

package/dist/index.d.ts

@@ -40,7 +40,7 @@ declare function whitelistSafeInput(input: Record<string, MaybeArray<Record<stri
 
 declare function normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>): Promise<T | T[] | false>;
 declare function normaliseClassProp(v: Required<Required<Head>['htmlAttrs']['class']>): string;
-declare function normaliseProps<T extends HeadTag>(props: T['props']): Promise<T['props']>;
+declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): Promise<T['props']>;
 declare const TagEntityBits = 10;
 declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promise<HeadTag[]>;
 

package/dist/index.mjs

@@ -3,7 +3,7 @@ function asArray$1(value) {
 }
 
 const SelfClosingTags = ["meta", "link", "base"];
-const TagsWithInnerContent = ["title", "script", "style", "noscript"];
+const TagsWithInnerContent = ["title", "titleTemplate", "script", "style", "noscript"];
 const HasElementTags = [
   "base",
   "meta",
@@ -26,7 +26,7 @@ const ValidHeadTags = [
   "noscript"
 ];
 const UniqueTags = ["base", "title", "titleTemplate", "bodyAttrs", "htmlAttrs", "templateParams"];
-const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy", "innerHTML", "textContent"];
+const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy", "innerHTML", "textContent", "processTemplateParams"];
 const IsBrowser = typeof window !== "undefined";
 const composableNames = [
   "getActiveHead",
@@ -553,57 +553,40 @@ function whitelistSafeInput(input) {
 }
 
 async function normaliseTag(tagName, input, e) {
-  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)) {
-    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") {
-    if (!["script", "noscript", "style"].includes(tagName))
-      return false;
-    if (tagName === "script" && (/^(https?:)?\/\//.test(input) || input.startsWith("/")))
-      tag.props.src = input;
-    else
-      tag.innerHTML = input;
-    return tag;
-  }
-  if (input.body) {
-    input.tagPosition = "bodyClose";
-    delete input.body;
-  }
-  if (input.children) {
-    input.innerHTML = input.children;
-    delete input.children;
-  }
-  tag.props = await normaliseProps({ ...input });
-  Object.keys(tag.props).filter((k) => TagConfigKeys.includes(k)).forEach((k) => {
-    if (!["innerHTML", "textContent"].includes(k) || TagsWithInnerContent.includes(tag.tag)) {
-      tag[k] = tag.props[k];
-    }
-    delete tag.props[k];
-  });
+  const tag = {
+    tag: tagName,
+    props: await normaliseProps(
+      // explicitly check for an object
+      // @ts-expect-error untyped
+      typeof input === "object" && typeof input !== "function" && !(input instanceof Promise) ? { ...input } : { [["script", "noscript", "style"].includes(tagName) ? "innerHTML" : "textContent"]: input },
+      ["templateParams", "titleTemplate"].includes(tagName)
+    )
+  };
   TagConfigKeys.forEach((k) => {
-    if (!tag[k] && e[k]) {
-      tag[k] = e[k];
+    const val = typeof tag.props[k] !== "undefined" ? tag.props[k] : e[k];
+    if (typeof val !== "undefined") {
+      if (!["innerHTML", "textContent"].includes(k) || TagsWithInnerContent.includes(tag.tag)) {
+        tag[k] = val;
+      }
+      delete tag.props[k];
     }
   });
-  if (tag.tag === "script" && typeof tag.innerHTML === "object")
+  if (tag.props.body) {
+    tag.tagPosition = "bodyClose";
+    delete tag.props.body;
+  }
+  if (tag.props.children) {
+    tag.innerHTML = tag.props.children;
+    delete tag.props.children;
+  }
+  if (tag.tag === "script" && typeof tag.innerHTML === "object") {
     tag.innerHTML = JSON.stringify(tag.innerHTML);
-  if (tag.props.content && Array.isArray(tag.props.content))
-    return tag.props.content.map((v) => ({ ...tag, props: { ...tag.props, content: v } }));
-  return tag;
+    tag.props.type = tag.props.type || "application/json";
+  } else if (tag.tag === "script" && tag.innerHTML && (/^(https?:)?\/\//.test(tag.innerHTML) || tag.innerHTML.startsWith("/"))) {
+    tag.props.src = tag.innerHTML;
+    delete tag.innerHTML;
+  }
+  return Array.isArray(tag.props.content) ? tag.props.content.map((v) => ({ ...tag, props: { ...tag.props, content: v } })) : tag;
 }
 function normaliseClassProp(v) {
   if (typeof v === "object" && !Array.isArray(v)) {
@@ -611,7 +594,7 @@ function normaliseClassProp(v) {
   }
   return (Array.isArray(v) ? v.join(" ") : v).split(" ").filter((c) => c.trim()).filter(Boolean).join(" ");
 }
-async function normaliseProps(props) {
+async function normaliseProps(props, virtual) {
   for (const k of Object.keys(props)) {
     if (k === "class") {
       props[k] = normaliseClassProp(props[k]);
@@ -619,15 +602,17 @@ async function normaliseProps(props) {
     }
     if (props[k] instanceof Promise)
       props[k] = await props[k];
-    const v = String(props[k]);
-    const isDataKey = k.startsWith("data-");
-    if (v === "true" || v === "") {
-      props[k] = isDataKey ? "true" : true;
-    } else if (!props[k]) {
-      if (isDataKey && v === "false")
-        props[k] = "false";
-      else
-        delete props[k];
+    if (!virtual && !TagConfigKeys.includes(k)) {
+      const v = String(props[k]);
+      const isDataKey = k.startsWith("data-");
+      if (v === "true" || v === "") {
+        props[k] = isDataKey ? "true" : true;
+      } else if (!props[k]) {
+        if (isDataKey && v === "false")
+          props[k] = "false";
+        else
+          delete props[k];
+      }
     }
   }
   return props;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/shared",
   "type": "module",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -34,7 +34,7 @@
     "dist"
   ],
   "dependencies": {
-    "@unhead/schema": "1.6.1"
+    "@unhead/schema": "1.6.2"
   },
   "devDependencies": {
     "packrup": "^0.1.0"