unhead 0.1.2 → 0.1.4

package/dist/index.cjs

@@ -2,18 +2,57 @@
 
 const hookable = require('hookable');
 
-function normaliseTag$1(tagName, input, options = {}) {
+const HasElementTags = [
+  "base",
+  "meta",
+  "link",
+  "style",
+  "script",
+  "noscript"
+];
+const ValidHeadTags = [
+  "title",
+  "titleTemplate",
+  "base",
+  "htmlAttrs",
+  "bodyAttrs",
+  "meta",
+  "link",
+  "style",
+  "script",
+  "noscript"
+];
+const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy"];
+
+function normaliseTag(tagName, input) {
   const tag = { tag: tagName, props: {} };
   if (tagName === "title")
     tag.children = String(input);
   else
     tag.props = normaliseProps({ ...input });
-  ["children", ...options?.childrenKeys || []].forEach((key) => {
+  ["children", "innerHtml", "innerHTML"].forEach((key) => {
     if (typeof tag.props[key] !== "undefined") {
       tag.children = tag.props[key];
       delete tag.props[key];
     }
   });
+  Object.keys(tag.props).filter((k) => TagConfigKeys.includes(k)).forEach((k) => {
+    tag[k] = tag.props[k];
+    delete tag.props[k];
+  });
+  if (typeof tag.props.class === "object" && !Array.isArray(tag.props.class)) {
+    tag.props.class = Object.keys(tag.props.class).filter((k) => tag.props.class[k]);
+  }
+  if (Array.isArray(tag.props.class))
+    tag.props.class = tag.props.class.join(" ");
+  if (tag.props.content && Array.isArray(tag.props.content)) {
+    return tag.props.content.map((v, i) => {
+      const newTag = { ...tag, props: { ...tag.props } };
+      newTag.props.content = v;
+      newTag.key = `${tag.props.name || tag.props.property}:${i}`;
+      return newTag;
+    });
+  }
   return tag;
 }
 function normaliseProps(props) {
@@ -26,44 +65,26 @@ function normaliseProps(props) {
   }
   return props;
 }
-const HasElementTags = [
-  "base",
-  "meta",
-  "link",
-  "style",
-  "script",
-  "noscript"
-];
-const ValidHeadTags = [
-  "title",
-  "titleTemplate",
-  "base",
-  "htmlAttrs",
-  "bodyAttrs",
-  "meta",
-  "link",
-  "style",
-  "script",
-  "noscript"
-];
 
-const sortCriticalTags = (aTag, bTag) => {
-  const tagWeight = (tag) => {
-    switch (tag.tag) {
-      case "base":
-        return -1;
-      case "title":
-        return 1;
-      case "meta":
-        if (tag.props.charset)
-          return -2;
-        if (tag.props["http-equiv"] === "content-security-policy")
-          return 0;
-        return 10;
-      default:
-        return 10;
-    }
-  };
+const tagWeight = (tag) => {
+  if (typeof tag.tagPriority === "number")
+    return tag.tagPriority;
+  switch (tag.tag) {
+    case "base":
+      return -1;
+    case "title":
+      return 1;
+    case "meta":
+      if (tag.props.charset)
+        return -2;
+      if (tag.props["http-equiv"] === "content-security-policy")
+        return 0;
+      return 10;
+    default:
+      return 10;
+  }
+};
+const sortTags = (aTag, bTag) => {
   return tagWeight(aTag) - tagWeight(bTag);
 };
 
@@ -181,12 +202,8 @@ const SortTagsPlugin = () => {
       "tags:resolve": (ctx) => {
         const tagIndexForKey = (key) => ctx.tags.find((tag) => tag._d === key)?._p;
         for (const tag of ctx.tags) {
-          if (!tag?.tagPriority)
-            continue;
-          if (typeof tag.tagPriority === "number") {
-            tag._p = tag.tagPriority;
+          if (!tag.tagPriority || typeof tag.tagPriority === "number")
             continue;
-          }
           const modifiers = [{ prefix: "before:", offset: -1 }, { prefix: "after:", offset: 1 }];
           for (const { prefix, offset } of modifiers) {
             if (tag.tagPriority.startsWith(prefix)) {
@@ -197,7 +214,7 @@ const SortTagsPlugin = () => {
             }
           }
         }
-        ctx.tags.sort((a, b) => a._p - b._p).sort(sortCriticalTags);
+        ctx.tags.sort((a, b) => a._p - b._p).sort(sortTags);
       }
     }
   });
@@ -286,34 +303,12 @@ const useNoscript = (noscript) => {
 function asArray(value) {
   return Array.isArray(value) ? value : [value];
 }
-const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy"];
 
-function normaliseTag(tagName, input, entry) {
-  const tag = normaliseTag$1(tagName, input, { childrenKeys: ["innerHTML", "textContent"] });
-  tag._e = entry._i;
-  Object.keys(tag.props).filter((k) => TagConfigKeys.includes(k)).forEach((k) => {
-    tag[k] = tag.props[k];
-    delete tag.props[k];
-  });
-  if (typeof tag.props.class === "object" && !Array.isArray(tag.props.class)) {
-    tag.props.class = Object.keys(tag.props.class).filter((k) => tag.props.class[k]);
-  }
-  if (Array.isArray(tag.props.class))
-    tag.props.class = tag.props.class.join(" ");
-  if (tag.props.content && Array.isArray(tag.props.content)) {
-    return tag.props.content.map((v, i) => {
-      const newTag = { ...tag, props: { ...tag.props } };
-      newTag.props.content = v;
-      newTag.key = `${tag.props.name || tag.props.property}:${i}`;
-      return newTag;
-    });
-  }
-  return tag;
-}
 function normaliseEntryTags(e) {
   return Object.entries(e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).map(
-    ([k, value]) => asArray(value).map((props) => asArray(normaliseTag(k, props, e)))
+    ([k, value]) => asArray(value).map((props) => asArray(normaliseTag(k, props)))
   ).flat(3).map((t, i) => {
+    t._e = e._i;
     t._p = (e._i << 8) + i++;
     return t;
   });
@@ -406,14 +401,12 @@ function defineHeadPlugin(plugin) {
 exports.DedupesTagsPlugin = DedupesTagsPlugin;
 exports.HydratesStatePlugin = HydratesStatePlugin;
 exports.SortTagsPlugin = SortTagsPlugin;
-exports.TagConfigKeys = TagConfigKeys;
 exports.TitleTemplatePlugin = TitleTemplatePlugin;
 exports.asArray = asArray;
 exports.createHead = createHead;
 exports.defineHeadPlugin = defineHeadPlugin;
 exports.getActiveHead = getActiveHead;
 exports.normaliseEntryTags = normaliseEntryTags;
-exports.normaliseTag = normaliseTag;
 exports.setActiveHead = setActiveHead;
 exports.useBase = useBase;
 exports.useBodyAttrs = useBodyAttrs;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _unhead_schema from '@unhead/schema';
-import { Head, HeadEntryOptions, Meta, Link, Script, Style, Base, HtmlAttributes, BodyAttributes, Noscript, HeadClient, CreateHeadOptions, HeadPlugin, HeadTag, HeadEntry } from '@unhead/schema';
+import { Head, HeadEntryOptions, Meta, Link, Script, Style, Base, HtmlAttributes, BodyAttributes, Noscript, HeadClient, CreateHeadOptions, HeadPlugin, HeadEntry, HeadTag } from '@unhead/schema';
 
 interface DedupesTagsPluginOptions {
     dedupeKeys?: string[];
@@ -33,11 +33,9 @@ declare function createHead<T extends {} = Head>(options?: CreateHeadOptions): P
 
 declare function defineHeadPlugin(plugin: HeadPlugin): HeadPlugin;
 
-declare function normaliseTag<T>(tagName: HeadTag['tag'], input: HeadTag['props'], entry: HeadEntry<T>): HeadTag | HeadTag[];
 declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): HeadTag[];
 
 declare type Arrayable<T> = T | Array<T>;
 declare function asArray<T>(value: Arrayable<T>): T[];
-declare const TagConfigKeys: string[];
 
-export { Arrayable, DedupesTagsPlugin, DedupesTagsPluginOptions, HydratesStatePlugin, SortTagsPlugin, TagConfigKeys, TitleTemplatePlugin, activeHead, asArray, createHead, defineHeadPlugin, getActiveHead, normaliseEntryTags, normaliseTag, setActiveHead, useBase, useBodyAttrs, useHead, useHtmlAttrs, useLink, useMeta, useNoscript, useScript, useServerHead, useStyle, useTitle, useTitleTemplate };
+export { Arrayable, DedupesTagsPlugin, DedupesTagsPluginOptions, HydratesStatePlugin, SortTagsPlugin, TitleTemplatePlugin, activeHead, asArray, createHead, defineHeadPlugin, getActiveHead, normaliseEntryTags, setActiveHead, useBase, useBodyAttrs, useHead, useHtmlAttrs, useLink, useMeta, useNoscript, useScript, useServerHead, useStyle, useTitle, useTitleTemplate };

package/dist/index.mjs

@@ -1,17 +1,56 @@
 import { createHooks } from 'hookable';
 
-function normaliseTag$1(tagName, input, options = {}) {
+const HasElementTags = [
+  "base",
+  "meta",
+  "link",
+  "style",
+  "script",
+  "noscript"
+];
+const ValidHeadTags = [
+  "title",
+  "titleTemplate",
+  "base",
+  "htmlAttrs",
+  "bodyAttrs",
+  "meta",
+  "link",
+  "style",
+  "script",
+  "noscript"
+];
+const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy"];
+
+function normaliseTag(tagName, input) {
   const tag = { tag: tagName, props: {} };
   if (tagName === "title")
     tag.children = String(input);
   else
     tag.props = normaliseProps({ ...input });
-  ["children", ...options?.childrenKeys || []].forEach((key) => {
+  ["children", "innerHtml", "innerHTML"].forEach((key) => {
     if (typeof tag.props[key] !== "undefined") {
       tag.children = tag.props[key];
       delete tag.props[key];
     }
   });
+  Object.keys(tag.props).filter((k) => TagConfigKeys.includes(k)).forEach((k) => {
+    tag[k] = tag.props[k];
+    delete tag.props[k];
+  });
+  if (typeof tag.props.class === "object" && !Array.isArray(tag.props.class)) {
+    tag.props.class = Object.keys(tag.props.class).filter((k) => tag.props.class[k]);
+  }
+  if (Array.isArray(tag.props.class))
+    tag.props.class = tag.props.class.join(" ");
+  if (tag.props.content && Array.isArray(tag.props.content)) {
+    return tag.props.content.map((v, i) => {
+      const newTag = { ...tag, props: { ...tag.props } };
+      newTag.props.content = v;
+      newTag.key = `${tag.props.name || tag.props.property}:${i}`;
+      return newTag;
+    });
+  }
   return tag;
 }
 function normaliseProps(props) {
@@ -24,44 +63,26 @@ function normaliseProps(props) {
   }
   return props;
 }
-const HasElementTags = [
-  "base",
-  "meta",
-  "link",
-  "style",
-  "script",
-  "noscript"
-];
-const ValidHeadTags = [
-  "title",
-  "titleTemplate",
-  "base",
-  "htmlAttrs",
-  "bodyAttrs",
-  "meta",
-  "link",
-  "style",
-  "script",
-  "noscript"
-];
 
-const sortCriticalTags = (aTag, bTag) => {
-  const tagWeight = (tag) => {
-    switch (tag.tag) {
-      case "base":
-        return -1;
-      case "title":
-        return 1;
-      case "meta":
-        if (tag.props.charset)
-          return -2;
-        if (tag.props["http-equiv"] === "content-security-policy")
-          return 0;
-        return 10;
-      default:
-        return 10;
-    }
-  };
+const tagWeight = (tag) => {
+  if (typeof tag.tagPriority === "number")
+    return tag.tagPriority;
+  switch (tag.tag) {
+    case "base":
+      return -1;
+    case "title":
+      return 1;
+    case "meta":
+      if (tag.props.charset)
+        return -2;
+      if (tag.props["http-equiv"] === "content-security-policy")
+        return 0;
+      return 10;
+    default:
+      return 10;
+  }
+};
+const sortTags = (aTag, bTag) => {
   return tagWeight(aTag) - tagWeight(bTag);
 };
 
@@ -179,12 +200,8 @@ const SortTagsPlugin = () => {
       "tags:resolve": (ctx) => {
         const tagIndexForKey = (key) => ctx.tags.find((tag) => tag._d === key)?._p;
         for (const tag of ctx.tags) {
-          if (!tag?.tagPriority)
-            continue;
-          if (typeof tag.tagPriority === "number") {
-            tag._p = tag.tagPriority;
+          if (!tag.tagPriority || typeof tag.tagPriority === "number")
             continue;
-          }
           const modifiers = [{ prefix: "before:", offset: -1 }, { prefix: "after:", offset: 1 }];
           for (const { prefix, offset } of modifiers) {
             if (tag.tagPriority.startsWith(prefix)) {
@@ -195,7 +212,7 @@ const SortTagsPlugin = () => {
             }
           }
         }
-        ctx.tags.sort((a, b) => a._p - b._p).sort(sortCriticalTags);
+        ctx.tags.sort((a, b) => a._p - b._p).sort(sortTags);
       }
     }
   });
@@ -284,34 +301,12 @@ const useNoscript = (noscript) => {
 function asArray(value) {
   return Array.isArray(value) ? value : [value];
 }
-const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy"];
 
-function normaliseTag(tagName, input, entry) {
-  const tag = normaliseTag$1(tagName, input, { childrenKeys: ["innerHTML", "textContent"] });
-  tag._e = entry._i;
-  Object.keys(tag.props).filter((k) => TagConfigKeys.includes(k)).forEach((k) => {
-    tag[k] = tag.props[k];
-    delete tag.props[k];
-  });
-  if (typeof tag.props.class === "object" && !Array.isArray(tag.props.class)) {
-    tag.props.class = Object.keys(tag.props.class).filter((k) => tag.props.class[k]);
-  }
-  if (Array.isArray(tag.props.class))
-    tag.props.class = tag.props.class.join(" ");
-  if (tag.props.content && Array.isArray(tag.props.content)) {
-    return tag.props.content.map((v, i) => {
-      const newTag = { ...tag, props: { ...tag.props } };
-      newTag.props.content = v;
-      newTag.key = `${tag.props.name || tag.props.property}:${i}`;
-      return newTag;
-    });
-  }
-  return tag;
-}
 function normaliseEntryTags(e) {
   return Object.entries(e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).map(
-    ([k, value]) => asArray(value).map((props) => asArray(normaliseTag(k, props, e)))
+    ([k, value]) => asArray(value).map((props) => asArray(normaliseTag(k, props)))
   ).flat(3).map((t, i) => {
+    t._e = e._i;
     t._p = (e._i << 8) + i++;
     return t;
   });
@@ -401,4 +396,4 @@ function defineHeadPlugin(plugin) {
   return plugin;
 }
 
-export { DedupesTagsPlugin, HydratesStatePlugin, SortTagsPlugin, TagConfigKeys, TitleTemplatePlugin, activeHead, asArray, createHead, defineHeadPlugin, getActiveHead, normaliseEntryTags, normaliseTag, setActiveHead, useBase, useBodyAttrs, useHead, useHtmlAttrs, useLink, useMeta, useNoscript, useScript, useServerHead, useStyle, useTitle, useTitleTemplate };
+export { DedupesTagsPlugin, HydratesStatePlugin, SortTagsPlugin, TitleTemplatePlugin, activeHead, asArray, createHead, defineHeadPlugin, getActiveHead, normaliseEntryTags, setActiveHead, useBase, useBodyAttrs, useHead, useHtmlAttrs, useLink, useMeta, useNoscript, useScript, useServerHead, useStyle, useTitle, useTitleTemplate };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unhead",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "packageManager": "pnpm@7.14.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -19,20 +19,22 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
+      "require": "./dist/index.cjs",
       "import": "./dist/index.mjs"
     }
   },
+  "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@unhead/schema": "0.1.2",
+    "@unhead/schema": "0.1.4",
     "hookable": "^5.4.1"
   },
   "devDependencies": {
-    "zhead": "1.0.0-beta.4"
+    "zhead": "1.0.0-beta.5"
   },
   "scripts": {
     "build": "unbuild .",