lithent 1.20.0 → 1.20.2

package/README.md

@@ -38,8 +38,6 @@ used lightly in a variety of situations.
 - [Examples](#examples)
   - [With ESM](#with-esm)
   - [With UMD](#with-umd)
-- [Context API](#context-api)
-  - [Multi-value Provider Example](#multi-value-provider-example)
 - [Related Projects](#related-projects)
 - [Develop Guide](#develop-guide)
 - [Test](#test)
@@ -92,14 +90,14 @@ pnpm add lithent
 
 #### Or Use CDN
 
-* UMD : https://cdn.jsdelivr.net/npm/lithent@1.20.0/dist/lithent.umd.js
-* UMD-HELPER: https://cdn.jsdelivr.net/npm/lithent@1.20.0/helper/dist/lithentHelper.umd.js
-* UMD-FTAGS: https://cdn.jsdelivr.net/npm/lithent@1.20.0/ftags/dist/lithentFTags.umd.js
-* UMD-TAG: https://cdn.jsdelivr.net/npm/lithent@1.20.0/tag/dist/lithentTag.umd.js
-* ESM : https://cdn.jsdelivr.net/npm/lithent@1.20.0/dist/lithent.mjs
-* ESM-HELPER: https://cdn.jsdelivr.net/npm/lithent@1.20.0/helper/dist/lithentHelper.mjs
-* ESM-FTAGS: https://cdn.jsdelivr.net/npm/lithent@1.20.0/ftags/dist/lithentFTags.mjs
-* ESM-TAG: https://cdn.jsdelivr.net/npm/lithent@1.20.0/tag/dist/lithentTag.mjs
+* UMD : https://cdn.jsdelivr.net/npm/lithent@1.20.2/dist/lithent.umd.js
+* UMD-HELPER: https://cdn.jsdelivr.net/npm/lithent@1.20.2/helper/dist/lithentHelper.umd.js
+* UMD-FTAGS: https://cdn.jsdelivr.net/npm/lithent@1.20.2/ftags/dist/lithentFTags.umd.js
+* UMD-TAG: https://cdn.jsdelivr.net/npm/lithent@1.20.2/tag/dist/lithentTag.umd.js
+* ESM : https://cdn.jsdelivr.net/npm/lithent@1.20.2/dist/lithent.mjs
+* ESM-HELPER: https://cdn.jsdelivr.net/npm/lithent@1.20.2/helper/dist/lithentHelper.mjs
+* ESM-FTAGS: https://cdn.jsdelivr.net/npm/lithent@1.20.2/ftags/dist/lithentFTags.mjs
+* ESM-TAG: https://cdn.jsdelivr.net/npm/lithent@1.20.2/tag/dist/lithentTag.mjs
 
 
 It's easier to use lithent with JSX or HTM.
@@ -124,9 +122,9 @@ import { fTags, fFragment, fMount } from 'lithent/ftags';
 const { section, div, p, br, strong } = fTags;
 
 /* UMD
-<script src="https://cdn.jsdelivr.net/npm/lithent@1.20.0/dist/lithent.umd.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/lithent@1.20.0/helper/dist/lithentHelper.umd.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/lithent@1.20.0/ftags/dist/lithentFTags.umd.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/lithent@1.20.2/dist/lithent.umd.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/lithent@1.20.2/helper/dist/lithentHelper.umd.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/lithent@1.20.2/ftags/dist/lithentFTags.umd.js"></script>
 
 const { render } = lithent;
 const { fTags, fMount, fFragment } = lithentFTags;
@@ -199,10 +197,10 @@ const destroy = render(lTag`<${Component} />`, document.getElementById('root'),
 #### With UMD
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/lithent@1.20.0/dist/lithent.umd.js"></script>
-<!--script src="https://cdn.jsdelivr.net/npm/lithent@1.20.0/helper/dist/lithentHelper.umd.js"></script-->
-<script src="https://cdn.jsdelivr.net/npm/lithent@1.20.0/tag/dist/lithentTag.umd.js"></script>
-<!--script src="https://cdn.jsdelivr.net/npm/lithent@1.20.0/ftags/dist/lithentFTags.umd.js"></script-->
+<script src="https://cdn.jsdelivr.net/npm/lithent@1.20.2/dist/lithent.umd.js"></script>
+<!--script src="https://cdn.jsdelivr.net/npm/lithent@1.20.2/helper/dist/lithentHelper.umd.js"></script-->
+<script src="https://cdn.jsdelivr.net/npm/lithent@1.20.2/tag/dist/lithentTag.umd.js"></script>
+<!--script src="https://cdn.jsdelivr.net/npm/lithent@1.20.2/ftags/dist/lithentFTags.umd.js"></script-->
 
 <div id="root"></div>
 
@@ -234,68 +232,6 @@ const destroy = render(lTag`<${Component} />`, document.getElementById('root'),
 </script>
 ```
 
-## Context API
-
-Lithent-helper ships a lightweight context system so you can share state without manual prop drilling. Providers stay isolated from consumer renews and you can subscribe to every key or only the slices you need.
-
-### Multi-value Provider Example
-
-```tsx
-import { h, mount } from 'lithent';
-import { createContext } from 'lithent-helper';
-
-type AppState = { user: string; theme: string; count: number };
-
-const AppContext = createContext<AppState>();
-const { Provider, contextState, useContext } = AppContext;
-
-const AppProvider = mount((_renew, _props, children) => {
-  // Provider owns the shared state; consumers cannot trigger its renew directly.
-  const user = contextState('Alice');
-  const theme = contextState('dark');
-  const count = contextState(0);
-
-  return () => (
-    <Provider user={user} theme={theme} count={count}>
-      {children}
-    </Provider>
-  );
-});
-
-const StatsPanel = mount(renew => {
-  // Omitting the subscribe list subscribes to every value exposed by the Provider.
-  const ctx = useContext(AppContext, renew);
-  return () => (
-    <section>
-      <p>User: {ctx.user?.value}</p>
-      <p>Theme: {ctx.theme?.value}</p>
-      <p>Count: {ctx.count?.value}</p>
-      <button onClick={() => ctx.count && (ctx.count.value += 1)}>
-        Increment
-      </button>
-      <button onClick={() => ctx.count && (ctx.count.value = 3)}>
-        Set count to 3
-      </button>
-    </section>
-  );
-});
-
-const ThemeBadge = mount(renew => {
-  // Subscribe only to the theme key; user/count updates will not rerender this component.
-  const ctx = useContext(AppContext, renew, ['theme']);
-  return () => <span>Theme: {ctx.theme?.value}</span>;
-});
-
-const App = mount(() => {
-  return () => (
-    <AppProvider>
-      <StatsPanel />
-      <ThemeBadge />
-    </AppProvider>
-  );
-});
-```
-
 ## Related Projects
 - [htm](https://www.npmjs.com/package/htm) - making **H**yperscript **T**agged **M**arkup possible
 

package/dist/lithent.mjs

@@ -1,10 +1,10 @@
-const a = (e) => typeof e == "object" && !("resolve" in e), P = (e, t) => a(e) && e.type === t, he = (e, t) => "ctor" in e ? e.ctor === (t && t.ctor) : e === (t && t.ctor), ae = (e, t) => !!(a(e) && t && t.type === "f" && t.children && t.children.length === (e.children && e.children.length)), ye = (e, t) => !!(a(e) && t && t.type === "e" && t.tag === e.tag && t.children && t.children.length === (e.children && e.children.length)), G = (e, t) => !!(a(e) && t && t.type === e.type), Ce = (e, t) => !!(a(e) && t && t.type === e.type && (k(p((e.children || [])[0])) && k(p((t.children || [])[0])) || t.children && e.children && t.children.length === e.children.length)), p = (e) => e && e.compProps && e.compProps.key || e && e.props && e.props.key, h = (e) => e && ["f", "l"].includes(e), E = (e) => typeof e == "function" && !H(e) || typeof e == "object" && "resolve" in e, H = (e) => typeof e == "function" && e === _, ve = (e) => a(e) && !e.type, k = (e) => e != null, J = (e, t) => e === "style" && typeof t == "object", ke = (e, t) => e === "ref" && typeof t == "object", Re = (e, t) => {
+const a = (e) => typeof e == "object" && !("resolve" in e), E = (e, t) => a(e) && e.type === t, he = (e, t) => "ctor" in e ? e.ctor === (t && t.ctor) : e === (t && t.ctor), ae = (e, t) => !!(a(e) && t && t.type === "f" && t.children && t.children.length === (e.children && e.children.length)), ye = (e, t) => !!(a(e) && t && t.type === "e" && t.tag === e.tag && t.children && t.children.length === (e.children && e.children.length)), G = (e, t) => !!(a(e) && t && t.type === e.type), Ce = (e, t) => !!(a(e) && t && t.type === e.type && (k(f((e.children || [])[0])) && k(f((t.children || [])[0])) || t.children && e.children && t.children.length === e.children.length)), f = (e) => e && e.compProps && e.compProps.key || e && e.props && e.props.key, h = (e) => e && ["f", "l"].includes(e), P = (e) => typeof e == "function" && !H(e) || typeof e == "object" && "resolve" in e, H = (e) => typeof e == "function" && e === _, ve = (e) => a(e) && !e.type, k = (e) => e != null, J = (e, t) => e === "style" && typeof t == "object", ke = (e, t) => e === "ref" && typeof t == "object", Re = (e, t) => {
   const n = Object.getOwnPropertyDescriptor(
     e.constructor.prototype,
     t
   );
   return n && n.get && n.set;
-}, Pe = (e) => E(e) ? "c" : P(e, "f") ? "f" : P(e, "e") ? "e" : P(e, "l") ? "l" : P(e, "t") ? "t" : "et", Ee = {
+}, Ee = (e) => P(e) ? "c" : E(e, "f") ? "f" : E(e, "e") ? "e" : E(e, "l") ? "l" : E(e, "t") ? "t" : "et", Pe = {
   c: he,
   l: Ce,
   t: G,
@@ -71,9 +71,9 @@ const Te = (e) => {
 }, Ue = (e) => {
   const { compKey: t } = e;
   if (t) {
-    const n = u.get(t), c = n && n.mts, r = n && n.upS;
-    y.value = t, r && (r.value = 0), c && (n.mts = [], c.forEach((s) => {
-      const o = s();
+    const n = u.get(t), c = n && n.mts, s = n && n.upS;
+    y.value = t, s && (s.value = 0), c && (n.mts = [], c.forEach((r) => {
+      const o = r();
       o && W(o);
     }));
   }
@@ -87,9 +87,9 @@ const Te = (e) => {
   const { compKey: t } = e;
   if (t) {
     const n = u.get(t), c = n && n.wdCB;
-    y.value = t, c && c.length > 0 && (n.wdCB = [], c.forEach((r) => {
-      const s = r();
-      s && typeof s == "function" && W(s);
+    y.value = t, c && c.length > 0 && (n.wdCB = [], c.forEach((s) => {
+      const r = s();
+      r && typeof r == "function" && W(r);
     }));
   }
 }, Y = (e, t = () => []) => {
@@ -97,23 +97,23 @@ const Te = (e) => {
   if (!n) return;
   const c = u.get(n);
   if (!c) return;
-  const { upD: r, upS: s } = c, o = r[s.value], l = t();
+  const { upD: s, upS: r } = c, o = s[r.value], l = t();
   if (o && Le(o, l)) {
-    const f = e();
-    f && c.upCB.push(f);
+    const p = e();
+    p && c.upCB.push(p);
   }
-  r[s.value] = l, s.value += 1;
+  s[r.value] = l, r.value += 1;
 }, Fe = (e) => {
   const { compKey: t } = e;
   if (t) {
-    const n = u.get(t), c = n && n.upCB, r = n && n.upS;
-    y.value = t, r && (r.value = 0), e.ctor && c && (n.upCB = [], c.forEach((s) => s()));
+    const n = u.get(t), c = n && n.upCB, s = n && n.upS;
+    y.value = t, s && (s.value = 0), e.ctor && c && (n.upCB = [], c.forEach((r) => r()));
   }
 }, Le = (e, t) => e.length ? e.some((n, c) => n !== t[c]) : !0, Ae = (e) => e === "className" ? "class" : e, ee = (e) => e.replace(/^on(.*)/, (t, n) => n.toLowerCase()), j = () => new DocumentFragment(), Z = (e) => document.createElement(e), Rt = (e, t, n, c) => {
   e.isRoot = !0, t = t || document.body, e.wrapElement = t;
-  const r = M(e, c);
-  return n ? (e.afterElement = n, t.insertBefore(r, n)) : c || (t.tagName === "HTML" ? t.replaceWith(r) : t.appendChild(r)), Q(), () => {
-    const s = u.get(e.compProps || {}), o = s && s.vd.value || e;
+  const s = M(e, c);
+  return n ? (e.afterElement = n, t.insertBefore(s, n)) : c || (t.tagName === "HTML" ? t.replaceWith(s) : t.appendChild(s)), Q(), () => {
+    const r = u.get(e.compProps || {}), o = r && r.vd.value || e;
     o !== e && x(o), N(o), Oe(o);
   };
 }, te = (e) => {
@@ -146,8 +146,8 @@ const Te = (e) => {
     const c = n.el && n.el.nodeType;
     if (c)
       if ([1, 3].includes(c)) {
-        const r = n.el;
-        r.tagName === "HTML" ? r.innerHTML = "" : r.remove();
+        const s = n.el;
+        s.tagName === "HTML" ? s.innerHTML = "" : s.remove();
       } else c === 11 && ce(n);
   });
 }, se = (e) => {
@@ -161,14 +161,14 @@ const Te = (e) => {
   t || (t = M(e));
   const n = i(e);
   if (n.type) {
-    const c = b(n), s = n.type === "l" && n.needRerender && n.needRerender !== "CNSU" ? L(n, i(n)) : L(e, n);
-    t && c && (e.tag !== "portal" && (s ? c.insertBefore(t, s) : c.appendChild(t)), Q());
+    const c = b(n), r = n.type === "l" && n.needRerender && n.needRerender !== "CNSU" ? L(n, i(n)) : L(e, n);
+    t && c && (e.tag !== "portal" && (r ? c.insertBefore(t, r) : c.appendChild(t)), Q());
   }
 }, re = (e) => h(e.type) ? (e && e.children || []).reduce((t, n) => {
   const c = re(n);
   return c && t.appendChild(c), t;
 }, j()) : e.el, L = (e, t) => {
-  const n = t.children || [], r = n.indexOf(e) + 1, s = n.slice(r), o = oe(s), l = t.type || "";
+  const n = t.children || [], s = n.indexOf(e) + 1, r = n.slice(s), o = oe(r), l = t.type || "";
   if (o)
     return o;
   if (!t.isRoot && h(l))
@@ -178,8 +178,8 @@ const Te = (e) => {
 }, oe = (e) => e.reduce(
   (t, n) => {
     if (t) return t;
-    const { type: c, el: r } = n;
-    return c && h(c) ? oe(n.children || []) : r && r.nodeType !== 11 ? r : t;
+    const { type: c, el: s } = n;
+    return c && h(c) ? oe(n.children || []) : s && s.nodeType !== 11 ? s : t;
   },
   void 0
 ), Qe = (e) => {
@@ -188,8 +188,8 @@ const Te = (e) => {
     if (n.nodeType === 11)
       se(e);
     else {
-      const c = b(t), r = M(e);
-      c && e.tag !== "portal" && c.replaceChild(r, n), Q();
+      const c = b(t), s = M(e);
+      c && e.tag !== "portal" && c.replaceChild(s, n), Q();
     }
 }, le = (e, t) => {
   R(e || {}).forEach(([n, c]) => {
@@ -213,100 +213,102 @@ const Te = (e) => {
 }, je = (e) => {
   e.el && (e.el.nodeValue = String(e.text));
 }, ue = (e, t, n, c) => {
-  const r = { ...n };
-  R(e || {}).forEach(([s, o]) => {
-    c && s.match(/^on/) ? $(
+  const s = { ...n };
+  R(e || {}).forEach(([r, o]) => {
+    c && r.match(/^on/) ? $(
       t,
-      s,
+      r,
       o,
-      r[s]
-    ) : (s === "key" || o === r[s] || s === "portal" && typeof o == "object" || (s === "innerHTML" && typeof o == "string" ? t.innerHTML = o : J(s, o) ? _e(
+      s[r]
+    ) : (r === "key" || o === s[r] || r === "portal" && typeof o == "object" || (r === "innerHTML" && typeof o == "string" ? t.innerHTML = o : J(r, o) ? _e(
       o,
-      J(s, r.style) ? r.style : {},
+      J(r, s.style) ? s.style : {},
       t
-    ) : ke(s, o) ? o.value = t : s.match(/^on/) ? $(
+    ) : ke(r, o) ? o.value = t : r.match(/^on/) ? $(
       t,
-      s,
+      r,
       o,
-      r[s]
-    ) : s && (s !== "type" && Re(t, s) ? t[s] = o : qe(
-      Ae(s),
+      s[r]
+    ) : r && (r !== "type" && Re(t, r) ? t[r] = o : qe(
+      Ae(r),
       t,
       o
-    ))), delete r[s]);
-  }), w(r).forEach(
-    (s) => t.removeAttribute(s)
+    ))), delete s[r]);
+  }), w(s).forEach(
+    (r) => t.removeAttribute(r)
   );
 }, qe = (e, t, n) => v.value && e !== "xmlns" ? t.setAttributeNS(null, e, n) : t.setAttribute(e, n), M = (e, t) => {
   let n;
-  const { type: c, tag: r, text: s, props: o, children: l = [] } = e, f = h(c);
-  return ge(e), r === "svg" && (v.value = String(o && o.xmlns)), t ? n = e.el : (f ? n = j() : c === "e" && r ? r === "portal" && o && o.portal ? n = o.portal : n = v.value ? document.createElementNS(v.value, r) : Z(r) : c === "t" && k(s) ? n = document.createTextNode(String(s)) : n = Z("e"), e.el = n), me(l, n, t), ue(o, n, null, t), Te(e), r === "svg" && (v.value = ""), n;
+  const { type: c, tag: s, text: r, props: o, children: l = [] } = e, p = h(c);
+  return ge(e), s === "svg" && (v.value = String(o && o.xmlns)), t ? n = e.el : (p ? n = j() : c === "e" && s ? s === "portal" && o && o.portal ? n = o.portal : n = v.value ? document.createElementNS(v.value, s) : Z(s) : c === "t" && k(r) ? n = document.createTextNode(String(r)) : n = Z("e"), e.el = n), me(l, n, t), ue(o, n, null, t), Te(e), s === "svg" && (v.value = ""), n;
 }, me = (e, t, n) => {
-  const c = e.reduce((r, s) => {
-    if (s.type) {
-      const o = M(s, n);
-      s.tag !== "portal" && !n && r.appendChild(o);
+  const c = e.reduce((s, r) => {
+    if (r.type) {
+      const o = M(r, n);
+      r.tag !== "portal" && !n && s.appendChild(o);
     }
-    return r;
+    return s;
   }, j());
   !n && t && c.hasChildNodes() && t.appendChild(c);
 }, $ = (e, t, n, c) => {
-  const r = ee(t);
-  c !== n && (c && e.removeEventListener(r, c), n && e.addEventListener(r, n));
+  const s = ee(t);
+  c !== n && (c && e.removeEventListener(s, c), n && e.addEventListener(s, n));
 }, _e = (e, t, n) => {
-  const c = { ...t }, r = (n instanceof HTMLElement, n), s = r == null ? void 0 : r.style;
-  s && (R(e).forEach(([o, l]) => {
-    s.setProperty(o, l), delete c[o];
-  }), R(c).forEach(([o]) => {
-    s.removeProperty(o);
-  }));
+  const c = { ...t }, s = n instanceof HTMLElement ? n : null, r = s == null ? void 0 : s.style;
+  if (!r) return;
+  const o = r;
+  R(e).forEach(([l, p]) => {
+    o[l] = p, delete c[l];
+  }), R(c).forEach(([l]) => {
+    o[l] = "";
+  });
 }, b = (e) => {
   const t = h(e.type);
   return e.isRoot && t ? e.wrapElement : t ? b(i(e)) : e.el;
 }, T = (e, t) => Ie(
   e,
-  Ee[Pe(e)](e, t),
+  Pe[Ee(e)](e, t),
   t
 ), Ie = (e, t, n) => {
-  const c = $e(e, t, n), r = Ge(
+  const c = $e(e, t, n), s = Ge(
     c,
     t,
     n
-  ), s = r === "N";
-  return s || (c.children = He(
+  ), r = s === "N";
+  return r || (c.children = He(
     c,
     t,
     n
-  )), c.needRerender = r, ze(c, n, r), !s && n && (n.isLegacy = !0, delete n.children), c;
+  )), c.needRerender = s, ze(c, n, s), !r && n && (n.isLegacy = !0, delete n.children), c;
 }, ze = (e, t, n) => {
   n !== "A" && t && (e.el = t.el), n && ["D", "R", "SR"].includes(n) && (t && (x(t), N(t)), e.oldChildren = t && t.children), e.oldProps = t && t.props;
 }, Ge = (e, t, n) => {
   if (ve(e)) return "D";
   if (e.type === "t" && t && e.text === (n && n.text) || e === n) return "N";
   if (!(n && n.type)) return "A";
-  const s = p(e), o = i(n), l = !e.isRoot && o && o.type === "l" && k(s);
-  let f = t ? l ? "SU" : "U" : l ? "SR" : "R";
-  return e.type === "l" && f === "U" && n && Je(e, n) && (f = "CNSU"), f;
+  const r = f(e), o = i(n), l = !e.isRoot && o && o.type === "l" && k(r);
+  let p = t ? l ? "SU" : "U" : l ? "SR" : "R";
+  return e.type === "l" && p === "U" && n && Je(e, n) && (p = "CNSU"), p;
 }, Je = (e, t) => {
   const n = [...t && t.children || []], c = [...e && e.children || []].filter(
-    (o) => n.find((l) => p(o) === p(l))
-  ), r = n.filter(
-    (o) => c.find((l) => p(o) === p(l))
+    (o) => n.find((l) => f(o) === f(l))
+  ), s = n.filter(
+    (o) => c.find((l) => f(o) === f(l))
   );
-  let s = r.length === c.length;
-  return s && (s = r.every(
-    (o, l) => p(o) === p(c[l])
-  )), s;
+  let r = s.length === c.length;
+  return r && (r = s.every(
+    (o, l) => f(o) === f(c[l])
+  )), r;
 }, Xe = (e, t) => {
   e && t !== e && (w(e).forEach((n) => delete e[n]), R(t || {}).forEach(([n, c]) => e[n] = c));
 }, Ye = (e, t) => {
   e && (e.splice(0, e.length), t && t.forEach((n) => e.push(n)));
 }, Ze = (e, t) => {
-  const { compProps: n, compChild: c } = e, { props: r, children: s } = t;
-  return n && Xe(n, r), c && s && c !== s && Ye(c, s), e.reRender && e.reRender();
-}, $e = (e, t, n) => E(e) ? t && n ? Ze(n, e) : e.resolve() : e, He = (e, t, n) => t && n ? Ke(e, n) : Ve(e), Ve = (e) => (e.children || []).map(
+  const { compProps: n, compChild: c } = e, { props: s, children: r } = t;
+  return n && Xe(n, s), c && r && c !== r && Ye(c, r), e.reRender && e.reRender();
+}, $e = (e, t, n) => P(e) ? t && n ? Ze(n, e) : e.resolve() : e, He = (e, t, n) => t && n ? Ke(e, n) : Ve(e), Ve = (e) => (e.children || []).map(
   (t) => S(T(t), { getParent: () => e })
-), Ke = (e, t) => e.type === "l" && k(p((e.children || [])[0])) ? we(e, t) : (e.children || []).map(
+), Ke = (e, t) => e.type === "l" && k(f((e.children || [])[0])) ? we(e, t) : (e.children || []).map(
   (n, c) => S(T(n, (t.children || [])[c]), {
     getParent: () => e
   })
@@ -315,17 +317,17 @@ const Te = (e) => {
     e,
     t
   );
-  return c.forEach((r) => {
-    x(r), N(r), q(r);
+  return c.forEach((s) => {
+    x(s), N(s), q(s);
   }), n;
 }, We = (e, t) => {
   const n = [...t.children || []];
-  return [(e.children || []).map((r) => {
-    const s = De(r, n), o = T(r, s);
-    return s && n.splice(n.indexOf(s), 1), o.getParent = () => e, o;
+  return [(e.children || []).map((s) => {
+    const r = De(s, n), o = T(s, r);
+    return r && n.splice(n.indexOf(r), 1), o.getParent = () => e, o;
   }), n];
 }, De = (e, t) => t.find(
-  (n) => p(n) === p(e)
+  (n) => f(n) === f(e)
 ), O = /* @__PURE__ */ new Map();
 let B = !1;
 const et = (e, t) => {
@@ -339,7 +341,7 @@ const et = (e, t) => {
   O.forEach((e) => {
     e();
   }), O.clear(), B = !1;
-}, Pt = (e, t = () => []) => {
+}, Et = (e, t = () => []) => {
   const n = C();
   if (!n) return;
   const c = u.get(n);
@@ -355,16 +357,16 @@ const et = (e, t) => {
   [d]: !0,
   children: t
 }), st = (e, t, ...n) => {
-  const c = { value: void 0 }, r = pe(c, n), s = lt(e, t || {}, r);
-  return E(s) || (c.value = s), s;
-}, Et = (e, t) => st("portal", { portal: t }, e), St = (e) => (t, n) => e, rt = (e, t, n) => {
-  const c = (r, s) => {
-    if (!(!r || s.has(r))) {
-      if (s.add(r), r.compChild) {
-        const o = r.compChild.indexOf(t);
-        o !== -1 && r.compChild.splice(o, 1, n);
+  const c = { value: void 0 }, s = pe(c, n), r = lt(e, t || {}, s);
+  return P(r) || (c.value = r), r;
+}, Pt = (e, t) => st("portal", { portal: t }, e), St = (e) => (t, n) => e, rt = (e, t, n) => {
+  const c = (s, r) => {
+    if (!(!s || r.has(s))) {
+      if (r.add(s), s.compChild) {
+        const o = s.compChild.indexOf(t);
+        o !== -1 && s.compChild.splice(o, 1, n);
       }
-      c(r.getParent ? r.getParent() : void 0, s);
+      c(s.getParent ? s.getParent() : void 0, r);
     }
   };
   c(e, /* @__PURE__ */ new Set());
@@ -372,17 +374,17 @@ const et = (e, t) => {
   if (c.isLegacy)
     return;
   g.value = !0;
-  const r = fe(e, t, n), s = T(r, c), { isRoot: o, getParent: l, wrapElement: f, afterElement: de } = c;
-  if (s.getParent = l, !o && l) {
+  const s = fe(e, t, n), r = T(s, c), { isRoot: o, getParent: l, wrapElement: p, afterElement: de } = c;
+  if (r.getParent = l, !o && l) {
     const U = l(), I = U && U.children || [], z = I.indexOf(c);
-    z !== -1 && I.splice(z, 1, s), rt(U, c, s);
+    z !== -1 && I.splice(z, 1, r), rt(U, c, r);
   } else
-    s.isRoot = !0, s.wrapElement = f, s.afterElement = de;
-  g.value = !1, te(s);
+    r.isRoot = !0, r.wrapElement = p, r.afterElement = de;
+  g.value = !1, te(r);
 }, lt = (e, t, n) => {
   if (H(e))
     return _(t, ...n);
-  if (E(e)) {
+  if (P(e)) {
     const c = fe(e, t, n);
     return g.value ? c : c.resolve();
   }
@@ -412,52 +414,52 @@ const et = (e, t) => {
   return e;
 }, pt = (e, t, n) => (c = t) => {
   Ne(c);
-  const r = e(t, n), o = (typeof r == "function" ? r : () => () => r)(
+  const s = e(t, n), o = (typeof s == "function" ? s : () => () => s)(
     tt(c),
     t,
     n
   );
   return ft(o, c, e, t, n);
 }, fe = (e, t, n) => {
-  const c = e.name, r = e, s = n, o = pt(e, t, s);
-  return { tagName: c, ctor: r, props: t, children: s, resolve: o };
-}, ft = (e, t, n, c, r) => {
-  const { wrappedComponentMaker: s, customNode: o } = ht(
+  const c = e.name, s = e, r = n, o = pt(e, t, r);
+  return { tagName: c, ctor: s, props: t, children: r, resolve: o };
+}, ft = (e, t, n, c, s) => {
+  const { wrappedComponentMaker: r, customNode: o } = ht(
     e,
     c
   ), l = it(
-    s,
+    r,
     t,
     n,
     c,
-    r
+    s
   );
-  return ie(o, t, n, c, r, l), o;
-}, it = (e, t, n, c, r) => {
-  const s = () => dt(e, t, n, c, r, s);
-  return s;
-}, dt = (e, t, n, c, r, s) => {
+  return ie(o, t, n, c, s, l), o;
+}, it = (e, t, n, c, s) => {
+  const r = () => dt(e, t, n, c, s, r);
+  return r;
+}, dt = (e, t, n, c, s, r) => {
   xe(t), ct();
   const o = e(c);
-  return ie(o, t, n, c, r, s), o;
+  return ie(o, t, n, c, s, r), o;
 }, ht = (e, t) => {
   let n = e(t);
   if (!n.reRender)
     return { wrappedComponentMaker: e, customNode: n };
-  const c = (r) => {
-    const s = e(r), o = _({}, s);
-    return s.getParent = () => o, o;
+  const c = (s) => {
+    const r = e(s), o = _({}, r);
+    return r.getParent = () => o, o;
   };
   return n = c(t), { wrappedComponentMaker: c, customNode: n };
-}, ie = (e, t, n, c, r, s) => {
+}, ie = (e, t, n, c, s, r) => {
   S(e, {
     compProps: c,
-    compChild: r,
+    compChild: s,
     ctor: n,
     tagName: n.name,
     compKey: t,
-    reRender: s
-  }), et(t, () => ot(n, c, r, e)), X(t, "vd") && (X(t, "vd").value = e);
+    reRender: r
+  }), et(t, () => ot(n, c, s, e)), X(t, "vd") && (X(t, "vd").value = e);
 }, xt = (e) => ({ value: e }), Nt = () => Promise.resolve();
 export {
   _ as Fragment,
@@ -472,11 +474,11 @@ export {
   vt as mountCallback,
   kt as mountReadyCallback,
   Nt as nextTick,
-  Et as portal,
+  Pt as portal,
   xt as ref,
   Rt as render,
   ot as replaceWDom,
   at as setComponentMapManualMode,
-  Pt as updateCallback
+  Et as updateCallback
 };
 //# sourceMappingURL=lithent.mjs.map