ddd-react 1.11.0 → 1.12.0

package/dist/component.d.ts

@@ -30,7 +30,7 @@ export declare abstract class Component<P = {}, S = {}, C = null> {
     didUnmount(): void | Promise<void>;
     didCatch(error: Error, errorInfo: any): void | Promise<void>;
     shouldComponentUpdate(prevProps: P, nextProps: P): boolean;
-    abstract render(): VDOMNode[] | VDOMNode | Function | null | undefined;
+    abstract render(): VDOMNode | VDOMNode[] | Function | string | null | undefined;
     get elements(): HTMLElement[];
     get firstElement(): HTMLElement | undefined;
     get offset(): number;

package/dist/{h-edTp7-8E.mjs → h-DE267foy.mjs}

@@ -166,8 +166,8 @@ export {
   d as a,
   m as b,
   I as c,
-  E as d,
+  a as d,
   f as e,
-  a as f,
+  E as f,
   g as h
 };

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { h, hFragment, hString } from './h';
 import { render } from './render';
 import { createRef } from './ref';
 import type { Ref } from './ref';
-import type { ComponentType } from './types/types';
+import type { ComponentType } from './types';
 import { createPortal } from './portal';
 export type { ComponentType, Ref };
 export { Component, createContext, createRef, h, hFragment, hString, render, createPortal };

package/dist/index.mjs

@@ -1,5 +1,4 @@
-import { D as u, e as g, a as F, A as v, b as U, h as N, c as B, d as I } from "./h-edTp7-8E.mjs";
-import { f as Ot } from "./h-edTp7-8E.mjs";
+import { D as u, e as m, a as x, A as v, b as U, h as N, c as B, d as I, f as _ } from "./h-DE267foy.mjs";
 function b(e, t) {
   if (e === null || t === null || e === void 0 || t === void 0)
     return e === t;
@@ -46,7 +45,7 @@ function M(e, t, r, n = null) {
   }
   return r.addEventListener(e, s), s;
 }
-function _(e = {}, t, r = null) {
+function $(e = {}, t, r = null) {
   const n = {};
   return Object.entries(e).forEach(([s, i]) => {
     n[s] = M(
@@ -57,7 +56,7 @@ function _(e = {}, t, r = null) {
     );
   }), n;
 }
-function $(e = {}, t) {
+function q(e = {}, t) {
   Object.entries(e).forEach(([r, n]) => {
     t.removeEventListener(r, n);
   });
@@ -66,15 +65,15 @@ function p(e) {
   const { type: t } = e;
   switch (t) {
     case u.TEXT: {
-      q(e);
+      G(e);
       break;
     }
     case u.ELEMENT: {
-      G(e);
+      z(e);
       break;
     }
     case u.FRAGMENT: {
-      z(e);
+      X(e);
       break;
     }
     case u.COMPONENT: {
@@ -82,7 +81,7 @@ function p(e) {
       break;
     }
     case u.PORTAL: {
-      X(e);
+      J(e);
       break;
     }
     default:
@@ -90,37 +89,37 @@ function p(e) {
   }
   delete e.el;
 }
-function q(e) {
+function G(e) {
   const { el: t } = e;
   t && t.remove();
 }
-function G(e) {
+function z(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 && ($(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 && (q(n, t), delete e.listeners);
 }
-function z(e) {
+function X(e) {
   const { children: t } = e;
   t && t.forEach(p);
 }
-function X(e) {
+function J(e) {
   const { children: t } = e;
   t && t.forEach(p);
 }
 function w(e, t, r) {
   e.style[t] = r.toString();
 }
-function J(e, t) {
+function K(e, t) {
   e.style[t] = null;
 }
-function K(e, t) {
+function W(e, t) {
   const { class: r, style: n, ...s } = t;
-  r && W(e, r), n && Object.entries(n).forEach(([i, o]) => {
+  r && Y(e, r), n && Object.entries(n).forEach(([i, o]) => {
     w(e, i, o);
   });
   for (const [i, o] of Object.entries(s))
     D(e, i, o);
 }
-function W(e, t) {
+function Y(e, t) {
   if (e instanceof SVGElement) {
     e.removeAttribute("class"), typeof t == "string" ? e.setAttribute("class", t) : Array.isArray(t) && e.classList.add(...t);
     return;
@@ -136,12 +135,12 @@ function j(e, t) {
 let P = !1;
 const O = [];
 function d(e) {
-  O.push(e), Y();
-}
-function Y() {
-  P || (P = !0, queueMicrotask(H));
+  O.push(e), H();
 }
 function H() {
+  P || (P = !0, queueMicrotask(Q));
+}
+function Q() {
   for (; O.length > 0; ) {
     const e = O.shift();
     let t;
@@ -168,11 +167,11 @@ function A(e) {
 function h(e, t, r = null, n = null) {
   switch (e.type) {
     case u.TEXT: {
-      Q(e, t, r);
+      Z(e, t, r);
       break;
     }
     case u.ELEMENT: {
-      V(
+      tt(
         e,
         t,
         r,
@@ -181,7 +180,7 @@ function h(e, t, r = null, n = null) {
       break;
     }
     case u.FRAGMENT: {
-      Z(
+      V(
         e,
         t,
         r,
@@ -190,7 +189,7 @@ function h(e, t, r = null, n = null) {
       break;
     }
     case u.COMPONENT: {
-      et(
+      rt(
         e,
         t,
         r,
@@ -201,34 +200,34 @@ function h(e, t, r = null, n = null) {
       break;
     }
     case u.PORTAL: {
-      rt(e, n);
+      nt(e, n);
       break;
     }
     default:
       throw new Error(`Can't mount DOM of type: ${e.type}`);
   }
 }
-function Q(e, t, r) {
+function Z(e, t, r) {
   const { value: n } = e, s = document.createTextNode(n);
   e.el = s, L(s, t, r);
 }
-function Z(e, t, r, n) {
+function V(e, t, r, n) {
   const { children: s } = e;
   e.el = t, s?.forEach((i, o) => {
     h(i, t, r != null ? r + o : null, n);
   });
 }
-function V(e, t, r, n) {
+function tt(e, t, r, n) {
   const { tag: s, children: i } = e, l = s === "svg" || t instanceof SVGElement ? document.createElementNS("http://www.w3.org/2000/svg", s) : document.createElement(s);
-  tt(l, e, n), e.el = l, i?.forEach((f) => {
+  et(l, e, n), e.el = l, i?.forEach((f) => {
     h(f, l, null, n);
   }), L(l, t, r);
 }
-function tt(e, t, r) {
+function et(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 = $(s, e, r), W(e, n);
 }
-function et(e, t, r, n) {
+function rt(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;
 }
@@ -242,7 +241,7 @@ function L(e, t, r) {
   const n = t.childNodes;
   r >= n.length ? t.append(e) : t.insertBefore(e, n[r]);
 }
-function rt(e, t) {
+function nt(e, t) {
   const { children: r, container: n } = e;
   r?.forEach((s) => {
     h(s, n, null, t);
@@ -281,22 +280,22 @@ function S(e, t) {
     updated: i
   };
 }
-function nt(e) {
+function st(e) {
   return e !== "";
 }
 function T(e) {
-  return nt(e.trim());
+  return st(e.trim());
 }
 function y(e, t, r, n = null) {
   if (!R(e, t)) {
-    const s = st(r, e.el);
+    const s = ot(r, e.el);
     return p(e), h(t, r, s, n), t;
   }
   switch (t.el = e.el, t.type) {
     case u.TEXT:
-      return ot(e, t), t;
+      return it(e, t), t;
     case u.ELEMENT: {
-      it(
+      ct(
         e,
         t,
         n
@@ -304,14 +303,14 @@ function y(e, t, r, n = null) {
       break;
     }
     case u.COMPONENT: {
-      at(
+      ht(
         e,
         t
       );
       break;
     }
     case u.PORTAL: {
-      ht(
+      dt(
         e,
         t,
         n
@@ -319,18 +318,18 @@ function y(e, t, r, n = null) {
       break;
     }
   }
-  return x(e, t, n), t;
+  return F(e, t, n), t;
 }
-function st(e, t) {
+function ot(e, t) {
   if (!t) return null;
   const r = Array.from(e.childNodes).indexOf(t);
   return r < 0 ? null : r;
 }
-function ot(e, t) {
+function it(e, t) {
   const r = e.el, { value: n } = e, { value: s } = t;
   n !== s && r && (r.nodeValue = s);
 }
-function it(e, t, r) {
+function ct(e, t, r) {
   const n = e.el, {
     class: s,
     style: i,
@@ -341,20 +340,20 @@ function it(e, t, r) {
     style: c,
     on: a,
     ...E
-  } = t.props ?? {}, { listeners: m } = e;
-  ct(n, l, E), ut(n, s, f), lt(
+  } = t.props ?? {}, { listeners: g } = e;
+  ut(n, l, E), lt(n, s, f), ft(
     n,
     i,
     c
-  ), t.listeners = ft(
+  ), t.listeners = at(
     n,
-    m,
+    g,
     o ?? {},
     a ?? {},
     r
   );
 }
-function ct(e, t = {}, r = {}) {
+function ut(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 };
@@ -368,21 +367,21 @@ function ct(e, t = {}, r = {}) {
   for (const a of l.concat(c))
     D(e, a, o[a]);
 }
-function ut(e, t, r) {
+function lt(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);
 }
 function k(e = "") {
   return Array.isArray(e) ? e.filter(T) : String(e).split(/(\s+)/).filter(T);
 }
-function lt(e, t = {}, r = {}) {
+function ft(e, t = {}, r = {}) {
   const { added: n, removed: s, updated: i } = S(t, r);
   for (const o of s)
-    J(e, o);
+    K(e, o);
   for (const o of n.concat(i))
     w(e, o, r[o]);
 }
-function ft(e, t = {}, r = {}, n = {}, s = null) {
+function at(e, t = {}, r = {}, n = {}, s = null) {
   const { removed: i, added: o, updated: l } = S(r, n), f = { ...t };
   for (const c of i.concat(l)) {
     const a = t?.[c];
@@ -397,8 +396,8 @@ function ft(e, t = {}, r = {}, n = {}, s = null) {
     );
   return f;
 }
-function x(e, t, r) {
-  const n = g(e), s = g(t), i = e.el, o = F(
+function F(e, t, r) {
+  const n = m(e), s = m(t), i = e.el, o = x(
     n,
     s,
     R
@@ -416,8 +415,8 @@ function x(e, t, r) {
   for (const f of o)
     switch (f.op) {
       case v.MOVE: {
-        const { from: c, index: a } = f, E = n[c].el, m = i.childNodes[a + l];
-        E && (i.insertBefore(E, m), y(
+        const { from: c, index: a } = f, E = n[c].el, g = i.childNodes[a + l];
+        E && (i.insertBefore(E, g), y(
           n[c],
           s[a],
           i,
@@ -437,18 +436,18 @@ function x(e, t, r) {
       }
     }
 }
-function at(e, t) {
+function ht(e, t) {
   const { component: r } = e, { props: n } = A(t);
   r.updateProps(n), t.component = r, t.el = r.firstElement;
 }
-function ht(e, t, r) {
+function dt(e, t, r) {
   if (e.container !== t.container) {
     p(e), h(t, document.body, null, r);
     return;
   }
-  x(e, t, r);
+  F(e, t, r);
 }
-const dt = (e) => e.isProvider, pt = (e) => e.isConsumer;
+const pt = (e) => e.isProvider, yt = (e) => e.isConsumer;
 class C {
   isMounted = !1;
   vdom = null;
@@ -504,7 +503,7 @@ class C {
     return b(t, r);
   }
   get elements() {
-    return this.vdom == null ? [] : this.vdom.type === u.FRAGMENT ? g(this.vdom).flatMap((t) => t.type === u.COMPONENT && t.component ? t.component.elements : t.el ? [t.el] : []) : this.vdom.el ? [this.vdom.el] : [];
+    return this.vdom == null ? [] : this.vdom.type === u.FRAGMENT ? m(this.vdom).flatMap((t) => t.type === u.COMPONENT && t.component ? t.component.elements : t.el ? [t.el] : []) : this.vdom.el ? [this.vdom.el] : [];
   }
   get firstElement() {
     return this.elements[0];
@@ -514,7 +513,7 @@ class C {
   }
   updateProps(t) {
     const n = { ...this.getDefaultProps(), ...this.props, ...t }, s = this.props;
-    this.props = n, !this.shouldComponentUpdate(s, n) && (dt(this) && this.notify(), this.patch(s, this.state));
+    this.props = n, !this.shouldComponentUpdate(s, n) && (pt(this) && this.notify(), this.patch(s, this.state));
   }
   setState(t) {
     const r = this.state;
@@ -529,7 +528,7 @@ class C {
   mount(t, r = null) {
     if (this.isMounted)
       throw new Error("Component is already mounted");
-    pt(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext();
+    yt(this) && !this.subscribedProvider && this.subscribeToProvider(), this.updateContext();
     try {
       const n = this.render(), s = this.normalizeRenderResult(n);
       this.hostEl = t, this.isMounted = !0, s !== null ? (h(s, t, r, this), this.vdom = s) : this.vdom = null;
@@ -649,10 +648,10 @@ class C {
     return this.constructor.getDerivedStateFromError !== void 0;
   }
   normalizeRenderResult(t) {
-    return t == null ? null : Array.isArray(t) ? t.length > 0 ? N(t) : null : typeof t == "function" ? B(t, {}) : t;
+    return t == null ? null : Array.isArray(t) ? t.length > 0 ? N(t) : null : typeof t == "function" ? B(t, {}) : typeof t == "string" ? I(t) : t;
   }
 }
-function Et(e) {
+function vt(e) {
   class t extends C {
     isProvider = !0;
     render() {
@@ -686,7 +685,7 @@ function Et(e) {
     defaultValue: e
   };
 }
-function vt(e, t) {
+function gt(e, t) {
   if (!t)
     throw new Error("Container element is not provided for rendering.");
   h(e, t);
@@ -696,17 +695,17 @@ function mt(e = null) {
     current: e
   };
 }
-function gt(e, t) {
+function bt(e, t) {
   const r = Array.isArray(e) ? e : [e];
-  return I(r, t);
+  return _(r, t);
 }
 export {
   C as Component,
-  Et as createContext,
-  gt as createPortal,
+  vt as createContext,
+  bt as createPortal,
   mt as createRef,
   B as h,
   N as hFragment,
-  Ot as hString,
-  vt as render
+  I as hString,
+  gt as render
 };

package/dist/jsx-runtime.mjs

@@ -1,4 +1,4 @@
-import { h as p, c, f as a } from "./h-edTp7-8E.mjs";
+import { h as p, c, d as a } from "./h-DE267foy.mjs";
 const h = /* @__PURE__ */ Symbol("Fragment");
 function l(n) {
   return n == null || n === !1 ? null : typeof n == "string" || typeof n == "number" || typeof n == "boolean" ? a(String(n)) : n;

package/package.json

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