unhead 0.1.4 → 0.2.0

package/dist/index.cjs

@@ -26,10 +26,11 @@ 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 });
+  if (tagName === "title" || tagName === "titleTemplate") {
+    tag.children = input;
+    return tag;
+  }
+  tag.props = normaliseProps({ ...input });
   ["children", "innerHtml", "innerHTML"].forEach((key) => {
     if (typeof tag.props[key] !== "undefined") {
       tag.children = tag.props[key];
@@ -125,7 +126,7 @@ function resolveTitleTemplateFromTags(tags) {
     if (newTitle !== null) {
       tags[titleIdx].children = newTitle || tags[titleIdx].children;
     } else {
-      tags = tags.filter((_, i) => i !== titleIdx);
+      delete tags[titleIdx];
     }
   } else if (titleTemplateIdx !== -1) {
     const newTitle = renderTitleTemplate(
@@ -136,9 +137,10 @@ function resolveTitleTemplateFromTags(tags) {
       tags[titleTemplateIdx].tag = "title";
     }
   }
-  if (titleTemplateIdx !== -1)
-    tags = tags.filter((_, i) => i !== titleTemplateIdx);
-  return tags;
+  if (titleTemplateIdx !== -1) {
+    delete tags[titleTemplateIdx];
+  }
+  return tags.filter(Boolean);
 }
 
 const DedupesTagsPlugin = (options) => {
@@ -230,6 +232,23 @@ const TitleTemplatePlugin = () => {
   });
 };
 
+function defineHeadPlugin(plugin) {
+  return plugin;
+}
+
+const DeprecatedTagAttrPlugin = () => {
+  return defineHeadPlugin({
+    hooks: {
+      "tag:normalise": function({ tag }) {
+        if (tag.props.body) {
+          tag.tagPosition = "bodyClose";
+          delete tag.props.body;
+        }
+      }
+    }
+  });
+};
+
 function hashCode(s) {
   let h = 9;
   for (let i = 0; i < s.length; )
@@ -314,7 +333,7 @@ function normaliseEntryTags(e) {
   });
 }
 
-async function createHead(options = {}) {
+function createHead(options = {}) {
   let entries = [];
   let _sde = {};
   let entryId = 0;
@@ -322,12 +341,14 @@ async function createHead(options = {}) {
   if (options.hooks)
     hooks.addHooks(options.hooks);
   const plugins = [
+    DeprecatedTagAttrPlugin(),
     DedupesTagsPlugin(),
     SortTagsPlugin(),
     TitleTemplatePlugin()
   ];
   plugins.push(...options.plugins || []);
   plugins.forEach((plugin) => hooks.addHooks(plugin.hooks || {}));
+  const triggerUpdate = () => hooks.callHook("entries:updated", head);
   const head = {
     _removeQueuedSideEffect(key) {
       delete _sde[key];
@@ -350,28 +371,29 @@ async function createHead(options = {}) {
         _sde: {},
         ...options2
       });
-      hooks.callHook("entries:updated", head);
+      triggerUpdate();
+      const queueSideEffects = (e) => {
+        _sde = { ..._sde, ...e._sde || {} };
+        e._sde = {};
+        triggerUpdate();
+      };
       return {
         dispose() {
           entries = entries.filter((e) => {
             if (e._i !== _i)
               return true;
-            _sde = { ..._sde, ...e._sde || {} };
-            e._sde = {};
+            queueSideEffects(e);
             return false;
           });
-          hooks.callHook("entries:updated", head);
         },
         patch(input2) {
           entries = entries.map((e) => {
             if (e._i === _i) {
-              _sde = { ..._sde, ...e._sde || {} };
-              e._sde = {};
+              queueSideEffects(e);
               e.input = e._i === _i ? input2 : e.input;
             }
             return e;
           });
-          hooks.callHook("entries:updated", head);
         }
       };
     },
@@ -389,16 +411,13 @@ async function createHead(options = {}) {
       return resolveCtx.tags;
     }
   };
-  await head.hooks.callHook("init", head);
+  head.hooks.callHook("init", head);
   setActiveHead(head);
   return head;
 }
 
-function defineHeadPlugin(plugin) {
-  return plugin;
-}
-
 exports.DedupesTagsPlugin = DedupesTagsPlugin;
+exports.DeprecatedTagAttrPlugin = DeprecatedTagAttrPlugin;
 exports.HydratesStatePlugin = HydratesStatePlugin;
 exports.SortTagsPlugin = SortTagsPlugin;
 exports.TitleTemplatePlugin = TitleTemplatePlugin;

package/dist/index.d.ts

@@ -10,6 +10,8 @@ declare const SortTagsPlugin: () => _unhead_schema.HeadPlugin;
 
 declare const TitleTemplatePlugin: () => _unhead_schema.HeadPlugin;
 
+declare const DeprecatedTagAttrPlugin: () => _unhead_schema.HeadPlugin;
+
 declare const HydratesStatePlugin: () => _unhead_schema.HeadPlugin;
 
 declare function useHead<T extends Head>(input: T, options?: HeadEntryOptions): void;
@@ -29,7 +31,7 @@ declare let activeHead: HeadClient<any> | undefined;
 declare const setActiveHead: <T extends HeadClient<_unhead_schema.Head<_unhead_schema.SchemaAugmentations>>>(head: T | undefined) => T | undefined;
 declare const getActiveHead: <T extends HeadClient<_unhead_schema.Head<_unhead_schema.SchemaAugmentations>>>() => T;
 
-declare function createHead<T extends {} = Head>(options?: CreateHeadOptions): Promise<HeadClient<T>>;
+declare function createHead<T extends {} = Head>(options?: CreateHeadOptions): HeadClient<T>;
 
 declare function defineHeadPlugin(plugin: HeadPlugin): HeadPlugin;
 
@@ -38,4 +40,4 @@ declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): HeadT
 declare type Arrayable<T> = T | Array<T>;
 declare function asArray<T>(value: Arrayable<T>): T[];
 
-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 };
+export { Arrayable, DedupesTagsPlugin, DedupesTagsPluginOptions, DeprecatedTagAttrPlugin, 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

@@ -24,10 +24,11 @@ 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 });
+  if (tagName === "title" || tagName === "titleTemplate") {
+    tag.children = input;
+    return tag;
+  }
+  tag.props = normaliseProps({ ...input });
   ["children", "innerHtml", "innerHTML"].forEach((key) => {
     if (typeof tag.props[key] !== "undefined") {
       tag.children = tag.props[key];
@@ -123,7 +124,7 @@ function resolveTitleTemplateFromTags(tags) {
     if (newTitle !== null) {
       tags[titleIdx].children = newTitle || tags[titleIdx].children;
     } else {
-      tags = tags.filter((_, i) => i !== titleIdx);
+      delete tags[titleIdx];
     }
   } else if (titleTemplateIdx !== -1) {
     const newTitle = renderTitleTemplate(
@@ -134,9 +135,10 @@ function resolveTitleTemplateFromTags(tags) {
       tags[titleTemplateIdx].tag = "title";
     }
   }
-  if (titleTemplateIdx !== -1)
-    tags = tags.filter((_, i) => i !== titleTemplateIdx);
-  return tags;
+  if (titleTemplateIdx !== -1) {
+    delete tags[titleTemplateIdx];
+  }
+  return tags.filter(Boolean);
 }
 
 const DedupesTagsPlugin = (options) => {
@@ -228,6 +230,23 @@ const TitleTemplatePlugin = () => {
   });
 };
 
+function defineHeadPlugin(plugin) {
+  return plugin;
+}
+
+const DeprecatedTagAttrPlugin = () => {
+  return defineHeadPlugin({
+    hooks: {
+      "tag:normalise": function({ tag }) {
+        if (tag.props.body) {
+          tag.tagPosition = "bodyClose";
+          delete tag.props.body;
+        }
+      }
+    }
+  });
+};
+
 function hashCode(s) {
   let h = 9;
   for (let i = 0; i < s.length; )
@@ -312,7 +331,7 @@ function normaliseEntryTags(e) {
   });
 }
 
-async function createHead(options = {}) {
+function createHead(options = {}) {
   let entries = [];
   let _sde = {};
   let entryId = 0;
@@ -320,12 +339,14 @@ async function createHead(options = {}) {
   if (options.hooks)
     hooks.addHooks(options.hooks);
   const plugins = [
+    DeprecatedTagAttrPlugin(),
     DedupesTagsPlugin(),
     SortTagsPlugin(),
     TitleTemplatePlugin()
   ];
   plugins.push(...options.plugins || []);
   plugins.forEach((plugin) => hooks.addHooks(plugin.hooks || {}));
+  const triggerUpdate = () => hooks.callHook("entries:updated", head);
   const head = {
     _removeQueuedSideEffect(key) {
       delete _sde[key];
@@ -348,28 +369,29 @@ async function createHead(options = {}) {
         _sde: {},
         ...options2
       });
-      hooks.callHook("entries:updated", head);
+      triggerUpdate();
+      const queueSideEffects = (e) => {
+        _sde = { ..._sde, ...e._sde || {} };
+        e._sde = {};
+        triggerUpdate();
+      };
       return {
         dispose() {
           entries = entries.filter((e) => {
             if (e._i !== _i)
               return true;
-            _sde = { ..._sde, ...e._sde || {} };
-            e._sde = {};
+            queueSideEffects(e);
             return false;
           });
-          hooks.callHook("entries:updated", head);
         },
         patch(input2) {
           entries = entries.map((e) => {
             if (e._i === _i) {
-              _sde = { ..._sde, ...e._sde || {} };
-              e._sde = {};
+              queueSideEffects(e);
               e.input = e._i === _i ? input2 : e.input;
             }
             return e;
           });
-          hooks.callHook("entries:updated", head);
         }
       };
     },
@@ -387,13 +409,9 @@ async function createHead(options = {}) {
       return resolveCtx.tags;
     }
   };
-  await head.hooks.callHook("init", head);
+  head.hooks.callHook("init", head);
   setActiveHead(head);
   return head;
 }
 
-function defineHeadPlugin(plugin) {
-  return plugin;
-}
-
-export { DedupesTagsPlugin, HydratesStatePlugin, SortTagsPlugin, TitleTemplatePlugin, activeHead, asArray, createHead, defineHeadPlugin, getActiveHead, normaliseEntryTags, setActiveHead, useBase, useBodyAttrs, useHead, useHtmlAttrs, useLink, useMeta, useNoscript, useScript, useServerHead, useStyle, useTitle, useTitleTemplate };
+export { DedupesTagsPlugin, DeprecatedTagAttrPlugin, 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.4",
+  "version": "0.2.0",
   "packageManager": "pnpm@7.14.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -30,11 +30,11 @@
     "dist"
   ],
   "dependencies": {
-    "@unhead/schema": "0.1.4",
+    "@unhead/schema": "0.2.0",
     "hookable": "^5.4.1"
   },
   "devDependencies": {
-    "zhead": "1.0.0-beta.5"
+    "zhead": "1.0.0-beta.8"
   },
   "scripts": {
     "build": "unbuild .",