ddd-react 1.5.0 → 1.6.0

package/dist/component.d.ts

@@ -10,7 +10,9 @@ export declare abstract class Component<P = {}, S = ComponentState, ContextValue
     dependencies: {
         consumer: Component;
     }[];
-    subscribedProvider: Component | null;
+    subscribedProvider: Component<{
+        value: any;
+    }> | null;
     isProvider: boolean;
     isConsumer: boolean;
     constructor(props: P, parentComponent: Component | null);

package/dist/index.mjs

@@ -13,8 +13,8 @@ function g(e, t) {
     if (Array.isArray(e)) {
       if (e.length !== t.length)
         return !1;
-      for (let r = 0; r < e.length; ++r)
-        if (!g(e[r], t[r]))
+      for (let n = 0; n < e.length; ++n)
+        if (!g(e[n], t[n]))
           return !1;
       return !0;
     }
@@ -24,14 +24,14 @@ function g(e, t) {
       return e.valueOf() === t.valueOf();
     if (e.toString !== Object.prototype.toString)
       return e.toString() === t.toString();
-    const n = Object.keys(e);
-    if (n.length !== Object.keys(t).length)
+    const r = Object.keys(e);
+    if (r.length !== Object.keys(t).length)
       return !1;
-    for (let r = 0; r < n.length; ++r)
-      if (!Object.prototype.hasOwnProperty.call(t, n[r]))
+    for (let n = 0; n < r.length; ++n)
+      if (!Object.prototype.hasOwnProperty.call(t, 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" && e.$$typeof) && !g(e[s], t[s]))
         return !1;
     }
@@ -39,27 +39,27 @@ function g(e, t) {
   }
   return !1;
 }
-function S(e, t, n, r = null) {
-  function s(o) {
-    const i = o;
-    r ? t.call(r, i) : t(i);
+function S(e, t, r, n = null) {
+  function s(i) {
+    const o = i;
+    n ? t.call(n, o) : t(o);
   }
-  return n.addEventListener(e, s), s;
+  return r.addEventListener(e, s), s;
 }
-function $(e = {}, t, n = null) {
-  const r = {};
-  return Object.entries(e).forEach(([s, o]) => {
-    r[s] = S(
+function $(e = {}, t, r = null) {
+  const n = {};
+  return Object.entries(e).forEach(([s, i]) => {
+    n[s] = S(
       s,
-      o,
+      i,
       t,
-      n
+      r
     );
-  }), r;
+  }), n;
 }
 function q(e = {}, t) {
-  Object.entries(e).forEach(([n, r]) => {
-    t.removeEventListener(n, r);
+  Object.entries(e).forEach(([r, n]) => {
+    t.removeEventListener(r, n);
   });
 }
 function p(e) {
@@ -95,8 +95,8 @@ function G(e) {
   t && t.remove();
 }
 function W(e) {
-  const { el: t, children: n, listeners: r, props: s } = e;
-  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), t && t.remove(), n && n.forEach(p), r && t && (q(r, t), delete e.listeners);
+  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);
 }
 function B(e) {
   const { children: t } = e;
@@ -106,19 +106,19 @@ function X(e) {
   const { children: t } = e;
   t && t.forEach(p);
 }
-function C(e, t, n) {
-  e.style[t] = n.toString();
+function C(e, t, r) {
+  e.style[t] = r.toString();
 }
 function _(e, t) {
   e.style[t] = null;
 }
 function J(e, t) {
-  const { class: n, style: r, ...s } = t;
-  n && K(e, n), r && Object.entries(r).forEach(([o, i]) => {
-    C(e, o, i);
+  const { class: r, style: n, ...s } = t;
+  r && K(e, r), n && Object.entries(n).forEach(([i, o]) => {
+    C(e, i, o);
   });
-  for (const [o, i] of Object.entries(s))
-    L(e, o, i);
+  for (const [i, o] of Object.entries(s))
+    L(e, i, o);
 }
 function K(e, t) {
   if (e instanceof SVGElement) {
@@ -127,8 +127,8 @@ function K(e, t) {
   }
   e.className = "", typeof t == "string" ? e.className = t : Array.isArray(t) && e.classList.add(...t);
 }
-function L(e, t, n) {
-  n == null ? w(e, t) : e.setAttribute(t, String(n));
+function L(e, t, r) {
+  r == null ? w(e, t) : e.setAttribute(t, String(r));
 }
 function w(e, t) {
   e[t] = null, e.removeAttribute(t);
@@ -147,276 +147,276 @@ function H() {
     let t;
     try {
       t = e();
-    } catch (n) {
-      console.error(`[scheduler]: ${n}`);
+    } catch (r) {
+      console.error(`[scheduler]: ${r}`);
       continue;
     }
     Promise.resolve(t).then(
       () => {
       },
-      (n) => {
-        console.error(`[scheduler]: ${n}`);
+      (r) => {
+        console.error(`[scheduler]: ${r}`);
       }
     );
   }
   P = !1;
 }
 function A(e) {
-  const { on: t = {}, ...n } = e.props;
-  return delete n.key, { props: n, events: t };
+  const { on: t = {}, ...r } = e.props;
+  return delete r.key, { props: r, events: t };
 }
-function h(e, t, n = null, r = null) {
+function h(e, t, r = null, n = null) {
   switch (e.type) {
     case c.TEXT: {
-      z(e, t, n);
+      z(e, t, r);
       break;
     }
     case c.ELEMENT: {
-      Z(e, t, n, r);
+      Z(e, t, r, n);
       break;
     }
     case c.FRAGMENT: {
-      Q(e, t, n, r);
+      Q(e, t, r, n);
       break;
     }
     case c.COMPONENT: {
-      tt(e, t, n, r);
+      tt(e, t, r, n);
       const s = e.component;
       s && E(() => s.onMount());
       break;
     }
     case c.PORTAL: {
-      et(e, r);
+      et(e, n);
       break;
     }
     default:
       throw new Error(`Can't mount DOM of type: ${e.type}`);
   }
 }
-function z(e, t, n) {
-  const { value: r } = e, s = document.createTextNode(r);
-  e.el = s, j(s, t, n);
+function z(e, t, r) {
+  const { value: n } = e, s = document.createTextNode(n);
+  e.el = s, j(s, t, r);
 }
-function Q(e, t, n, r) {
+function Q(e, t, r, n) {
   const { children: s } = e;
-  e.el = t, s?.forEach((o, i) => {
-    h(o, t, n != null ? n + i : null, r);
+  e.el = t, s?.forEach((i, o) => {
+    h(i, t, r != null ? r + o : null, n);
   });
 }
-function Z(e, t, n, r) {
-  const { tag: s, children: o } = e, f = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
-  V(f, e, r), e.el = f, o?.forEach((l) => {
-    h(l, f, null, r);
-  }), j(f, t, 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);
+  }), j(f, t, r);
 }
-function V(e, t, n) {
-  const { props: r, events: s } = A(t);
-  r.ref && typeof r.ref == "object" && "current" in r.ref && (r.ref.current = e, delete r.ref), t.listeners = $(s, e, n), J(e, 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), J(e, n);
 }
-function tt(e, t, n, r) {
-  const s = e.tag, { props: o } = A(e), i = new s(o, r);
-  i.mount(t, n), e.component = i, e.el = i.firstElement || null;
+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;
 }
-function j(e, t, n) {
-  if (n == null) {
+function j(e, t, r) {
+  if (r == null) {
     t.append(e);
     return;
   }
-  if (n < 0)
-    throw new Error(`Index must be a positive integer, got ${n}`);
-  const r = t.childNodes;
-  n >= r.length ? t.append(e) : t.insertBefore(e, r[n]);
+  if (r < 0)
+    throw new Error(`Index must be a positive integer, got ${r}`);
+  const n = t.childNodes;
+  r >= n.length ? t.append(e) : t.insertBefore(e, n[r]);
 }
 function et(e, t) {
-  const { children: n, container: r } = e;
-  n?.forEach((s) => {
-    h(s, r, null, t);
+  const { children: r, container: n } = e;
+  r?.forEach((s) => {
+    h(s, n, null, t);
   });
 }
 function D(e, t) {
   if (e.type !== t.type)
     return !1;
   if (e.type === c.ELEMENT) {
-    const n = e, r = t, {
+    const r = e, n = t, {
       tag: s,
-      props: { key: o }
-    } = n, {
-      tag: i,
+      props: { key: i }
+    } = r, {
+      tag: o,
       props: { key: f }
-    } = r;
-    return s === i && o === f;
+    } = n;
+    return s === o && i === f;
   }
   if (e.type === c.COMPONENT) {
-    const n = e, r = t, { tag: s } = n, { tag: o } = r;
-    return s === o;
+    const r = e, n = t, { tag: s } = r, { tag: i } = n;
+    return s === i;
   }
   if (e.type === c.PORTAL) {
-    const n = e, r = t;
-    return n.container === r.container;
+    const r = e, n = t;
+    return r.container === n.container;
   }
   return !0;
 }
 function T(e, t) {
-  const n = Object.keys(e), r = Object.keys(t), s = [], o = [];
-  for (const i of r)
-    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: n.filter((i) => !(i in t)),
-    updated: o
+    removed: r.filter((o) => !(o in t)),
+    updated: i
   };
 }
-function nt(e) {
+function rt(e) {
   return e !== "";
 }
 function N(e) {
-  return nt(e.trim());
+  return rt(e.trim());
 }
-function m(e, t, n, r = null) {
+function m(e, t, r, n = null) {
   if (!D(e, t)) {
-    const s = rt(n, e.el);
-    return p(e), h(t, n, s, r), t;
+    const s = nt(r, e.el);
+    return p(e), h(t, r, s, n), t;
   }
   switch (t.el = e.el, t.type) {
     case c.TEXT:
       return st(e, t), t;
     case c.ELEMENT: {
-      ot(e, t, r);
+      it(e, t, n);
       break;
     }
     case c.COMPONENT: {
-      lt(e, t);
+      at(e, t);
       break;
     }
     case c.PORTAL: {
-      at(e, t, r);
+      lt(e, t, n);
       break;
     }
   }
-  return R(e, t, r), t;
+  return R(e, t, n), t;
 }
-function rt(e, t) {
+function nt(e, t) {
   if (!t) return null;
-  const n = Array.from(e.childNodes).indexOf(t);
-  return n < 0 ? null : n;
+  const r = Array.from(e.childNodes).indexOf(t);
+  return r < 0 ? null : r;
 }
 function st(e, t) {
-  const n = e.el, { value: r } = e, { value: s } = t;
-  r !== s && n && (n.nodeValue = s);
+  const r = e.el, { value: n } = e, { value: s } = t;
+  n !== s && r && (r.nodeValue = s);
 }
-function ot(e, t, n) {
-  const r = e.el, {
+function it(e, t, r) {
+  const n = e.el, {
     class: s,
-    style: o,
-    on: i,
+    style: i,
+    on: o,
     ...f
   } = e.props ?? {}, {
-    class: l,
+    class: a,
     style: u,
-    on: a,
+    on: l,
     ...d
   } = t.props ?? {}, { listeners: b } = e;
-  it(r, f, d), ct(r, s, l), ut(
-    r,
-    o,
+  ot(n, f, d), ct(n, s, a), ut(
+    n,
+    i,
     u
   ), t.listeners = ft(
-    r,
+    n,
     b,
-    i ?? {},
-    a ?? {},
-    n
+    o ?? {},
+    l ?? {},
+    r
   );
 }
-function it(e, t = {}, n = {}) {
-  const r = t.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 = e));
-  const o = { ...t }, i = { ...n };
-  delete o.ref, delete i.ref;
-  const { added: f, removed: l, updated: u } = T(o, i);
-  for (const a of l)
-    w(e, a);
-  for (const a of f.concat(u))
-    L(e, a, i[a]);
-}
-function ct(e, t, n) {
-  const r = M(t), s = M(n), { added: o, removed: i } = F(r, s);
-  i.length > 0 && e.classList.remove(...i), o.length > 0 && e.classList.add(...o);
+function ot(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)
+    w(e, l);
+  for (const l of f.concat(u))
+    L(e, l, o[l]);
+}
+function ct(e, t, r) {
+  const n = M(t), s = M(r), { added: i, removed: o } = F(n, s);
+  o.length > 0 && e.classList.remove(...o), i.length > 0 && e.classList.add(...i);
 }
 function M(e = "") {
   return Array.isArray(e) ? e.filter(N) : String(e).split(/(\s+)/).filter(N);
 }
-function ut(e, t = {}, n = {}) {
-  const { added: r, removed: s, updated: o } = T(t, n);
-  for (const i of s)
-    _(e, i);
-  for (const i of r.concat(o))
-    C(e, i, n[i]);
-}
-function ft(e, t = {}, n = {}, r = {}, s = null) {
-  const { removed: o, added: i, updated: f } = T(n, r);
-  for (const u of o.concat(f)) {
-    const a = t?.[u];
-    a && e.removeEventListener(u, a);
-  }
-  const l = {};
-  for (const u of i.concat(f))
-    l[u] = S(
+function ut(e, t = {}, r = {}) {
+  const { added: n, removed: s, updated: i } = T(t, r);
+  for (const o of s)
+    _(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 l = t?.[u];
+    l && e.removeEventListener(u, l);
+  }
+  const a = {};
+  for (const u of o.concat(f))
+    a[u] = S(
       u,
-      r[u],
+      n[u],
       e,
       s
     );
-  return l;
-}
-function R(e, t, n) {
-  const r = v(e), s = v(t), o = e.el, i = x(r, s, D), f = n?.offset ?? 0;
-  for (const l of i)
-    if (l.op === y.NOOP) {
-      const { originalIndex: u, index: a } = l;
-      m(r[u], s[a], o, n);
+  return a;
+}
+function R(e, t, r) {
+  const n = v(e), s = v(t), i = e.el, o = x(n, s, D), f = r?.offset ?? 0;
+  for (const a of o)
+    if (a.op === y.NOOP) {
+      const { originalIndex: u, index: l } = a;
+      m(n[u], s[l], i, r);
     }
-  for (const l of i)
-    switch (l.op) {
+  for (const a of o)
+    switch (a.op) {
       case y.MOVE: {
-        const { from: u, index: a } = l, d = r[u].el, b = o.childNodes[a + f];
-        d && (o.insertBefore(d, b), m(r[u], s[a], o, n));
+        const { from: u, index: l } = a, d = n[u].el, b = i.childNodes[l + f];
+        d && (i.insertBefore(d, b), m(n[u], s[l], i, r));
         break;
       }
       case y.REMOVE: {
-        const { item: u } = l;
+        const { item: u } = a;
         p(u);
         break;
       }
       case y.ADD: {
-        const { index: u, item: a } = l;
-        h(a, o, u + f, n);
+        const { index: u, item: l } = a;
+        h(l, i, u + f, r);
         break;
       }
     }
 }
-function lt(e, t) {
-  const { component: n } = e, { props: r } = A(t);
-  n.updateProps(r), t.component = n, t.el = n.firstElement;
+function at(e, t) {
+  const { component: r } = e, { props: n } = A(t);
+  r.updateProps(n), t.component = r, t.el = r.firstElement;
 }
-function at(e, t, n) {
+function lt(e, t, r) {
   if (e.container !== t.container) {
-    p(e), h(t, document.body, null, n);
+    p(e), h(t, document.body, null, r);
     return;
   }
-  R(e, t, n);
+  R(e, t, r);
 }
 const ht = (e) => e.isProvider, pt = (e) => e.isConsumer;
 class k {
-  constructor(t = {}, n) {
-    this.isMounted = !1, this.vdom = null, this.hostEl = null, this.parent = null, this.state = {}, this.context = null, this.dependencies = [], this.subscribedProvider = null, this.isProvider = !1, this.isConsumer = !1, this.props = t, this.parent = n;
+  constructor(t = {}, r) {
+    this.isMounted = !1, this.vdom = null, this.hostEl = null, this.parent = null, this.state = {}, this.context = null, this.dependencies = [], this.subscribedProvider = null, this.isProvider = !1, this.isConsumer = !1, this.props = t, this.parent = r;
   }
   addDependency({ consumer: t }) {
-    this.dependencies.some((n) => n.consumer === t) || (this.dependencies.push({ consumer: t }), t.subscribedProvider = this);
+    this.dependencies.some((r) => r.consumer === t) || (this.dependencies.push({ consumer: t }), t.subscribedProvider = this);
   }
   removeDependency({ consumer: t }) {
-    const n = this.dependencies.findIndex((r) => r.consumer === t);
-    n !== -1 && (this.dependencies.splice(n, 1), t.subscribedProvider = null);
+    const r = this.dependencies.findIndex((n) => n.consumer === t);
+    r !== -1 && (this.dependencies.splice(r, 1), t.subscribedProvider = null);
   }
   notify() {
     this.dependencies.forEach(({ consumer: t }) => {
@@ -429,7 +429,7 @@ class k {
   onUnmount() {
     return Promise.resolve();
   }
-  onUpdate(t, n) {
+  onUpdate(t, r) {
     return Promise.resolve();
   }
   onWillUnmount() {
@@ -445,58 +445,48 @@ class k {
     return this.vdom?.type === c.FRAGMENT && this.hostEl && this.firstElement ? Array.from(this.hostEl.children).indexOf(this.firstElement) : 0;
   }
   updateProps(t) {
-    const n = { ...this.props, ...t }, r = this.props;
-    this.props = n;
+    const r = { ...this.props, ...t }, n = this.props;
+    this.props = r;
     let s = this.updateContext();
-    g(r, n) && !s || (ht(this) && this.notify(), this.patch(r, this.state));
+    g(n, r) && !s || (ht(this) && this.notify(), this.patch(n, this.state));
   }
   setState(t) {
-    let n = this.state;
+    let r = this.state;
     typeof t == "function" ? this.state = {
       ...this.state,
       ...t(this.state, this.props)
-    } : this.state = { ...this.state, ...t }, this.patch(this.props, n);
+    } : this.state = { ...this.state, ...t }, this.patch(this.props, r);
   }
-  mount(t, n = null) {
+  mount(t, r = null) {
     if (this.isMounted)
       throw new Error("Component is already mounted");
-    pt(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext(), this.vdom = this.render(), h(this.vdom, t, n, this), this.hostEl = t, this.isMounted = !0;
+    pt(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext(), this.vdom = this.render(), h(this.vdom, t, r, this), this.hostEl = t, this.isMounted = !0;
   }
   unmount() {
     this.isMounted && (E(() => this.onWillUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: t }) => {
       t.subscribedProvider = null;
     }), this.dependencies = [], this.vdom && p(this.vdom), E(() => this.onUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1);
   }
-  patch(t, n) {
+  patch(t, r) {
     if (!this.isMounted || !this.hostEl || !this.vdom)
       return;
-    const r = this.render();
-    this.vdom = m(this.vdom, r, this.hostEl, this), E(() => this.onUpdate(t, n));
+    const n = this.render();
+    this.vdom = m(this.vdom, n, this.hostEl, this), E(() => this.onUpdate(t, r));
   }
   updateContext() {
-    const t = Object.getPrototypeOf(this).constructor.contextType;
-    let n = this.parent;
-    if (t != null) {
-      for (; n; ) {
-        if (Object.getPrototypeOf(n).constructor === t.Provider)
-          return this.context = n.props.value, !0;
-        n = n.parent;
-      }
-      n == null && (this.context = t.defaultValue);
-    }
-    return !1;
+    return this.subscribedProvider ? (this.context = this.subscribedProvider.props.value, !0) : !1;
   }
   subscribeToProvider() {
     const t = Object.getPrototypeOf(this).constructor.contextType;
     if (!t)
       return;
-    let n = this.parent;
-    for (; n; ) {
-      if (Object.getPrototypeOf(n).constructor === t.Provider) {
-        n.addDependency({ consumer: this });
+    let r = this.parent;
+    for (; r; ) {
+      if (Object.getPrototypeOf(r).constructor === t.Provider) {
+        r.addDependency({ consumer: this });
         break;
       }
-      n = n.parent;
+      r = r.parent;
     }
   }
 }
@@ -506,36 +496,36 @@ function yt(e) {
       super(...arguments), this.isProvider = !0;
     }
     render() {
-      let o = [];
-      return Array.isArray(this.props.children) ? o = this.props.children : this.props.children ? o = [this.props.children] : o = [], U(o);
+      let i = [];
+      return Array.isArray(this.props.children) ? i = this.props.children : this.props.children ? i = [this.props.children] : i = [], U(i);
     }
   }
-  const r = class r extends k {
+  const n = class n extends k {
     constructor() {
       super(...arguments), this.isConsumer = !0;
     }
     render() {
-      let o = this.props.children;
-      if (Array.isArray(o))
-        if (o.length === 1 && typeof o[0] == "function")
-          o = o[0];
+      let i = this.props.children;
+      if (Array.isArray(i))
+        if (i.length === 1 && typeof i[0] == "function")
+          i = i[0];
         else
           throw new Error(
             "Consumer: expected single function child, got array"
           );
-      if (typeof o != "function")
+      if (typeof i != "function")
         throw new Error("Consumer: children is not a function");
-      return o(this.context);
+      return i(this.context);
     }
   };
-  r.contextType = {
+  n.contextType = {
     Provider: t,
     defaultValue: e
   };
-  let n = r;
+  let r = n;
   return {
     Provider: t,
-    Consumer: n,
+    Consumer: r,
     defaultValue: e
   };
 }
@@ -550,8 +540,8 @@ function bt(e = null) {
   };
 }
 function vt(e, t) {
-  const n = Array.isArray(e) ? e : [e];
-  return I(n, t);
+  const r = Array.isArray(e) ? e : [e];
+  return I(r, t);
 }
 export {
   k as Component,

package/package.json

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