ddd-react 1.10.1 → 1.10.3

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { D as c, e as b, a as x, A as E, b as F, h as U, c as B } from "./h-BbaMkkC7.mjs";
+import { D as c, e as m, a as F, A as v, b as x, h as U, c as B } from "./h-BbaMkkC7.mjs";
 import { d as Pt, f as Ot } from "./h-BbaMkkC7.mjs";
-function m(e, t) {
+function b(e, t) {
   if (e === null || t === null || e === void 0 || t === void 0)
     return e === t;
   if (typeof e != typeof t)
@@ -14,7 +14,7 @@ function m(e, t) {
       if (e.length !== t.length)
         return !1;
       for (let n = 0; n < e.length; ++n)
-        if (!m(e[n], t[n]))
+        if (!b(e[n], t[n]))
           return !1;
       return !0;
     }
@@ -32,7 +32,7 @@ function m(e, t) {
         return !1;
     for (let n = 0; n < r.length; ++n) {
       const s = r[n];
-      if (!(s === "_owner" && e.$$typeof) && !m(e[s], t[s]))
+      if (!(s === "_owner" && e.$$typeof) && !b(e[s], t[s]))
         return !1;
     }
     return !0;
@@ -40,18 +40,18 @@ function m(e, t) {
   return !1;
 }
 function N(e, t, r, n = null) {
-  function s(o) {
-    const i = o;
-    n ? t.call(n, i) : t(i);
+  function s(i) {
+    const o = i;
+    n ? t.call(n, o) : t(o);
   }
   return r.addEventListener(e, s), s;
 }
 function I(e = {}, t, r = null) {
   const n = {};
-  return Object.entries(e).forEach(([s, o]) => {
+  return Object.entries(e).forEach(([s, i]) => {
     n[s] = N(
       s,
-      o,
+      i,
       t,
       r
     );
@@ -114,11 +114,11 @@ function J(e, t) {
 }
 function K(e, t) {
   const { class: r, style: n, ...s } = t;
-  r && W(e, r), n && Object.entries(n).forEach(([o, i]) => {
-    M(e, o, i);
+  r && W(e, r), n && Object.entries(n).forEach(([i, o]) => {
+    M(e, i, o);
   });
-  for (const [o, i] of Object.entries(s))
-    w(e, o, i);
+  for (const [i, o] of Object.entries(s))
+    w(e, i, o);
 }
 function W(e, t) {
   if (e instanceof SVGElement) {
@@ -199,13 +199,13 @@ function z(e, t, r) {
 }
 function Q(e, t, r, n) {
   const { children: s } = e;
-  e.el = t, s?.forEach((o, i) => {
-    h(o, t, r != null ? r + i : null, n);
+  e.el = t, s?.forEach((i, o) => {
+    h(i, t, r != null ? r + o : null, n);
   });
 }
 function Z(e, t, r, n) {
-  const { tag: s, children: o } = e, a = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
-  V(a, e, n), e.el = a, o?.forEach((f) => {
+  const { tag: s, children: i } = e, a = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
+  V(a, e, n), e.el = a, i?.forEach((f) => {
     h(f, a, null, n);
   }), L(a, t, r);
 }
@@ -214,8 +214,8 @@ function V(e, t, r) {
   n.ref && typeof n.ref == "object" && "current" in n.ref && (n.ref.current = e, delete n.ref), t.listeners = I(s, e, r), K(e, n);
 }
 function tt(e, t, r, n) {
-  const s = e.tag, { props: o } = A(e), i = new s(o, n);
-  i.mount(t, r), e.component = i, e.el = i.firstElement || null;
+  const s = e.tag, { props: i } = A(e), o = new s(i, n);
+  o.mount(t, r), e.component = o, e.el = o.firstElement || null;
 }
 function L(e, t, r) {
   if (r == null) {
@@ -239,16 +239,16 @@ function j(e, t) {
   if (e.type === c.ELEMENT) {
     const r = e, n = t, {
       tag: s,
-      props: { key: o }
+      props: { key: i }
     } = r, {
-      tag: i,
+      tag: o,
       props: { key: a }
     } = n;
-    return s === i && o === a;
+    return s === o && i === a;
   }
   if (e.type === c.COMPONENT) {
-    const r = e, n = t, { tag: s } = r, { tag: o } = n;
-    return s === o;
+    const r = e, n = t, { tag: s } = r, { tag: i } = n;
+    return s === i;
   }
   if (e.type === c.PORTAL) {
     const r = e, n = t;
@@ -257,22 +257,22 @@ function j(e, t) {
   return !0;
 }
 function S(e, t) {
-  const r = Object.keys(e), n = Object.keys(t), s = [], o = [];
-  for (const i of n)
-    i in e ? e[i] !== t[i] && o.push(i) : s.push(i);
+  const r = Object.keys(e), n = Object.keys(t), s = [], i = [];
+  for (const o of n)
+    o in e ? e[o] !== t[o] && i.push(o) : s.push(o);
   return {
     added: s,
-    removed: r.filter((i) => !(i in t)),
-    updated: o
+    removed: r.filter((o) => !(o in t)),
+    updated: i
   };
 }
 function rt(e) {
   return e !== "";
 }
-function T(e) {
+function C(e) {
   return rt(e.trim());
 }
-function v(e, t, r, n = null) {
+function y(e, t, r, n = null) {
   if (!j(e, t)) {
     const s = nt(r, e.el);
     return p(e), h(t, r, s, n), t;
@@ -307,23 +307,23 @@ function st(e, t) {
 function ot(e, t, r) {
   const n = e.el, {
     class: s,
-    style: o,
-    on: i,
+    style: i,
+    on: o,
     ...a
   } = e.props ?? {}, {
     class: f,
     style: u,
     on: l,
-    ...y
+    ...E
   } = t.props ?? {}, { listeners: g } = e;
-  it(n, a, y), ct(n, s, f), ut(
+  it(n, a, E), ct(n, s, f), ut(
     n,
-    o,
+    i,
     u
   ), t.listeners = at(
     n,
     g,
-    i ?? {},
+    o ?? {},
     l ?? {},
     r
   );
@@ -331,36 +331,36 @@ function ot(e, t, r) {
 function it(e, t = {}, r = {}) {
   const n = t.ref, s = r.ref;
   n !== s && (n && typeof n == "object" && "current" in n && (n.current = null), s && typeof s == "object" && "current" in s && (s.current = e));
-  const o = { ...t }, i = { ...r };
-  delete o.ref, delete i.ref;
-  const { added: a, removed: f, updated: u } = S(o, i);
+  const i = { ...t }, o = { ...r };
+  delete i.ref, delete o.ref;
+  const { added: a, removed: f, updated: u } = S(i, o);
   for (const l of f)
     D(e, l);
   for (const l of a.concat(u))
-    w(e, l, i[l]);
+    w(e, l, o[l]);
 }
 function ct(e, t, r) {
-  const n = k(t), s = k(r), { added: o, removed: i } = F(n, s);
-  i.length > 0 && e.classList.remove(...i), o.length > 0 && e.classList.add(...o);
+  const n = T(t), s = T(r), { added: i, removed: o } = x(n, s);
+  o.length > 0 && e.classList.remove(...o), i.length > 0 && e.classList.add(...i);
 }
-function k(e = "") {
-  return Array.isArray(e) ? e.filter(T) : String(e).split(/(\s+)/).filter(T);
+function T(e = "") {
+  return Array.isArray(e) ? e.filter(C) : String(e).split(/(\s+)/).filter(C);
 }
 function ut(e, t = {}, r = {}) {
-  const { added: n, removed: s, updated: o } = S(t, r);
-  for (const i of s)
-    J(e, i);
-  for (const i of n.concat(o))
-    M(e, i, r[i]);
+  const { added: n, removed: s, updated: i } = S(t, r);
+  for (const o of s)
+    J(e, o);
+  for (const o of n.concat(i))
+    M(e, o, r[o]);
 }
 function at(e, t = {}, r = {}, n = {}, s = null) {
-  const { removed: o, added: i, updated: a } = S(r, n);
-  for (const u of o.concat(a)) {
+  const { removed: i, added: o, updated: a } = S(r, n);
+  for (const u of i.concat(a)) {
     const l = t?.[u];
     l && e.removeEventListener(u, l);
   }
   const f = {};
-  for (const u of i.concat(a))
+  for (const u of o.concat(a))
     f[u] = N(
       u,
       n[u],
@@ -370,27 +370,27 @@ function at(e, t = {}, r = {}, n = {}, s = null) {
   return f;
 }
 function R(e, t, r) {
-  const n = b(e), s = b(t), o = e.el, i = x(n, s, j), a = r?.offset ?? 0;
-  for (const f of i)
-    if (f.op === E.NOOP) {
+  const n = m(e), s = m(t), i = e.el, o = F(n, s, j), a = r?.offset ?? 0;
+  for (const f of o)
+    if (f.op === v.NOOP) {
       const { originalIndex: u, index: l } = f;
-      v(n[u], s[l], o, r);
+      y(n[u], s[l], i, r);
     }
-  for (const f of i)
+  for (const f of o)
     switch (f.op) {
-      case E.MOVE: {
-        const { from: u, index: l } = f, y = n[u].el, g = o.childNodes[l + a];
-        y && (o.insertBefore(y, g), v(n[u], s[l], o, r));
+      case v.MOVE: {
+        const { from: u, index: l } = f, E = n[u].el, g = i.childNodes[l + a];
+        E && (i.insertBefore(E, g), y(n[u], s[l], i, r));
         break;
       }
-      case E.REMOVE: {
+      case v.REMOVE: {
         const { item: u } = f;
         p(u);
         break;
       }
-      case E.ADD: {
+      case v.ADD: {
         const { index: u, item: l } = f;
-        h(l, o, u + a, r);
+        h(l, i, u + a, r);
         break;
       }
     }
@@ -407,7 +407,7 @@ function lt(e, t, r) {
   R(e, t, r);
 }
 const ht = (e) => e.isProvider, dt = (e) => e.isConsumer;
-class C {
+class k {
   isMounted = !1;
   vdom = null;
   hostEl = null;
@@ -458,10 +458,10 @@ class C {
     return console.error("Uncaught error:", t, r), this.error = t, Promise.resolve();
   }
   shouldComponentUpdate(t, r) {
-    return m(t, r);
+    return b(t, r);
   }
   get elements() {
-    return this.vdom == null ? [] : this.vdom.type === c.FRAGMENT ? b(this.vdom).flatMap((t) => t.type === c.COMPONENT && t.component ? t.component.elements : t.el ? [t.el] : []) : this.vdom.el ? [this.vdom.el] : [];
+    return this.vdom == null ? [] : this.vdom.type === c.FRAGMENT ? m(this.vdom).flatMap((t) => t.type === c.COMPONENT && t.component ? t.component.elements : t.el ? [t.el] : []) : this.vdom.el ? [this.vdom.el] : [];
   }
   get firstElement() {
     return this.elements[0];
@@ -500,7 +500,7 @@ class C {
       d(() => this.willUpdate(this.props, this.state));
       try {
         const n = this.render();
-        this.vdom = v(this.vdom, n, this.hostEl, this), d(() => this.didUpdate(t, r));
+        this.vdom = y(this.vdom, n, this.hostEl, this), d(() => this.didUpdate(t, r));
       } catch (n) {
         this.handleError(n, "patch");
       }
@@ -536,12 +536,13 @@ class C {
     return this.constructor.defaultProps || {};
   }
   handleError(t, r) {
+    console.log("handleError");
     const n = this.findClosestErrorBoundary();
-    if (n && n.isMounted) {
-      const o = n.constructor;
-      if (o.getDerivedStateFromError) {
-        const i = o.getDerivedStateFromError(t);
-        n.state = { ...n.state, ...i };
+    if (console.log("errorBoundary", n), n && n.isMounted) {
+      const i = n.constructor;
+      if (i.getDerivedStateFromError) {
+        const o = i.getDerivedStateFromError(t);
+        n.state = { ...n.state, ...o };
       }
       if (n.didCatch(t, {
         phase: r,
@@ -549,16 +550,19 @@ class C {
         componentStack: this.getComponentStack()
       }), n.hostEl && n.vdom)
         try {
-          if (n.render())
+          const o = n.render();
+          if (o) {
+            y(n.vdom, o, n.hostEl, n);
             return;
-        } catch (i) {
-          console.error("Error during ErrorBoundary recovery:", i);
+          }
+        } catch (o) {
+          console.error("Error during ErrorBoundary recovery:", o);
         }
     }
     const s = this.constructor;
     if (s.getDerivedStateFromError) {
-      const o = s.getDerivedStateFromError(t);
-      this.state = { ...this.state, ...o };
+      const i = s.getDerivedStateFromError(t);
+      this.state = { ...this.state, ...i };
     }
     d(() => {
       if (this.didCatch(t, {
@@ -566,10 +570,10 @@ class C {
         componentStack: this.getComponentStack()
       }), this.hostEl && this.isMounted)
         try {
-          const o = this.render();
-          o && v(this.vdom, o, this.hostEl, this);
-        } catch (o) {
-          console.error("Error during error recovery render:", o);
+          const i = this.render();
+          i && y(this.vdom, i, this.hostEl, this);
+        } catch (i) {
+          console.error("Error during error recovery render:", i);
         }
     });
   }
@@ -590,18 +594,18 @@ class C {
     return null;
   }
   isErrorBoundary() {
-    return this.constructor.getDerivedStateFromError !== void 0;
+    return console.log("isErrorBoundary"), console.log("this.constructor as typeof Component", this.constructor), console.log("(this.constructor as typeof Component).getDerivedStateFromError", this.constructor.getDerivedStateFromError), this.constructor.getDerivedStateFromError !== void 0;
   }
 }
 function yt(e) {
-  class t extends C {
+  class t extends k {
     isProvider = !0;
     render() {
       let s = [];
       return Array.isArray(this.props.children) ? s = this.props.children : this.props.children ? s = [this.props.children] : s = [], U(s);
     }
   }
-  class r extends C {
+  class r extends k {
     static contextType = {
       Provider: t,
       defaultValue: e
@@ -642,7 +646,7 @@ function gt(e, t) {
   return B(r, t);
 }
 export {
-  C as Component,
+  k as Component,
   yt as createContext,
   gt as createPortal,
   vt as createRef,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddd-react",
-  "version": "1.10.1",
+  "version": "1.10.3",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "type-check": "tsc --noEmit",