ddd-react 1.7.0 → 1.7.2

package/dist/component.d.ts

@@ -21,11 +21,11 @@ export declare abstract class Component<P = {}, S = {}, C = null> {
         consumer: Consumer<C>;
     }): void;
     notify(): void;
-    onMount(): void | Promise<void>;
-    onUnmount(): void | Promise<void>;
-    onWillUpdate(nextProps: P, nextState: S): void | Promise<void>;
-    onUpdate(prevProps: P, prevState: S): void | Promise<void>;
-    onWillUnmount(): void | Promise<void>;
+    didMount(): void | Promise<void>;
+    willUpdate(nextProps: P, nextState: S): void | Promise<void>;
+    didUpdate(prevProps: P, prevState: S): void | Promise<void>;
+    willUnmount(): void | Promise<void>;
+    didUnmount(): void | Promise<void>;
     abstract render(): VDOMNode;
     get elements(): HTMLElement[];
     get firstElement(): HTMLElement | undefined;

package/dist/index.mjs

@@ -13,8 +13,8 @@ function g(t, e) {
     if (Array.isArray(t)) {
       if (t.length !== e.length)
         return !1;
-      for (let r = 0; r < t.length; ++r)
-        if (!g(t[r], e[r]))
+      for (let n = 0; n < t.length; ++n)
+        if (!g(t[n], e[n]))
           return !1;
       return !0;
     }
@@ -24,14 +24,14 @@ function g(t, e) {
       return t.valueOf() === e.valueOf();
     if (t.toString !== Object.prototype.toString)
       return t.toString() === e.toString();
-    const n = Object.keys(t);
-    if (n.length !== Object.keys(e).length)
+    const r = Object.keys(t);
+    if (r.length !== Object.keys(e).length)
       return !1;
-    for (let r = 0; r < n.length; ++r)
-      if (!Object.prototype.hasOwnProperty.call(e, n[r]))
+    for (let n = 0; n < r.length; ++n)
+      if (!Object.prototype.hasOwnProperty.call(e, r[n]))
         return !1;
-    for (let r = 0; r < n.length; ++r) {
-      const s = n[r];
+    for (let n = 0; n < r.length; ++n) {
+      const s = r[n];
       if (!(s === "_owner" && t.$$typeof) && !g(t[s], e[s]))
         return !1;
     }
@@ -39,27 +39,27 @@ function g(t, e) {
   }
   return !1;
 }
-function S(t, e, n, r = null) {
+function S(t, e, r, n = null) {
   function s(i) {
     const o = i;
-    r ? e.call(r, o) : e(o);
+    n ? e.call(n, o) : e(o);
   }
-  return n.addEventListener(t, s), s;
+  return r.addEventListener(t, s), s;
 }
-function $(t = {}, e, n = null) {
-  const r = {};
+function $(t = {}, e, r = null) {
+  const n = {};
   return Object.entries(t).forEach(([s, i]) => {
-    r[s] = S(
+    n[s] = S(
       s,
       i,
       e,
-      n
+      r
     );
-  }), r;
+  }), n;
 }
 function q(t = {}, e) {
-  Object.entries(t).forEach(([n, r]) => {
-    e.removeEventListener(n, r);
+  Object.entries(t).forEach(([r, n]) => {
+    e.removeEventListener(r, n);
   });
 }
 function h(t) {
@@ -70,11 +70,11 @@ function h(t) {
       break;
     }
     case c.ELEMENT: {
-      W(t);
+      _(t);
       break;
     }
     case c.FRAGMENT: {
-      _(t);
+      B(t);
       break;
     }
     case c.COMPONENT: {
@@ -82,7 +82,7 @@ function h(t) {
       break;
     }
     case c.PORTAL: {
-      B(t);
+      X(t);
       break;
     }
     default:
@@ -94,43 +94,43 @@ function G(t) {
   const { el: e } = t;
   e && e.remove();
 }
-function W(t) {
-  const { el: e, children: n, listeners: r, props: s } = t;
-  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), e && e.remove(), n && n.forEach(h), r && e && (q(r, e), delete t.listeners);
-}
 function _(t) {
+  const { el: e, children: r, listeners: n, props: s } = t;
+  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), e && e.remove(), r && r.forEach(h), n && e && (q(n, e), delete t.listeners);
+}
+function B(t) {
   const { children: e } = t;
   e && e.forEach(h);
 }
-function B(t) {
+function X(t) {
   const { children: e } = t;
   e && e.forEach(h);
 }
-function C(t, e, n) {
-  t.style[e] = n.toString();
+function C(t, e, r) {
+  t.style[e] = r.toString();
 }
-function X(t, e) {
+function J(t, e) {
   t.style[e] = null;
 }
-function J(t, e) {
-  const { class: n, style: r, ...s } = e;
-  n && K(t, n), r && Object.entries(r).forEach(([i, o]) => {
+function K(t, e) {
+  const { class: r, style: n, ...s } = e;
+  r && W(t, r), n && Object.entries(n).forEach(([i, o]) => {
     C(t, i, o);
   });
   for (const [i, o] of Object.entries(s))
-    L(t, i, o);
+    w(t, i, o);
 }
-function K(t, e) {
+function W(t, e) {
   if (t instanceof SVGElement) {
     t.removeAttribute("class"), typeof e == "string" ? t.setAttribute("class", e) : Array.isArray(e) && t.classList.add(...e);
     return;
   }
   t.className = "", typeof e == "string" ? t.className = e : Array.isArray(e) && t.classList.add(...e);
 }
-function L(t, e, n) {
-  n == null ? w(t, e) : t.setAttribute(e, String(n));
+function w(t, e, r) {
+  r == null ? L(t, e) : t.setAttribute(e, String(r));
 }
-function w(t, e) {
+function L(t, e) {
   t[e] = null, t.removeAttribute(e);
 }
 let P = !1;
@@ -147,141 +147,141 @@ function H() {
     let e;
     try {
       e = t();
-    } catch (n) {
-      console.error(`[scheduler]: ${n}`);
+    } catch (r) {
+      console.error(`[scheduler]: ${r}`);
       continue;
     }
     Promise.resolve(e).then(
       () => {
       },
-      (n) => {
-        console.error(`[scheduler]: ${n}`);
+      (r) => {
+        console.error(`[scheduler]: ${r}`);
       }
     );
   }
   P = !1;
 }
 function A(t) {
-  const { on: e = {}, ...n } = t.props;
-  return delete n.key, { props: n, events: e };
+  const { on: e = {}, ...r } = t.props;
+  return delete r.key, { props: r, events: e };
 }
-function p(t, e, n = null, r = null) {
+function p(t, e, r = null, n = null) {
   switch (t.type) {
     case c.TEXT: {
-      z(t, e, n);
+      z(t, e, r);
       break;
     }
     case c.ELEMENT: {
-      Z(t, e, n, r);
+      Z(t, e, r, n);
       break;
     }
     case c.FRAGMENT: {
-      Q(t, e, n, r);
+      Q(t, e, r, n);
       break;
     }
     case c.COMPONENT: {
-      ee(t, e, n, r);
+      ee(t, e, r, n);
       const s = t.component;
-      s && d(() => s.onMount());
+      s && d(() => s.didMount());
       break;
     }
     case c.PORTAL: {
-      te(t, r);
+      te(t, n);
       break;
     }
     default:
       throw new Error(`Can't mount DOM of type: ${t.type}`);
   }
 }
-function z(t, e, n) {
-  const { value: r } = t, s = document.createTextNode(r);
-  t.el = s, j(s, e, n);
+function z(t, e, r) {
+  const { value: n } = t, s = document.createTextNode(n);
+  t.el = s, j(s, e, r);
 }
-function Q(t, e, n, r) {
+function Q(t, e, r, n) {
   const { children: s } = t;
   t.el = e, s?.forEach((i, o) => {
-    p(i, e, n != null ? n + o : null, r);
+    p(i, e, r != null ? r + o : null, n);
   });
 }
-function Z(t, e, n, r) {
+function Z(t, e, r, n) {
   const { tag: s, children: i } = t, u = s === "svg" || e instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
-  V(u, t, r), t.el = u, i?.forEach((l) => {
-    p(l, u, null, r);
-  }), j(u, e, n);
+  V(u, t, n), t.el = u, i?.forEach((l) => {
+    p(l, u, null, n);
+  }), j(u, e, r);
 }
-function V(t, e, n) {
-  const { props: r, events: s } = A(e);
-  r.ref && typeof r.ref == "object" && "current" in r.ref && (r.ref.current = t, delete r.ref), e.listeners = $(s, t, n), J(t, r);
+function V(t, e, r) {
+  const { props: n, events: s } = A(e);
+  n.ref && typeof n.ref == "object" && "current" in n.ref && (n.ref.current = t, delete n.ref), e.listeners = $(s, t, r), K(t, n);
 }
-function ee(t, e, n, r) {
-  const s = t.tag, { props: i } = A(t), o = new s(i, r);
-  o.mount(e, n), t.component = o, t.el = o.firstElement || null;
+function ee(t, e, r, n) {
+  const s = t.tag, { props: i } = A(t), o = new s(i, n);
+  o.mount(e, r), t.component = o, t.el = o.firstElement || null;
 }
-function j(t, e, n) {
-  if (n == null) {
+function j(t, e, r) {
+  if (r == null) {
     e.append(t);
     return;
   }
-  if (n < 0)
-    throw new Error(`Index must be a positive integer, got ${n}`);
-  const r = e.childNodes;
-  n >= r.length ? e.append(t) : e.insertBefore(t, r[n]);
+  if (r < 0)
+    throw new Error(`Index must be a positive integer, got ${r}`);
+  const n = e.childNodes;
+  r >= n.length ? e.append(t) : e.insertBefore(t, n[r]);
 }
 function te(t, e) {
-  const { children: n, container: r } = t;
-  n?.forEach((s) => {
-    p(s, r, null, e);
+  const { children: r, container: n } = t;
+  r?.forEach((s) => {
+    p(s, n, null, e);
   });
 }
 function D(t, e) {
   if (t.type !== e.type)
     return !1;
   if (t.type === c.ELEMENT) {
-    const n = t, r = e, {
+    const r = t, n = e, {
       tag: s,
       props: { key: i }
-    } = n, {
+    } = r, {
       tag: o,
       props: { key: u }
-    } = r;
+    } = n;
     return s === o && i === u;
   }
   if (t.type === c.COMPONENT) {
-    const n = t, r = e, { tag: s } = n, { tag: i } = r;
+    const r = t, n = e, { tag: s } = r, { tag: i } = n;
     return s === i;
   }
   if (t.type === c.PORTAL) {
-    const n = t, r = e;
-    return n.container === r.container;
+    const r = t, n = e;
+    return r.container === n.container;
   }
   return !0;
 }
 function T(t, e) {
-  const n = Object.keys(t), r = Object.keys(e), s = [], i = [];
-  for (const o of r)
+  const r = Object.keys(t), n = Object.keys(e), s = [], i = [];
+  for (const o of n)
     o in t ? t[o] !== e[o] && i.push(o) : s.push(o);
   return {
     added: s,
-    removed: n.filter((o) => !(o in e)),
+    removed: r.filter((o) => !(o in e)),
     updated: i
   };
 }
-function ne(t) {
+function re(t) {
   return t !== "";
 }
 function N(t) {
-  return ne(t.trim());
+  return re(t.trim());
 }
-function m(t, e, n, r = null) {
+function m(t, e, r, n = null) {
   if (!D(t, e)) {
-    const s = re(n, t.el);
-    return h(t), p(e, n, s, r), e;
+    const s = ne(r, t.el);
+    return h(t), p(e, r, s, n), e;
   }
   switch (e.el = t.el, e.type) {
     case c.TEXT:
       return se(t, e), e;
     case c.ELEMENT: {
-      oe(t, e, r);
+      oe(t, e, n);
       break;
     }
     case c.COMPONENT: {
@@ -289,23 +289,23 @@ function m(t, e, n, r = null) {
       break;
     }
     case c.PORTAL: {
-      ae(t, e, r);
+      ae(t, e, n);
       break;
     }
   }
-  return R(t, e, r), e;
+  return R(t, e, n), e;
 }
-function re(t, e) {
+function ne(t, e) {
   if (!e) return null;
-  const n = Array.from(t.childNodes).indexOf(e);
-  return n < 0 ? null : n;
+  const r = Array.from(t.childNodes).indexOf(e);
+  return r < 0 ? null : r;
 }
 function se(t, e) {
-  const n = t.el, { value: r } = t, { value: s } = e;
-  r !== s && n && (n.nodeValue = s);
+  const r = t.el, { value: n } = t, { value: s } = e;
+  n !== s && r && (r.nodeValue = s);
 }
-function oe(t, e, n) {
-  const r = t.el, {
+function oe(t, e, r) {
+  const n = t.el, {
     class: s,
     style: i,
     on: o,
@@ -316,45 +316,45 @@ function oe(t, e, n) {
     on: a,
     ...y
   } = e.props ?? {}, { listeners: b } = t;
-  ie(r, u, y), ce(r, s, l), fe(
-    r,
+  ie(n, u, y), ce(n, s, l), fe(
+    n,
     i,
     f
   ), e.listeners = ue(
-    r,
+    n,
     b,
     o ?? {},
     a ?? {},
-    n
+    r
   );
 }
-function ie(t, e = {}, n = {}) {
-  const r = e.ref, s = n.ref;
-  r !== s && (r && typeof r == "object" && "current" in r && (r.current = null), s && typeof s == "object" && "current" in s && (s.current = t));
-  const i = { ...e }, o = { ...n };
+function ie(t, e = {}, r = {}) {
+  const n = e.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 = t));
+  const i = { ...e }, o = { ...r };
   delete i.ref, delete o.ref;
   const { added: u, removed: l, updated: f } = T(i, o);
   for (const a of l)
-    w(t, a);
+    L(t, a);
   for (const a of u.concat(f))
-    L(t, a, o[a]);
+    w(t, a, o[a]);
 }
-function ce(t, e, n) {
-  const r = M(e), s = M(n), { added: i, removed: o } = U(r, s);
+function ce(t, e, r) {
+  const n = M(e), s = M(r), { added: i, removed: o } = U(n, s);
   o.length > 0 && t.classList.remove(...o), i.length > 0 && t.classList.add(...i);
 }
 function M(t = "") {
   return Array.isArray(t) ? t.filter(N) : String(t).split(/(\s+)/).filter(N);
 }
-function fe(t, e = {}, n = {}) {
-  const { added: r, removed: s, updated: i } = T(e, n);
+function fe(t, e = {}, r = {}) {
+  const { added: n, removed: s, updated: i } = T(e, r);
   for (const o of s)
-    X(t, o);
-  for (const o of r.concat(i))
-    C(t, o, n[o]);
+    J(t, o);
+  for (const o of n.concat(i))
+    C(t, o, r[o]);
 }
-function ue(t, e = {}, n = {}, r = {}, s = null) {
-  const { removed: i, added: o, updated: u } = T(n, r);
+function ue(t, e = {}, r = {}, n = {}, s = null) {
+  const { removed: i, added: o, updated: u } = T(r, n);
   for (const f of i.concat(u)) {
     const a = e?.[f];
     a && t.removeEventListener(f, a);
@@ -363,24 +363,24 @@ function ue(t, e = {}, n = {}, r = {}, s = null) {
   for (const f of o.concat(u))
     l[f] = S(
       f,
-      r[f],
+      n[f],
       t,
       s
     );
   return l;
 }
-function R(t, e, n) {
-  const r = v(t), s = v(e), i = t.el, o = x(r, s, D), u = n?.offset ?? 0;
+function R(t, e, r) {
+  const n = v(t), s = v(e), i = t.el, o = x(n, s, D), u = r?.offset ?? 0;
   for (const l of o)
     if (l.op === E.NOOP) {
       const { originalIndex: f, index: a } = l;
-      m(r[f], s[a], i, n);
+      m(n[f], s[a], i, r);
     }
   for (const l of o)
     switch (l.op) {
       case E.MOVE: {
-        const { from: f, index: a } = l, y = r[f].el, b = i.childNodes[a + u];
-        y && (i.insertBefore(y, b), m(r[f], s[a], i, n));
+        const { from: f, index: a } = l, y = n[f].el, b = i.childNodes[a + u];
+        y && (i.insertBefore(y, b), m(n[f], s[a], i, r));
         break;
       }
       case E.REMOVE: {
@@ -390,21 +390,21 @@ function R(t, e, n) {
       }
       case E.ADD: {
         const { index: f, item: a } = l;
-        p(a, i, f + u, n);
+        p(a, i, f + u, r);
         break;
       }
     }
 }
 function le(t, e) {
-  const { component: n } = t, { props: r } = A(e);
-  n.updateProps(r), e.component = n, e.el = n.firstElement;
+  const { component: r } = t, { props: n } = A(e);
+  r.updateProps(n), e.component = r, e.el = r.firstElement;
 }
-function ae(t, e, n) {
+function ae(t, e, r) {
   if (t.container !== e.container) {
-    h(t), p(e, document.body, null, n);
+    h(t), p(e, document.body, null, r);
     return;
   }
-  R(t, e, n);
+  R(t, e, r);
 }
 const pe = (t) => t.isProvider, he = (t) => t.isConsumer;
 class k {
@@ -419,15 +419,15 @@ class k {
   subscribedProvider = null;
   isProvider = !1;
   isConsumer = !1;
-  constructor(e = {}, n) {
-    this.props = e, this.parent = n;
+  constructor(e = {}, r) {
+    this.props = e, this.parent = r;
   }
   addDependency({ consumer: e }) {
-    this.dependencies.some((n) => n.consumer === e) || (this.dependencies.push({ consumer: e }), e.subscribedProvider = this);
+    this.dependencies.some((r) => r.consumer === e) || (this.dependencies.push({ consumer: e }), e.subscribedProvider = this);
   }
   removeDependency({ consumer: e }) {
-    const n = this.dependencies.findIndex((r) => r.consumer === e);
-    n !== -1 && (this.dependencies.splice(n, 1), e.subscribedProvider = null);
+    const r = this.dependencies.findIndex((n) => n.consumer === e);
+    r !== -1 && (this.dependencies.splice(r, 1), e.subscribedProvider = null);
   }
   notify() {
     d(() => {
@@ -436,19 +436,19 @@ class k {
       });
     });
   }
-  onMount() {
+  didMount() {
     return Promise.resolve();
   }
-  onUnmount() {
+  willUpdate(e, r) {
     return Promise.resolve();
   }
-  onWillUpdate(e, n) {
+  didUpdate(e, r) {
     return Promise.resolve();
   }
-  onUpdate(e, n) {
+  willUnmount() {
     return Promise.resolve();
   }
-  onWillUnmount() {
+  didUnmount() {
     return Promise.resolve();
   }
   get elements() {
@@ -461,45 +461,45 @@ class k {
     return this.vdom?.type === c.FRAGMENT && this.hostEl && this.firstElement ? Array.from(this.hostEl.children).indexOf(this.firstElement) : 0;
   }
   updateProps(e) {
-    const n = { ...this.props, ...e }, r = this.props;
-    this.props = n;
+    const r = { ...this.props, ...e }, n = this.props;
+    this.props = r;
     const s = this.updateContext();
-    g(r, n) && !s || (pe(this) && this.notify(), this.patch(r, this.state));
+    g(n, r) && !s || (pe(this) && this.notify(), this.patch(n, this.state));
   }
   setState(e) {
-    const n = this.state;
+    const r = this.state;
     typeof e == "function" ? this.state = {
       ...this.state,
       ...e(this.state, this.props)
-    } : this.state = { ...this.state, ...e }, this.patch(this.props, n);
+    } : this.state = { ...this.state, ...e }, this.patch(this.props, r);
   }
-  mount(e, n = null) {
+  mount(e, r = null) {
     if (this.isMounted)
       throw new Error("Component is already mounted");
-    he(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext(), this.vdom = this.render(), p(this.vdom, e, n, this), this.hostEl = e, this.isMounted = !0;
+    he(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext(), this.vdom = this.render(), p(this.vdom, e, r, this), this.hostEl = e, this.isMounted = !0;
   }
   unmount() {
-    this.isMounted && (d(() => this.onWillUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: e }) => {
+    this.isMounted && (d(() => this.willUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: e }) => {
       e.subscribedProvider = null;
-    }), this.dependencies = [], this.vdom && h(this.vdom), d(() => this.onUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1);
+    }), this.dependencies = [], this.vdom && h(this.vdom), d(() => this.didUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1);
   }
-  patch(e, n) {
+  patch(e, r) {
     if (!this.isMounted || !this.hostEl || !this.vdom)
       return;
-    d(() => this.onWillUpdate(this.props, this.state));
-    const r = this.render();
-    this.vdom = m(this.vdom, r, this.hostEl, this), d(() => this.onUpdate(e, n));
+    d(() => this.willUpdate(this.props, this.state));
+    const n = this.render();
+    this.vdom = m(this.vdom, n, this.hostEl, this), d(() => this.didUpdate(e, r));
   }
   updateContext() {
     const e = Object.getPrototypeOf(this).constructor.contextType;
-    let n = this.parent;
+    let r = this.parent;
     if (e != null) {
-      for (; n; ) {
-        if (Object.getPrototypeOf(n).constructor === e.Provider)
-          return this.context = n.props.value, !0;
-        n = n.parent;
+      for (; r; ) {
+        if (Object.getPrototypeOf(r).constructor === e.Provider)
+          return this.context = r.props.value, !0;
+        r = r.parent;
       }
-      n == null && (this.context = e.defaultValue);
+      r == null && (this.context = e.defaultValue);
     }
     return !1;
   }
@@ -507,13 +507,13 @@ class k {
     const e = Object.getPrototypeOf(this).constructor.contextType;
     if (!e)
       return;
-    let n = this.parent;
-    for (; n; ) {
-      if (Object.getPrototypeOf(n).constructor === e.Provider) {
-        n.addDependency({ consumer: this });
+    let r = this.parent;
+    for (; r; ) {
+      if (Object.getPrototypeOf(r).constructor === e.Provider) {
+        r.addDependency({ consumer: this });
         break;
       }
-      n = n.parent;
+      r = r.parent;
     }
   }
 }
@@ -525,7 +525,7 @@ function ye(t) {
       return Array.isArray(this.props.children) ? s = this.props.children : this.props.children ? s = [this.props.children] : s = [], F(s);
     }
   }
-  class n extends k {
+  class r extends k {
     static contextType = {
       Provider: e,
       defaultValue: t
@@ -547,7 +547,7 @@ function ye(t) {
   }
   return {
     Provider: e,
-    Consumer: n,
+    Consumer: r,
     defaultValue: t
   };
 }
@@ -562,8 +562,8 @@ function be(t = null) {
   };
 }
 function ve(t, e) {
-  const n = Array.isArray(t) ? t : [t];
-  return I(n, e);
+  const r = Array.isArray(t) ? t : [t];
+  return I(r, e);
 }
 export {
   k as Component,

package/package.json

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