@thi.ng/hdom 9.4.33 → 9.4.35

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-04-23T07:02:18Z
+- **Last updated**: 2024-06-21T19:34:38Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,13 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [9.4.35](https://github.com/thi-ng/umbrella/tree/@thi.ng/hdom@9.4.35) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- split up internal normalizeTree() ([1fbca7b](https://github.com/thi-ng/umbrella/commit/1fbca7b))
+- enforce uniform naming convention of internal functions ([56992b2](https://github.com/thi-ng/umbrella/commit/56992b2))
+
 ### [9.4.14](https://github.com/thi-ng/umbrella/tree/@thi.ng/hdom@9.4.14) (2024-02-16)
 
 #### ♻️ Refactoring

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 192 standalone projects, maintained as part
+> This is one of 193 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >
@@ -161,7 +161,7 @@ yarn install
 yarn start
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 3.48 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 3.49 KB
 
 ## Dependencies
 

package/diff.js

@@ -20,7 +20,7 @@ const INDEX = (() => {
   }
   return res;
 })();
-const buildIndex = (n) => {
+const __buildIndex = (n) => {
   if (n <= INDEX.length) {
     return INDEX.slice(0, n);
   }
@@ -75,14 +75,13 @@ const diffTree = (opts, impl, parent, prev, curr, child = 0) => {
   }
   const numEdits = edits.length;
   const prevLength = prev.length - 1;
-  const equivKeys = extractEquivElements(edits);
-  const offsets = buildIndex(prevLength + 1);
+  const equivKeys = __extractEquivElements(edits);
+  const offsets = __buildIndex(prevLength + 1);
   for (i = 2, ii = 6; ii < numEdits; i++, ii += 3) {
     status = edits[ii];
-    if (!status)
-      continue;
+    if (!status) continue;
     if (status === -1) {
-      diffDeleted(
+      __diffDeleted(
         opts,
         impl,
         el,
@@ -95,7 +94,7 @@ const diffTree = (opts, impl, parent, prev, curr, child = 0) => {
         prevLength
       );
     } else {
-      diffAdded(
+      __diffAdded(
         opts,
         impl,
         el,
@@ -111,7 +110,7 @@ const diffTree = (opts, impl, parent, prev, curr, child = 0) => {
     val.apply(curr, [el, ...curr.__args]);
   }
 };
-const diffDeleted = (opts, impl, el, prev, curr, edits, ii, equivKeys, offsets, prevLength) => {
+const __diffDeleted = (opts, impl, el, prev, curr, edits, ii, equivKeys, offsets, prevLength) => {
   const val = edits[ii + 2];
   if (isArray(val)) {
     let k = val[1].key;
@@ -123,13 +122,13 @@ const diffDeleted = (opts, impl, el, prev, curr, edits, ii, equivKeys, offsets,
       const idx = edits[ii + 1];
       releaseTree(val);
       impl.removeChild(el, offsets[idx]);
-      incOffsets(offsets, prevLength, idx);
+      __incOffsets(offsets, prevLength, idx);
     }
   } else if (typeof val === STR) {
     impl.setContent(el, "");
   }
 };
-const diffAdded = (opts, impl, el, edits, ii, equivKeys, offsets, prevLength) => {
+const __diffAdded = (opts, impl, el, edits, ii, equivKeys, offsets, prevLength) => {
   const val = edits[ii + 2];
   if (typeof val === STR) {
     impl.setContent(el, val);
@@ -138,16 +137,16 @@ const diffAdded = (opts, impl, el, edits, ii, equivKeys, offsets, prevLength) =>
     if (k === void 0 || equivKeys[k][0] === void 0) {
       const idx = edits[ii + 1];
       impl.createTree(opts, el, val, offsets[idx]);
-      decOffsets(offsets, prevLength, idx);
+      __decOffsets(offsets, prevLength, idx);
     }
   }
 };
-const incOffsets = (offsets, j, idx) => {
+const __incOffsets = (offsets, j, idx) => {
   for (; j > idx; j--) {
     offsets[j] = max(offsets[j] - 1, 0);
   }
 };
-const decOffsets = (offsets, j, idx) => {
+const __decOffsets = (offsets, j, idx) => {
   for (; j >= idx; j--) {
     offsets[j]++;
   }
@@ -183,7 +182,7 @@ const releaseTree = (tree) => {
     }
   }
 };
-const extractEquivElements = (edits) => {
+const __extractEquivElements = (edits) => {
   let k;
   let val;
   let ek;

package/dom.js

@@ -6,7 +6,7 @@ import { ATTRIB_JOIN_DELIMS, SVG_TAGS } from "@thi.ng/hiccup/api";
 import { css } from "@thi.ng/hiccup/css";
 import { formatPrefixes } from "@thi.ng/hiccup/prefix";
 import { XML_SVG } from "@thi.ng/prefixes/xml";
-const maybeInitElement = (el, tree) => tree.__init && tree.__init.apply(tree.__this, [el, ...tree.__args]);
+const __maybeInitElement = (el, tree) => tree.__init && tree.__init.apply(tree.__this, [el, ...tree.__args]);
 const createTree = (opts, impl, parent, tree, insert, init = true) => {
   if (isArray(tree)) {
     const tag = tree[0];
@@ -36,7 +36,7 @@ const createTree = (opts, impl, parent, tree, insert, init = true) => {
         createTree(opts, impl, el, tree[i], void 0, init);
       }
     }
-    init && maybeInitElement(el, tree);
+    init && __maybeInitElement(el, tree);
     return el;
   }
   if (isNotStringAndIterable(tree)) {
@@ -72,7 +72,7 @@ const hydrateTree = (opts, impl, parent, tree, index = 0) => {
         index
       );
     }
-    maybeInitElement(el, tree);
+    __maybeInitElement(el, tree);
     for (let a in attribs) {
       a[0] === "o" && a[1] === "n" && impl.setAttrib(el, a, attribs[a]);
     }
@@ -110,8 +110,7 @@ const setAttribs = (el, attribs) => {
 };
 const setAttrib = (el, id, val, attribs) => {
   implementsFunction(val, "deref") && (val = val.deref());
-  if (id.startsWith("__"))
-    return;
+  if (id.startsWith("__")) return;
   const isListener = id[0] === "o" && id[1] === "n";
   if (isListener) {
     if (isString(val)) {
@@ -122,10 +121,8 @@ const setAttrib = (el, id, val, attribs) => {
     }
     return el;
   }
-  if (typeof val === "function")
-    val = val(attribs);
-  if (isArray(val))
-    val = val.join(ATTRIB_JOIN_DELIMS[id] || " ");
+  if (typeof val === "function") val = val(attribs);
+  if (isArray(val)) val = val.join(ATTRIB_JOIN_DELIMS[id] || " ");
   switch (id) {
     case "style":
       setStyle(el, val);

package/normalize.js

@@ -27,7 +27,7 @@ const normalizeElement = (spec, keys) => {
   );
   return attribs.__skip && spec.length < 3 ? [name, attribs] : [name, attribs, ...spec.slice(hasAttribs ? 2 : 1)];
 };
-const normalizeTree = (opts, tree) => _normalizeTree(
+const normalizeTree = (opts, tree) => __normalizeTree(
   tree,
   opts,
   opts.ctx,
@@ -35,60 +35,53 @@ const normalizeTree = (opts, tree) => _normalizeTree(
   opts.keys !== false,
   opts.span !== false
 );
-const _normalizeTree = (tree, opts, ctx, path, keys, span) => {
-  if (tree == null) {
-    return;
+const __normalizeTree = (tree, opts, ctx, path, keys, span) => tree == null ? void 0 : isArray(tree) ? __normalizeArray(tree, opts, ctx, path, keys, span) : typeof tree === "function" ? __normalizeTree(tree(ctx), opts, ctx, path, keys, span) : typeof tree.toHiccup === "function" ? __normalizeTree(tree.toHiccup(opts.ctx), opts, ctx, path, keys, span) : typeof tree.deref === "function" ? __normalizeTree(tree.deref(), opts, ctx, path, keys, span) : span ? ["span", keys ? { key: path.join("-") } : {}, tree.toString()] : tree.toString();
+const __normalizeArray = (tree, opts, ctx, path, keys, span) => {
+  if (tree.length === 0) return;
+  let norm, nattribs = tree[1], impl;
+  if (nattribs && (impl = nattribs.__impl) && (impl = impl.normalizeTree)) {
+    return impl(opts, tree);
   }
-  if (isArray(tree)) {
-    if (tree.length === 0) {
-      return;
-    }
-    let norm, nattribs = tree[1], impl;
-    if (nattribs && (impl = nattribs.__impl) && (impl = impl.normalizeTree)) {
-      return impl(opts, tree);
-    }
-    const tag = tree[0];
-    if (typeof tag === "function") {
-      return _normalizeTree(
-        tag.apply(null, [ctx, ...tree.slice(1)]),
-        opts,
-        ctx,
-        path,
-        keys,
-        span
-      );
-    }
-    if (typeof tag.render === "function") {
-      const args = [ctx, ...tree.slice(1)];
-      norm = _normalizeTree(
-        tag.render.apply(tag, args),
-        opts,
-        ctx,
-        path,
-        keys,
-        span
-      );
-      if (isArray(norm)) {
-        norm.__this = tag;
-        norm.__init = tag.init;
-        norm.__release = tag.release;
-        norm.__args = args;
-      }
-      return norm;
-    }
-    norm = normalizeElement(tree, keys);
-    nattribs = norm[1];
-    if (nattribs.__normalize === false) {
-      return norm;
-    }
-    if (keys && nattribs.key === void 0) {
-      nattribs.key = path.join("-");
+  const tag = tree[0];
+  if (typeof tag === "function") {
+    return __normalizeTree(
+      tag.apply(null, [ctx, ...tree.slice(1)]),
+      opts,
+      ctx,
+      path,
+      keys,
+      span
+    );
+  }
+  if (typeof tag.render === "function") {
+    const args = [ctx, ...tree.slice(1)];
+    norm = __normalizeTree(
+      tag.render.apply(tag, args),
+      opts,
+      ctx,
+      path,
+      keys,
+      span
+    );
+    if (isArray(norm)) {
+      norm.__this = tag;
+      norm.__init = tag.init;
+      norm.__release = tag.release;
+      norm.__args = args;
     }
-    return norm.length > 2 ? normalizeChildren(norm, nattribs, opts, ctx, path, keys, span) : norm;
+    return norm;
+  }
+  norm = normalizeElement(tree, keys);
+  nattribs = norm[1];
+  if (nattribs.__normalize === false) {
+    return norm;
+  }
+  if (keys && nattribs.key === void 0) {
+    nattribs.key = path.join("-");
   }
-  return typeof tree === "function" ? _normalizeTree(tree(ctx), opts, ctx, path, keys, span) : typeof tree.toHiccup === "function" ? _normalizeTree(tree.toHiccup(opts.ctx), opts, ctx, path, keys, span) : typeof tree.deref === "function" ? _normalizeTree(tree.deref(), opts, ctx, path, keys, span) : span ? ["span", keys ? { key: path.join("-") } : {}, tree.toString()] : tree.toString();
+  return norm.length > 2 ? __normalizeChildren(norm, nattribs, opts, ctx, path, keys, span) : norm;
 };
-const normalizeChildren = (norm, nattribs, opts, ctx, path, keys, span) => {
+const __normalizeChildren = (norm, nattribs, opts, ctx, path, keys, span) => {
   const tag = norm[0];
   const res = [tag, nattribs];
   span = span && !NO_SPANS[tag];
@@ -98,7 +91,7 @@ const normalizeChildren = (norm, nattribs, opts, ctx, path, keys, span) => {
       const isarray = isArray(el);
       if (isarray && isArray(el[0]) || !isarray && isNotStringAndIterable(el)) {
         for (let c of el) {
-          c = _normalizeTree(
+          c = __normalizeTree(
             c,
             opts,
             ctx,
@@ -112,7 +105,7 @@ const normalizeChildren = (norm, nattribs, opts, ctx, path, keys, span) => {
           k++;
         }
       } else {
-        el = _normalizeTree(el, opts, ctx, path.concat(k), keys, span);
+        el = __normalizeTree(el, opts, ctx, path.concat(k), keys, span);
         if (el !== void 0) {
           res[j++] = el;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/hdom",
-  "version": "9.4.33",
+  "version": "9.4.35",
   "description": "Lightweight vanilla ES6 UI component trees with customizable branch-local behaviors",
   "type": "module",
   "module": "./index.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/thi-ng/umbrella.git"
   },
-  "homepage": "https://github.com/thi-ng/umbrella/tree/develop/packages/hdom#readme",
+  "homepage": "https://thi.ng/hdom",
   "funding": [
     {
       "type": "github",
@@ -39,21 +39,21 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.1",
-    "@thi.ng/checks": "^3.6.3",
-    "@thi.ng/diff": "^5.1.68",
-    "@thi.ng/equiv": "^2.1.57",
-    "@thi.ng/errors": "^2.5.6",
-    "@thi.ng/hiccup": "^5.2.0",
-    "@thi.ng/logger": "^3.0.11",
-    "@thi.ng/prefixes": "^2.3.18"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/checks": "^3.6.5",
+    "@thi.ng/diff": "^5.1.70",
+    "@thi.ng/equiv": "^2.1.59",
+    "@thi.ng/errors": "^2.5.8",
+    "@thi.ng/hiccup": "^5.2.2",
+    "@thi.ng/logger": "^3.0.13",
+    "@thi.ng/prefixes": "^2.3.20"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.0",
-    "@thi.ng/atom": "^5.2.45",
-    "esbuild": "^0.20.2",
-    "typedoc": "^0.25.12",
-    "typescript": "^5.4.3"
+    "@microsoft/api-extractor": "^7.47.0",
+    "@thi.ng/atom": "^5.3.1",
+    "esbuild": "^0.21.5",
+    "typedoc": "^0.25.13",
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "array",
@@ -131,5 +131,5 @@
     "status": "completed",
     "year": 2015
   },
-  "gitHead": "aed3421c21044c005fbcb7cc37965ccf85a870d2\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }

package/render-once.js

@@ -6,8 +6,7 @@ const renderOnce = (tree, opts = {}, impl = DEFAULT_IMPL) => {
   opts.ctx = derefContext(opts.ctx, opts.autoDerefKeys);
   const root = resolveRoot(opts.root, impl);
   tree = impl.normalizeTree(opts, tree);
-  if (!tree)
-    return;
+  if (!tree) return;
   opts.hydrate ? impl.hydrateTree(opts, root, tree) : impl.createTree(opts, root, tree);
 };
 export {