ilha 0.4.0 → 0.4.1

package/dist/index.js

@@ -605,6 +605,7 @@ var IlhaBuilder = class IlhaBuilder {
 			const input = resolveInput(props);
 			const state = buildPlainState(input);
 			const results = deriveds.map((entry) => {
+				const prevSub = setActiveSub(void 0);
 				try {
 					return {
 						key: entry.key,
@@ -619,6 +620,8 @@ var IlhaBuilder = class IlhaBuilder {
 						key: entry.key,
 						result: Promise.reject(err)
 					};
+				} finally {
+					setActiveSub(prevSub);
 				}
 			});
 			if (!results.some((r) => r.result instanceof Promise) || sync) {
@@ -633,12 +636,17 @@ var IlhaBuilder = class IlhaBuilder {
 					value: r.result,
 					error: void 0
 				};
-				const { html } = renderWithCtx(() => fn({
-					state,
-					derived,
-					input
-				}));
-				return stylePrefix + html;
+				const prevSub = setActiveSub(void 0);
+				try {
+					const { html } = renderWithCtx(() => fn({
+						state,
+						derived,
+						input
+					}));
+					return stylePrefix + html;
+				} finally {
+					setActiveSub(prevSub);
+				}
 			}
 			return Promise.all(results.map(async (r) => {
 				try {
@@ -663,12 +671,17 @@ var IlhaBuilder = class IlhaBuilder {
 			})).then(async (resolved) => {
 				const derived = {};
 				for (const r of resolved) derived[r.key] = r.envelope;
-				const { html } = await renderWithCtx(() => fn({
-					state,
-					derived,
-					input
-				}), void 0, true);
-				return stylePrefix + html;
+				const prevSub = setActiveSub(void 0);
+				try {
+					const { html } = await renderWithCtx(() => fn({
+						state,
+						derived,
+						input
+					}), void 0, true);
+					return stylePrefix + html;
+				} finally {
+					setActiveSub(prevSub);
+				}
 			});
 		}
 		function mountIsland(host, props) {
@@ -1028,23 +1041,45 @@ Element: ${host.outerHTML.slice(0, 120)}`);
 				if (doState) for (const entry of states) snapshotData[entry.key] = plainState[entry.key]();
 				if (doDerived) {
 					const derivedResults = {};
-					for (const entry of deriveds) try {
-						const result = await Promise.resolve(entry.fn({
-							state: plainState,
-							input,
-							signal: new AbortController().signal
-						}));
-						derivedResults[entry.key] = {
-							loading: false,
-							value: result,
-							error: void 0
-						};
-					} catch (err) {
-						derivedResults[entry.key] = {
-							loading: false,
-							value: void 0,
-							error: err instanceof Error ? err.message : String(err)
-						};
+					for (const entry of deriveds) {
+						const prevSub = setActiveSub(void 0);
+						let resultPromise;
+						let syncError;
+						let threw = false;
+						try {
+							resultPromise = entry.fn({
+								state: plainState,
+								input,
+								signal: new AbortController().signal
+							});
+						} catch (err) {
+							threw = true;
+							syncError = err;
+						} finally {
+							setActiveSub(prevSub);
+						}
+						if (threw) {
+							derivedResults[entry.key] = {
+								loading: false,
+								value: void 0,
+								error: syncError instanceof Error ? syncError.message : String(syncError)
+							};
+							continue;
+						}
+						try {
+							const result = await Promise.resolve(resultPromise);
+							derivedResults[entry.key] = {
+								loading: false,
+								value: result,
+								error: void 0
+							};
+						} catch (err) {
+							derivedResults[entry.key] = {
+								loading: false,
+								value: void 0,
+								error: err instanceof Error ? err.message : String(err)
+							};
+						}
 					}
 					snapshotData["_derived"] = derivedResults;
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilha",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A tiny, framework-free island architecture library",
   "license": "MIT",
   "author": "Ryuz <ryuzer@proton.me>",
@@ -26,6 +26,6 @@
     "alien-signals": "3.1.2"
   },
   "devDependencies": {
-    "zod": "^4.4.1"
+    "zod": "^4.4.3"
   }
 }