unhead 0.6.2 → 0.6.3

package/dist/index.cjs

@@ -2,14 +2,6 @@
 
 const hookable = require('hookable');
 
-const HasElementTags = [
-  "base",
-  "meta",
-  "link",
-  "style",
-  "script",
-  "noscript"
-];
 const ValidHeadTags = [
   "title",
   "titleTemplate",
@@ -413,11 +405,21 @@ const ProvideTagHashPlugin = () => {
     hooks: {
       "tag:normalise": (ctx) => {
         const { tag, entry } = ctx;
-        if (!HasElementTags.includes(tag.tag))
+        const isDynamic = typeof tag.props._dynamic !== "undefined";
+        if (!HasElementTags.includes(tag.tag) || !tag.key)
           return;
-        const isBrowser = IsBrowser || getActiveHead()?.resolvedOptions?.document;
-        if (!isBrowser && entry._m === "server" && tag.key)
-          tag.props["data-h-key"] = tag._d;
+        tag._hash = hashCode(JSON.stringify({ tag: tag.tag, key: tag.key }));
+        if (IsBrowser || getActiveHead()?.resolvedOptions?.document)
+          return;
+        if (entry._m === "server" || isDynamic) {
+          tag.props[`data-h-${tag._hash}`] = "";
+        }
+      },
+      "tags:resolve": (ctx) => {
+        ctx.tags = ctx.tags.map((t) => {
+          delete t.props._dynamic;
+          return t;
+        });
       }
     }
   });
