unhead 0.0.2 → 0.0.4

package/dist/client.d.ts

@@ -1,4 +1,4 @@
-import { a as HeadClient } from './types-011e5fbf.js';
+import { a as HeadClient } from './types-b4318c02.js';
 import 'hookable';
 import '@unhead/schema';
 

package/dist/client.mjs

@@ -1,16 +1,20 @@
 import { createElement, TagsWithInnerContent } from 'zhead';
 
-function setAttributesWithSideEffects($el, entry, tag) {
+function setAttributesWithSideEffects(head, $el, entry, tag) {
   const attrs = tag.props || {};
   const sdeKey = `${tag._p}:attr`;
-  Object.entries(entry._sde).filter(([key]) => key.startsWith(sdeKey)).forEach(([key, fn]) => delete entry._sde[key] && fn());
+  Object.entries(entry._sde).filter(([key]) => key.startsWith(sdeKey)).forEach(([key, fn]) => {
+    delete entry._sde[key] && fn();
+  });
   Object.entries(attrs).forEach(([k, value]) => {
     value = String(value);
     const attrSdeKey = `${sdeKey}:${k}`;
+    head._removeQueuedSideEffect(attrSdeKey);
     if (k === "class") {
       for (const c of value.split(" ")) {
         if (!$el.classList.contains(c)) {
           $el.classList.add(c);
+          head._removeQueuedSideEffect(`${attrSdeKey}:${c}`);
           entry._sde[`${attrSdeKey}:${c}`] = () => $el.classList.remove(c);
         }
       }
@@ -28,7 +32,6 @@ async function renderDOMHead(head, options = {}) {
   const dom = options.document || window.document;
   const tags = await head.resolveTags();
   await head.hooks.callHook("dom:beforeRender", { head, tags, document: dom });
-  head._flushQueuedSideEffectFns();
   for (const tag of tags) {
     const entry = head.headEntries().find((e) => e._i === Number(tag._e));
     const sdeKey = `${tag._s || tag._p}:el`;
@@ -37,11 +40,14 @@ async function renderDOMHead(head, options = {}) {
     const renderCtx = { tag, document: dom, head };
     await head.hooks.callHook("dom:renderTag", renderCtx);
     if ($el) {
+      head._removeQueuedSideEffect(sdeKey);
+      if ($newEl.isEqualNode($el))
+        continue;
       if (Object.keys(tag.props).length === 0) {
         $el.remove();
         continue;
       }
-      setAttributesWithSideEffects($el, entry, tag);
+      setAttributesWithSideEffects(head, $el, entry, tag);
       if (TagsWithInnerContent.includes(tag.tag))
         $el.innerHTML = tag.children || "";
       entry._sde[sdeKey] = () => $el?.remove();
@@ -52,7 +58,7 @@ async function renderDOMHead(head, options = {}) {
       continue;
     }
     if (tag.tag === "htmlAttrs" || tag.tag === "bodyAttrs") {
-      setAttributesWithSideEffects(dom[tag.tag === "htmlAttrs" ? "documentElement" : "body"], entry, tag);
+      setAttributesWithSideEffects(head, dom[tag.tag === "htmlAttrs" ? "documentElement" : "body"], entry, tag);
       continue;
     }
     switch (tag.tagPosition) {
@@ -69,6 +75,7 @@ async function renderDOMHead(head, options = {}) {
     }
     entry._sde[sdeKey] = () => $newEl?.remove();
   }
+  head._flushQueuedSideEffects();
 }
 let domUpdatePromise = null;
 async function debouncedRenderDOMHead(delayedFn, head, options = {}) {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as _unhead_schema from '@unhead/schema';
 import { Head, Meta, Link, Script, Style, Base, HtmlAttributes, BodyAttributes, Noscript } from '@unhead/schema';
-import { H as HeadPlugin, C as CreateHeadOptions, a as HeadClient, b as HeadEntryOptions } from './types-011e5fbf.js';
-export { A as ActiveHeadEntry, C as CreateHeadOptions, D as DomRenderTagContext, E as EntryResolveCtx, a as HeadClient, c as HeadEntry, b as HeadEntryOptions, f as HeadHooks, H as HeadPlugin, e as HookResult, R as RuntimeMode, S as SideEffectsRecord, d as defineHeadPlugin } from './types-011e5fbf.js';
+import { H as HeadPlugin, C as CreateHeadOptions, a as HeadClient, b as HeadEntryOptions } from './types-b4318c02.js';
+export { A as ActiveHeadEntry, C as CreateHeadOptions, D as DomRenderTagContext, E as EntryResolveCtx, a as HeadClient, c as HeadEntry, b as HeadEntryOptions, f as HeadHooks, H as HeadPlugin, e as HookResult, R as RuntimeMode, S as SideEffectsRecord, d as defineHeadPlugin } from './types-b4318c02.js';
 import 'hookable';
 
 declare const DedupesTagsPlugin: HeadPlugin<_unhead_schema.Head<_unhead_schema.SchemaAugmentations>>;

package/dist/index.mjs

@@ -113,7 +113,8 @@ const HydratesStatePlugin = defineHeadPlugin({
         return;
       if (typeof tag._d === "undefined" && entry._m === "server")
         return;
-      tag._s = `data-h-${hashCode(tag._d || tag.tag + JSON.stringify(tag.props))}`;
+      const hasChildren = tag.children && tag.children.length > 0;
+      tag._s = `data-h-${hashCode(tag._d || tag.tag + (hasChildren ? tag.children : JSON.stringify(tag.props)))}`;
       tag.props[tag._s] = "";
     }
   }
@@ -165,7 +166,10 @@ function createHead(options = {}) {
   plugins.push(...options.plugins || []);
   plugins.forEach((plugin) => hooks.addHooks(plugin.hooks || {}));
   const head = {
-    _flushQueuedSideEffectFns() {
+    _removeQueuedSideEffect(key) {
+      delete _sde[key];
+    },
+    _flushQueuedSideEffects() {
       Object.values(_sde).forEach((fn) => fn());
       _sde = {};
     },
@@ -195,9 +199,11 @@ function createHead(options = {}) {
         },
         patch(input2) {
           entries = entries.map((e) => {
-            _sde = { ..._sde, ...e._sde || {} };
-            e._sde = {};
-            e.input = e._i === _i ? input2 : e.input;
+            if (e._i === _i) {
+              _sde = { ..._sde, ...e._sde || {} };
+              e._sde = {};
+              e.input = e._i === _i ? input2 : e.input;
+            }
             return e;
           });
         }

package/dist/server.d.ts

@@ -1,3 +1,3 @@
-export { g as SSRHeadPayload, r as renderSSRHead } from './types-011e5fbf.js';
+export { g as SSRHeadPayload, r as renderSSRHead } from './types-b4318c02.js';
 import 'hookable';
 import '@unhead/schema';

package/dist/{types-011e5fbf.d.ts → types-b4318c02.d.ts}

@@ -80,12 +80,12 @@ interface HeadHooks<T> {
     'tags:resolve': (ctx: {
         tags: HeadTag[];
     }) => HookResult;
-    'dom:renderTag': (ctx: DomRenderTagContext) => HookResult;
     'dom:beforeRender': (ctx: {
         head: HeadClient;
         tags: HeadTag[];
         document: Document;
     }) => HookResult;
+    'dom:renderTag': (ctx: DomRenderTagContext) => HookResult;
     'ssr:beforeRender': (ctx: {
         tags: HeadTag[];
     }) => HookResult;
@@ -121,7 +121,11 @@ interface HeadClient<T = Head> {
     /**
      * @internal
      */
-    _flushQueuedSideEffectFns: () => void;
+    _removeQueuedSideEffect: (key: string) => void;
+    /**
+     * @internal
+     */
+    _flushQueuedSideEffects: () => void;
 }
 
 export { ActiveHeadEntry as A, CreateHeadOptions as C, DomRenderTagContext as D, EntryResolveCtx as E, HeadPlugin as H, RuntimeMode as R, SideEffectsRecord as S, HeadClient as a, HeadEntryOptions as b, HeadEntry as c, defineHeadPlugin as d, HookResult as e, HeadHooks as f, SSRHeadPayload as g, renderSSRHead as r };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unhead",
   "type": "module",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "packageManager": "pnpm@7.14.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "dist"
   ],
   "dependencies": {
-    "@unhead/schema": "0.0.2",
+    "@unhead/schema": "0.0.4",
     "hookable": "^5.4.1",
     "zhead": "1.0.0-beta.4"
   },