ddd-react 1.10.0 → 1.10.1

package/dist/component.d.ts

@@ -45,4 +45,6 @@ export declare abstract class Component<P = {}, S = {}, C = null> {
     getDefaultProps(): P;
     private handleError;
     private getComponentStack;
+    private findClosestErrorBoundary;
+    isErrorBoundary(): boolean;
 }

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { D as c, e as b, a as x, A as E, b as U, h as F, c as I } from "./h-BbaMkkC7.mjs";
-import { d as mt, f as Ot } from "./h-BbaMkkC7.mjs";
-function P(e, t) {
+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 Pt, f as Ot } from "./h-BbaMkkC7.mjs";
+function m(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 P(e, t) {
       if (e.length !== t.length)
         return !1;
       for (let n = 0; n < e.length; ++n)
-        if (!P(e[n], t[n]))
+        if (!m(e[n], t[n]))
           return !1;
       return !0;
     }
@@ -32,32 +32,32 @@ function P(e, t) {
         return !1;
     for (let n = 0; n < r.length; ++n) {
       const s = r[n];
-      if (!(s === "_owner" && e.$$typeof) && !P(e[s], t[s]))
+      if (!(s === "_owner" && e.$$typeof) && !m(e[s], t[s]))
         return !1;
     }
     return !0;
   }
   return !1;
 }
