lithent 1.14.1 → 1.15.0

package/dist/diff.d.ts

@@ -1,2 +1,5 @@
 import { WDom, TagFunctionResolver } from './types';
+/**
+ * 원본 가상돔과 리랜더링을 위한 새로운 가상돔 diff 처리의 시작점
+ */
 export declare const makeNewWDomTree: (newWDom: WDom | TagFunctionResolver, originalWDom?: WDom) => WDom;

package/dist/lithent.mjs

@@ -1,32 +1,32 @@
-const R = (e) => typeof e == "object" && !("resolve" in e), N = (e, t) => R(e) && e.type === t, oe = (e, t) => "ctor" in e ? e.ctor === (t == null ? void 0 : t.ctor) : e === (t == null ? void 0 : t.ctor), de = (e, t) => {
+const R = (e) => typeof e == "object" && !("resolve" in e), a = (e, t) => R(e) && e.type === t, pe = (e, t) => "ctor" in e ? e.ctor === (t == null ? void 0 : t.ctor) : e === (t == null ? void 0 : t.ctor), he = (e, t) => {
   var s, c;
   return R(e) && (t == null ? void 0 : t.type) === "fragment" && ((s = t == null ? void 0 : t.children) == null ? void 0 : s.length) === ((c = e == null ? void 0 : e.children) == null ? void 0 : c.length);
-}, pe = (e, t) => {
+}, ie = (e, t) => {
   var s, c;
   return R(e) && (t == null ? void 0 : t.type) === "element" && (t == null ? void 0 : t.tag) === e.tag && ((s = t == null ? void 0 : t.children) == null ? void 0 : s.length) === ((c = e == null ? void 0 : e.children) == null ? void 0 : c.length);
-}, J = (e, t) => R(e) && (t == null ? void 0 : t.type) === e.type, he = (e, t) => {
+}, X = (e, t) => R(e) && (t == null ? void 0 : t.type) === e.type, ye = (e, t) => {
   var s, c;
   return R(e) && (t == null ? void 0 : t.type) === e.type && (E(o((e.children || [])[0])) && E(o(((t == null ? void 0 : t.children) || [])[0])) || ((s = t == null ? void 0 : t.children) == null ? void 0 : s.length) === ((c = e == null ? void 0 : e.children) == null ? void 0 : c.length));
 }, o = (e) => {
   var t, s;
   return ((t = e == null ? void 0 : e.compProps) == null ? void 0 : t.key) ?? ((s = e == null ? void 0 : e.props) == null ? void 0 : s.key);
-}, v = (e) => e && ["fragment", "loop"].includes(e), b = (e) => typeof e == "function" && !V(e) || typeof e == "object" && "resolve" in e, V = (e) => typeof e == "function" && e === H, K = (e) => R(e) && !e.type, E = (e) => e != null, X = (e, t) => e === "style" && typeof t == "object", ie = (e, t) => e === "ref" && typeof t == "object", ye = (e, t) => {
+}, C = (e) => e && ["fragment", "loop"].includes(e), T = (e) => typeof e == "function" && !g(e) || typeof e == "object" && "resolve" in e, g = (e) => typeof e == "function" && e === J, m = (e) => R(e) && !e.type, E = (e) => e != null, Y = (e, t) => e === "style" && typeof t == "object", ve = (e, t) => e === "ref" && typeof t == "object", Ce = (e, t) => {
   const s = Object.getOwnPropertyDescriptor(
     e.constructor.prototype,
     t
   );
   return s && s.get && s.set;
-}, Ce = (e) => {
+}, Re = (e) => {
   let t = "et";
-  return b(e) ? t = "c" : N(e, "fragment") ? t = "f" : N(e, "element") ? t = "e" : N(e, "loop") ? t = "l" : N(e, "text") ? t = "t" : K(e) && (t = "et"), t;
-}, ve = {
-  c: oe,
-  l: he,
-  t: J,
-  e: pe,
-  f: de,
-  et: J
-}, C = Symbol.for("lithentWDomSymbol"), k = { value: "" }, a = { value: {} }, M = { value: !1 }, f = /* @__PURE__ */ new WeakMap(), Re = (e) => {
+  return T(e) ? t = "c" : a(e, "fragment") ? t = "f" : a(e, "element") ? t = "e" : a(e, "loop") ? t = "l" : a(e, "text") ? t = "t" : m(e) && (t = "et"), t;
+}, ke = {
+  c: pe,
+  l: ye,
+  t: X,
+  e: ie,
+  f: he,
+  et: X
+}, v = Symbol.for("lithentWDomSymbol"), k = { value: "" }, S = { value: {} }, O = { value: !1 }, f = /* @__PURE__ */ new WeakMap(), Ee = (e) => {
   f.set(e, {
     vd: { value: null },
     up: () => {
@@ -38,131 +38,131 @@ const R = (e) => typeof e == "object" && !("resolve" in e), N = (e, t) => R(e) &
     mts: [],
     umts: []
   });
-}, S = () => a.value, ke = (e, t) => f.get(e)[t], Ee = (e) => a.value = e, Pe = (e) => {
-  a.value = e, Re(e);
-}, h = (e) => e.getParent && e.getParent(), P = Object.entries, g = Object.keys, T = Object.assign, lt = (e) => typeof e == "object" && !Object.getOwnPropertySymbols(e).includes(C), ae = (e) => {
-  f.get(S()).umts.push(e);
+}, x = () => S.value, Z = (e, t) => f.get(e) ? f.get(e)[t] : null, Pe = (e) => S.value = e, Se = (e) => {
+  S.value = e, Ee(e);
+}, i = (e) => e.getParent && e.getParent(), P = Object.entries, w = Object.keys, b = Object.assign, lt = (e) => typeof e == "object" && !Array.isArray(e) && !Object.getOwnPropertySymbols(e).includes(v), xe = (e) => {
+  f.get(x()).umts.push(e);
 }, U = (e) => {
   const { compKey: t } = e;
-  t && Se(t), m(e);
-}, m = (e) => {
+  t && Ne(t), W(e);
+}, W = (e) => {
   (e.children || []).forEach((t) => {
-    t.compKey ? U(t) : m(t);
+    t.compKey ? U(t) : W(t);
   });
-}, Se = (e) => {
+}, Ne = (e) => {
   const t = f.get(e);
   t && (t.umts.forEach((s) => s()), t.umts = [], f.delete(e));
 };
-let j = [];
+let Q = [];
 const I = () => {
-  j.forEach((e) => Ne(e)), j = [];
-}, xe = (e) => {
-  e.compKey && j.push(e);
-}, ft = (e) => f.get(S()).mts.push(e), Ne = (e) => {
+  Q.forEach((e) => Te(e)), Q = [];
+}, ae = (e) => {
+  e.compKey && Q.push(e);
+}, ft = (e) => f.get(x()).mts.push(e), Te = (e) => {
   const { compKey: t } = e;
   if (t) {
-    const s = f.get(t), c = s == null ? void 0 : s.mts, n = s == null ? void 0 : s.upS;
-    a.value = t, n && (n.value = 0), c && (s.mts = [], c.forEach((r) => {
-      const u = r();
-      u && ae(u);
+    const s = f.get(t), c = s == null ? void 0 : s.mts, r = s == null ? void 0 : s.upS;
+    S.value = t, r && (r.value = 0), c && (s.mts = [], c.forEach((n) => {
+      const u = n();
+      u && xe(u);
     }));
   }
-}, Y = (e, t = () => []) => {
-  const s = f.get(S()), { upD: c, upS: n } = s, r = c[n.value];
-  if (r && Te(r, t())) {
+}, H = (e, t = () => []) => {
+  const s = f.get(x()), { upD: c, upS: r } = s, n = c[r.value];
+  if (n && Ue(n, t())) {
     const u = e();
     u && s.upCB.push(u);
   }
-  c[n.value] = t(), n.value += 1;
+  c[r.value] = t(), r.value += 1;
 }, be = (e) => {
   const { compKey: t } = e;
   if (t) {
-    const s = f.get(t), c = s == null ? void 0 : s.upCB, n = s == null ? void 0 : s.upS;
-    a.value = t, n && (n.value = 0), e.ctor && c && (s.upCB = [], c.forEach((r) => r()));
+    const s = f.get(t), c = s == null ? void 0 : s.upCB, r = s == null ? void 0 : s.upS;
+    S.value = t, r && (r.value = 0), e.ctor && c && (s.upCB = [], c.forEach((n) => n()));
   }
-}, Te = (e, t) => e.length ? e.some((s, c) => s !== t[c]) : !0, Ue = (e) => e === "className" ? "class" : e, w = (e) => e.replace(/^on(.*)/, (t, s) => s.toLowerCase()), z = () => new DocumentFragment(), Z = (e) => document.createElement(e), ot = (e, t, s) => {
-  t ?? (t = document.body), e.isRoot = !0, e.wrapElement = t;
-  const c = L(e);
-  return s ? (e.afterElement = s, t.insertBefore(c, s)) : t.appendChild(c), I(), () => {
-    var r;
-    const n = (r = f.get(e.compProps || {})) == null ? void 0 : r.vd.value;
-    n && U(n), F(n || e), Fe(n || e);
+}, Ue = (e, t) => e.length ? e.some((s, c) => s !== t[c]) : !0, Fe = (e) => e === "className" ? "class" : e, D = (e) => e.replace(/^on(.*)/, (t, s) => s.toLowerCase()), z = () => new DocumentFragment(), V = (e) => document.createElement(e), ot = (e, t, s, c) => {
+  e.isRoot = !0, t ?? (t = document.body), e.wrapElement = t;
+  const r = L(e, c);
+  return s ? (e.afterElement = s, t.insertBefore(r, s)) : c || (t.tagName === "HTML" ? t.replaceWith(r) : t.appendChild(r)), I(), () => {
+    var u;
+    const n = (u = f.get(e.compProps || {})) == null ? void 0 : u.vd.value;
+    n && U(n), F(n || e), Le(n || e);
   };
-}, W = (e) => {
+}, ee = (e) => {
   const { needRerender: t } = e;
   t && t !== "N" && ({
     A: G,
     D: $,
-    R: Oe,
+    R: Me,
     U: B,
     CNSU: B,
-    SR: te,
-    SU: Le
+    SR: ce,
+    SU: Ae
   }[t](e), delete e.needRerender, delete e.oldChildren, delete e.oldProps);
 }, F = (e) => {
-  e.props && e.el && ne(e.props, e.el), (e.children || []).forEach((t) => {
+  e.props && e.el && ue(e.props, e.el), (e.children || []).forEach((t) => {
     F(t);
   });
-}, Fe = (e) => {
-  D(e, e.wrapElement);
+}, Le = (e) => {
+  te(e, e.wrapElement);
 }, $ = (e) => {
-  e.oldProps && e.el && ne(e.oldProps, e.el), D(
+  e.oldProps && e.el && ue(e.oldProps, e.el), te(
     e,
-    O(h(e))
+    A(i(e))
   );
-}, D = (e, t) => {
+}, te = (e, t) => {
   var s, c;
-  t && e.el && ([1, 3].includes((s = e.el) == null ? void 0 : s.nodeType) ? t.removeChild(e.el) : ((c = e.el) == null ? void 0 : c.nodeType) === 11 && ee(e, t), delete e.el);
-}, ee = (e, t) => {
+  t && e.el && ([1, 3].includes((s = e.el) == null ? void 0 : s.nodeType) ? t.removeChild(e.el) : ((c = e.el) == null ? void 0 : c.nodeType) === 11 && se(e), delete e.el);
+}, se = (e, t) => {
   ((e == null ? void 0 : e.oldChildren) || (e == null ? void 0 : e.children) || []).forEach((s) => {
-    var n;
-    const c = (n = s.el) == null ? void 0 : n.nodeType;
-    c && ([1, 3].includes(c) ? t.removeChild(s == null ? void 0 : s.el) : c === 11 && ee(s, t));
+    var r;
+    const c = (r = s.el) == null ? void 0 : r.nodeType;
+    c && ([1, 3].includes(c) ? s.el.tagName === "HTML" ? s.el.innerHTML = "" : s.el.remove() : c === 11 && se(s));
   });
-}, te = (e) => {
+}, ce = (e) => {
   $(e), G(e);
-}, Le = (e) => {
-  if (B(e), h(e).needRerender !== "CNSU") {
-    const s = se(e);
+}, Ae = (e) => {
+  if (B(e), i(e).needRerender !== "CNSU") {
+    const s = ne(e);
     G(e, s);
   }
 }, G = (e, t) => {
   t || (t = L(e));
-  const s = h(e);
+  const s = i(e);
   if (s.type) {
-    const c = O(s), r = s.type === "loop" && s.needRerender && s.needRerender !== "CNSU" ? Q(s, h(s)) : Q(e, s);
-    t && c && (e.tag !== "portal" && (r ? c.insertBefore(t, r) : c.appendChild(t)), I());
+    const c = A(s), n = s.type === "loop" && s.needRerender && s.needRerender !== "CNSU" ? j(s, i(s)) : j(e, s);
+    t && c && (e.tag !== "portal" && (n ? c.insertBefore(t, n) : c.appendChild(t)), I());
   }
-}, se = (e) => v(e.type) ? ((e == null ? void 0 : e.children) || []).reduce((t, s) => {
-  const c = se(s);
+}, ne = (e) => C(e.type) ? ((e == null ? void 0 : e.children) || []).reduce((t, s) => {
+  const c = ne(s);
   return c && t.appendChild(c), t;
-}, z()) : e.el, Q = (e, t) => {
-  const s = t.children || [], n = s.indexOf(e) + 1, r = s.slice(n), u = ce(r), l = t.type || "";
+}, z()) : e.el, j = (e, t) => {
+  const s = t.children || [], r = s.indexOf(e) + 1, n = s.slice(r), u = re(n), l = t.type || "";
   if (u)
     return u;
-  if (!t.isRoot && v(l))
-    return Q(t, h(t));
-  if (t.isRoot && v(l) && t.afterElement)
+  if (!t.isRoot && C(l))
+    return j(t, i(t));
+  if (t.isRoot && C(l) && t.afterElement)
     return t.afterElement;
-}, ce = (e) => e.reduce(
+}, re = (e) => e.reduce(
   (t, s) => {
-    const c = s.type, n = s.el, r = c && v(c);
-    return t || (r ? ce(s.children || []) : n && n.nodeType !== 11 ? n : t);
+    const c = s.type, r = s.el, n = c && C(c);
+    return t || (n ? re(s.children || []) : r && r.nodeType !== 11 ? r : t);
   },
   void 0
-), Oe = (e) => {
-  const t = h(e), s = e.el;
+), Me = (e) => {
+  const t = i(e), s = e.el;
   if (t.type && s)
     if (s.nodeType === 11)
-      te(e);
+      ce(e);
     else {
-      const c = O(t), n = L(e);
-      c && e.tag !== "portal" && c.replaceChild(n, s), I();
+      const c = A(t), r = L(e);
+      c && e.tag !== "portal" && c.replaceChild(r, s), I();
     }
-}, ne = (e, t) => {
+}, ue = (e, t) => {
   P(e || {}).forEach(([s, c]) => {
     s.match(/^on/) && t.removeEventListener(
-      w(s),
+      D(s),
       c
     );
   });
@@ -170,106 +170,111 @@ const I = () => {
   var s;
   const t = e.el;
   if (e.type === "text") {
-    Ae(e);
+    Oe(e);
     return;
   }
   if (t) {
-    const { oldProps: c, props: n } = e;
-    re(n, t, c), delete e.oldProps, e.tag === "input" && (t.value = String(((s = e == null ? void 0 : e.props) == null ? void 0 : s.value) || ""));
+    const { oldProps: c, props: r } = e;
+    le(r, t, c), delete e.oldProps, e.tag === "input" && (t.value = String(((s = e == null ? void 0 : e.props) == null ? void 0 : s.value) || ""));
   }
-  (e.children || []).forEach((c) => W(c)), be(e);
-}, Ae = (e) => {
+  (e.children || []).forEach((c) => ee(c)), be(e);
+}, Oe = (e) => {
   const t = e.el;
   t && (t.nodeValue = String(e.text));
-}, re = (e, t, s) => {
-  const c = { ...s };
-  P(e || {}).forEach(([n, r]) => {
-    n === "key" || r === c[n] || n === "portal" && typeof r == "object" || (n === "innerHTML" && typeof r == "string" ? t.innerHTML = r : X(n, r) ? Be(
-      r,
-      X(n, c.style) ? c.style : {},
+}, le = (e, t, s, c) => {
+  const r = { ...s };
+  P(e || {}).forEach(([n, u]) => {
+    c && n.match(/^on/) ? K(
+      t,
+      n,
+      u,
+      r[n]
+    ) : (n === "key" || u === r[n] || n === "portal" && typeof u == "object" || (n === "innerHTML" && typeof u == "string" ? t.innerHTML = u : Y(n, u) ? Be(
+      u,
+      Y(n, r.style) ? r.style : {},
       t
-    ) : ie(n, r) ? r.value = t : n.match(/^on/) ? Qe(
+    ) : ve(n, u) ? u.value = t : n.match(/^on/) ? K(
       t,
       n,
-      r,
-      c[n]
-    ) : n && (n !== "type" && ye(t, n) ? t[n] = r : Me(
-      Ue(n),
+      u,
+      r[n]
+    ) : n && (n !== "type" && Ce(t, n) ? t[n] = u : Qe(
+      Fe(n),
       t,
-      r
-    ))), delete c[n];
-  }), g(c).forEach(
+      u
+    ))), delete r[n]);
+  }), w(r).forEach(
     (n) => t.removeAttribute(n)
   );
-}, Me = (e, t, s) => {
+}, Qe = (e, t, s) => {
   k.value && e !== "xmlns" ? t.setAttributeNS(null, e, s) : t.setAttribute(e, s);
-}, L = (e) => {
-  let t;
-  const { type: s, tag: c, text: n, props: r, children: u = [] } = e, l = v(s);
-  return c === "svg" && (k.value = String(r == null ? void 0 : r.xmlns)), l ? t = z() : s === "element" && c ? c === "portal" && (r != null && r.portal) ? t = r.portal : t = k.value ? document.createElementNS(k.value, c) : Z(c) : s === "text" && E(n) ? t = document.createTextNode(String(n)) : t = Z("e"), je(u, t), re(r, t), e.el = t, xe(e), c === "svg" && (k.value = ""), t;
-}, je = (e, t) => {
-  const s = e.reduce(
-    (c, n) => {
+}, L = (e, t) => {
+  let s;
+  const { type: c, tag: r, text: n, props: u, children: l = [] } = e, p = C(c);
+  return r === "svg" && (k.value = String(u == null ? void 0 : u.xmlns)), t ? s = e.el : (p ? s = z() : c === "element" && r ? r === "portal" && (u != null && u.portal) ? s = u.portal : s = k.value ? document.createElementNS(k.value, r) : V(r) : c === "text" && E(n) ? s = document.createTextNode(String(n)) : s = V("e"), e.el = s), je(l, s, t), le(u, s, null, t), ae(e), r === "svg" && (k.value = ""), s;
+}, je = (e, t, s) => {
+  const c = e.reduce(
+    (r, n) => {
       if (n.type) {
-        const r = L(n);
-        n.tag !== "portal" && c.appendChild(r);
+        const u = L(n, s);
+        n.tag !== "portal" && !s && r.appendChild(u);
       }
-      return c;
+      return r;
     },
     z()
   );
-  t && s.hasChildNodes() && t.appendChild(s);
-}, Qe = (e, t, s, c) => {
-  const n = w(t);
-  c !== s && (c && e.removeEventListener(n, c), s && e.addEventListener(n, s));
+  !s && t && c.hasChildNodes() && t.appendChild(c);
+}, K = (e, t, s, c) => {
+  const r = D(t);
+  c !== s && (c && e.removeEventListener(r, c), s && e.addEventListener(r, s));
 }, Be = (e, t, s) => {
-  const c = { ...t }, n = s == null ? void 0 : s.style;
-  n && (P(e).forEach(([r, u]) => {
-    n[r] = u, delete c[r];
+  const c = { ...t }, r = s == null ? void 0 : s.style;
+  r && (P(e).forEach(([n, u]) => {
+    r[n] = u, delete c[n];
   }), P(c).forEach(
-    ([r]) => n[r] = ""
+    ([n]) => r[n] = ""
   ));
-}, O = (e) => {
-  const t = v(e.type);
-  return e.isRoot && t ? e.wrapElement : t ? O(h(e)) : e.el;
-}, A = (e, t) => qe(
+}, A = (e) => {
+  const t = C(e.type);
+  return e.isRoot && t ? e.wrapElement : t ? A(i(e)) : e.el;
+}, M = (e, t) => qe(
   e,
-  ve[Ce(e)](e, t),
+  ke[Re(e)](e, t),
   t
 ), qe = (e, t, s) => {
-  const c = Je(e, t, s), n = [
+  const c = Xe(e, t, s), r = [
     c,
     t,
     s
-  ], r = Ie(...n), u = r === "N";
-  return u || (c.children = Xe(...n)), c.needRerender = r, _e(c, s, r), !u && s && (s.isLegacy = !0, delete s.children), c;
+  ], n = Ie(...r), u = n === "N";
+  return u || (c.children = Ye(...r)), c.needRerender = n, _e(c, s, n), !u && s && (s.isLegacy = !0, delete s.children), c;
 }, _e = (e, t, s) => {
   s !== "A" && t && (e.el = t.el), s && ["D", "R", "SR"].includes(s) && (t && (U(t), F(t)), e.oldChildren = t == null ? void 0 : t.children), e.oldProps = t == null ? void 0 : t.props;
 }, Ie = (e, t, s) => {
-  const c = s && s.type, n = K(e), r = e.isRoot, u = s && h(s), l = !r && (u == null ? void 0 : u.type), i = o(e), p = l === "loop" && E(i), y = e.type === "text" && t && e.text === (s == null ? void 0 : s.text), x = e === s;
+  const c = s && s.type, r = m(e), n = e.isRoot, u = s && i(s), l = !n && (u == null ? void 0 : u.type), p = o(e), h = l === "loop" && E(p), y = e.type === "text" && t && e.text === (s == null ? void 0 : s.text), N = e === s;
   let d;
-  return n ? d = "D" : y || x ? d = "N" : c ? t ? d = p ? "SU" : "U" : d = p ? "SR" : "R" : d = "A", e.type === "loop" && d === "U" && s && ze(e, s) && (d = "CNSU"), d;
+  return r ? d = "D" : y || N ? d = "N" : c ? t ? d = h ? "SU" : "U" : d = h ? "SR" : "R" : d = "A", e.type === "loop" && d === "U" && s && ze(e, s) && (d = "CNSU"), d;
 }, ze = (e, t) => {
   const s = [...(t == null ? void 0 : t.children) || []], c = [...(e == null ? void 0 : e.children) || []].filter(
     (u) => s.find((l) => o(u) === o(l))
-  ), n = s.filter(
+  ), r = s.filter(
     (u) => c.find((l) => o(u) === o(l))
   );
-  let r = n.length === c.length;
-  return r && (r = n.every(
+  let n = r.length === c.length;
+  return n && (n = r.every(
     (u, l) => o(u) === o(c[l])
-  )), r;
+  )), n;
 }, $e = (e, t) => {
-  e && t !== e && (g(e).forEach((s) => delete e[s]), P(t || {}).forEach(([s, c]) => e[s] = c));
+  e && t !== e && (w(e).forEach((s) => delete e[s]), P(t || {}).forEach(([s, c]) => e[s] = c));
 }, Ge = (e, t) => {
   e && t !== e && (e.splice(0, e.length), t && t.forEach((s) => e.push(s)));
-}, He = (e, t) => {
-  const { compProps: s, compChild: c } = e, { props: n, children: r } = t;
-  return s && $e(s, n), c && Ge(c, r), e.reRender && e.reRender();
-}, Je = (e, t, s) => b(e) ? t && s ? He(s, e) : e.resolve() : e, Xe = (e, t, s) => t && s ? Ze(e, s) : Ye(e), Ye = (e) => (e.children || []).map(
-  (t) => T(A(t), { getParent: () => e })
-), Ze = (e, t) => e.type === "loop" && E(o((e.children || [])[0])) ? Ve(e, t) : (e.children || []).map(
-  (s, c) => T(A(s, (t.children || [])[c]), {
+}, Je = (e, t) => {
+  const { compProps: s, compChild: c } = e, { props: r, children: n } = t;
+  return s && $e(s, r), c && Ge(c, n), e.reRender && e.reRender();
+}, Xe = (e, t, s) => T(e) ? t && s ? Je(s, e) : e.resolve() : e, Ye = (e, t, s) => t && s ? He(e, s) : Ze(e), Ze = (e) => (e.children || []).map(
+  (t) => b(M(t), { getParent: () => e })
+), He = (e, t) => e.type === "loop" && E(o((e.children || [])[0])) ? Ve(e, t) : (e.children || []).map(
+  (s, c) => b(M(s, (t.children || [])[c]), {
     getParent: () => e
   })
 ), Ve = (e, t) => {
@@ -277,13 +282,13 @@ const I = () => {
     e,
     t
   );
-  return c.forEach((n) => {
-    U(n), F(n), $(n);
+  return c.forEach((r) => {
+    U(r), F(r), $(r);
   }), s;
 }, Ke = (e, t) => {
   const s = [...e.children || []], c = [...t.children || []];
-  return [s.map((r) => {
-    const u = ge(r, c), l = A(r, u);
+  return [s.map((n) => {
+    const u = ge(n, c), l = M(n, u);
     return u && c.splice(c.indexOf(u), 1), l.getParent = () => e, l;
   }), c];
 }, ge = (e, t) => t.find(
@@ -291,9 +296,9 @@ const I = () => {
 ), q = /* @__PURE__ */ new Map();
 let _ = !1;
 const me = (e, t) => {
-  f.get(e).up = () => {
+  f.get(e) && (f.get(e).up = () => {
     q.set(e, t), _ || (_ = !0, queueMicrotask(We));
-  };
+  });
 }, we = (e) => () => {
   var c;
   const t = (c = f.get(e)) == null ? void 0 : c.up;
@@ -304,105 +309,105 @@ const me = (e, t) => {
     e();
   }), q.clear(), _ = !1;
 }, dt = (e, t = () => []) => {
-  f.get(S()).upR.push(() => Y(e, t)), Y(e, t);
+  f.get(x()).upR.push(() => H(e, t)), H(e, t);
 }, De = () => {
   var t;
-  const e = (t = f.get(S())) == null ? void 0 : t.upR;
+  const e = (t = f.get(x())) == null ? void 0 : t.upR;
   e != null && e.length && e.forEach((s) => s());
-}, H = (e, ...t) => ({
+}, J = (e, ...t) => ({
   type: "fragment",
-  [C]: !0,
+  [v]: !0,
   children: t
 }), et = (e, t, ...s) => {
-  const c = { value: void 0 }, n = t || {}, r = fe(c, s), u = rt(e, n, r);
-  return b(u) || (c.value = u), u;
+  const c = { value: void 0 }, r = t || {}, n = de(c, s), u = rt(e, r, n);
+  return T(u) || (c.value = u), u;
 }, pt = (e, t) => et("portal", { portal: t }, e), ht = (e) => (t, s) => e, tt = (e, t, s, c) => {
   var y;
   if (c.isLegacy)
     return;
-  M.value = !0;
-  const n = ue(e, t, s), r = A(n, c), { isRoot: u, getParent: l, wrapElement: i, afterElement: p } = c;
-  if (r.getParent = l, !u && l) {
-    const x = ((y = l()) == null ? void 0 : y.children) || [], d = x.indexOf(c);
-    x.splice(d, 1, r);
+  O.value = !0;
+  const r = fe(e, t, s), n = M(r, c), { isRoot: u, getParent: l, wrapElement: p, afterElement: h } = c;
+  if (n.getParent = l, !u && l) {
+    const N = ((y = l()) == null ? void 0 : y.children) || [], d = N.indexOf(c);
+    N.splice(d, 1, n);
   } else
-    r.isRoot = !0, r.wrapElement = i, r.afterElement = p;
-  M.value = !1, W(r);
-}, ue = (e, t, s) => ({ tagName: e.name, ctor: e, props: t, children: s, resolve: (u = t) => {
-  Pe(u);
-  const i = e(t, s)(we(u), t, s);
+    n.isRoot = !0, n.wrapElement = p, n.afterElement = h;
+  O.value = !1, ee(n);
+}, fe = (e, t, s) => ({ tagName: e.name, ctor: e, props: t, children: s, resolve: (u = t) => {
+  Se(u);
+  const p = e(t, s)(we(u), t, s);
   return st(
-    i,
+    p,
     u,
     e,
     t,
     s
   );
-} }), st = (e, t, s, c, n) => {
-  let r = e, u = e(c);
-  u.reRender && (r = (i) => {
-    const p = e(i), y = H({}, p);
-    return p.getParent = () => y, y;
-  }, u = r(c));
+} }), st = (e, t, s, c, r) => {
+  let n = e, u = e(c);
+  u.reRender && (n = (p) => {
+    const h = e(p), y = J({}, h);
+    return h.getParent = () => y, y;
+  }, u = n(c));
   const l = ct(
-    r,
+    n,
     t,
     s,
     c,
-    n
+    r
   );
-  return le(u, t, s, c, n, l), u;
-}, ct = (e, t, s, c, n) => {
-  const r = () => nt(e, t, s, c, n, r);
-  return r;
-}, nt = (e, t, s, c, n, r) => {
-  Ee(t), De();
+  return oe(u, t, s, c, r, l), u;
+}, ct = (e, t, s, c, r) => {
+  const n = () => nt(e, t, s, c, r, n);
+  return n;
+}, nt = (e, t, s, c, r, n) => {
+  Pe(t), De();
   const u = e(c);
-  return le(u, t, s, c, n, r), u;
-}, le = (e, t, s, c, n, r) => {
-  T(e, {
+  return oe(u, t, s, c, r, n), u;
+}, oe = (e, t, s, c, r, n) => {
+  b(e, {
     compProps: c,
-    compChild: n,
+    compChild: r,
     ctor: s,
     tagName: s.name,
     compKey: t,
-    reRender: r
+    reRender: n
   }), me(
     t,
-    () => tt(s, c, n, e)
-  ), ke(t, "vd").value = e;
+    () => tt(s, c, r, e)
+  ), Z(t, "vd") && (Z(t, "vd").value = e);
 }, rt = (e, t, s) => {
-  if (V(e))
-    return H(t, ...s);
-  if (b(e)) {
-    const c = ue(e, t, s);
-    return M.value ? c : c.resolve();
+  if (g(e))
+    return J(t, ...s);
+  if (T(e)) {
+    const c = fe(e, t, s);
+    return O.value ? c : c.resolve();
   }
   return {
     type: "element",
-    [C]: !0,
+    [v]: !0,
     tag: e,
     props: t,
     children: s
   };
-}, fe = (e, t) => t.map(
-  (s) => T(ut(s), { getParent: () => e.value })
+}, de = (e, t) => t.map(
+  (s) => b(ut(s), { getParent: () => e.value })
 ), ut = (e) => {
   if (e == null || e === !1)
-    return { type: null, [C]: !0 };
+    return { type: null, [v]: !0 };
   if (Array.isArray(e)) {
-    const t = { value: void 0 }, s = fe(t, e), c = {
+    const t = { value: void 0 }, s = de(t, e), c = {
       type: "loop",
-      [C]: !0,
+      [v]: !0,
       children: s
     };
     return t.value = c, c;
   } else if (typeof e == "string" || typeof e == "number")
-    return { type: "text", [C]: !0, text: e };
+    return { type: "text", [v]: !0, text: e };
   return e;
 }, it = (e) => ({ value: e }), yt = () => Promise.resolve();
 export {
-  H as Fragment,
+  J as Fragment,
   et as h,
   lt as isPropType,
   ht as mount,