ilha 0.4.2 → 0.4.3

package/dist/index.js

@@ -275,81 +275,137 @@ function batch(fn) {
 		endBatch();
 	}
 }
-function buildDerivedSignals(entries, state, input, derivedSnapshot) {
+function createDerivedProxy(entries, state, input, derivedSnapshot) {
 	const envelopes = /* @__PURE__ */ new Map();
-	const stops = [];
 	for (const entry of entries) {
-		const env = signal(derivedSnapshot?.[entry.key] ?? {
+		let initialEnvelope;
+		if (derivedSnapshot != null && entry.key in derivedSnapshot) initialEnvelope = { ...derivedSnapshot[entry.key] };
+		else if (!(entry.fn.constructor.name === "AsyncFunction" || entry.fn.constructor.name === "AsyncGeneratorFunction")) {
+			const ac = new AbortController();
+			try {
+				const result = entry.fn({
+					state,
+					input,
+					signal: ac.signal
+				});
+				if (!(result instanceof Promise)) initialEnvelope = {
+					loading: false,
+					value: result,
+					error: void 0
+				};
+				else {
+					initialEnvelope = {
+						loading: true,
+						value: void 0,
+						error: void 0
+					};
+					result.catch(() => {});
+				}
+			} catch (err) {
+				initialEnvelope = {
+					loading: false,
+					value: void 0,
+					error: err instanceof Error ? err : new Error(String(err))
+				};
+			} finally {
+				ac.abort();
+			}
+		} else initialEnvelope = {
 			loading: true,
 			value: void 0,
 			error: void 0
-		});
+		};
+		const env = signal(initialEnvelope);
 		envelopes.set(entry.key, env);
-		let ac = new AbortController();
-		let skipFirst = derivedSnapshot != null && entry.key in derivedSnapshot;
-		const stopEffect = effect(() => {
-			ac.abort();
-			ac = new AbortController();
-			const currentAc = ac;
-			const result = entry.fn({
-				state,
-				input,
-				signal: currentAc.signal
-			});
-			if (skipFirst) {
-				skipFirst = false;
-				if (result instanceof Promise) result.catch(() => {});
-				return;
-			}
-			if (!(result instanceof Promise)) {
+	}
+	const proxy = new Proxy({}, { get(_, key) {
+		const env = envelopes.get(key);
+		if (!env) return {
+			loading: false,
+			value: void 0,
+			error: void 0
+		};
+		return env();
+	} });
+	const setup = () => {
+		const stops = [];
+		for (const entry of entries) {
+			const env = envelopes.get(entry.key);
+			let ac = new AbortController();
+			let skipFirst = derivedSnapshot != null && entry.key in derivedSnapshot;
+			const stopEffect = effect(() => {
+				ac.abort();
+				ac = new AbortController();
+				const currentAc = ac;
+				let result;
+				try {
+					result = entry.fn({
+						state,
+						input,
+						signal: currentAc.signal
+					});
+				} catch (err) {
+					if (skipFirst) {
+						skipFirst = false;
+						return;
+					}
+					const prevSub = setActiveSub(void 0);
+					env({
+						loading: false,
+						value: void 0,
+						error: err instanceof Error ? err : new Error(String(err))
+					});
+					setActiveSub(prevSub);
+					return;
+				}
+				if (skipFirst) {
+					skipFirst = false;
+					if (result instanceof Promise) result.catch(() => {});
+					return;
+				}
+				if (!(result instanceof Promise)) {
+					const prevSub = setActiveSub(void 0);
+					env({
+						loading: false,
+						value: result,
+						error: void 0
+					});
+					setActiveSub(prevSub);
+					return;
+				}
 				const prevSub = setActiveSub(void 0);
 				env({
-					loading: false,
-					value: result,
+					loading: true,
+					value: env().value,
 					error: void 0
 				});
 				setActiveSub(prevSub);
-				return;
-			}
-			const prevSub = setActiveSub(void 0);
-			env({
-				loading: true,
-				value: env().value,
-				error: void 0
-			});
-			setActiveSub(prevSub);
-			result.then((value) => {
-				if (currentAc.signal.aborted) return;
-				env({
-					loading: false,
-					value,
-					error: void 0
-				});
-			}).catch((err) => {
-				if (currentAc.signal.aborted) return;
-				env({
-					loading: false,
-					value: void 0,
-					error: err instanceof Error ? err : new Error(String(err))
+				result.then((value) => {
+					if (currentAc.signal.aborted) return;
+					env({
+						loading: false,
+						value,
+						error: void 0
+					});
+				}).catch((err) => {
+					if (currentAc.signal.aborted) return;
+					env({
+						loading: false,
+						value: void 0,
+						error: err instanceof Error ? err : new Error(String(err))
+					});
 				});
 			});
-		});
-		stops.push(() => {
-			stopEffect();
-			ac.abort();
-		});
-	}
+			stops.push(() => {
+				stopEffect();
+				ac.abort();
+			});
+		}
+		return () => stops.forEach((s) => s());
+	};
 	return {
-		proxy: new Proxy({}, { get(_, key) {
-			const env = envelopes.get(key);
-			if (!env) return {
-				loading: false,
-				value: void 0,
-				error: void 0
-			};
-			return env();
-		} }),
-		stop: () => stops.forEach((s) => s())
+		proxy,
+		setup
 	};
 }
 function resolveBindConfig(el) {
@@ -774,8 +830,8 @@ Element: ${host.outerHTML.slice(0, 120)}`);
 				const result = transition.enter(host);
 				if (result instanceof Promise) result.catch(console.error);
 			}
-			const { proxy: derived, stop: stopDerived } = buildDerivedSignals(deriveds, state, input, derivedSnapshot);
-			cleanups.push(stopDerived);
+			const { proxy: derived, setup: setupDerived } = createDerivedProxy(deriveds, state, input, derivedSnapshot);
+			let stopDerived = () => {};
 			function reportError(err, source) {
 				const error = err instanceof Error ? err : new Error(String(err));
 				if (onErrors.length === 0) {
@@ -947,6 +1003,47 @@ Element: ${host.outerHTML.slice(0, 120)}`);
 				}
 				if (userCleanup) cleanups.push(userCleanup);
 			}
+			for (const entry of effects) {
+				let userCleanup;
+				let runController = null;
+				const stopEffect = effect(() => {
+					if (userCleanup) {
+						try {
+							userCleanup();
+						} catch (err) {
+							reportError(err, "effect");
+						}
+						userCleanup = void 0;
+					}
+					if (runController) runController.abort();
+					runController = new AbortController();
+					const runSignal = anySignal([unmountController.signal, runController.signal]);
+					startBatch();
+					try {
+						userCleanup = entry.fn({
+							state,
+							input,
+							host,
+							signal: runSignal
+						});
+					} catch (err) {
+						reportError(err, "effect");
+					} finally {
+						endBatch();
+					}
+				});
+				cleanups.push(() => {
+					stopEffect();
+					if (userCleanup) try {
+						userCleanup();
+					} catch (err) {
+						reportError(err, "effect");
+					}
+					if (runController) runController.abort();
+				});
+			}
+			stopDerived = setupDerived();
+			cleanups.push(stopDerived);
 			let initialized = false;
 			const initialRenderedHtml = initial.html;
 			const stopRender = effect(() => {
@@ -989,45 +1086,6 @@ Element: ${host.outerHTML.slice(0, 120)}`);
 			});
 			cleanups.push(stopRender);
 			cleanups.push(detachListeners);
-			for (const entry of effects) {
-				let userCleanup;
-				let runController = null;
-				const stopEffect = effect(() => {
-					if (userCleanup) {
-						try {
-							userCleanup();
-						} catch (err) {
-							reportError(err, "effect");
-						}
-						userCleanup = void 0;
-					}
-					if (runController) runController.abort();
-					runController = new AbortController();
-					const runSignal = anySignal([unmountController.signal, runController.signal]);
-					startBatch();
-					try {
-						userCleanup = entry.fn({
-							state,
-							input,
-							host,
-							signal: runSignal
-						});
-					} catch (err) {
-						reportError(err, "effect");
-					} finally {
-						endBatch();
-					}
-				});
-				cleanups.push(() => {
-					stopEffect();
-					if (userCleanup) try {
-						userCleanup();
-					} catch (err) {
-						reportError(err, "effect");
-					}
-					if (runController) runController.abort();
-				});
-			}
 			let tornDown = false;
 			const unmount = () => {
 				if (tornDown) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilha",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "A tiny, framework-free island architecture library",
   "license": "MIT",
   "author": "Ryuz <ryuzer@proton.me>",
@@ -23,7 +23,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "alien-signals": "3.1.2"
+    "alien-signals": "3.2.0"
   },
   "devDependencies": {
     "zod": "^4.4.3"