@elurjs/core 3.6.1 → 3.7.0-beta.0

package/dist/lib/server.js

@@ -1,18 +1,19 @@
-import { ELUR_RENDER_PROTOCOL as e, ELUR_TEMPLATE_DESCRIPTOR as t, isElurTemplate as n, isKeyedList as r } from "./elur/template/types.js";
-import { isElurComponent as i } from "./lifecycle.js";
-import { _popComponentContext as a, _pushComponentContext as o, _setContextScopeResolver as s } from "./context.js";
-import { normalizeRepeatKey as c, serializeRepeatKey as l } from "./elur/template/keyed.js";
-import { sanitizeUrl as u } from "./elur/template/sanitize.js";
-import { AsyncLocalStorage as d } from "node:async_hooks";
+import { Signal as e, untrack as t } from "./elur/next-2/reactivity.js";
+import { ELUR_RENDER_PROTOCOL as n, ELUR_TEMPLATE_DESCRIPTOR as r, isDerivedBinding as i, isElurTemplate as a, isKeyedList as o } from "./elur/template/types.js";
+import { isElurComponent as s } from "./lifecycle.js";
+import { _popComponentContext as c, _pushComponentContext as l, _setContextScopeResolver as u } from "./context.js";
+import { normalizeRepeatKey as d, serializeRepeatKey as f } from "./elur/template/keyed.js";
+import { sanitizeUrl as p } from "./elur/template/sanitize.js";
+import { AsyncLocalStorage as m } from "node:async_hooks";
 //#region src/elur/server/index.ts