@@ -504,6 +506,20 @@ const EventHandlersPlugin = () => {
 function asArray(value) {
   return Array.isArray(value) ? value : [value];
 }
+function hashCode(s) {
+  let h = 9;
+  for (let i = 0; i < s.length; )
+    h = Math.imul(h ^ s.charCodeAt(i++), 9 ** 9);
+  return ((h ^ h >>> 9) + 65536).toString(16).substring(1, 8).toLowerCase();
+}
+const HasElementTags = [
+  "base",
+  "meta",
+  "link",
+  "style",
+  "script",
+  "noscript"
+];
 
 exports.activeHead = void 0;
 const setActiveHead = (head) => exports.activeHead = head;
@@ -576,11 +592,6 @@ function createHead(options = {}) {
   const triggerUpdateHook = () => hooks.callHook("entries:updated", head);
   const head = {
     resolvedOptions: options,
-    _popSideEffectQueue() {
-      const sde = { ..._sde };
-      _sde = {};
-      return sde;
-    },
     headEntries() {
       return entries;
     },
@@ -635,6 +646,12 @@ function createHead(options = {}) {
       }
       await hooks.callHook("tags:resolve", resolveCtx);
       return resolveCtx.tags;
+    },
+    _elMap: {},
+    _popSideEffectQueue() {
+      const sde = { ..._sde };
+      _sde = {};
+      return sde;
     }
   };
   head.hooks.callHook("init", head);
@@ -685,6 +702,7 @@ const unheadComposablesImports = [
 exports.DedupesTagsPlugin = DedupesTagsPlugin;
 exports.DeprecatedTagAttrPlugin = DeprecatedTagAttrPlugin;
 exports.EventHandlersPlugin = EventHandlersPlugin;
+exports.HasElementTags = HasElementTags;
 exports.PatchDomOnEntryUpdatesPlugin = PatchDomOnEntryUpdatesPlugin;
 exports.ProvideTagHashPlugin = ProvideTagHashPlugin;
 exports.SortTagsPlugin = SortTagsPlugin;
@@ -694,6 +712,7 @@ exports.composableNames = composableNames;
 exports.createHead = createHead;
 exports.defineHeadPlugin = defineHeadPlugin;
 exports.getActiveHead = getActiveHead;
+exports.hashCode = hashCode;
 exports.normaliseEntryTags = normaliseEntryTags;
 exports.setActiveHead = setActiveHead;
 exports.unheadComposablesImports = unheadComposablesImports;

package/dist/index.d.ts

@@ -29,6 +29,8 @@ declare const EventHandlersPlugin: () => _unhead_schema.HeadPlugin;
 
 declare type Arrayable<T> = T | Array<T>;
 declare function asArray<T>(value: Arrayable<T>): T[];
+declare function hashCode(s: string): string;
+declare const HasElementTags: string[];
 
 declare function useHead<T extends Head>(input: T, options?: HeadEntryOptions): ActiveHeadEntry<T> | void;
 declare const useTagTitle: (title: Title) => ActiveHeadEntry<any> | void;
@@ -72,4 +74,4 @@ declare const unheadComposablesImports: {
     imports: string[];
 }[];
 
-export { Arrayable, DedupesTagsPlugin, DedupesTagsPluginOptions, DeprecatedTagAttrPlugin, EventHandlersPlugin, PatchDomOnEntryUpdatesPlugin, ProvideTagHashPlugin, SortTagsPlugin, TitleTemplatePlugin, activeHead, asArray, composableNames, createHead, defineHeadPlugin, getActiveHead, normaliseEntryTags, setActiveHead, unheadComposablesImports, useBodyAttrs, useHead, useHtmlAttrs, useServerBodyAttrs, useServerHead, useServerHtmlAttrs, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate };
+export { Arrayable, DedupesTagsPlugin, DedupesTagsPluginOptions, DeprecatedTagAttrPlugin, EventHandlersPlugin, HasElementTags, PatchDomOnEntryUpdatesPlugin, ProvideTagHashPlugin, SortTagsPlugin, TitleTemplatePlugin, activeHead, asArray, composableNames, createHead, defineHeadPlugin, getActiveHead, hashCode, normaliseEntryTags, setActiveHead, unheadComposablesImports, useBodyAttrs, useHead, useHtmlAttrs, useServerBodyAttrs, useServerHead, useServerHtmlAttrs, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate };

package/dist/index.mjs

@@ -1,13 +1,5 @@
 import { createHooks } from 'hookable';
 
-const HasElementTags = [
-  "base",
-  "meta",
-  "link",
-  "style",
-  "script",
-  "noscript"
-];
 const ValidHeadTags = [
   "title",
   "titleTemplate",
@@ -411,11 +403,21 @@ const ProvideTagHashPlugin = () => {
     hooks: {
       "tag:normalise": (ctx) => {
         const { tag, entry } = ctx;
-        if (!HasElementTags.includes(tag.tag))
+        const isDynamic = typeof tag.props._dynamic !== "undefined";
+        if (!HasElementTags.includes(tag.tag) || !tag.key)
           return;
-        const isBrowser = IsBrowser || getActiveHead()?.resolvedOptions?.document;
-        if (!isBrowser && entry._m === "server" && tag.key)
-          tag.props["data-h-key"] = tag._d;
+        tag._hash = hashCode(JSON.stringify({ tag: tag.tag, key: tag.key }));
+        if (IsBrowser || getActiveHead()?.resolvedOptions?.document)
+          return;
+        if (entry._m === "server" || isDynamic) {
+          tag.props[`data-h-${tag._hash}`] = "";
+        }
+      },
+      "tags:resolve": (ctx) => {
+        ctx.tags = ctx.tags.map((t) => {
+          delete t.props._dynamic;
+          return t;
+        });
       }
     }
   });
@@ -502,6 +504,20 @@ const EventHandlersPlugin = () => {
 function asArray(value) {
   return Array.isArray(value) ? value : [value];
 }
+function hashCode(s) {
+  let h = 9;
+  for (let i = 0; i < s.length; )
+    h = Math.imul(h ^ s.charCodeAt(i++), 9 ** 9);
+  return ((h ^ h >>> 9) + 65536).toString(16).substring(1, 8).toLowerCase();
+}
+const HasElementTags = [
+  "base",
+  "meta",
+  "link",
+  "style",
+  "script",
+  "noscript"
+];
 
 let activeHead;
 const setActiveHead = (head) => activeHead = head;
@@ -574,11 +590,6 @@ function createHead(options = {}) {
   const triggerUpdateHook = () => hooks.callHook("entries:updated", head);
   const head = {
     resolvedOptions: options,
-    _popSideEffectQueue() {
-      const sde = { ..._sde };
-      _sde = {};
-      return sde;
-    },
     headEntries() {
       return entries;
     },
@@ -633,6 +644,12 @@ function createHead(options = {}) {
       }
       await hooks.callHook("tags:resolve", resolveCtx);
       return resolveCtx.tags;
+    },
+    _elMap: {},
+    _popSideEffectQueue() {
+      const sde = { ..._sde };
+      _sde = {};
+      return sde;
     }
   };
   head.hooks.callHook("init", head);
@@ -680,4 +697,4 @@ const unheadComposablesImports = [
   }
 ];
 
-export { DedupesTagsPlugin, DeprecatedTagAttrPlugin, EventHandlersPlugin, PatchDomOnEntryUpdatesPlugin, ProvideTagHashPlugin, SortTagsPlugin, TitleTemplatePlugin, activeHead, asArray, composableNames, createHead, defineHeadPlugin, getActiveHead, normaliseEntryTags, setActiveHead, unheadComposablesImports, useBodyAttrs, useHead, useHtmlAttrs, useServerBodyAttrs, useServerHead, useServerHtmlAttrs, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate };
+export { DedupesTagsPlugin, DeprecatedTagAttrPlugin, EventHandlersPlugin, HasElementTags, PatchDomOnEntryUpdatesPlugin, ProvideTagHashPlugin, SortTagsPlugin, TitleTemplatePlugin, activeHead, asArray, composableNames, createHead, defineHeadPlugin, getActiveHead, hashCode, normaliseEntryTags, setActiveHead, unheadComposablesImports, useBodyAttrs, useHead, useHtmlAttrs, useServerBodyAttrs, useServerHead, useServerHtmlAttrs, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unhead",
   "type": "module",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "packageManager": "pnpm@7.14.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "dist"
   ],
   "dependencies": {
-    "@unhead/dom": "0.6.2",
-    "@unhead/schema": "0.6.2",
+    "@unhead/dom": "0.6.3",
+    "@unhead/schema": "0.6.3",
     "hookable": "^5.4.1"
   },
   "devDependencies": {