-function S(e, t, r, n = null) {
-  function s(i) {
-    const o = i;
-    n ? t.call(n, o) : t(o);
+function N(e, t, r, n = null) {
+  function s(o) {
+    const i = o;
+    n ? t.call(n, i) : t(i);
   }
   return r.addEventListener(e, s), s;
 }
-function $(e = {}, t, r = null) {
+function I(e = {}, t, r = null) {
   const n = {};
-  return Object.entries(e).forEach(([s, i]) => {
-    n[s] = S(
+  return Object.entries(e).forEach(([s, o]) => {
+    n[s] = N(
       s,
-      i,
+      o,
       t,
       r
     );
   }), n;
 }
-function q(e = {}, t) {
+function $(e = {}, t) {
   Object.entries(e).forEach(([r, n]) => {
     t.removeEventListener(r, n);
   });
@@ -66,15 +66,15 @@ function p(e) {
   const { type: t } = e;
   switch (t) {
     case c.TEXT: {
-      G(e);
+      q(e);
       break;
     }
     case c.ELEMENT: {
-      _(e);
+      G(e);
       break;
     }
     case c.FRAGMENT: {
-      B(e);
+      _(e);
       break;
     }
     case c.COMPONENT: {
@@ -90,15 +90,15 @@ function p(e) {
   }
   delete e.el;
 }
-function G(e) {
+function q(e) {
   const { el: t } = e;
   t && t.remove();
 }
-function _(e) {
+function G(e) {
   const { el: t, children: r, listeners: n, props: s } = e;
-  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), t && t.remove(), r && r.forEach(p), n && t && (q(n, t), delete e.listeners);
+  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), t && t.remove(), r && r.forEach(p), n && t && ($(n, t), delete e.listeners);
 }
-function B(e) {
+function _(e) {
   const { children: t } = e;
   t && t.forEach(p);
 }
@@ -106,7 +106,7 @@ function X(e) {
   const { children: t } = e;
   t && t.forEach(p);
 }
-function C(e, t, r) {
+function M(e, t, r) {
   e.style[t] = r.toString();
 }
 function J(e, t) {
@@ -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(([i, o]) => {
-    C(e, i, o);
+  r && W(e, r), n && Object.entries(n).forEach(([o, i]) => {
+    M(e, o, i);
   });
-  for (const [i, o] of Object.entries(s))
-    w(e, i, o);
+  for (const [o, i] of Object.entries(s))
+    w(e, o, i);
 }
 function W(e, t) {
   if (e instanceof SVGElement) {
@@ -133,13 +133,13 @@ function w(e, t, r) {
 function D(e, t) {
   e[t] = null, e.removeAttribute(t);
 }
-let m = !1;
+let P = !1;
 const O = [];
 function d(e) {
   O.push(e), Y();
 }
 function Y() {
-  m || (m = !0, queueMicrotask(H));
+  P || (P = !0, queueMicrotask(H));
 }
 function H() {
   for (; O.length > 0; ) {
@@ -159,7 +159,7 @@ function H() {
       }
     );
   }
-  m = !1;
+  P = !1;
 }
 function A(e) {
   const { on: t = {}, ...r } = e.props;
@@ -199,23 +199,23 @@ function z(e, t, r) {
 }
 function Q(e, t, r, n) {
   const { children: s } = e;
-  e.el = t, s?.forEach((i, o) => {
-    h(i, t, r != null ? r + o : null, n);
+  e.el = t, s?.forEach((o, i) => {
+    h(o, t, r != null ? r + i : null, n);
   });
 }
 function Z(e, t, r, n) {
-  const { tag: s, children: i } = e, f = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
-  V(f, e, n), e.el = f, i?.forEach((a) => {
-    h(a, f, null, n);
-  }), L(f, t, r);
+  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) => {
+    h(f, a, null, n);
+  }), L(a, t, r);
 }
 function V(e, t, r) {
   const { props: n, events: s } = A(t);
-  n.ref && typeof n.ref == "object" && "current" in n.ref && (n.ref.current = e, delete n.ref), t.listeners = $(s, e, r), K(e, n);
+  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: i } = A(e), o = new s(i, n);
-  o.mount(t, r), e.component = o, e.el = o.firstElement || null;
+  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;
 }
 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: i }
+      props: { key: o }
     } = r, {
-      tag: o,
-      props: { key: f }
+      tag: i,
+      props: { key: a }
     } = n;
-    return s === o && i === f;
+    return s === i && o === a;
   }
   if (e.type === c.COMPONENT) {
-    const r = e, n = t, { tag: s } = r, { tag: i } = n;
-    return s === i;
+    const r = e, n = t, { tag: s } = r, { tag: o } = n;
+    return s === o;
   }
   if (e.type === c.PORTAL) {
     const r = e, n = t;
@@ -256,20 +256,20 @@ function j(e, t) {
   }
   return !0;
 }
-function T(e, t) {
-  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);
+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);
   return {
     added: s,
-    removed: r.filter((o) => !(o in t)),
-    updated: i
+    removed: r.filter((i) => !(i in t)),
+    updated: o
   };
 }
 function rt(e) {
   return e !== "";
 }
-function N(e) {
+function T(e) {
   return rt(e.trim());
 }
 function v(e, t, r, n = null) {
@@ -285,7 +285,7 @@ function v(e, t, r, n = null) {
       break;
     }
     case c.COMPONENT: {
-      at(e, t);
+      ft(e, t);
       break;
     }
     case c.PORTAL: {
@@ -307,23 +307,23 @@ function st(e, t) {
 function ot(e, t, r) {
   const n = e.el, {
     class: s,
-    style: i,
-    on: o,
-    ...f
+    style: o,
+    on: i,
+    ...a
   } = e.props ?? {}, {
-    class: a,
+    class: f,
     style: u,
     on: l,
     ...y
   } = t.props ?? {}, { listeners: g } = e;
-  it(n, f, y), ct(n, s, a), ut(
+  it(n, a, y), ct(n, s, f), ut(
     n,
-    i,
+    o,
     u
-  ), t.listeners = ft(
+  ), t.listeners = at(
     n,
     g,
-    o ?? {},
+    i ?? {},
     l ?? {},
     r
   );
@@ -331,71 +331,71 @@ 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 i = { ...t }, o = { ...r };
-  delete i.ref, delete o.ref;
-  const { added: f, removed: a, updated: u } = T(i, o);
-  for (const l of a)
+  const o = { ...t }, i = { ...r };
+  delete o.ref, delete i.ref;
+  const { added: a, removed: f, updated: u } = S(o, i);
+  for (const l of f)
     D(e, l);
-  for (const l of f.concat(u))
-    w(e, l, o[l]);
+  for (const l of a.concat(u))
+    w(e, l, i[l]);
 }
 function ct(e, t, r) {
-  const n = k(t), s = k(r), { added: i, removed: o } = U(n, s);
-  o.length > 0 && e.classList.remove(...o), i.length > 0 && e.classList.add(...i);
+  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);
 }
 function k(e = "") {
-  return Array.isArray(e) ? e.filter(N) : String(e).split(/(\s+)/).filter(N);
+  return Array.isArray(e) ? e.filter(T) : String(e).split(/(\s+)/).filter(T);
 }
 function ut(e, t = {}, r = {}) {
-  const { added: n, removed: s, updated: i } = T(t, r);
-  for (const o of s)
-    J(e, o);
-  for (const o of n.concat(i))
-    C(e, o, r[o]);
-}
-function ft(e, t = {}, r = {}, n = {}, s = null) {
-  const { removed: i, added: o, updated: f } = T(r, n);
-  for (const u of i.concat(f)) {
+  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]);
+}
+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 l = t?.[u];
     l && e.removeEventListener(u, l);
   }
-  const a = {};
-  for (const u of o.concat(f))
-    a[u] = S(
+  const f = {};
+  for (const u of i.concat(a))
+    f[u] = N(
       u,
       n[u],
       e,
       s
     );
-  return a;
+  return f;
 }
 function R(e, t, r) {
-  const n = b(e), s = b(t), i = e.el, o = x(n, s, j), f = r?.offset ?? 0;
-  for (const a of o)
-    if (a.op === E.NOOP) {
-      const { originalIndex: u, index: l } = a;
-      v(n[u], s[l], i, 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 { originalIndex: u, index: l } = f;
+      v(n[u], s[l], o, r);
     }
-  for (const a of o)
-    switch (a.op) {
+  for (const f of i)
+    switch (f.op) {
       case E.MOVE: {
-        const { from: u, index: l } = a, y = n[u].el, g = i.childNodes[l + f];
-        y && (i.insertBefore(y, g), v(n[u], s[l], i, r));
+        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));
         break;
       }
       case E.REMOVE: {
-        const { item: u } = a;
+        const { item: u } = f;
         p(u);
         break;
       }
       case E.ADD: {
-        const { index: u, item: l } = a;
-        h(l, i, u + f, r);
+        const { index: u, item: l } = f;
+        h(l, o, u + a, r);
         break;
       }
     }
 }
-function at(e, t) {
+function ft(e, t) {
   const { component: r } = e, { props: n } = A(t);
   r.updateProps(n), t.component = r, t.el = r.firstElement;
 }
@@ -407,7 +407,7 @@ function lt(e, t, r) {
   R(e, t, r);
 }
 const ht = (e) => e.isProvider, dt = (e) => e.isConsumer;
-class M {
+class C {
   isMounted = !1;
   vdom = null;
   hostEl = null;
@@ -458,7 +458,7 @@ class M {
     return console.error("Uncaught error:", t, r), this.error = t, Promise.resolve();
   }
   shouldComponentUpdate(t, r) {
-    return P(t, r);
+    return m(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] : [];
@@ -536,10 +536,29 @@ class M {
     return this.constructor.defaultProps || {};
   }
   handleError(t, r) {
-    const n = this.constructor;
-    if (n.getDerivedStateFromError) {
-      const s = n.getDerivedStateFromError(t);
-      this.state = { ...this.state, ...s };
+    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 (n.didCatch(t, {
+        phase: r,
+        failedComponent: this.constructor.name,
+        componentStack: this.getComponentStack()
+      }), n.hostEl && n.vdom)
+        try {
+          if (n.render())
+            return;
+        } catch (i) {
+          console.error("Error during ErrorBoundary recovery:", i);
+        }
+    }
+    const s = this.constructor;
+    if (s.getDerivedStateFromError) {
+      const o = s.getDerivedStateFromError(t);
+      this.state = { ...this.state, ...o };
     }
     d(() => {
       if (this.didCatch(t, {
@@ -547,10 +566,10 @@ class M {
         componentStack: this.getComponentStack()
       }), this.hostEl && this.isMounted)
         try {
-          const s = this.render();
-          s && v(this.vdom, s, this.hostEl, this);
-        } catch (s) {
-          console.error("Error during error recovery render:", s);
+          const o = this.render();
+          o && v(this.vdom, o, this.hostEl, this);
+        } catch (o) {
+          console.error("Error during error recovery render:", o);
         }
     });
   }
@@ -561,16 +580,28 @@ class M {
       t.push(r.constructor.name), r = r.parent;
     return t.reverse();
   }
+  findClosestErrorBoundary() {
+    let t = this.parent;
+    for (; t; ) {
+      if (t.isErrorBoundary())
+        return t;
+      t = t.parent;
+    }
+    return null;
+  }
+  isErrorBoundary() {
+    return this.constructor.getDerivedStateFromError !== void 0;
+  }
 }
 function yt(e) {
-  class t extends M {
+  class t extends C {
     isProvider = !0;
     render() {
       let s = [];
-      return Array.isArray(this.props.children) ? s = this.props.children : this.props.children ? s = [this.props.children] : s = [], F(s);
+      return Array.isArray(this.props.children) ? s = this.props.children : this.props.children ? s = [this.props.children] : s = [], U(s);
     }
   }
-  class r extends M {
+  class r extends C {
     static contextType = {
       Provider: t,
       defaultValue: e
@@ -608,15 +639,15 @@ function vt(e = null) {
 }
 function gt(e, t) {
   const r = Array.isArray(e) ? e : [e];
-  return I(r, t);
+  return B(r, t);
 }
 export {
-  M as Component,
+  C as Component,
   yt as createContext,
   gt as createPortal,
   vt as createRef,
-  mt as h,
-  F as hFragment,
+  Pt as h,
+  U as hFragment,
   Ot as hString,
   Et as render
 };

package/package.json

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