eclipsa 0.1.9 → 0.1.11

package/{action-CArGTCnQ.mjs → action-BcEktMN2.mjs}

@@ -1870,7 +1870,7 @@ const parseInsertMarker = (value) => {
 };
 //#endregion
 //#region core/runtime/serialization.ts
-const createRuntimeSerialization = ({ createProjectionSlot, ensureRouterState, ensureRuntimeElementId, evaluateProps, findRuntimeElement, getResolvedRuntimeSymbols, isPlainObject, isProjectionSlot, isRenderObject, isRouteSlot, loadSymbol, materializeScope, materializeSymbolReference, registerScope, registerSerializedScope, resolveRenderable }) => {
+const createRuntimeSerialization = ({ createProjectionSlot, ensureRouterState, ensureRuntimeElementId, evaluateProps, findRuntimeElement, getResolvedRuntimeSymbols, isPlainObject, isProjectionSlot, isRenderObject, isRouteSlot, loadSymbol, materializeComputedSignalReference, materializeScope, materializeSymbolReference, registerScope, registerSerializedScope, resolveRenderable }) => {
 	const getRenderComponentTypeRef = (value) => {
 		if (typeof value !== "function") return null;
 		return value[RENDER_COMPONENT_TYPE_KEY] ?? null;
@@ -1994,7 +1994,7 @@ const createRuntimeSerialization = ({ createProjectionSlot, ensureRouterState, e
 		const signalMeta = getSignalMeta(candidate);
 		if (signalMeta) return {
 			__eclipsa_type: "ref",
-			kind: "signal",
+			kind: signalMeta.kind === "computed-signal" ? "computed-signal" : "signal",
 			token: signalMeta.id
 		};
 		if (getNavigateMeta(candidate)) return {
@@ -2128,6 +2128,7 @@ const createRuntimeSerialization = ({ createProjectionSlot, ensureRouterState, e
 			if (!record) throw new Error(`Missing signal ${reference.token}.`);
 			return record.handle;
 		}
+		if (reference.kind === "computed-signal") return materializeComputedSignalReference(container, reference.token);
 		if (reference.kind === "symbol") {
 			if (!reference.data || !Array.isArray(reference.data)) throw new TypeError("Symbol references require an encoded scope array.");
 			const scopeId = registerSerializedScope(container, reference.data);
@@ -2373,6 +2374,7 @@ const getRuntimeSerialization = () => {
 		isRenderObject,
 		isRouteSlot,
 		loadSymbol,
+		materializeComputedSignalReference,
 		materializeScope,
 		materializeSymbolReference,
 		registerScope,
@@ -2394,8 +2396,15 @@ const findNextNumericId = (ids, prefix) => {
 	}
 	return nextId;
 };
-const getRefSignalId = (value) => getSignalMeta(value)?.id ?? null;
-const getBindableSignalId = (value) => getSignalMeta(value)?.id ?? null;
+const isWritableSignalMeta = (meta) => !!meta && meta.kind !== "computed-signal";
+const getRefSignalId = (value) => {
+	const signalMeta = getSignalMeta(value);
+	return isWritableSignalMeta(signalMeta) ? signalMeta.id : null;
+};
+const getBindableSignalId = (value) => {
+	const signalMeta = getSignalMeta(value);
+	return isWritableSignalMeta(signalMeta) ? signalMeta.id : null;
+};
 const syncRuntimeRefMarker = (element, value) => {
 	const signalId = getRefSignalId(value);
 	if (signalId) {
@@ -2412,7 +2421,7 @@ const readBindableSignalValue = (value) => {
 };
 const assignRuntimeRef = (value, element, container = getCurrentContainer()) => {
 	const signalMeta = getSignalMeta(value);
-	if (!signalMeta) return false;
+	if (!isWritableSignalMeta(signalMeta)) return false;
 	const record = container?.signals.get(signalMeta.id);
 	if (record) {
 		writeSignalValue(container, record, element);
@@ -2567,12 +2576,41 @@ const createSignalHandle = (record, container) => {
 	setSignalMeta(handle, {
 		get: () => record.value,
 		id: record.id,
+		kind: "signal",
 		set: (value) => {
 			writeSignalValue(container, record, value);
 		}
 	});
 	return handle;
 };
+const isComputedSignalSnapshot = (value) => !!value && typeof value === "object" && value.__e_async_computed === true;
+const readComputedSignalValue = (record) => {
+	recordSignalRead(record);
+	const snapshot = record.value;
+	if (!isComputedSignalSnapshot(snapshot)) return snapshot;
+	if (snapshot.status === "pending") throw createPendingSignalError(snapshot.promise ?? Promise.resolve(void 0));
+	if (snapshot.status === "rejected") throw snapshot.error;
+	return snapshot.value;
+};
+const createComputedSignalHandle = (record, _container) => {
+	const handle = {};
+	Object.defineProperty(handle, "value", {
+		configurable: true,
+		enumerable: true,
+		get() {
+			return readComputedSignalValue(record);
+		}
+	});
+	setSignalMeta(handle, {
+		get: () => readComputedSignalValue(record),
+		id: record.id,
+		kind: "computed-signal",
+		set: () => {
+			throw new TypeError("Computed signals are read-only.");
+		}
+	});
+	return handle;
+};
 const isPrimitiveSignalValue = (value) => value === null || typeof value !== "object" && typeof value !== "function";
 const didSignalValueChange = (previous, next) => {
 	if (isPrimitiveSignalValue(previous) && isPrimitiveSignalValue(next)) return !Object.is(previous, next);
@@ -2742,6 +2780,10 @@ const pushContainer = (container, fn) => {
 	}
 };
 const withRuntimeContainer = pushContainer;
+const runReactiveEffectInContainer = (effect, fn) => {
+	if (!effect.container) return fn();
+	return pushContainer(effect.container, fn);
+};
 const withRuntimeContextValue = (token, value, fn) => {
 	const stack = getContextValueStack();
 	stack.push({
@@ -2797,6 +2839,11 @@ const materializeSymbolReference = (container, symbolId, scopeId) => {
 	});
 	return fn;
 };
+const materializeComputedSignalReference = (container, signalId) => {
+	const record = container.signals.get(signalId);
+	if (!record) throw new Error(`Missing signal ${signalId}.`);
+	return createComputedSignalHandle(record, container);
+};
 const materializeScope = (container, scopeId) => {
 	const slots = container.scopes.get(scopeId);
 	if (!slots) throw new Error(`Missing scope ${scopeId}.`);
@@ -2892,6 +2939,7 @@ const getOrCreateWatchState = (container, id, componentId) => {
 		return existing;
 	}
 	const effect = {
+		container,
 		fn() {},
 		signals: /* @__PURE__ */ new Set()
 	};
@@ -5477,6 +5525,32 @@ const collectResumeHmrBoundaryIds = (container, symbolIds) => {
 	}
 	return result;
 };
+const rewriteSerializedSymbolReferenceToken = (value, affectedIds, nextSymbolId) => {
+	if (Array.isArray(value)) {
+		for (const entry of value) rewriteSerializedSymbolReferenceToken(entry, affectedIds, nextSymbolId);
+		return;
+	}
+	if (!value || typeof value !== "object" || !("__eclipsa_type" in value)) return;
+	switch (value.__eclipsa_type) {
+		case "object":
+			for (const [, entry] of value.entries) rewriteSerializedSymbolReferenceToken(entry, affectedIds, nextSymbolId);
+			return;
+		case "map":
+			for (const [key, entry] of value.entries) {
+				rewriteSerializedSymbolReferenceToken(key, affectedIds, nextSymbolId);
+				rewriteSerializedSymbolReferenceToken(entry, affectedIds, nextSymbolId);
+			}
+			return;
+		case "set":
+			for (const entry of value.entries) rewriteSerializedSymbolReferenceToken(entry, affectedIds, nextSymbolId);
+			return;
+		case "ref":
+			if (value.kind === "symbol" && affectedIds.has(value.token)) value.token = nextSymbolId;
+			if (value.data !== void 0) rewriteSerializedSymbolReferenceToken(value.data, affectedIds, nextSymbolId);
+			return;
+		default: return;
+	}
+};
 const applyResumeHmrSymbolReplacements = (container, replacements) => {
 	for (const [oldSymbolId, url] of Object.entries(replacements)) {
 		const currentUrl = container.symbols.get(oldSymbolId);
@@ -5491,6 +5565,7 @@ const applyResumeHmrSymbolReplacements = (container, replacements) => {
 		for (const component of container.components.values()) if (affectedIds.has(component.symbol)) component.symbol = nextSymbolId;
 		for (const watch of container.watches.values()) if (affectedIds.has(watch.symbol)) watch.symbol = nextSymbolId;
 		for (const visible of container.visibles.values()) if (affectedIds.has(visible.symbol)) visible.symbol = nextSymbolId;
+		for (const slots of container.scopes.values()) for (const slot of slots) rewriteSerializedSymbolReferenceToken(slot, affectedIds, nextSymbolId);
 		container.symbols.set(nextSymbolId, url);
 		invalidateRuntimeSymbolCaches(container, [nextSymbolId]);
 	}
@@ -6238,7 +6313,10 @@ const useRuntimeSignal = (fallback) => {
 };
 const createDetachedRuntimeSignal = (container, id, fallback) => ensureSignalRecord(container, id, fallback).handle;
 const getRuntimeComponentId = () => getCurrentFrame()?.component.id ?? null;
-const getRuntimeSignalId = (value) => getSignalMeta(value)?.id ?? null;
+const getRuntimeSignalId = (value) => {
+	const signalMeta = getSignalMeta(value);
+	return isWritableSignalMeta(signalMeta) ? signalMeta.id : null;
+};
 const useRuntimeNavigate = () => {
 	const container = getCurrentContainer();
 	if (!container) return createStandaloneNavigate();
@@ -6273,22 +6351,26 @@ const notFound = () => {
 };
 const isRouteNotFoundError = (error) => !!error && typeof error === "object" && (error.__eclipsa_not_found__ === true || error[ROUTE_NOT_FOUND_KEY] === true);
 const createEffect = (fn, options) => {
+	const container = getCurrentContainer();
 	const frame = getCurrentFrame();
 	const effect = {
+		container,
 		fn() {
-			const dependencies = options?.dependencies;
-			if (!dependencies) {
-				collectTrackedDependencies(effect, fn);
-				return;
-			}
-			collectTrackedDependencies(effect, () => {
-				trackWatchDependencies(dependencies, options?.errorLabel);
+			runReactiveEffectInContainer(effect, () => {
+				const dependencies = options?.dependencies;
+				if (!dependencies) {
+					collectTrackedDependencies(effect, fn);
+					return;
+				}
+				collectTrackedDependencies(effect, () => {
+					trackWatchDependencies(dependencies, options?.errorLabel);
+				});
+				if (options?.untracked) {
+					runWithoutDependencyTracking(fn);
+					return;
+				}
+				fn();
 			});
-			if (options?.untracked) {
-				runWithoutDependencyTracking(fn);
-				return;
-			}
-			fn();
 		},
 		signals: /* @__PURE__ */ new Set()
 	};
@@ -6326,8 +6408,11 @@ const createWatch = (fn, dependencies) => {
 	if (!container || !frame || frame.component.id === "$root" || !watchMeta) {
 		const cleanupSlot = createCleanupSlot();
 		const effect = {
+			container,
 			fn() {
-				createLocalWatchRunner(effect, cleanupSlot, fn, dependencies)();
+				runReactiveEffectInContainer(effect, () => {
+					createLocalWatchRunner(effect, cleanupSlot, fn, dependencies)();
+				});
 			},
 			signals: /* @__PURE__ */ new Set()
 		};
@@ -6963,4 +7048,4 @@ const __eclipsaAction = (id, middlewares, handler) => {
 //#endregion
 export { shouldReconnectDetachedInsertMarkers as $, deserializeValue as $n, __eclipsaLoader as $t, getRuntimeComponentId as A, createPendingSignalError as An, getActionHookMeta as At, refreshRegisteredRouteContainers as B, createRequestFetch as Bn, getRegisteredLoaderHook as Bt, createOnCleanup as C, createContext as Cn, RESUME_FINAL_STATE_ELEMENT_ID as Ct, createStandaloneRuntimeSignal as D, materializeRuntimeContextProvider as Dn, __eclipsaLazy as Dt, createResumeContainer as E, materializeRuntimeContext as En, __eclipsaEvent as Et, notFound as F, applyActionCsrfCookie as Fn, getLoaderHandleMeta as Ft, renderSSRAttr as G, registerClientHooks as Gn, registerLoaderHook as Gt, registerRuntimeScopedStyle as H, getClientHooks as Hn, getSignalMeta as Ht, preserveReusableContentInRoots as I, ensureActionCsrfToken as In, getLoaderHookMeta as It, renderString as J, runHandleError as Jn, setExternalComponentMeta as Jt, renderSSRMap as K, resetClientHooks as Kn, setActionHandleMeta as Kt, primeLocationState as L, readActionCsrfTokenFromDocument as Ln, getNavigateMeta as Lt, getRuntimeSignalId as M, isSuspenseType as Mn, getEventMeta as Mt, getStreamingResumeBootstrapScriptContent as N, ACTION_CSRF_FIELD as Nn, getExternalComponentMeta as Nt, createWatch as O, useContext as On, __eclipsaWatch as Ot, installResumeListeners as P, ACTION_CSRF_INPUT_ATTR as Pn, getLazyMeta as Pt, restoreSignalRefs as Q, withServerRequestContext as Qn, setSignalMeta as Qt, primeRouteModules as R, APP_HOOKS_ELEMENT_ID as Rn, getRegisteredActionHook as Rt, createEffect as S, resolveRouteMetadata as Sn, ACTION_FORM_ATTR$1 as St, createOnVisible as T, getRuntimeContextReference as Tn, __eclipsaComponent as Tt, renderClientInsertable as U, getCurrentServerRequestContext as Un, getWatchMeta as Ut, registerResumeContainer as V, deserializePublicValue as Vn, getRegisteredLoaderHookIds as Vt, renderClientInsertableForOwner as W, markPublicError as Wn, registerActionHook as Wt, restoreResumedExternalComponents as X, toPublicError as Xn, setLoaderHookMeta as Xt, restoreRegisteredRpcHandles as Y, serializePublicValue as Yn, setLoaderHandleMeta as Yt, restoreResumedLocalSignalEffects as Z, transformCurrentPublicError as Zn, setNavigateMeta as Zt, beginSSRContainer as _, ROUTE_REPLACE_ATTR as _n, getRememberedInsertMarkerNodeCount as _t, action as a, loader_exports as an, IS_BROWSER as ar, useRuntimeLocation as at, collectPendingSuspenseBoundaryIds as b, composeRouteMetadata as bn, rememberManagedAttributesForNodes as bt, getActionFormSubmissionId as c, registerLoader as cn, noSerialize as cr, useRuntimeRouteParams as ct, primeActionState as d, ROUTE_DATA_REQUEST_HEADER as dn, writeAsyncSignalSnapshot as dt, consumePendingSsrLoaderIds as en, escapeInlineScriptText as er, syncRuntimeRefMarker as et, registerAction as f, ROUTE_LINK_ATTR as fn, INSERT_MARKER_PREFIX as ft, beginAsyncSSRContainer as g, ROUTE_PREFLIGHT_REQUEST_HEADER as gn, parseInsertMarker as gt, assignRuntimeRef as h, ROUTE_PREFLIGHT_ENDPOINT as hn, parseComponentBoundaryMarker as ht, __eclipsaAction as i, loader as in, serializeValue as ir, tryPatchNodeSequenceInPlace as it, getRuntimeContainer as j, isPendingSignalError as jn, getComponentMeta as jt, getResumePayloadScriptContent as k, Suspense as kn, getActionHandleMeta as kt, getNormalizedActionInput as l, resolvePendingLoaders as ln, useRuntimeSignal as lt, applyResumeHmrUpdateToRegisteredContainers as m, ROUTE_PREFETCH_ATTR as mn, createInsertMarker as mt, ACTION_FORM_ATTR as n, hasLoader as nn, parseSerializedJSON as nr, toResumePayloadSubset as nt, executeAction as o, markPendingSsrLoader as on, IS_SSR as or, useRuntimeNavigate as ot, validator as p, ROUTE_MANIFEST_ELEMENT_ID as pn, createComponentBoundaryHtmlComment as pt, renderSSRValue as q, resolveReroute as qn, setActionHookMeta as qt, ACTION_FORM_FIELD as r, isPendingSsrLoaderError as rn, serializeJSONScriptContent as rr, tryPatchElementShellInPlace as rt, executeActionSubmission as s, primeLoaderState as sn, isNoSerialize as sr, useRuntimeRouteError as st, ACTION_CONTENT_TYPE as t, executeLoader as tn, escapeJSONScriptText as tr, toResumePayload as tt, hasAction as u, ROUTE_DATA_ENDPOINT as un, withRuntimeContainer as ut, bindRuntimeEvent as v, ROUTE_RPC_URL_HEADER as vn, rememberInsertMarkerRange as vt, createOnMount as w, getContextProviderMeta as wn, RESUME_STATE_ELEMENT_ID as wt, createDetachedClientInsertOwner as x, renderRouteMetadataHead as xn, syncManagedAttributeSnapshot as xt, captureClientInsertOwner as y, ROUTE_METADATA_HEAD_ATTR as yn, rememberManagedAttributesForNode as yt, readAsyncSignalSnapshot as z, attachRequestFetch as zn, getRegisteredActionHookIds as zt };
 
-//# sourceMappingURL=action-CArGTCnQ.mjs.map
+//# sourceMappingURL=action-BcEktMN2.mjs.map