@potok-web-framework/core 0.5.0 → 0.7.0

package/dist/block.d.ts

@@ -4,7 +4,7 @@ export declare abstract class LibBlock {
     node: LibNode | null;
     abstract context: LibContext;
     abstract props: LibProps;
-    effects: Effect[];
+    effects: Set<Effect>;
     children: (LibBlock | null)[];
     get nearestParentElement(): LibHtmlElementNode | null;
     get previousBlock(): LibBlock | null;

package/dist/client.mjs

@@ -1,133 +1,103 @@
-import { a as objectKeys, c as createEffect, l as createSignal, p as untrack, u as deepTrack } from "./utils-CAe_kbSH.mjs";
+import { i as createSignal, r as createEffect } from "./signals-ZsU9bGc3.mjs";
 import { n as HTML_ELEMENT_STYLE_PX_PROPERTIES } from "./constants-BOAOReQ3.mjs";
-function renderToDOM(o) {
-	let s = o.root ?? document, c = /* @__PURE__ */ new Map(), l = createSignal({
+function isTextNode(e) {
+	return e.nodeType === Node.TEXT_NODE;
+}
+function isHTMLElementNode(e) {
+	return e.nodeType === Node.ELEMENT_NODE;
+}
+function isLibNodeEqualToDomNode(e, t) {
+	return e.type === "text" && isTextNode(t) ? String(e.props.text) === t.textContent : e.type === "html-element" && isHTMLElementNode(t) ? e.props.tag === t.tagName.toLowerCase() : !1;
+}
+function hydrate(r) {
+	let o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Set(), l = createSignal({
 		portals: {},
-		listeners: {},
-		isHydrating: o.needToHydrate ?? !1
+		isHydrating: !0
 	});
-	function u(e) {
-		let t = e.replace(/^on([A-Z])/, (e, t) => t.toLowerCase());
-		document.addEventListener(t, (t) => {
-			let n = !1, r = t.target, i = t.stopPropagation.bind(t), a = t.stopImmediatePropagation.bind(t);
-			for (t.stopPropagation = () => {
-				n = !0, i();
-			}, t.stopImmediatePropagation = () => {
-				n = !0, a();
-			}; r;) {
-				let i = l.listeners[e]?.get(r);
-				if (i && (Object.defineProperty(t, "currentTarget", {
-					configurable: !0,
-					enumerable: !0,
-					get: () => r
-				}), i(t), n)) break;
-				r = r.parentElement;
+	function u(e, t, r, a) {
+		if (e.type === "text") t.textContent = String(a);
+		else if (e.type === "html-element" && isHTMLElementNode(t)) if (r.startsWith("on")) if (a) {
+			if (s.has(r) || s.set(r, /* @__PURE__ */ new Map()), s.get(r).set(t, a), !c.has(r)) {
+				let e = r.replace(/^on/, "").toLowerCase();
+				document.addEventListener(e, (e) => {
+					let t = !1, n = e.target, i = e.stopPropagation.bind(e), a = e.stopImmediatePropagation.bind(e);
+					for (e.stopPropagation = () => {
+						t = !0, i();
+					}, e.stopImmediatePropagation = () => {
+						t = !0, a();
+					}; n;) {
+						let i = s.get(r)?.get(n);
+						if (i && (Object.defineProperty(e, "currentTarget", {
+							configurable: !0,
+							enumerable: !0,
+							get: () => n
+						}), i(e), t)) break;
+						n = n.parentElement;
+					}
+				}), c.add(r);
 			}
-		});
+		} else s.get(r)?.delete(t);
+		else if (r.startsWith("aria")) {
+			let e = r.toLowerCase().replace("aria", "aria-");
+			a ? t.setAttribute(e, a) : t.removeAttribute(e);
+		} else r === "className" ? a ? t.className = a : t.removeAttribute("class") : r === "style" ? a ? Object.keys(a).forEach((e) => {
+			let r = a[e];
+			if (r !== void 0) {
+				let i = String(HTML_ELEMENT_STYLE_PX_PROPERTIES.has(e) && typeof r == "number" ? `${r}px` : r);
+				t.style.setProperty(e, i);
+			} else t.style.removeProperty(e);
+		}) : t.removeAttribute("style") : a == null ? t.removeAttribute(r) : t.setAttribute(r, String(a));
 	}
-	let d = /* @__PURE__ */ new Set();
-	createEffect(() => {
-		deepTrack(l.listeners, 1), untrack(() => {
-			objectKeys(l.listeners).forEach((e) => {
-				d.has(e) || (u(e), d.add(e));
-			});
-		});
-	}, !0);
-	let f = (e, t, n) => e.insertBefore(t, n ? n.nextSibling : e.firstChild), p = (e) => e instanceof HTMLElement;
-	if (!o.needToHydrate) for (; s.firstChild;) s.removeChild(s.firstChild);
-	o.app()({
+	let d = {
 		parentBlock: null,
 		index: 0,
 		portals: l.portals,
 		contexts: {},
-		listeners: l.listeners,
 		isServer: !1,
 		promises: [],
 		get isHydrating() {
 			return l.isHydrating;
 		},
-		insertNode(e, t, n) {
-			if (l.isHydrating) {
-				if (e === null) c.set(t, document.querySelector("html"));
-				else {
-					let r = c.get(e);
-					if (!r) throw Error("Ошибка гидрации");
-					let i = null;
-					if (n) {
-						let e = c.get(n);
-						if (!e) throw Error("Ошибка гидрации");
-						i = e.nextSibling;
-					} else i = r.firstChild;
-					for (;;) {
-						if (!i) throw Error("Ошибка гидрации");
-						if (t.type === "text" && String(t.props.text) === i.textContent || t.type === "html-element" && p(i) && t.props.tag === i.tagName.toLowerCase()) {
-							c.set(t, i);
-							break;
-						} else {
-							let e = i;
-							i = i.nextSibling, e.parentElement?.removeChild(e);
-						}
-					}
+		insertNode(e, n, r) {
+			let i;
+			if (e) {
+				if (!o.has(e)) {
+					if (l.isHydrating) throw Error("Ошибка гидрации");
+					o.set(e, document.createElement(e.props.tag));
 				}
-				return;
-			}
-			e && !c.has(e) && c.set(e, document.createElement(e.props.tag));
-			let r = e ? c.get(e) : s, i = (n && c.get(n)) ?? null;
-			if (t.type === "text") {
-				let e = document.createTextNode(String(t.props.text));
-				c.set(t, e), this.updateTextNode(t), f(r, e, i);
-			} else if (t.type === "html-element") {
-				c.has(t) || c.set(t, document.createElement(t.props.tag));
-				for (let [e, n] of Object.entries(Object.getOwnPropertyDescriptors(t.props))) {
-					if ([
-						"tag",
-						"children",
-						"ref"
-					].includes(e)) continue;
-					let r = n.get?.() ?? n.value;
-					this.updateHtmlElementNodeProp(t, e, r);
+				i = o.get(e);
+			} else i = document;
+			let s = null;
+			if (r && (s = o.get(r) ?? null), l.isHydrating) {
+				let e = s ? s.nextSibling : i.firstChild;
+				for (;;) {
+					if (!e) throw Error("Ошибка гидрации");
+					if (isLibNodeEqualToDomNode(n, e)) {
+						o.set(n, e);
+						break;
+					} else {
+						let t = e;
+						e = e.nextSibling, t.parentElement?.removeChild(t);
+					}
 				}
-				let e = c.get(t);
-				f(r, e, i), t.props.ref && (t.props.ref.element = e);
-			} else throw Error("Неверный тип ноды");
-		},
-		updateTextNode(e) {
-			let t = e.props.text, n = c.get(e);
-			n && (n.textContent = String(t));
-		},
-		updateHtmlElementNodeProp(e, t, n) {
-			let r = c.get(e);
-			if (!r) return;
-			let i = r;
-			if (((e) => e.startsWith("on"))(t)) {
-				n ? (this.listeners[t] ??= /* @__PURE__ */ new Map(), this.listeners[t].set(i, n)) : this.listeners[t]?.delete(i);
-				return;
-			}
-			if (t.startsWith("aria")) {
-				let e = t.toLowerCase().replace("aria", "aria-");
-				n ? i.setAttribute(e, n) : i.removeAttribute(e);
-				return;
-			}
-			if (t === "className") {
-				n ? i.className = n : i.removeAttribute("class");
-				return;
-			}
-			if (t === "style") {
-				n ? Object.keys(n).forEach((e) => {
-					let t = n[e];
-					if (t !== void 0) {
-						let n = String(HTML_ELEMENT_STYLE_PX_PROPERTIES.has(e) && typeof t == "number" ? `${t}px` : t);
-						i.style.setProperty(e, n);
-					} else i.style.removeProperty(e);
-				}) : i.removeAttribute("style");
-				return;
-			}
-			n == null ? i.removeAttribute(t) : i.setAttribute(t, String(n));
+			} else o.has(n) || (n.type === "text" ? o.set(n, document.createTextNode(String(n.props.text))) : n.type === "html-element" && o.set(n, document.createElement(n.props.tag)));
+			let c = o.get(n), d = Object.getOwnPropertyDescriptors(n.props);
+			for (let [e, r] of Object.entries(d)) [
+				"tag",
+				"children",
+				"ref"
+			].includes(e) || (r.value && u(n, c, e, r.value), r.get && createEffect(() => {
+				u(n, c, e, r.get());
+			}, !0));
+			l.isHydrating || i.insertBefore(c, s ? s.nextSibling : i.firstChild);
 		},
 		removeNode(e) {
-			let t = c.get(e);
-			t && (c.delete(e), p(t) ? t.remove() : t.parentElement?.removeChild(t));
+			let t = o.get(e);
+			t && (o.delete(e), isHTMLElementNode(t) ? (t.remove(), s.forEach((e) => {
+				e.delete(t);
+			})) : t.parentElement?.removeChild(t));
 		}
-	}), o.needToHydrate && (l.isHydrating = !1);
+	};
+	r.app()(d), l.isHydrating = !1;
 }
-export { renderToDOM };
+export { hydrate };

package/dist/dom/hydrate.d.ts

@@ -0,0 +1,6 @@
+import { PotokElement } from '../types';
+type HydrateOptions = {
+    app: () => PotokElement;
+};
+export declare function hydrate(options: HydrateOptions): void;
+export {};

package/dist/dom/utils.d.ts

@@ -0,0 +1,4 @@
+import { LibNode } from '../types';
+export declare function isTextNode(node: Node): node is Text;
+export declare function isHTMLElementNode(node: Node): node is HTMLElement;
+export declare function isLibNodeEqualToDomNode(libNode: LibNode, domNode: Node): boolean;

package/dist/exports/client.d.ts

@@ -1 +1 @@
-export { renderToDOM } from '../render-to-dom';
+export { hydrate } from '../dom/hydrate';

package/dist/exports/index.d.ts

@@ -11,4 +11,4 @@ export { Show } from '../show';
 export { createSignal, createEffect, batch, untrack, deepTrack, getSignal, } from '../signals';
 export { createStore } from '../store';
 export type { PotokElement, WithChildren } from '../types';
-export type * from '../jsx-types.ts';
+export type * from '../jsx-types';

package/dist/fragment-BSt6shYv.mjs

@@ -0,0 +1,103 @@
+import { n as createDisposer } from "./signals-ZsU9bGc3.mjs";
+var LibBlock = class {
+	node = null;
+	effects = /* @__PURE__ */ new Set();
+	children = [];
+	get nearestParentElement() {
+		return this.node ?? this.context.parentBlock?.nearestParentElement ?? null;
+	}
+	get previousBlock() {
+		let e = this.context.parentBlock;
+		return e ? e.children[this.context.index - 1] || (e.node ? null : e.previousBlock) : null;
+	}
+	get nearestPreviousNode() {
+		if (this.node) return this.node;
+		let e = this.children[this.children.length - 1];
+		if (e) return e.nearestPreviousNode;
+		let t = this.previousBlock;
+		return t ? t.nearestPreviousNode : null;
+	}
+	get previousNode() {
+		let e = this.previousBlock;
+		return e ? e.nearestPreviousNode : null;
+	}
+	addEffect(e) {
+		this.effects.add(e);
+	}
+	unmountChildren() {
+		this.children.forEach((e) => {
+			e?.unmount();
+		}), this.children = [];
+	}
+	insertNode() {
+		let t = this.node;
+		t && createDisposer(() => {
+			this.context.insertNode(this.context.parentBlock?.nearestParentElement ?? null, t, this.previousNode);
+		}).effects.forEach((e) => {
+			this.effects.add(e);
+		});
+	}
+	unmount() {
+		this.node && this.context.removeNode(this.node), this.unmountChildren(), this.effects.forEach((e) => {
+			e.dispose();
+		}), this.effects.clear();
+	}
+}, LibText = class extends LibBlock {
+	constructor(e, t) {
+		super(), this.props = e, this.context = t, this.node = {
+			type: "text",
+			props: e,
+			context: t
+		}, this.insertNode();
+	}
+};
+function text(e) {
+	return function(t) {
+		return new LibText(e, t);
+	};
+}
+function mergeContext(e, t) {
+	return {
+		parentBlock: t.parentBlock,
+		get index() {
+			return t.index;
+		},
+		portals: e.portals,
+		contexts: {
+			...e.contexts,
+			...t.contexts
+		},
+		isServer: e.isServer,
+		promises: e.promises,
+		get isHydrating() {
+			return e.isHydrating;
+		},
+		insertNode: e.insertNode,
+		removeNode: e.removeNode
+	};
+}
+function normalizeArray(e) {
+	return Array.isArray(e) ? e : [e];
+}
+function normalizeChild(e) {
+	return typeof e == "string" || typeof e == "number" ? [text({ text: String(e) })] : Array.isArray(e) ? e.flatMap(normalizeChildren) : [e];
+}
+function normalizeChildren(e) {
+	return e ? normalizeArray(e).filter((e) => e != null).flatMap(normalizeChild) : [];
+}
+var FragmentClass = class extends LibBlock {
+	constructor(e, t) {
+		super(), this.props = e, this.context = t, normalizeChildren(e.children).forEach((e, n) => {
+			this.children.push(e(mergeContext(t, {
+				parentBlock: this,
+				index: n
+			})));
+		});
+	}
+};
+function fragment(e) {
+	return function(t) {
+		return new FragmentClass(e, t);
+	};
+}
+export { text as a, normalizeChildren as i, mergeContext as n, LibBlock as o, normalizeArray as r, fragment as t };

package/dist/hmr.mjs

@@ -1,6 +1,6 @@
-import { g as HMR_DEV, h as isWindowDefined, l as createSignal, m as getComponentInstanceId } from "./utils-CAe_kbSH.mjs";
-import { n as Show, r as LibContextReader, t as Lifecycle } from "./lifecycle-4vjEuXGy.mjs";
-import { t as fragment } from "./fragment-BahmURhz.mjs";
+import { d as HMR_DEV, i as createSignal, l as getComponentInstanceId, u as isWindowDefined } from "./signals-ZsU9bGc3.mjs";
+import { t as fragment } from "./fragment-BSt6shYv.mjs";
+import { n as Show, r as LibContextReader, t as Lifecycle } from "./lifecycle-C9_o5zOU.mjs";
 function registerComponent(o, s, c) {
 	if (!isWindowDefined()) return o;
 	let l = HMR_DEV.registry.addComponent(s, c, o);
@@ -15,15 +15,15 @@ function registerComponent(o, s, c) {
 		let a = l.component(e);
 		return l.addCachedInstance(r, a, HMR_DEV.currentInstance.states), HMR_DEV.currentInstance = null, a;
 	}
-	return (e) => LibContextReader({ children(r) {
-		let o = createSignal({ element: u(e, r) }), d = getComponentInstanceId(r);
+	return (t) => LibContextReader({ children(i) {
+		let o = createSignal({ element: u(t, i) }), d = getComponentInstanceId(i);
 		return Lifecycle({
 			onMounted() {
-				let t = HMR_DEV.registry.subscribeToComponent(s, c, () => {
-					o.element = null, o.element = u(e, r, !0);
+				let e = HMR_DEV.registry.subscribeToComponent(s, c, () => {
+					o.element = null, o.element = u(t, i, !0);
 				});
 				return l.unmarkInstanceAsRemovable(d), () => {
-					t(), l.markInstanceAsRemovable(d), setTimeout(() => {
+					e(), l.markInstanceAsRemovable(d), setTimeout(() => {
 						l.getCachedInstance(d)?.isRemovable && l.removeCachedInstance(d);
 					});
 				};

package/dist/html-element-DeGD0uGZ.mjs

@@ -0,0 +1,24 @@
+import { i as normalizeChildren, n as mergeContext, o as LibBlock } from "./fragment-BSt6shYv.mjs";
+var LibHTMLElement = class extends LibBlock {
+	constructor(n, r) {
+		super(), this.props = n, this.context = r, this.node = {
+			type: "html-element",
+			context: r,
+			props: n
+		}, r.isHydrating && this.insertNode(), normalizeChildren(n.children).forEach((e, n) => {
+			this.children.push(e(mergeContext(r, {
+				parentBlock: this,
+				index: n
+			})));
+		}), r.isHydrating || this.insertNode();
+	}
+	unmount() {
+		this.props.ref && (this.props.ref.element = null), super.unmount();
+	}
+};
+function htmlElement(e) {
+	return function(t) {
+		return new LibHTMLElement(e, t);
+	};
+}
+export { htmlElement as t };

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { _ as LibBlock, c as createEffect, d as getSignal, f as isSignal, i as normalizeChildren, l as createSignal, n as mergeContext, p as untrack, r as normalizeArray, s as batch, u as deepTrack } from "./utils-CAe_kbSH.mjs";
-import { n as Show, r as LibContextReader, t as Lifecycle } from "./lifecycle-4vjEuXGy.mjs";
-import { t as fragment } from "./fragment-BahmURhz.mjs";
-import { n as PortalOut, t as PortalIn } from "./portal-CbcYOHLv.mjs";
+import { a as deepTrack, c as untrack, i as createSignal, o as getSignal, r as createEffect, s as isSignal, t as batch } from "./signals-ZsU9bGc3.mjs";
+import { i as normalizeChildren, n as mergeContext, o as LibBlock, r as normalizeArray, t as fragment } from "./fragment-BSt6shYv.mjs";
+import { n as Show, r as LibContextReader, t as Lifecycle } from "./lifecycle-C9_o5zOU.mjs";
+import { n as PortalOut, t as PortalIn } from "./portal-BxUviJsE.mjs";
 function ClientOnly(e) {
 	return LibContextReader({ children: (t) => Show({
 		get when() {
@@ -42,17 +42,17 @@ function ErrorBoundary(e) {
 }
 function Lazy(e) {
 	return LibContextReader({ children: (t) => {
-		let n = createSignal({ block: null });
+		let r = createSignal({ block: null });
 		return t.promises.push(e.import().then((t) => {
-			n.block = e.resolve(t);
+			r.block = e.resolve(t);
 		})), fragment({ children: [Show({
 			get when() {
-				return n.block !== null;
+				return r.block !== null;
 			},
-			children: [n.block]
+			children: [r.block]
 		}), Show({
 			get when() {
-				return n.block === null;
+				return r.block === null;
 			},
 			children: [e.fallback]
 		})] });
@@ -63,34 +63,34 @@ function LibScripts() {
 }
 var ListClass = class extends LibBlock {
 	signals = [];
-	constructor(e, i) {
-		super(), this.props = e, this.context = i;
-		let c = [];
+	constructor(o, s) {
+		super(), this.props = o, this.context = s;
+		let l = [];
 		this.addEffect(createEffect(() => {
-			let t = e.items;
-			isSignal(t) && deepTrack(t, 1), untrack(() => {
-				this.diff(c, t).forEach((t) => {
-					if (t.type === "add") {
-						let r = createSignal({
-							item: t.item,
-							index: t.index
+			let i = o.items;
+			isSignal(i) && deepTrack(i, 1), untrack(() => {
+				this.diff(l, i).forEach((e) => {
+					if (e.type === "add") {
+						let t = createSignal({
+							item: e.item,
+							index: e.index
 						});
-						this.children.splice(t.index, 0, null), this.signals.splice(t.index, 0, getSignal(r));
-						let s = e.render(r)(mergeContext(i, {
+						this.children.splice(e.index, 0, null), this.signals.splice(e.index, 0, getSignal(t));
+						let i = o.render(t)(mergeContext(s, {
 							parentBlock: this,
 							get index() {
-								return r.index;
+								return t.index;
 							}
 						}));
-						this.children[t.index] = s;
-					} else if (t.type === "replace") this.signals[t.index].proxy.item = t.newItem;
-					else if (t.type === "delete") {
-						let e = this.children[t.index];
-						this.children.splice(t.index, 1), this.signals.splice(t.index, 1), e?.unmount();
+						this.children[e.index] = i;
+					} else if (e.type === "replace") this.signals[e.index].proxy.item = e.newItem;
+					else if (e.type === "delete") {
+						let t = this.children[e.index];
+						this.children.splice(e.index, 1), this.signals.splice(e.index, 1), t?.unmount();
 					}
 				}), this.signals.forEach((e, t) => {
 					e.value.index !== t && (e.proxy.index = t);
-				}), c = [...t];
+				}), l = [...i];
 			});
 		}, !0));
 	}
@@ -177,17 +177,17 @@ function createStore() {
 	return function(e) {
 		let t = createContext();
 		return {
-			provider(n) {
-				let r = createSignal(e.state({ props: n })), i = e.actions({
-					props: n,
-					state: r
-				}), o = Object.entries(i).reduce((e, [t, n]) => (e[t] = (...e) => batch(() => n.apply(i, e)), e), {});
+			provider(r) {
+				let i = createSignal(e.state({ props: r })), a = e.actions({
+					props: r,
+					state: i
+				}), s = Object.entries(a).reduce((e, [t, n]) => (e[t] = (...e) => batch(() => n.apply(a, e)), e), {});
 				return t.provider({
 					value: {
-						state: r,
-						actions: o
+						state: i,
+						actions: s
 					},
-					children: n.children
+					children: r.children
 				});
 			},
 			reader(e) {

package/dist/jsx-runtime.mjs

@@ -1,6 +1,6 @@
-import { o as text } from "./utils-CAe_kbSH.mjs";
-import { t as fragment } from "./fragment-BahmURhz.mjs";
-import { t as htmlElement } from "./html-element-Cm0RtMkT.mjs";
+import "./signals-ZsU9bGc3.mjs";
+import { a as text, t as fragment } from "./fragment-BSt6shYv.mjs";
+import { t as htmlElement } from "./html-element-DeGD0uGZ.mjs";
 function detectChild(e) {
 	let t = e.value, n = typeof t;
 	return n === "string" || n === "number" || n === "boolean" ? text({ get text() {

package/dist/{lifecycle-4vjEuXGy.mjs → lifecycle-C9_o5zOU.mjs}

@@ -1,4 +1,5 @@
-import { _ as LibBlock, c as createEffect, i as normalizeChildren, n as mergeContext, p as untrack, r as normalizeArray } from "./utils-CAe_kbSH.mjs";
+import { c as untrack, r as createEffect } from "./signals-ZsU9bGc3.mjs";
+import { i as normalizeChildren, n as mergeContext, o as LibBlock, r as normalizeArray } from "./fragment-BSt6shYv.mjs";
 var LibContextReaderClass = class extends LibBlock {
 	constructor(e, t) {
 		super(), this.props = e, this.context = t, normalizeArray(e.children).forEach((e, n) => {
@@ -15,13 +16,13 @@ function LibContextReader(e) {
 	};
 }
 var ShowClass = class extends LibBlock {
-	constructor(e, r) {
-		super(), this.props = e, this.context = r;
-		let i = normalizeChildren(e.children);
+	constructor(r, i) {
+		super(), this.props = r, this.context = i;
+		let a = normalizeChildren(r.children);
 		this.addEffect(createEffect(() => {
-			e.when ? untrack(() => {
-				i.forEach((e, t) => {
-					this.children.push(e(mergeContext(r, {
+			r.when ? untrack(() => {
+				a.forEach((e, t) => {
+					this.children.push(e(mergeContext(i, {
 						parentBlock: this,
 						index: t
 					})));

package/dist/portal-BxUviJsE.mjs

@@ -0,0 +1,45 @@
+import { c as untrack, r as createEffect } from "./signals-ZsU9bGc3.mjs";
+import { i as normalizeChildren, n as mergeContext, o as LibBlock } from "./fragment-BSt6shYv.mjs";
+var PortalInClass = class extends LibBlock {
+	constructor(n, r) {
+		super(), this.props = n, this.context = r;
+		let i;
+		r.portals[n.name] ? console.warn(`Портал ${n.name} уже существует`) : this.addEffect(createEffect(() => {
+			let t = n.name;
+			t !== i && untrack(() => {
+				delete r.portals[t], r.portals[t] = n.children;
+			}), i = t;
+		}));
+	}
+	unmount() {
+		super.unmount(), delete this.context.portals[this.props.name];
+	}
+};
+function PortalIn(e) {
+	return function(t) {
+		return new PortalInClass(e, t);
+	};
+}
+var PortalOutClass = class extends LibBlock {
+	constructor(i, a) {
+		super(), this.props = i, this.context = a;
+		let o;
+		this.addEffect(createEffect(() => {
+			let t = i.name, s = normalizeChildren(a.portals[t]);
+			s ? s !== o && (this.unmountChildren(), untrack(() => {
+				s.forEach((e, t) => {
+					this.children.push(e(mergeContext(a, {
+						parentBlock: this,
+						index: t
+					})));
+				});
+			}), o = s) : (this.unmountChildren(), o = null);
+		}));
+	}
+};
+function PortalOut(e) {
+	return function(t) {
+		return new PortalOutClass(e, t);
+	};
+}
+export { PortalOut as n, PortalIn as t };

package/dist/prop-types.d.ts

@@ -181,7 +181,7 @@ type StyleWithNumericSupport = {
     maxHeight?: CSSLength;
     minHeight?: CSSLength;
 };
-type LibHTMLElementStyle = Partial<Omit<CSSStyleDeclaration, 'getPropertyCSSValue' | 'getPropertyPriority' | 'getPropertyValue' | 'item' | 'removeProperty' | 'setProperty' | 'cssFloat' | 'cssText' | 'length' | 'parentRule' | keyof StyleWithNumericSupport> & StyleWithNumericSupport>;
+type LibHTMLElementStyle = Partial<Omit<CSSStyleDeclaration, "getPropertyCSSValue" | "getPropertyPriority" | "getPropertyValue" | "item" | "removeProperty" | "setProperty" | "cssFloat" | "cssText" | "length" | "parentRule" | keyof StyleWithNumericSupport> & StyleWithNumericSupport>;
 export type LibHTMLElementProps = WithChildren<{
     accessKey?: string;
     autocapitalize?: string;
@@ -268,7 +268,7 @@ export type LibHTMLAudioElementProps = {
     loop?: boolean;
     muted?: boolean;
     playbackRate?: number;
-    preload?: HTMLAudioElement['preload'];
+    preload?: HTMLAudioElement["preload"];
     preservesPitch?: boolean;
     src?: string;
     srcObject?: MediaProvider | null;
@@ -307,7 +307,7 @@ export type LibHTMLButtonElementProps = {
     formNoValidate?: boolean;
     formTarget?: string;
     name?: string;
-    type?: HTMLButtonElement['type'];
+    type?: HTMLButtonElement["type"];
     value?: string;
 } & LibHTMLElementProps & LibHTMLElementEventMap & LibHTMLelementAriaProps;
 export type LibHTMLCanvasElementProps = {
@@ -457,10 +457,10 @@ export type LibHTMLImageElementProps = {
     ref?: LibHTMLElementReference<HTMLImageElement>;
     alt?: string;
     crossOrigin?: string | null;
-    decoding?: HTMLImageElement['decoding'];
+    decoding?: HTMLImageElement["decoding"];
     height?: number;
     isMap?: boolean;
-    loading?: HTMLImageElement['loading'];
+    loading?: HTMLImageElement["loading"];
     referrerPolicy?: string;
     sizes?: string;
     src?: string;
@@ -497,7 +497,7 @@ export type LibHTMLInputElementProps = {
     placeholder?: string;
     readOnly?: boolean;
     required?: boolean;
-    selectionDirection?: HTMLInputElement['selectionDirection'];
+    selectionDirection?: HTMLInputElement["selectionDirection"];
     selectionEnd?: number | null;
     selectionStart?: number | null;
     size?: number;
@@ -716,9 +716,9 @@ export type LibHTMLSupElementProps = {
 } & LibHTMLElementProps;
 export type LibHTMLTableElementProps = {
     ref?: LibHTMLElementReference<HTMLTableElement>;
-    caption?: HTMLTableElement['caption'];
-    tFoot?: HTMLTableElement['tFoot'];
-    tHead?: HTMLTableElement['tHead'];
+    caption?: HTMLTableElement["caption"];
+    tFoot?: HTMLTableElement["tFoot"];
+    tHead?: HTMLTableElement["tHead"];
 } & LibHTMLElementProps & LibHTMLElementEventMap & LibHTMLelementAriaProps;
 export type LibHTMLTbodyElementProps = {
     ref?: LibHTMLElementReference<HTMLTableSectionElement>;
@@ -736,7 +736,7 @@ export type LibHTMLTemplateElementProps = {
 } & LibHTMLElementProps;
 export type LibHTMLTextAreaElementProps = {
     ref?: LibHTMLElementReference<HTMLTextAreaElement>;
-    autocomplete?: HTMLTextAreaElement['autocomplete'];
+    autocomplete?: HTMLTextAreaElement["autocomplete"];
     cols?: number;
     defaultValue?: string;
     dirName?: string;
@@ -748,7 +748,7 @@ export type LibHTMLTextAreaElementProps = {
     readOnly?: boolean;
     required?: boolean;
     rows?: number;
-    selectionDirection?: HTMLTextAreaElement['selectionDirection'];
+    selectionDirection?: HTMLTextAreaElement["selectionDirection"];
     selectionEnd?: number;
     selectionStart?: number;
     value?: string;
@@ -808,10 +808,10 @@ export type LibHTMLVideoElementProps = {
     loop?: boolean;
     muted?: boolean;
     playbackRate?: number;
-    preload?: HTMLVideoElement['preload'];
+    preload?: HTMLVideoElement["preload"];
     preservesPitch?: boolean;
     src?: string;
-    srcObject?: HTMLMediaElement['srcObject'];
+    srcObject?: HTMLMediaElement["srcObject"];
     volume?: number;
     disablePictureInPicture?: boolean;
     height?: number;

package/dist/server.mjs

@@ -1,8 +1,8 @@
-import { l as createSignal } from "./utils-CAe_kbSH.mjs";
-import { t as fragment } from "./fragment-BahmURhz.mjs";
-import { t as PortalIn } from "./portal-CbcYOHLv.mjs";
+import { i as createSignal } from "./signals-ZsU9bGc3.mjs";
+import { t as fragment } from "./fragment-BSt6shYv.mjs";
+import { t as PortalIn } from "./portal-BxUviJsE.mjs";
 import { t as CLIENT_ENTRY_FILE_NAME } from "./constants-BOAOReQ3.mjs";
-import { t as htmlElement } from "./html-element-Cm0RtMkT.mjs";
+import { t as htmlElement } from "./html-element-DeGD0uGZ.mjs";
 import path from "path";
 import { Readable, Writable } from "node:stream";
 import util from "node:util";
@@ -64,16 +64,12 @@ var ServerNode = class {
 	}
 };
 async function renderToString(t) {
-	let n = createSignal({
-		portals: {},
-		listeners: {}
-	}), r = /* @__PURE__ */ new Map(), i, a = [];
+	let n = createSignal({ portals: {} }), r = /* @__PURE__ */ new Map(), i, a = [];
 	if (t({
 		parentBlock: null,
 		index: 0,
 		portals: n.portals,
 		contexts: {},
-		listeners: n.listeners,
 		isServer: !0,
 		promises: a,
 		isHydrating: !1,
@@ -86,8 +82,6 @@ async function renderToString(t) {
 				r.get(e)?.addChild(a, t);
 			}
 		},
-		updateTextNode() {},
-		updateHtmlElementNodeProp() {},
 		removeNode(e) {
 			r.get(e)?.remove();
 		}

package/dist/{utils-CAe_kbSH.mjs → signals-ZsU9bGc3.mjs}

@@ -7,45 +7,7 @@ var __create = Object.create, __defProp = Object.defineProperty, __getOwnPropDes
 }, __toESM = (n, r, a) => (a = n == null ? {} : __create(__getProtoOf(n)), __copyProps(r || !n || !n.__esModule ? __defProp(a, "default", {
 	value: n,
 	enumerable: !0
-}) : a, n)), LibBlock = class {
-	node = null;
-	effects = [];
-	children = [];
-	get nearestParentElement() {
-		return this.node ?? this.context.parentBlock?.nearestParentElement ?? null;
-	}
-	get previousBlock() {
-		let e = this.context.parentBlock;
-		return e ? e.children[this.context.index - 1] || (e.node ? null : e.previousBlock) : null;
-	}
-	get nearestPreviousNode() {
-		if (this.node) return this.node;
-		let e = this.children[this.children.length - 1];
-		if (e) return e.nearestPreviousNode;
-		let t = this.previousBlock;
-		return t ? t.nearestPreviousNode : null;
-	}
-	get previousNode() {
-		let e = this.previousBlock;
-		return e ? e.nearestPreviousNode : null;
-	}
-	addEffect(e) {
-		this.effects.push(e);
-	}
-	unmountChildren() {
-		this.children.forEach((e) => {
-			e?.unmount();
-		}), this.children = [];
-	}
-	insertNode() {
-		this.node && this.context.insertNode(this.context.parentBlock?.nearestParentElement ?? null, this.node, this.previousNode);
-	}
-	unmount() {
-		this.node && this.context.removeNode(this.node), this.unmountChildren(), this.effects.forEach((e) => {
-			e.dispose();
-		}), this.effects = [];
-	}
-}, RegisteredComponent = class {
+}) : a, n)), RegisteredComponent = class {
 	component;
 	subscribers;
 	cachedInstances;
@@ -286,60 +248,15 @@ function _deepTrack(e, t, n = 0) {
 function deepTrack(e, t) {
 	_deepTrack(e, t);
 }
-var LibText = class extends LibBlock {
-	constructor(e, t) {
-		super(), this.props = e, this.context = t;
-		let n = {
-			type: "text",
-			props: e,
-			context: t
-		};
-		this.node = n, this.addEffect(createEffect(() => {
-			t.updateTextNode(n);
-		}, !0)), this.insertNode();
-	}
-};
-function text(e) {
-	return function(t) {
-		return new LibText(e, t);
-	};
-}
-function mergeContext(e, t) {
-	return {
-		parentBlock: t.parentBlock,
-		get index() {
-			return t.index;
-		},
-		portals: e.portals,
-		contexts: {
-			...e.contexts,
-			...t.contexts
-		},
-		listeners: e.listeners,
-		isServer: e.isServer,
-		promises: e.promises,
-		get isHydrating() {
-			return e.isHydrating;
-		},
-		insertNode: e.insertNode,
-		updateTextNode: e.updateTextNode,
-		updateHtmlElementNodeProp: e.updateHtmlElementNodeProp,
-		removeNode: e.removeNode
+function createDisposer(e) {
+	let t = {
+		effects: /* @__PURE__ */ new Set(),
+		dispose() {
+			t.effects.forEach((e) => {
+				e.dispose();
+			});
+		}
 	};
+	return currentDisposer = t, e(), currentDisposer = null, t;
 }
-function objectKeys(e) {
-	return Object.keys(e);
-}
-function extractListenersFromProps(e) {
-	return Object.entries(e).reduce((e, [t, n]) => (t.startsWith("on") && (e[t] = n), e), {});
-}
-function normalizeArray(e) {
-	return Array.isArray(e) ? e : [e];
-}
-function normalizeChild(e) {
-	return typeof e == "string" || typeof e == "number" ? [text({ text: String(e) })] : Array.isArray(e) ? e.flatMap(normalizeChildren) : [e];
-}
-function normalizeChildren(e) {
-	return e ? normalizeArray(e).filter((e) => e != null).flatMap(normalizeChild) : [];
-}
-export { LibBlock as _, objectKeys as a, createEffect as c, getSignal as d, isSignal as f, HMR_DEV as g, isWindowDefined as h, normalizeChildren as i, createSignal as l, getComponentInstanceId as m, mergeContext as n, text as o, untrack as p, normalizeArray as r, batch as s, extractListenersFromProps as t, deepTrack as u };
+export { deepTrack as a, untrack as c, HMR_DEV as d, createSignal as i, getComponentInstanceId as l, createDisposer as n, getSignal as o, createEffect as r, isSignal as s, batch as t, isWindowDefined as u };

package/dist/types.d.ts

@@ -1,15 +1,15 @@
 import { LibBlock } from './block';
 import { LibHTMLElementProps } from './html-element';
-import { LibHTMLElementEventMap, LibHTMLElementTagNameMap } from './prop-types';
+import { LibHTMLElementTagNameMap } from './prop-types';
 import { LibTextProps } from './text';
 export type LibProps = Record<string, any>;
 export type LibTextNode = {
-    type: 'text';
+    type: "text";
     context: LibContext;
     props: LibTextProps;
 };
 export type LibHtmlElementNode<Tag extends keyof LibHTMLElementTagNameMap = keyof LibHTMLElementTagNameMap> = {
-    type: 'html-element';
+    type: "html-element";
     context: LibContext;
     props: LibHTMLElementProps<Tag>;
 };
@@ -18,12 +18,9 @@ export type LibContext = {
     parentBlock: LibBlock | null;
     index: number;
     insertNode(parent: LibHtmlElementNode | null, node: LibNode, after: LibNode | null): void;
-    updateTextNode(node: LibTextNode): void;
-    updateHtmlElementNodeProp(node: LibHtmlElementNode, key: string, value: unknown): void;
     removeNode(node: LibNode): void;
-    portals: Record<string, WithChildren<{}>['children']>;
+    portals: Record<string, WithChildren<{}>["children"]>;
     contexts: Record<symbol, Record<string, unknown>>;
-    listeners: Record<keyof LibHTMLElementEventMap, Map<HTMLElement, LibHTMLElementEventMap[keyof LibHTMLElementEventMap]>>;
     isServer: boolean;
     promises: Promise<unknown>[];
     isHydrating: boolean;

package/dist/utils.d.ts

@@ -1,11 +1,9 @@
-import { LibHTMLElementEventMap, LibHTMLElementTagNameMap } from './prop-types';
 import { Child, Children, LibContext, MaybeArray, PotokElement } from './types';
-export declare function mergeContext(rootContext: LibContext, childContext: Pick<LibContext, 'parentBlock' | 'index'> & Partial<Pick<LibContext, 'contexts'>>): LibContext;
+export declare function mergeContext(rootContext: LibContext, childContext: Pick<LibContext, "parentBlock" | "index"> & Partial<Pick<LibContext, "contexts">>): LibContext;
 export declare function objectKeys<Obj extends Record<string, unknown>>(obj: Obj): (keyof Obj)[];
-export declare function extractListenersFromProps(props: LibHTMLElementTagNameMap[keyof LibHTMLElementTagNameMap]): LibHTMLElementEventMap;
 export declare function map<T extends string | number | symbol, K>(field: T, mapObject: Record<T, K>): K;
 export declare function map<T extends string | number | symbol, K>(field: T | undefined | null, mapObject: Partial<Record<T, K>>, defaultValue: K): K;
-export declare function map<T extends boolean, K>(field: T, mapObject: Record<'true' | 'false', K>): K;
+export declare function map<T extends boolean, K>(field: T, mapObject: Record<"true" | "false", K>): K;
 export declare function normalizeArray<T>(array: MaybeArray<T>): T[];
 export declare function normalizeChild(child: NonNullable<Child>): PotokElement[];
 export declare function normalizeChildren(children: Children): PotokElement[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@potok-web-framework/core",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "exports": {
     ".": {
       "import": "./dist/index.mjs",
@@ -36,8 +36,7 @@
     "fetch-to-node": "^2.1.0",
     "klona": "^2.0.6",
     "vite": "8.0.0-beta.10",
-    "vite-plugin-dts": "^4.5.4",
-    "@potok-web-framework/vite-plugin": "0.4.0"
+    "vite-plugin-dts": "^4.5.4"
   },
   "peerDependencies": {
     "typescript": "^5"

package/dist/fragment-BahmURhz.mjs

@@ -1,17 +0,0 @@
-import { _ as LibBlock, i as normalizeChildren, n as mergeContext } from "./utils-CAe_kbSH.mjs";
-var FragmentClass = class extends LibBlock {
-	constructor(e, n) {
-		super(), this.props = e, this.context = n, normalizeChildren(e.children).forEach((e, t) => {
-			this.children.push(e(mergeContext(n, {
-				parentBlock: this,
-				index: t
-			})));
-		});
-	}
-};
-function fragment(e) {
-	return function(t) {
-		return new FragmentClass(e, t);
-	};
-}
-export { fragment as t };

package/dist/html-element-Cm0RtMkT.mjs

@@ -1,42 +0,0 @@
-import { _ as LibBlock, a as objectKeys, c as createEffect, i as normalizeChildren, n as mergeContext, t as extractListenersFromProps } from "./utils-CAe_kbSH.mjs";
-var LibHTMLElement = class extends LibBlock {
-	constructor(e, t) {
-		super(), this.props = e, this.context = t;
-		let a = {
-			type: "html-element",
-			context: t,
-			props: e
-		};
-		this.node = a;
-		let o = Object.getOwnPropertyDescriptors(e);
-		for (let [e, r] of Object.entries(o)) {
-			if ([
-				"tag",
-				"children",
-				"ref"
-			].includes(e)) continue;
-			r.value && t.updateHtmlElementNodeProp(a, e, r.value);
-			let i = r.get;
-			i && this.addEffect(createEffect(() => {
-				t.updateHtmlElementNodeProp(a, e, i());
-			}, !0));
-		}
-		t.isHydrating && this.insertNode(), normalizeChildren(e.children).forEach((e, n) => {
-			this.children.push(e(mergeContext(t, {
-				parentBlock: this,
-				index: n
-			})));
-		}), t.isHydrating || this.insertNode();
-	}
-	unmount() {
-		this.node && objectKeys(extractListenersFromProps(this.props)).forEach((e) => {
-			this.context.listeners[e]?.delete(this.node);
-		}), this.props.ref && (this.props.ref.element = null), super.unmount();
-	}
-};
-function htmlElement(e) {
-	return function(t) {
-		return new LibHTMLElement(e, t);
-	};
-}
-export { htmlElement as t };

package/dist/portal-CbcYOHLv.mjs

@@ -1,44 +0,0 @@
-import { _ as LibBlock, c as createEffect, i as normalizeChildren, n as mergeContext, p as untrack } from "./utils-CAe_kbSH.mjs";
-var PortalInClass = class extends LibBlock {
-	constructor(e, n) {
-		super(), this.props = e, this.context = n;
-		let r;
-		n.portals[e.name] ? console.warn(`Портал ${e.name} уже существует`) : this.addEffect(createEffect(() => {
-			let t = e.name;
-			t !== r && untrack(() => {
-				delete n.portals[t], n.portals[t] = e.children;
-			}), r = t;
-		}));
-	}
-	unmount() {
-		super.unmount(), delete this.context.portals[this.props.name];
-	}
-};
-function PortalIn(e) {
-	return function(t) {
-		return new PortalInClass(e, t);
-	};
-}
-var PortalOutClass = class extends LibBlock {
-	constructor(e, i) {
-		super(), this.props = e, this.context = i;
-		let a;
-		this.addEffect(createEffect(() => {
-			let t = e.name, o = normalizeChildren(i.portals[t]);
-			o ? o !== a && (this.unmountChildren(), untrack(() => {
-				o.forEach((e, t) => {
-					this.children.push(e(mergeContext(i, {
-						parentBlock: this,
-						index: t
-					})));
-				});
-			}), a = o) : (this.unmountChildren(), a = null);
-		}));
-	}
-};
-function PortalOut(e) {
-	return function(t) {
-		return new PortalOutClass(e, t);
-	};
-}
-export { PortalOut as n, PortalIn as t };

package/dist/render-to-dom.d.ts

@@ -1,8 +0,0 @@
-import { PotokElement } from './types';
-type RenderToDOMOptions = {
-    app: () => PotokElement;
-    needToHydrate?: boolean;
-    root?: Element;
-};
-export declare function renderToDOM(options: RenderToDOMOptions): void;
-export {};