@potok-web-framework/core 0.13.0 → 0.15.0

package/dist/block.d.ts

@@ -1,4 +1,5 @@
-import { LibHTMLElementNode } from './html-element';
+import { LibDocumentTypeNode } from './document-type-node';
+import { LibHTMLElementNode } from './html-element-node';
 import { LibNode } from './lib-node';
 import { Effect } from './signals';
 import { LibTextNode } from './text-node';
@@ -16,6 +17,7 @@ export declare abstract class LibBlock {
     isNode(): this is LibNode;
     isHTMLElementNode(): this is LibHTMLElementNode;
     isTextNode(): this is LibTextNode;
+    isDocumentTypeNode(): this is LibDocumentTypeNode;
     addEffect(effect: Effect): void;
     unmountChildren(): void;
     unmount(): void;

package/dist/client/utils/dom.d.ts

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

package/dist/client.mjs

@@ -1,15 +1,18 @@
-import { i as createSignal, n as batch, r as createEffect } from "./lib-node-JxhtuJyh.mjs";
+import { i as createSignal, n as batch, r as createEffect } from "./lib-node-A2uZ5QH1.mjs";
 import { i as PRELOAD_SCRIPTS_SCRIPT_ID, n as HYDRATION_STATE_SCRIPT_ID, r as NON_BUBBLING_EVENTS } from "./constants-Bxn0R4hW.mjs";
 import { t as deserializeWithTypes } from "./serialization-qOayQbjE.mjs";
-import { n as normalizeCssPropertyValue, t as normalizeCssPropertyName } from "./css-BercB0Kp.mjs";
+import { n as normalizeCssPropertyValue, t as normalizeCssPropertyName } from "./css-DMDIE7dH.mjs";
 function isTextNode(e) {
 	return e.nodeType === Node.TEXT_NODE;
 }
 function isHTMLElementNode(e) {
 	return e.nodeType === Node.ELEMENT_NODE;
 }
+function isDocumentTypeNode(e) {
+	return e.nodeType === Node.DOCUMENT_TYPE_NODE;
+}
 function isLibNodeEqualToDomNode(e, t) {
-	return e.isTextNode() && isTextNode(t) ? String(e.props.text) === t.textContent : e.isHTMLElementNode() && isHTMLElementNode(t) ? e.props.tag === t.tagName.toLowerCase() : !1;
+	return e.isTextNode() && isTextNode(t) ? String(e.props.text) === t.textContent : e.isHTMLElementNode() && isHTMLElementNode(t) ? e.props.tag === t.tagName.toLowerCase() : e.isDocumentTypeNode() && isDocumentTypeNode(t) ? e.props.type === t.name.toLowerCase() : !1;
 }
 function hydrate(s) {
 	let c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map(), u = /* @__PURE__ */ new Set(), d = document.getElementById(PRELOAD_SCRIPTS_SCRIPT_ID), f = createSignal({
@@ -79,7 +82,7 @@ function hydrate(s) {
 						n = n.nextSibling, e.parentElement?.removeChild(e);
 					}
 				}
-			} else c.has(e) || (e.isTextNode() ? c.set(e, document.createTextNode(String(e.props.text))) : e.isHTMLElementNode() && c.set(e, document.createElement(e.props.tag)));
+			} else c.has(e) || (e.isTextNode() ? c.set(e, document.createTextNode(String(e.props.text))) : e.isHTMLElementNode() ? c.set(e, document.createElement(e.props.tag)) : e.isDocumentTypeNode() && c.set(e, document.implementation.createDocumentType(e.props.type, "", "")));
 			let s = c.get(e);
 			h(e, (t, n) => {
 				if (e.isTextNode()) s.textContent = String(n);

package/dist/context-IwELKojA.mjs

@@ -0,0 +1,41 @@
+import { l as LibBlock } from "./lib-node-A2uZ5QH1.mjs";
+import { i as mergeContext, r as normalizeArray, t as normalizeChildren } from "./normalize-children-C7XDL3rl.mjs";
+var ContextProvider = class extends LibBlock {
+	constructor(e, n, i) {
+		super(), this.props = e, this.context = i, normalizeChildren(e.children).forEach((r, a) => {
+			this.children.push(r(mergeContext(i, {
+				parentBlock: this,
+				index: a,
+				contexts: { [n]: e.value }
+			})));
+		});
+	}
+}, ContextConsumer = class extends LibBlock {
+	constructor(e, r, i) {
+		super(), this.props = e, this.context = i;
+		let a = i.contexts[r];
+		if (!a) throw Error("Контекст не найден");
+		normalizeArray(e.children).forEach((e, n) => {
+			this.children.push(e(a)(mergeContext(i, {
+				parentBlock: this,
+				index: n
+			})));
+		});
+	}
+};
+function createContext() {
+	let e = Symbol("context");
+	return {
+		provider(t) {
+			return function(n) {
+				return new ContextProvider(t, e, n);
+			};
+		},
+		reader(t) {
+			return function(n) {
+				return new ContextConsumer(t, e, n);
+			};
+		}
+	};
+}
+export { createContext as t };

package/dist/document-type-node.d.ts

@@ -0,0 +1,12 @@
+import { LibNode } from './lib-node';
+import { LibContext, PotokElement } from './types';
+export type LibDocumentTypeNodeProps = {
+    type: "html" | "xml" | "svg";
+};
+export declare class LibDocumentTypeNode extends LibNode {
+    readonly props: LibDocumentTypeNodeProps;
+    readonly context: LibContext;
+    constructor(props: LibDocumentTypeNodeProps, context: LibContext);
+    isDocumentTypeNode(): this is LibDocumentTypeNode;
+}
+export declare function DocumentType(props: LibDocumentTypeNodeProps): PotokElement;

package/dist/exports/index.d.ts

@@ -10,5 +10,7 @@ export { PortalIn, PortalOut } from '../portal';
 export { createElementReference } from '../ref';
 export { Show } from '../show';
 export { createSignal, createEffect, batch, untrack, deepTrack, getSignal, } from '../signals';
+export { createContext } from '../context';
+export { DocumentType } from '../document-type-node';
 export type { PotokElement, WithChildren } from '../types';
 export type * from '../jsx-types';

package/dist/exports/jsx-runtime.d.ts

@@ -1,5 +1,5 @@
 export { fragment } from '../fragment';
-export { htmlElement } from '../html-element';
+export { htmlElement } from '../html-element-node';
 export { text } from '../text-node';
 export { detectChild } from '../detect-child';
 export { potokPreload } from '../client/potok-preload';

package/dist/{fragment-miU_1DSF.mjs → fragment-BPbIbst6.mjs}

@@ -1,5 +1,5 @@
-import { l as LibBlock } from "./lib-node-JxhtuJyh.mjs";
-import { i as mergeContext, t as normalizeChildren } from "./normalize-children-Dh51Diw_.mjs";
+import { l as LibBlock } from "./lib-node-A2uZ5QH1.mjs";
+import { i as mergeContext, t as normalizeChildren } from "./normalize-children-C7XDL3rl.mjs";
 var FragmentClass = class extends LibBlock {
 	constructor(e, r) {
 		super(), this.props = e, this.context = r, normalizeChildren(e.children).forEach((e, n) => {

package/dist/{get-component-instance-id-BC0t58Yc.mjs → get-component-instance-id-BsCBJaZv.mjs}

@@ -1,5 +1,5 @@
-import { i as createSignal, l as LibBlock } from "./lib-node-JxhtuJyh.mjs";
-import { i as mergeContext, r as normalizeArray, t as normalizeChildren } from "./normalize-children-Dh51Diw_.mjs";
+import { i as createSignal, l as LibBlock } from "./lib-node-A2uZ5QH1.mjs";
+import { i as mergeContext, r as normalizeArray, t as normalizeChildren } from "./normalize-children-C7XDL3rl.mjs";
 var LibContextReaderClass = class extends LibBlock {
 	constructor(e, t) {
 		super(), this.props = e, this.context = t, normalizeArray(e.children).forEach((e, r) => {

package/dist/hmr.mjs

@@ -1,6 +1,6 @@
-import { i as createSignal } from "./lib-node-JxhtuJyh.mjs";
-import { i as HMR_STYLES } from "./get-component-instance-id-BC0t58Yc.mjs";
-import { n as registerComponent } from "./register-component-BpqHm9l-.mjs";
+import { i as createSignal } from "./lib-node-A2uZ5QH1.mjs";
+import { i as HMR_STYLES } from "./get-component-instance-id-BsCBJaZv.mjs";
+import { n as registerComponent } from "./register-component-fwzVBk6g.mjs";
 function registerStyle(n, r) {
 	let i = HMR_STYLES.styles.find((e) => e.id === n);
 	i ? i.css = r : HMR_STYLES.styles = [...HMR_STYLES.styles, createSignal({

package/dist/{html-element-C4QFddWA.mjs → html-element-node-TpTgOUo-.mjs}

@@ -1,5 +1,5 @@
-import { t as LibNode } from "./lib-node-JxhtuJyh.mjs";
-import { i as mergeContext, t as normalizeChildren } from "./normalize-children-Dh51Diw_.mjs";
+import { t as LibNode } from "./lib-node-A2uZ5QH1.mjs";
+import { i as mergeContext, t as normalizeChildren } from "./normalize-children-C7XDL3rl.mjs";
 function potokPreload(e, t) {
 	let n = () => e();
 	return n.dependencies = t, n;

package/dist/index.mjs

@@ -1,12 +1,13 @@
-import { a as deepTrack, c as untrack, i as createSignal, l as LibBlock, n as batch, o as getSignal, r as createEffect, s as isSignal } from "./lib-node-JxhtuJyh.mjs";
-import { i as mergeContext, n as text, t as normalizeChildren } from "./normalize-children-Dh51Diw_.mjs";
-import { a as Lifecycle, i as HMR_STYLES, o as LibContextReader } from "./get-component-instance-id-BC0t58Yc.mjs";
-import { r as Show, t as isRegisteredComponentElement } from "./register-component-BpqHm9l-.mjs";
-import { n as isPotokPreloader, t as htmlElement } from "./html-element-C4QFddWA.mjs";
-import { t as fragment } from "./fragment-miU_1DSF.mjs";
+import { a as deepTrack, c as untrack, i as createSignal, l as LibBlock, n as batch, o as getSignal, r as createEffect, s as isSignal, t as LibNode } from "./lib-node-A2uZ5QH1.mjs";
+import { i as mergeContext, n as text, t as normalizeChildren } from "./normalize-children-C7XDL3rl.mjs";
+import { a as Lifecycle, i as HMR_STYLES, o as LibContextReader } from "./get-component-instance-id-BsCBJaZv.mjs";
+import { r as Show, t as isRegisteredComponentElement } from "./register-component-fwzVBk6g.mjs";
+import { n as isPotokPreloader, t as htmlElement } from "./html-element-node-TpTgOUo-.mjs";
+import { t as fragment } from "./fragment-BPbIbst6.mjs";
 import { i as PRELOAD_SCRIPTS_SCRIPT_ID, n as HYDRATION_STATE_SCRIPT_ID } from "./constants-Bxn0R4hW.mjs";
 import { t as escapeFromScriptTag } from "./escape-from-script-tag-CRT2evI1.mjs";
 import { n as serializeWithTypes } from "./serialization-qOayQbjE.mjs";
+import { t as createContext } from "./context-IwELKojA.mjs";
 import { clientEntry } from "virtual:client-variables";
 function ClientOnly(e) {
 	return LibContextReader({ children: (t) => Show({
@@ -268,4 +269,17 @@ function PortalOut(e) {
 		return new PortalOutClass(e, t);
 	};
 }
-export { ClientOnly, ErrorBoundary, FooterScripts, HeaderScripts, Lazy, LibContextReader, Lifecycle, List, PortalIn, PortalOut, Show, batch, createEffect, createElementReference, createSignal, deepTrack, getSignal, untrack };
+var LibDocumentTypeNode = class extends LibNode {
+	constructor(e, t) {
+		super(), this.props = e, this.context = t, this.insert();
+	}
+	isDocumentTypeNode() {
+		return !0;
+	}
+};
+function DocumentType(e) {
+	return function(t) {
+		return new LibDocumentTypeNode(e, t);
+	};
+}
+export { ClientOnly, DocumentType, ErrorBoundary, FooterScripts, HeaderScripts, Lazy, LibContextReader, Lifecycle, List, PortalIn, PortalOut, Show, batch, createContext, createEffect, createElementReference, createSignal, deepTrack, getSignal, untrack };

package/dist/jsx-runtime.mjs

@@ -1,6 +1,6 @@
-import { n as text } from "./normalize-children-Dh51Diw_.mjs";
-import { r as potokPreload, t as htmlElement } from "./html-element-C4QFddWA.mjs";
-import { t as fragment } from "./fragment-miU_1DSF.mjs";
+import { n as text } from "./normalize-children-C7XDL3rl.mjs";
+import { r as potokPreload, t as htmlElement } from "./html-element-node-TpTgOUo-.mjs";
+import { t as fragment } from "./fragment-BPbIbst6.mjs";
 function detectChild(e) {
 	let t = e.value, n = typeof t;
 	return n === "string" || n === "number" || n === "boolean" ? text({ get text() {

package/dist/{lib-node-JxhtuJyh.mjs → lib-node-A2uZ5QH1.mjs}

@@ -32,6 +32,9 @@ var LibBlock = class {
 	isTextNode() {
 		return !1;
 	}
+	isDocumentTypeNode() {
+		return !1;
+	}
 	addEffect(e) {
 		this.effects.add(e);
 	}

package/dist/{normalize-children-Dh51Diw_.mjs → normalize-children-C7XDL3rl.mjs}

@@ -1,4 +1,4 @@
-import { t as LibNode } from "./lib-node-JxhtuJyh.mjs";
+import { t as LibNode } from "./lib-node-A2uZ5QH1.mjs";
 function mergeContext(e, t) {
 	return {
 		parentBlock: t.parentBlock,

package/dist/{register-component-BpqHm9l-.mjs → register-component-fwzVBk6g.mjs}

@@ -1,7 +1,7 @@
-import { c as untrack, i as createSignal, l as LibBlock, r as createEffect } from "./lib-node-JxhtuJyh.mjs";
-import { i as mergeContext, t as normalizeChildren } from "./normalize-children-Dh51Diw_.mjs";
-import { a as Lifecycle, n as HMR_COMPONENTS_REGISTRY, o as LibContextReader, t as getComponentInstanceId } from "./get-component-instance-id-BC0t58Yc.mjs";
-import { t as fragment } from "./fragment-miU_1DSF.mjs";
+import { c as untrack, i as createSignal, l as LibBlock, r as createEffect } from "./lib-node-A2uZ5QH1.mjs";
+import { i as mergeContext, t as normalizeChildren } from "./normalize-children-C7XDL3rl.mjs";
+import { a as Lifecycle, n as HMR_COMPONENTS_REGISTRY, o as LibContextReader, t as getComponentInstanceId } from "./get-component-instance-id-BsCBJaZv.mjs";
+import { t as fragment } from "./fragment-BPbIbst6.mjs";
 var ShowClass = class extends LibBlock {
 	constructor(t, n) {
 		super(), this.props = t, this.context = n;

package/dist/{server-node.d.ts → server/server-node.d.ts}

@@ -1,10 +1,11 @@
-import { LibNode } from './lib-node';
+import { LibNode } from '../lib-node';
 export declare class ServerNode {
-    libNode: LibNode;
+    readonly libNode: LibNode | null;
     parent: ServerNode | null;
     children: ServerNode[];
-    constructor(libNode: LibNode);
+    constructor(libNode: LibNode | null);
     addChild(node: ServerNode, after: ServerNode | null): void;
     remove(): void;
+    private stringifyChildren;
     stringify(): string;
 }

package/dist/server.mjs

@@ -1,6 +1,6 @@
-import { i as createSignal, n as batch } from "./lib-node-JxhtuJyh.mjs";
+import { i as createSignal, n as batch } from "./lib-node-A2uZ5QH1.mjs";
 import { t as escapeFromScriptTag } from "./escape-from-script-tag-CRT2evI1.mjs";
-import { n as normalizeCssPropertyValue, t as normalizeCssPropertyName } from "./css-BercB0Kp.mjs";
+import { n as normalizeCssPropertyValue, t as normalizeCssPropertyName } from "./css-DMDIE7dH.mjs";
 import { clientDependencies } from "virtual:client-variables";
 import path from "path";
 async function bootstrapApp(e) {
@@ -29,7 +29,6 @@ function escapeHtml(e) {
 	return /[&<>"']/.test(e) ? e.replace(/[&<>"']/g, (e) => HTML_ESCAPE_MAP[e]) : e;
 }
 var ServerNode = class {
-	libNode;
 	parent = null;
 	children = [];
 	constructor(e) {
@@ -46,7 +45,11 @@ var ServerNode = class {
 	remove() {
 		this.parent && this.parent.children.splice(this.parent.children.indexOf(this), 1);
 	}
+	stringifyChildren() {
+		return this.children.map((e) => e.stringify()).join("");
+	}
 	stringify() {
+		if (!this.libNode) return this.stringifyChildren();
 		if (this.libNode.isTextNode()) {
 			let e = this.libNode.parentElementNode?.props.tag;
 			return e === "title" ? escapeHtml(String(this.libNode.props.text)) : e === "script" ? escapeFromScriptTag(String(this.libNode.props.text)) : `<!-- -->${escapeHtml(String(this.libNode.props.text))}<!-- -->`;
@@ -74,10 +77,8 @@ var ServerNode = class {
 				} else if (t.startsWith("on")) continue;
 				else e += ` ${t}="${escapeHtml(String(a))}"`;
 			}
-			return e += ">", this.children.forEach((t) => {
-				e += t.stringify();
-			}), e += `</${this.libNode.props.tag}>`, e;
-		}
+			return e += ">", e += this.stringifyChildren(), e += `</${this.libNode.props.tag}>`, e;
+		} else if (this.libNode.isDocumentTypeNode()) return `<!DOCTYPE ${escapeHtml(this.libNode.props.type)}>`;
 		throw Error("Not implemented");
 	}
 }, clientDependencyScripts = clientDependencies.map((t) => createSignal({
@@ -99,7 +100,7 @@ async function renderToString(n) {
 				});
 			}
 		}
-	}), i = /* @__PURE__ */ new Map(), a, o = [];
+	}), i = /* @__PURE__ */ new Map(), a = new ServerNode(null), o = [];
 	function s(e) {
 		return i.has(e) || i.set(e, new ServerNode(e)), i.get(e);
 	}
@@ -114,14 +115,14 @@ async function renderToString(n) {
 		promises: o,
 		isHydrating: !1,
 		insertNode(e) {
-			let t = e.parentElementNode ? s(e.parentElementNode) : null, n = s(e), r = e.previousNode ? s(e.previousNode) : null;
-			t === null ? a = n : t?.addChild(n, r);
+			let t = e.parentElementNode ? s(e.parentElementNode) : a, n = s(e), r = e.previousNode ? s(e.previousNode) : null;
+			t.addChild(n, r);
 		},
 		removeNode(e) {
 			i.get(e)?.remove();
 		}
 	});
-	if (await Promise.all(o), !a) throw Error("Корневая нода не найдена");
+	await Promise.all(o);
 	let l = a.stringify();
 	return c.unmount(), l;
 }

package/dist/store.mjs

@@ -1,45 +1,7 @@
-import { a as deepTrack, i as createSignal, l as LibBlock, n as batch, r as createEffect } from "./lib-node-JxhtuJyh.mjs";
-import { i as mergeContext, r as normalizeArray, t as normalizeChildren } from "./normalize-children-Dh51Diw_.mjs";
-import { a as Lifecycle, o as LibContextReader, r as HMR_STATE_CACHE, t as getComponentInstanceId } from "./get-component-instance-id-BC0t58Yc.mjs";
+import { a as deepTrack, i as createSignal, n as batch, r as createEffect } from "./lib-node-A2uZ5QH1.mjs";
+import { a as Lifecycle, o as LibContextReader, r as HMR_STATE_CACHE, t as getComponentInstanceId } from "./get-component-instance-id-BsCBJaZv.mjs";
 import { t as isPureObject } from "./is-pure-object-s_MkQp1w.mjs";
-var ContextProvider = class extends LibBlock {
-	constructor(e, t, n) {
-		super(), this.props = e, this.context = n, normalizeChildren(e.children).forEach((r, i) => {
-			this.children.push(r(mergeContext(n, {
-				parentBlock: this,
-				index: i,
-				contexts: { [t]: e.value }
-			})));
-		});
-	}
-}, ContextConsumer = class extends LibBlock {
-	constructor(e, t, n) {
-		super(), this.props = e, this.context = n;
-		let r = n.contexts[t];
-		if (!r) throw Error("Контекст не найден");
-		normalizeArray(e.children).forEach((e, t) => {
-			this.children.push(e(r)(mergeContext(n, {
-				parentBlock: this,
-				index: t
-			})));
-		});
-	}
-};
-function createContext() {
-	let e = Symbol("context");
-	return {
-		provider(t) {
-			return function(n) {
-				return new ContextProvider(t, e, n);
-			};
-		},
-		reader(t) {
-			return function(n) {
-				return new ContextConsumer(t, e, n);
-			};
-		}
-	};
-}
+import { t as createContext } from "./context-IwELKojA.mjs";
 function deepAssignObject(e, t) {
 	for (let n in t) {
 		if (!Object.prototype.hasOwnProperty.call(t, n)) continue;
@@ -49,34 +11,34 @@ function deepAssignObject(e, t) {
 	return e;
 }
 function createStore() {
-	return function(n) {
-		let a = createContext();
+	return function(a) {
+		let s = createContext();
 		return {
 			provider(o) {
-				return LibContextReader({ children: (s) => {
-					let c = getComponentInstanceId(s), l = [], u = Object.entries(n.extensions).reduce((e, [t, n]) => {
+				return LibContextReader({ children: (i) => {
+					let c = getComponentInstanceId(i), l = [], u = Object.entries(a.extensions).reduce((e, [t, n]) => {
 						let r = n();
 						return r.onUnmounted && l.push(r.onUnmounted), e[t] = r.api, e;
-					}, {}), d = s.states[c] ?? {}, f;
-					process.env.NODE_ENV === "development" && HMR_STATE_CACHE.has(c) ? f = HMR_STATE_CACHE.get(c).value : (f = createSignal(deepAssignObject(n.state({
+					}, {}), d = i.states[c] ?? {}, f;
+					process.env.NODE_ENV === "development" && HMR_STATE_CACHE.has(c) ? f = HMR_STATE_CACHE.get(c).value : (f = createSignal(deepAssignObject(a.state({
 						props: o,
 						extensions: u
 					}), d)), process.env.NODE_ENV === "development" && HMR_STATE_CACHE.set(c, {
 						value: f,
 						isRemovable: !1
 					}));
-					let p = n.actions({
+					let p = a.actions({
 						props: o,
 						state: f
-					}), m = Object.entries(p).reduce((e, [t, n]) => (e[t] = (...e) => batch(() => n.apply(p, e)), e), {});
+					}), m = Object.entries(p).reduce((e, [t, r]) => (e[t] = (...e) => batch(() => r.apply(p, e)), e), {});
 					return Lifecycle({
 						onMounted() {
 							if (process.env.NODE_ENV === "development") {
 								let e = HMR_STATE_CACHE.get(c);
 								e && (e.isRemovable = !1);
 							}
-							if (s.isServer) return createEffect(() => {
-								deepTrack(f), s.states[c] = f;
+							if (i.isServer) return createEffect(() => {
+								deepTrack(f), i.states[c] = f;
 							}, !0).dispose;
 						},
 						onUnmounted() {
@@ -87,7 +49,7 @@ function createStore() {
 								}));
 							}
 						},
-						children: a.provider({
+						children: s.provider({
 							value: {
 								state: f,
 								actions: m
@@ -98,7 +60,7 @@ function createStore() {
 				} });
 			},
 			reader(e) {
-				return a.reader({ children: (t) => e.children(t) });
+				return s.reader({ children: (t) => e.children(t) });
 			}
 		};
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@potok-web-framework/core",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "exports": {
     ".": {
       "import": "./dist/index.mjs",