-var f = n, p = r, m = new d();
-s(() => m.getStore());
-function h(e = {}) {
+var h = a, g = o, _ = new m();
+u(() => _.getStore());
+function v(e = {}) {
 	let t = new AbortController(), n = {
 		markers: e.markers === "hydration",
 		context: e.context,
 		onError: e.onError
-	}, r = (e) => Promise.resolve(m.run([], e));
+	}, r = (e) => Promise.resolve(_.run([], e));
 	return {
 		signal: t.signal,
 		async render(e, i) {
@@ -22,11 +23,11 @@ function h(e = {}) {
 				signal: t.signal
 			}, o = "";
 			return await r(() => (async () => {
-				for await (let t of y(e, a)) o += t.value;
+				for await (let t of S(e, a)) o += t.value;
 			})()), o;
 		},
 		renderToChunks(e, r) {
-			return g(e, {
+			return y(e, {
 				...n,
 				markers: r?.markers ?? n.markers,
 				signal: t.signal
@@ -37,13 +38,13 @@ function h(e = {}) {
 		}
 	};
 }
-function g(e, t) {
+function y(e, t) {
 	return { async *[Symbol.asyncIterator]() {
 		let n = [], r = [], i = !1, a, o = () => {
 			r.shift()?.();
-		}, s = m.run([], async () => {
+		}, s = _.run([], async () => {
 			try {
-				for await (let r of y(e, t)) n.push(r), o();
+				for await (let r of S(e, t)) n.push(r), o();
 			} catch (e) {
 				a = e;
 			} finally {
@@ -56,7 +57,11 @@ function g(e, t) {
 			let e = n.shift();
 			e && (yield e);
 		}
-		if (a) throw a;
+		if (a) throw yield {
+			type: "error",
+			value: a instanceof Error ? a.message : String(a),
+			index: -1
+		}, a;
 		yield {
 			type: "done",
 			value: "",
@@ -64,66 +69,66 @@ function g(e, t) {
 		}, await s;
 	} };
 }
-async function _(e, t = {}) {
+async function b(e, t = {}) {
 	let n = {
 		markers: t.markers === "hydration",
 		signal: t.signal,
 		context: t.context,
 		onError: t.onError
 	}, r = "";
-	return await Promise.resolve(m.run([], async () => {
-		for await (let t of y(e, n)) r += t.value;
+	return await Promise.resolve(_.run([], async () => {
+		for await (let t of S(e, n)) r += t.value;
 	})), r;
 }
-function v(e, t = {}) {
-	return g(e, {
+function x(e, t = {}) {
+	return y(e, {
 		markers: t.markers === "hydration",
 		signal: t.signal,
 		context: t.context,
 		onError: t.onError
 	});
 }
-async function* y(n, r) {
-	if (C(r), n instanceof Promise) {
-		yield* y(await n, r);
+async function* S(e, t) {
+	if (D(t), e instanceof Promise) {
+		yield* S(await e, t);
 		return;
 	}
-	if (!(n == null || n === !1 || n === !0)) {
-		if (typeof n == "string" || typeof n == "number" || typeof n == "bigint") {
+	if (!(e == null || e === !1 || e === !0)) {
+		if (typeof e == "string" || typeof e == "number" || typeof e == "bigint") {
 			yield {
 				type: "markup",
-				value: E(String(n)),
+				value: A(String(e)),
 				index: -1
 			};
 			return;
 		}
-		if (Array.isArray(n)) {
-			let e = await Promise.all(n.map((e) => w(e)));
-			C(r);
-			for (let t of e) r.markers && (yield {
+		if (Array.isArray(e)) {
+			let n = await Promise.all(e.map((e) => O(e)));
+			D(t);
+			for (let e of n) t.markers && (yield {
 				type: "markup",
 				value: "<!--elur-ai-->",
 				index: -1
-			}), yield* y(t, r), r.markers && (yield {
+			}), yield* S(e, t), t.markers && (yield {
 				type: "markup",
 				value: "<!--elur-aiend-->",
 				index: -1
 			});
 			return;
 		}
-		if ((typeof n == "object" || typeof n == "function") && n !== null) {
-			let t = n[e];
-			if (t?.renderServer) {
-				let e = await t.renderServer({
-					markers: r.markers,
-					signal: r.signal,
-					context: r.context,
-					render: (e, t) => S(e, {
-						...r,
-						markers: t?.markers ?? r.markers
+		if ((typeof e == "object" || typeof e == "function") && e !== null) {
+			let r = e[n];
+			if (r?.renderServer) {
+				let e = await r.renderServer({
+					markers: t.markers,
+					signal: t.signal,
+					context: t.context,
+					render: (e, n) => E(e, {
+						...t,
+						markers: n?.markers ?? t.markers
 					})
 				});
-				C(r), yield {
+				D(t), yield {
 					type: "markup",
 					value: e,
 					index: -1
@@ -131,27 +136,27 @@ async function* y(n, r) {
 				return;
 			}
 		}
-		if (i(n)) {
-			yield* b(n, r);
+		if (s(e)) {
+			yield* C(e, t);
 			return;
 		}
-		if (p(n)) {
-			if (!r.markers) {
+		if (g(e)) {
+			if (!t.markers) {
 				yield {
 					type: "markup",
-					value: (await Promise.all(n.items.map((e, t) => S(n.renderFn(e, t), r)))).join(""),
+					value: (await Promise.all(e.items.map((n, r) => E(e.renderFn(n, r), t)))).join(""),
 					index: -1
 				};
 				return;
 			}
-			let e = /* @__PURE__ */ new Set();
-			for (let t = 0; t < n.items.length; t++) {
-				let i = n.items[t], a = c(n.keyFn(i, t), t), o = l(a);
-				e.has(o) && console.warn(`[elur] repeat(): duplicate key "${a}" during server render. Keys must be unique; entries after the first will leak during hydration.`), e.add(o), yield {
+			let n = /* @__PURE__ */ new Set();
+			for (let r = 0; r < e.items.length; r++) {
+				let i = e.items[r], a = d(e.keyFn(i, r), r), o = f(a);
+				n.has(o) && console.warn(`[elur] repeat(): duplicate key "${a}" during server render. Keys must be unique; entries after the first will leak during hydration.`), n.add(o), yield {
 					type: "markup",
 					value: `<!--elur-ki:${o}-->`,
 					index: -1
-				}, yield* y(n.renderFn(i, t), r), yield {
+				}, yield* S(e.renderFn(i, r), t), yield {
 					type: "markup",
 					value: "<!--elur-ke-->",
 					index: -1
@@ -159,21 +164,21 @@ async function* y(n, r) {
 			}
 			return;
 		}
-		if (f(n)) {
-			let e = n[t];
-			if (!e) throw TypeError("[elur] Template does not support server rendering");
-			yield* x(e, r);
+		if (h(e)) {
+			let n = e[r];
+			if (!n) throw TypeError("[elur] Template does not support server rendering");
+			yield* T(n, t);
 			return;
 		}
 		yield {
 			type: "markup",
-			value: E(String(n)),
+			value: A(String(e)),
 			index: -1
 		};
 	}
 }
-async function* b(e, t) {
-	o();
+async function* C(e, t) {
+	l();
 	let n = {
 		index: -1,
 		context: "component",
@@ -188,7 +193,7 @@ async function* b(e, t) {
 			else throw t;
 		}
 		try {
-			yield* y(e.render(), t);
+			yield* S(e.render(), t);
 		} catch (t) {
 			if (e.onError) {
 				e.onError(t);
@@ -202,106 +207,173 @@ async function* b(e, t) {
 			cause: e
 		}), e;
 	} finally {
-		a();
+		c();
 	}
 }
-async function* x(e, t) {
-	let n = new Uint8Array(e.strings.length);
-	for (let r = 0; r < e.strings.length; r++) {
+function w(e, t) {
+	return {
+		m: (e) => ({
+			type: "markup",
+			value: e,
+			index: -1
+		}),
+		node: async function* (t, n) {
+			e.markers && (yield {
+				type: "boundary-start",
+				value: `<!--elur-${t}-->`,
+				index: t
+			});
+			try {
+				let t = await O(n);
+				D(e), yield* S(t, e);
+			} catch (n) {
+				throw e.onError?.(n, {
+					index: t,
+					context: "node",
+					cause: n
+				}), n;
+			}
+			e.markers && (yield {
+				type: "boundary-end",
+				value: `<!--elur-end-${t}-->`,
+				index: t
+			});
+		},
+		attr: async (n, r, i, a, o, s) => {
+			let c = [{
+				type: "markup",
+				value: n,
+				index: r
+			}], l = await O(s);
+			if (D(e), i !== "ref" && l != null && l !== !1) {
+				let e = a ? p(String(l)) : String(l), t = /\s$/.test(n) ? "" : " ";
+				c.push({
+					type: "markup",
+					value: `${t}${i}="${j(e)}"`,
+					index: r
+				});
+			}
+			return e.markers && !t && c.push({
+				type: "markup",
+				value: ` data-elur-a-${r}="${j(i)}"`,
+				index: r
+			}), c;
+		},
+		event: (n, r, i) => e.markers && !t ? {
+			type: "markup",
+			value: `${r}${/\s$/.test(r) ? "" : " "}data-elur-e-${n}="${j(i)}"`,
+			index: n
+		} : {
+			type: "markup",
+			value: r.replace(/\s+$/, ""),
+			index: n
+		}
+	};
+}
+async function* T(e, t) {
+	let n = e.hydrate !== void 0;
+	if (e.ssr) {
+		yield* e.ssr(w(t, n), e.values);
+		return;
+	}
+	let r = new Uint8Array(e.strings.length);
+	for (let i = 0; i < e.strings.length; i++) {
 		if (t.signal?.aborted) throw t.signal.reason ?? new DOMException("Render aborted", "AbortError");
-		let i = e.strings[r];
-		if (n[r] === 1 && (i[0] === "\"" || i[0] === "'") && (i = i.slice(1)), r >= e.contexts.length) {
+		let a = e.strings[i];
+		if (r[i] === 1 && (a[0] === "\"" || a[0] === "'") && (a = a.slice(1)), i >= e.contexts.length) {
 			yield {
 				type: "markup",
-				value: i,
-				index: r
+				value: a,
+				index: i
 			};
 			continue;
 		}
-		let a = e.contexts[r], o = e.values[r];
-		if (a.type === "node") {
+		let o = e.contexts[i], s = e.values[i];
+		if (o.type === "node") {
 			yield {
 				type: "markup",
-				value: i,
-				index: r
+				value: a,
+				index: i
 			}, t.markers && (yield {
 				type: "boundary-start",
-				value: `<!--elur-${r}-->`,
-				index: r
+				value: `<!--elur-${i}-->`,
+				index: i
 			});
 			try {
-				let e = await w(o);
-				C(t), yield* y(e, t);
+				let e = await O(s);
+				D(t), yield* S(e, t);
 			} catch (e) {
 				throw t.onError?.(e, {
-					index: r,
+					index: i,
 					context: "node",
 					cause: e
 				}), e;
 			}
 			t.markers && (yield {
 				type: "boundary-end",
-				value: `<!--elur-end-${r}-->`,
-				index: r
+				value: `<!--elur-end-${i}-->`,
+				index: i
 			});
 			continue;
 		}
-		let s = T(a), c = i.slice(0, -s);
-		if (a.hadOpenQuote && (n[r + 1] = 1), a.type === "event") {
-			t.markers ? yield {
+		let c = k(o), l = a.slice(0, -c);
+		if (o.hadOpenQuote && (r[i + 1] = 1), o.type === "event") {
+			t.markers && !n ? yield {
 				type: "markup",
-				value: `${c}${/\s$/.test(c) ? "" : " "}data-elur-e-${r}="${D(a.eventName)}"`,
-				index: r
+				value: `${l}${/\s$/.test(l) ? "" : " "}data-elur-e-${i}="${j(o.eventName)}"`,
+				index: i
 			} : yield {
 				type: "markup",
-				value: c.replace(/\s+$/, ""),
-				index: r
+				value: l.replace(/\s+$/, ""),
+				index: i
 			};
 			continue;
 		}
 		yield {
 			type: "markup",
-			value: c,
-			index: r
+			value: l,
+			index: i
 		};
-		let l = await w(o);
-		if (C(t), a.attrName !== "ref" && l != null && l !== !1) {
-			let e = a.url ? u(String(l)) : String(l);
+		let u = await O(s);
+		if (D(t), o.attrName !== "ref" && u != null && u !== !1) {
+			let e = o.url ? p(String(u)) : String(u);
 			yield {
 				type: "markup",
-				value: `${/\s$/.test(c) ? "" : " "}${a.attrName}="${D(e)}"`,
-				index: r
+				value: `${/\s$/.test(l) ? "" : " "}${o.attrName}="${j(e)}"`,
+				index: i
 			};
 		}
-		t.markers && (yield {
+		t.markers && !n && (yield {
 			type: "markup",
-			value: ` data-elur-a-${r}="${D(a.attrName)}"`,
-			index: r
+			value: ` data-elur-a-${i}="${j(o.attrName)}"`,
+			index: i
 		});
 	}
 }
-async function S(e, t) {
+async function E(e, t) {
 	let n = "";
-	for await (let r of y(e, t)) n += r.value;
+	for await (let r of S(e, t)) n += r.value;
 	return n;
 }
-function C(e) {
+function D(e) {
 	if (e.signal?.aborted) throw e.signal.reason ?? new DOMException("Render aborted", "AbortError");
 }
-async function w(e) {
-	let t = typeof e == "function" ? e() : e;
-	return t instanceof Promise ? await t : t;
+async function O(n) {
+	if (n instanceof e) return n.peek();
+	if (i(n)) return t(n.get);
+	let r = typeof n == "function" ? n() : n;
+	return r instanceof Promise ? await r : r;
 }
-function T(e) {
+function k(e) {
 	return e.type === "event" ? `@${e.modifiers.length ? `${e.eventName}.${e.modifiers.join(".")}` : e.eventName}=`.length + +!!e.hadOpenQuote : `${e.attrName}=`.length + +!!e.hadOpenQuote;
 }
-function E(e) {
+function A(e) {
 	return e.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-function D(e) {
-	return E(e).replace(/"/g, "&quot;");
+function j(e) {
+	return A(e).replace(/"/g, "&quot;");
 }
 //#endregion
-export { h as createServerRenderScope, v as renderToChunks, _ as renderToString };
+export { v as createServerRenderScope, x as renderToChunks, b as renderToString };
 
 //# sourceMappingURL=server.js.map

package/dist/lib/signals.cjs

@@ -1,2 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});function e(){return{ctxPool:[],ctxStack:[],activeEffect:null,activeDeps:null,activeErrorHandler:null,errorHandlerStack:[],batchLevel:0,pendingEffectsSet:new Set,pendingEffectsArr:[],effectDepth:0,notifyBuf:[],notifyBase:0,signalDebugHooks:null}}var t=Symbol.for(`@elurjs/core/reactivity-state`),n=globalThis,r=(()=>{let r=n[t];if(r){let t=e(),n=r;for(let e of Object.keys(t))e in n||(n[e]=t[e]);return r}let i=e();return n[t]=i,i})();function i(e){r.errorHandlerStack.push(r.activeErrorHandler),r.activeErrorHandler=e}function a(){r.activeErrorHandler=r.errorHandlerStack.pop()??null}var o=100,s=64,c=16,l=32;function u(){let e=r.signalDebugHookSet;if(!e||e.size===0){r.signalDebugHooks=null;return}if(e.size===1){r.signalDebugHooks=e.values().next().value??null;return}r.signalDebugHooks={onCreate(t,n){for(let r of e)r.onCreate?.(t,n)},onWrite(t,n){for(let r of e)r.onWrite?.(t,n)}}}function d(e){let t=new Set;e&&t.add(e),r.signalDebugHookSet=t,u()}function f(e){let t=r.signalDebugHookSet;return t||(t=new Set,r.signalDebugHooks&&t.add(r.signalDebugHooks),r.signalDebugHookSet=t),t.add(e),u(),()=>{t.delete(e),u()}}function p(){return r.notifyBuf.length}var m=class{_value;_subs=new Set;constructor(e){this._value=e,r.signalDebugHooks?.onCreate?.(this,e)}get value(){return r.activeEffect&&(this._subs.add(r.activeEffect),r.activeDeps?.add(this)),this._value}set value(e){Object.is(this._value,e)||(this._value=e,r.signalDebugHooks?.onWrite?.(this,e),this._notify())}update(e){this.value=e(this._value)}peek(){return this._value}_removeSub(e){this._subs.delete(e)}_notify(){if(r.batchLevel>0){for(let e of this._subs)r.pendingEffectsSet.has(e)||(r.pendingEffectsSet.add(e),r.pendingEffectsArr.push(e));return}let e=r.notifyBase,t=0;for(let n of this._subs)r.notifyBuf[e+ t++]=n;r.notifyBase=e+t;try{for(let n=0;n<t;n++){let t=r.notifyBuf[e+n];r.notifyBuf[e+n]=null,t?.()}}finally{r.notifyBase=e,e===0&&r.notifyBuf.length>s&&t<c&&(r.notifyBuf.length=l)}}dispose(){this._subs.clear()}};function h(e){return new m(e)}function g(e){let t=!1,n,i=new Set,a=new Set,s=r.activeErrorHandler,c=()=>{if(t)return;typeof n==`function`&&n();let l=i;i=a,a=l,a.clear();let u=r.ctxPool.length>0?r.ctxPool.pop():{effect:null,deps:null};if(u.effect=r.activeEffect,u.deps=r.activeDeps,r.ctxStack.push(u),r.activeEffect=c,r.activeDeps=a,r.effectDepth++,r.effectDepth>o){r.effectDepth=0;let e=r.ctxStack.pop();throw r.activeEffect=e.effect,r.activeDeps=e.deps,e.effect=null,e.deps=null,r.ctxPool.push(e),Error(`[elur] Maximum effect re-execution depth exceeded (possible infinite loop).`)}try{n=e()}catch(e){if(s)s(e);else throw e}finally{r.effectDepth--;let e=r.ctxStack.pop();r.activeEffect=e.effect,r.activeDeps=e.deps,e.effect=null,e.deps=null,r.ctxPool.push(e);for(let e of i)a.has(e)||e._removeSub(c)}};return c(),()=>{t=!0,typeof n==`function`&&n();for(let e of a)e._removeSub(c);a.clear(),i.clear()}}var _=Symbol(`elur-computed-uninitialized`);function v(e,t=Object.is){let n=new m(_),r=null,i=!1,a=!1,o=()=>{i||a||(i=!0,b(()=>{r=g(()=>{let r=e(),i=n.peek();(i===_||!t(r,i))&&(n.value=r)})}))},s=Object.getOwnPropertyDescriptor(Object.getPrototypeOf(n),`value`);if(!s?.get||!s?.set)throw Error(`[elur] Internal error: Signal.value descriptor not found.`);Object.defineProperty(n,`value`,{get(){return o(),s.get.call(this)},set(e){s.set.call(this,e)},configurable:!0});let c=n.dispose;return n.dispose=()=>{a=!0,r?.(),r=null,c.call(n)},n}function y(e){r.batchLevel++;try{e()}finally{if(r.batchLevel--,r.batchLevel===0&&r.pendingEffectsArr.length>0){let e=r.pendingEffectsArr.length;for(let t=0;t<e;t++)r.pendingEffectsArr[t]();r.pendingEffectsArr.length=0,r.pendingEffectsSet.clear()}}}function b(e){let t=r.activeEffect,n=r.activeDeps;r.activeEffect=null,r.activeDeps=null;try{return e()}finally{r.activeEffect=t,r.activeDeps=n}}function x(e,t,n={}){let{immediate:r=!1,once:i=!1}=n,a=e instanceof m?()=>e.value:e,o,s=!0,c=!1,l=g(()=>{let e=a();if(s){if(s=!1,r&&!c){let n=e;b(()=>t(n,void 0)),i&&(c=!0,Promise.resolve().then(l))}o=e;return}if(!c){let n=e,r=o;o=e,b(()=>t(n,r)),i&&(c=!0,Promise.resolve().then(l))}});return()=>{c=!0,l()}}function S(e){return e?Promise.resolve().then(e):Promise.resolve()}exports.Signal=m,exports._addSignalDebugHooks=f,exports._getNotifyBufSize=p,exports._popErrorHandler=a,exports._pushErrorHandler=i,exports._setSignalDebugHooks=d,exports.batch=y,exports.computed=v,exports.effect=g,exports.nextTick=S,exports.signal=h,exports.untrack=b,exports.watch=x;
-//# sourceMappingURL=signals.cjs.map
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require(`./elur/next-2/reactivity.cjs`);exports.Computed=e.Computed,exports.Owner=e.Owner,exports.ReactiveCycleError=e.ReactiveCycleError,exports.Signal=e.Signal,exports._addSignalDebugHooks=e._addSignalDebugHooks,exports._bindDerived=e._bindDerived,exports._bindSignal=e._bindSignal,exports._bindText=e._bindText,exports._getNotifyBufSize=e._getNotifyBufSize,exports._popErrorHandler=e._popErrorHandler,exports._pushErrorHandler=e._pushErrorHandler,exports._renderEffect=e._renderEffect,exports._setSignalDebugHooks=e._setSignalDebugHooks,exports.batch=e.batch,exports.computed=e.computed,exports.constSignal=e.constSignal,exports.createRoot=e.createRoot,exports.effect=e.effect,exports.getOwner=e.getOwner,exports.nextTick=e.nextTick,exports.onCleanup=e.onCleanup,exports.runWithOwner=e.runWithOwner,exports.signal=e.signal,exports.untrack=e.untrack,exports.watch=e.watch;