ddd-react 1.3.7 → 1.3.9

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { D as c, e as v, a as F, A as y, b as U, h as q, c as I } from "./h-BbaMkkC7.mjs";
-import { d as Oe, f as me } from "./h-BbaMkkC7.mjs";
+import { D as c, e as v, a as U, A as g, b as q, h as I, c as $ } from "./h-BbaMkkC7.mjs";
+import { d as me, f as Oe } from "./h-BbaMkkC7.mjs";
 function E(t, e) {
   if (t === null || e === null || t === void 0 || e === void 0)
     return t === e;
@@ -39,17 +39,17 @@ function E(t, e) {
   }
   return !1;
 }
-function S(t, e, n, r = null) {
+function w(t, e, n, r = null) {
   function s(o) {
     const i = o;
     r ? e.call(r, i) : e(i);
   }
   return n.addEventListener(t, s), s;
 }
-function $(t = {}, e, n = null) {
+function G(t = {}, e, n = null) {
   const r = {};
   return Object.entries(t).forEach(([s, o]) => {
-    r[s] = S(
+    r[s] = w(
       s,
       o,
       e,
@@ -57,7 +57,7 @@ function $(t = {}, e, n = null) {
     );
   }), r;
 }
-function G(t = {}, e) {
+function W(t = {}, e) {
   Object.entries(t).forEach(([n, r]) => {
     e.removeEventListener(n, r);
   });
@@ -66,15 +66,15 @@ function p(t) {
   const { type: e } = t;
   switch (e) {
     case c.TEXT: {
-      W(t);
+      B(t);
       break;
     }
     case c.ELEMENT: {
-      B(t);
+      X(t);
       break;
     }
     case c.FRAGMENT: {
-      X(t);
+      _(t);
       break;
     }
     case c.COMPONENT: {
@@ -82,7 +82,7 @@ function p(t) {
       break;
     }
     case c.PORTAL: {
-      _(t);
+      J(t);
       break;
     }
     default:
@@ -90,60 +90,60 @@ function p(t) {
   }
   delete t.el;
 }
-function W(t) {
+function B(t) {
   const { el: e } = t;
   e && e.remove();
 }
-function B(t) {
+function X(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(p), r && e && (G(r, e), delete t.listeners);
+  s?.ref && typeof s.ref == "object" && "current" in s.ref && (s.ref.current = null), e && e.remove(), n && n.forEach(p), r && e && (W(r, e), delete t.listeners);
 }
-function X(t) {
+function _(t) {
   const { children: e } = t;
   e && e.forEach(p);
 }
-function _(t) {
+function J(t) {
   const { children: e } = t;
   e && e.forEach(p);
 }
-function w(t, e, n) {
+function L(t, e, n) {
   t.style[e] = n.toString();
 }
-function J(t, e) {
+function K(t, e) {
   t.style[e] = null;
 }
-function K(t, e) {
+function Y(t, e) {
   const { class: n, style: r, ...s } = e;
-  n && Y(t, n), r && Object.entries(r).forEach(([o, i]) => {
-    w(t, o, i);
+  n && H(t, n), r && Object.entries(r).forEach(([o, i]) => {
+    L(t, o, i);
   });
   for (const [o, i] of Object.entries(s))
-    L(t, o, i);
+    j(t, o, i);
 }
-function Y(t, e) {
+function H(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 ? j(t, e) : t.setAttribute(e, String(n));
+function j(t, e, n) {
+  n == null ? x(t, e) : t.setAttribute(e, String(n));
 }
-function j(t, e) {
+function x(t, e) {
   t[e] = null, t.removeAttribute(e);
 }
 let P = !1;
-const O = [];
-function g(t) {
-  O.push(t), H();
-}
-function H() {
-  P || (P = !0, queueMicrotask(z));
+const m = [];
+function y(t) {
+  m.push(t), z();
 }
 function z() {
-  for (; O.length > 0; ) {
-    const t = O.shift();
+  P || (P = !0, queueMicrotask(Q));
+}
+function Q() {
+  for (; m.length > 0; ) {
+    const t = m.shift();
     let e;
     try {
       e = t();
@@ -168,56 +168,56 @@ function A(t) {
 function h(t, e, n = null, r = null) {
   switch (t.type) {
     case c.TEXT: {
-      Q(t, e, n);
+      Z(t, e, n);
       break;
     }
     case c.ELEMENT: {
-      V(t, e, n, r);
+      ee(t, e, n, r);
       break;
     }
     case c.FRAGMENT: {
-      Z(t, e, n, r);
+      V(t, e, n, r);
       break;
     }
     case c.COMPONENT: {
-      te(t, e, n, r);
+      ne(t, e, n, r);
       const s = t.component;
-      s && g(() => s.onMount());
+      s && y(() => s.onMount());
       break;
     }
     case c.PORTAL: {
-      ne(t, r);
+      re(t, r);
       break;
     }
     default:
       throw new Error(`Can't mount DOM of type: ${t.type}`);
   }
 }
-function Q(t, e, n) {
+function Z(t, e, n) {
   const { value: r } = t, s = document.createTextNode(r);
-  t.el = s, x(s, e, n);
+  t.el = s, D(s, e, n);
 }
-function Z(t, e, n, r) {
+function V(t, e, n, r) {
   const { children: s } = t;
   t.el = e, s?.forEach((o, i) => {
     h(o, e, n != null ? n + i : null, r);
   });
 }
-function V(t, e, n, r) {
+function ee(t, e, n, r) {
   const { tag: s, children: o } = t, u = s === "svg" || e instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
-  ee(u, t, r), t.el = u, o?.forEach((f) => {
+  te(u, t, r), t.el = u, o?.forEach((f) => {
     h(f, u, null, r);
-  }), x(u, e, n);
+  }), D(u, e, n);
 }
-function ee(t, e, n) {
+function te(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), K(t, r);
+  r.ref && typeof r.ref == "object" && "current" in r.ref && (r.ref.current = t, delete r.ref), e.listeners = G(s, t, n), Y(t, r);
 }
-function te(t, e, n, r) {
+function ne(t, e, n, r) {
   const s = t.tag, { props: o } = A(t), i = new s(o, r);
   i.mount(e, n), t.component = i, t.el = i.firstElement || null;
 }
-function x(t, e, n) {
+function D(t, e, n) {
   if (n == null) {
     e.append(t);
     return;
@@ -227,13 +227,13 @@ function x(t, e, n) {
   const r = e.childNodes;
   n >= r.length ? e.append(t) : e.insertBefore(t, r[n]);
 }
-function ne(t, e) {
+function re(t, e) {
   const { children: n, container: r } = t;
   n?.forEach((s) => {
     h(s, r, null, e);
   });
 }
-function D(t, e) {
+function R(t, e) {
   if (t.type !== e.type)
     return !1;
   if (t.type === c.ELEMENT) {
@@ -266,45 +266,45 @@ function T(t, e) {
     updated: o
   };
 }
-function re(t) {
+function se(t) {
   return t !== "";
 }
 function N(t) {
-  return re(t.trim());
+  return se(t.trim());
 }
-function m(t, e, n, r = null) {
-  if (!D(t, e)) {
-    const s = se(n, t.el);
+function O(t, e, n, r = null) {
+  if (!R(t, e)) {
+    const s = oe(n, t.el);
     return p(t), h(e, n, s, r), e;
   }
   switch (e.el = t.el, e.type) {
     case c.TEXT:
-      return oe(t, e), e;
+      return ie(t, e), e;
     case c.ELEMENT: {
-      ie(t, e, r);
+      ce(t, e, r);
       break;
     }
     case c.COMPONENT: {
-      ae(t, e);
+      he(t, e);
       break;
     }
     case c.PORTAL: {
-      he(t, e, r);
+      pe(t, e, r);
       break;
     }
   }
-  return R(t, e, r), e;
+  return F(t, e, r), e;
 }
-function se(t, e) {
+function oe(t, e) {
   if (!e) return null;
   const n = Array.from(t.childNodes).indexOf(e);
   return n < 0 ? null : n;
 }
-function oe(t, e) {
+function ie(t, e) {
   const n = t.el, { value: r } = t, { value: s } = e;
   r !== s && n && (n.nodeValue = s);
 }
-function ie(t, e, n) {
+function ce(t, e, n) {
   const r = t.el, {
     class: s,
     style: o,
@@ -316,11 +316,11 @@ function ie(t, e, n) {
     on: a,
     ...d
   } = e.props ?? {}, { listeners: b } = t;
-  ce(r, u, d), le(r, s, f), ue(
+  le(r, u, d), ue(r, s, f), fe(
     r,
     o,
     l
-  ), e.listeners = fe(
+  ), e.listeners = ae(
     r,
     b,
     i ?? {},
@@ -328,32 +328,32 @@ function ie(t, e, n) {
     n
   );
 }
-function ce(t, e = {}, n = {}) {
+function le(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 o = { ...e }, i = { ...n };
   delete o.ref, delete i.ref;
   const { added: u, removed: f, updated: l } = T(o, i);
   for (const a of f)
-    j(t, a);
+    x(t, a);
   for (const a of u.concat(l))
-    L(t, a, i[a]);
+    j(t, a, i[a]);
 }
-function le(t, e, n) {
-  const r = M(e), s = M(n), { added: o, removed: i } = U(r, s);
+function ue(t, e, n) {
+  const r = M(e), s = M(n), { added: o, removed: i } = q(r, s);
   i.length > 0 && t.classList.remove(...i), o.length > 0 && t.classList.add(...o);
 }
 function M(t = "") {
   return Array.isArray(t) ? t.filter(N) : String(t).split(/(\s+)/).filter(N);
 }
-function ue(t, e = {}, n = {}) {
+function fe(t, e = {}, n = {}) {
   const { added: r, removed: s, updated: o } = T(e, n);
   for (const i of s)
-    J(t, i);
+    K(t, i);
   for (const i of r.concat(o))
-    w(t, i, n[i]);
+    L(t, i, n[i]);
 }
-function fe(t, e = {}, n = {}, r = {}, s = null) {
+function ae(t, e = {}, n = {}, r = {}, s = null) {
   const { removed: o, added: i, updated: u } = T(n, r);
   for (const l of o.concat(u)) {
     const a = e?.[l];
@@ -361,7 +361,7 @@ function fe(t, e = {}, n = {}, r = {}, s = null) {
   }
   const f = {};
   for (const l of i.concat(u))
-    f[l] = S(
+    f[l] = w(
       l,
       r[l],
       t,
@@ -369,45 +369,45 @@ function fe(t, e = {}, n = {}, r = {}, s = null) {
     );
   return f;
 }
-function R(t, e, n) {
-  const r = v(t), s = v(e), o = t.el, i = F(r, s, D), u = n?.offset ?? 0;
+function F(t, e, n) {
+  const r = v(t), s = v(e), o = t.el, i = U(r, s, R), u = n?.offset ?? 0;
   for (const f of i)
-    if (f.op === y.NOOP) {
+    if (f.op === g.NOOP) {
       const { originalIndex: l, index: a } = f;
-      m(r[l], s[a], o, n);
+      O(r[l], s[a], o, n);
     }
   for (const f of i)
     switch (f.op) {
-      case y.MOVE: {
+      case g.MOVE: {
         const { from: l, index: a } = f, d = r[l].el, b = o.childNodes[a + u];
-        d && (o.insertBefore(d, b), m(r[l], s[a], o, n));
+        d && (o.insertBefore(d, b), O(r[l], s[a], o, n));
         break;
       }
-      case y.REMOVE: {
+      case g.REMOVE: {
         const { item: l } = f;
         p(l);
         break;
       }
-      case y.ADD: {
+      case g.ADD: {
         const { index: l, item: a } = f;
         h(a, o, l + u, n);
         break;
       }
     }
 }
-function ae(t, e) {
+function he(t, e) {
   const { component: n } = t, { props: r } = A(e);
   n.updateProps(r), e.component = n, e.el = n.firstElement;
 }
-function he(t, e, n) {
+function pe(t, e, n) {
   if (t.container !== e.container) {
     p(t), h(e, document.body, null, n);
     return;
   }
-  R(t, e, n);
+  F(t, e, n);
 }
-const k = (t) => t.constructor.name.includes("Provider"), pe = (t) => t.constructor.name.includes("Consumer");
-class C {
+const k = (t) => (console.log("isProvider"), console.log("component.constructor.name", t.constructor.name), t.constructor.name.includes("Provider")), C = (t) => (console.log("isConsumer"), console.log("component.constructor.name", t.constructor.name), t.constructor.name.includes("Consumer"));
+class S {
   constructor(e = {}, n) {
     this.isMounted = !1, this.vdom = null, this.hostEl = null, this.parent = null, this.state = {}, this.context = null, this.dependencies = [], this.subscribedProvider = null, this.props = e, this.parent = n;
   }
@@ -456,7 +456,7 @@ class C {
       console.log("return");
       return;
     }
-    console.log("isProvider(this as Component)", k(this)), k(this) && this.notify(), this.patch();
+    console.log("this.parent", this.parent), console.log("isProvider(this.parent as Component)", k(this.parent)), k(this.parent) && this.notify(), this.patch();
   }
   setState(e) {
     typeof e == "function" ? this.state = {
@@ -467,18 +467,18 @@ class C {
   mount(e, n = null) {
     if (this.isMounted)
       throw new Error("Component is already mounted");
-    pe(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext(), this.vdom = this.render(), h(this.vdom, e, n, this), this.hostEl = e, this.isMounted = !0;
+    console.log("this.parent", this.parent), console.log("isConsumer(this as Component)", C(this)), C(this) && !this.subscribedProvider && (console.log(" this.subscribeToProvider()"), this.subscribeToProvider()), this.updateContext(), this.vdom = this.render(), h(this.vdom, e, n, this), this.hostEl = e, this.isMounted = !0;
   }
   unmount() {
-    this.isMounted && (g(() => this.onWillUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: e }) => {
+    this.isMounted && (y(() => this.onWillUnmount()), this.subscribedProvider && this.subscribedProvider.removeDependency({ consumer: this }), this.dependencies.forEach(({ consumer: e }) => {
       e.subscribedProvider = null;
-    }), this.dependencies = [], this.vdom && p(this.vdom), g(() => this.onUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1);
+    }), this.dependencies = [], this.vdom && p(this.vdom), y(() => this.onUnmount()), this.vdom = null, this.hostEl = null, this.isMounted = !1);
   }
   patch() {
     if (!this.isMounted || !this.hostEl || !this.vdom)
       return;
     const e = this.render();
-    this.vdom = m(this.vdom, e, this.hostEl, this), g(() => this.onUpdate());
+    this.vdom = O(this.vdom, e, this.hostEl, this), y(() => this.onUpdate());
   }
   updateContext() {
     console.log("updateContext");
@@ -509,14 +509,14 @@ class C {
     }
   }
 }
-function ye(t) {
-  class e extends C {
+function ge(t) {
+  class e extends S {
     render() {
       let o = [];
-      return Array.isArray(this.props.children) ? o = this.props.children : this.props.children ? o = [this.props.children] : o = [], q(o);
+      return Array.isArray(this.props.children) ? o = this.props.children : this.props.children ? o = [this.props.children] : o = [], I(o);
     }
   }
-  const r = class r extends C {
+  const r = class r extends S {
     render() {
       let o = this.props.children;
       if (Array.isArray(o))
@@ -542,7 +542,7 @@ function ye(t) {
     defaultValue: t
   };
 }
-function ge(t, e) {
+function ye(t, e) {
   if (!e)
     throw new Error("Container element is not provided for rendering.");
   h(t, e);
@@ -554,15 +554,15 @@ function Ee(t = null) {
 }
 function be(t, e) {
   const n = Array.isArray(t) ? t : [t];
-  return I(n, e);
+  return $(n, e);
 }
 export {
-  C as Component,
-  ye as createContext,
+  S as Component,
+  ge as createContext,
   be as createPortal,
   Ee as createRef,
-  Oe as h,
-  q as hFragment,
-  me as hString,
-  ge as render
+  me as h,
+  I as hFragment,
+  Oe as hString,
+  ye as render
 };

package/package.json

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