ilha 0.10.1 → 0.10.3

package/dist/{index-Bi_I3qEL.d.ts → index-BDM797j2.d.ts}

@@ -242,6 +242,8 @@ type OnMountContext<TInput, TStateMap extends Record<string, unknown>, TDerivedM
   input: TInput;
   host: Element;
   hydrated: boolean;
+  /** AbortSignal that aborts when the island unmounts. */
+  signal: AbortSignal;
 };
 type HandlerContext<TInput, TStateMap extends Record<string, unknown>, TDerivedMap extends Record<string, unknown> = Record<never, never>, TActionMap extends ActionMap = Record<never, never>> = {
   state: IslandState<TStateMap>;

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { A as __ilhaJsxSlot, B as mount, C as NativeEventModifier, D as SignalSetter, E as SignalAccessor, F as html, H as raw, I as ilha, L as ilhaComputed, M as context, N as css, O as SignalWriter, P as from, R as ilhaEffect, S as NativeEventHandler, T as RawHtml, U as untrack, V as onUncaughtError, _ as IslandState, a as EffectContext, b as MountResult, c as ExternalSignal, d as HydratableOptions, f as ISLAND_MOUNT_HANDLES, g as IslandDerived, h as IslandActions, i as DerivedValue, j as batch, k as __ilhaJsxEvent, l as HandlerContext, m as Island, n as ActionContext, o as ErrorContext, p as ISLAND_MOUNT_INTERNAL, r as DerivedAccessor, s as ErrorSource, t as ActionAccessor, u as HandlerContextFor, v as KeyedIsland, w as OnMountContext, x as NativeEventContext, y as MountOptions, z as ilhaSignal } from "./index-Bi_I3qEL.js";
+import { A as __ilhaJsxSlot, B as mount, C as NativeEventModifier, D as SignalSetter, E as SignalAccessor, F as html, H as raw, I as ilha, L as ilhaComputed, M as context, N as css, O as SignalWriter, P as from, R as ilhaEffect, S as NativeEventHandler, T as RawHtml, U as untrack, V as onUncaughtError, _ as IslandState, a as EffectContext, b as MountResult, c as ExternalSignal, d as HydratableOptions, f as ISLAND_MOUNT_HANDLES, g as IslandDerived, h as IslandActions, i as DerivedValue, j as batch, k as __ilhaJsxEvent, l as HandlerContext, m as Island, n as ActionContext, o as ErrorContext, p as ISLAND_MOUNT_INTERNAL, r as DerivedAccessor, s as ErrorSource, t as ActionAccessor, u as HandlerContextFor, v as KeyedIsland, w as OnMountContext, x as NativeEventContext, y as MountOptions, z as ilhaSignal } from "./index-BDM797j2.js";
 export { ActionAccessor, ActionContext, DerivedAccessor, DerivedValue, EffectContext, ErrorContext, ErrorSource, ExternalSignal, HandlerContext, HandlerContextFor, HydratableOptions, ISLAND_MOUNT_HANDLES, ISLAND_MOUNT_INTERNAL, Island, IslandActions, IslandDerived, IslandState, KeyedIsland, MountOptions, MountResult, NativeEventContext, NativeEventHandler, NativeEventModifier, OnMountContext, RawHtml, SignalAccessor, SignalSetter, SignalWriter, __ilhaJsxEvent, __ilhaJsxSlot, batch, ilhaComputed as computed, context, css, ilha as default, ilhaEffect as effect, from, html, ilhaSignal, ilhaSignal as signal, mount, onUncaughtError, raw, untrack };

package/dist/index.js

@@ -465,6 +465,7 @@ const RAW = Symbol.for("ilha.raw");
 const SIGNAL_ACCESSOR = Symbol.for("ilha.signalAccessor");
 const ISLAND = Symbol.for("ilha.island");
 const ISLAND_CALL = Symbol.for("ilha.islandCall");
+const ASTRO_RENDERER_GLOBAL = Symbol.for("ilha.astroRenderer");
 /** @internal Internal hook used by a parent's mountSlots to mount a child island and
 * retain a handle to push updated props into it on subsequent parent
 * re-renders. Not part of the public surface. */
@@ -523,8 +524,8 @@ function isIslandCall(v) {
 function emitIslandSlot({ island, props, key }) {
 	const ctx = currentRenderCtx();
 	let id;
-	if (key !== void 0) id = `k:${key}`;
-	else id = ctx ? `p:${ctx.positional++}` : "p:0";
+	if (key === void 0) id = ctx ? `p:${ctx.positional++}` : "p:0";
+	else id = `k:${key}`;
 	if (ctx) ctx.slots.set(id, {
 		island,
 		props
@@ -827,7 +828,8 @@ function ilhaHtml(strings, ...values) {
 		}
 		if (pendingBindSpecs !== "" || pendingEventSpecs !== "") {
 			const { index: gtIdx, quote } = findTagCloseIndex(chunk, pendingQuote);
-			if (gtIdx !== -1) {
+			if (gtIdx === -1) pendingQuote = quote;
+			else {
 				const head = chunk.slice(0, gtIdx).replace(/\s*\/\s*$/, "");
 				const bindAttr = pendingBindSpecs ? ` data-ilha-bind="${pendingBindSpecs}"` : "";
 				const eventAttr = pendingEventSpecs ? ` data-ilha-on="${pendingEventSpecs}"` : "";
@@ -835,7 +837,7 @@ function ilhaHtml(strings, ...values) {
 				pendingBindSpecs = "";
 				pendingEventSpecs = "";
 				pendingQuote = null;
-			} else pendingQuote = quote;
+			}
 		}
 		if (i >= values.length) {
 			result += chunk;
@@ -843,13 +845,14 @@ function ilhaHtml(strings, ...values) {
 		}
 		const value = values[i];
 		const eventMatch = chunk.match(EVENT_PREFIX_RE);
-		if (eventMatch && isEventAttributePosition(result + chunk, result.length + chunk.length - eventMatch[0].length)) {
+		const eventMatchStart = eventMatch ? chunk.length - eventMatch[0].length : -1;
+		const eventAttributeFragment = eventMatch !== null && chunk.slice(0, eventMatchStart).trim() === "";
+		if (eventMatch && (eventAttributeFragment || isEventAttributePosition(result + chunk, result.length + eventMatchStart))) {
 			const eventName = eventMatch[1];
 			const rawModifier = eventMatch[2];
 			const modifier = NATIVE_EVENT_MODIFIERS.has(rawModifier) ? rawModifier : void 0;
 			const openQuote = eventMatch[3] ?? null;
-			const matchStart = chunk.length - eventMatch[0].length;
-			const cleanPrefix = chunk.slice(0, matchStart).replace(/\s+$/, "");
+			const cleanPrefix = chunk.slice(0, eventMatchStart).replace(/\s+$/, "");
 			result += cleanPrefix;
 			if (ctx && typeof value === "function") {
 				const index = ctx.events.length;
@@ -1077,46 +1080,128 @@ function buildDerivedAccessors(envelopes) {
 		return accessors.get(key) ?? defaultDerivedAccessor();
 	} });
 }
+const ILHA_QUERY = Symbol.for("ilha.store.query");
+const ILHA_QUERY_RUN = Symbol.for("ilha.store.query.run");
+const ILHA_QUERY_PENDING = Symbol.for("ilha.store.query.pending");
+const ILHA_QUERY_STACK = Symbol.for("ilha.store.query.stack");
+function queryCaptureStack() {
+	const g = globalThis;
+	let stack = g[ILHA_QUERY_STACK];
+	if (!stack) {
+		stack = [];
+		g[ILHA_QUERY_STACK] = stack;
+	}
+	return stack;
+}
+function isQueryCall(value) {
+	return value !== null && typeof value === "object" && ILHA_QUERY in value;
+}
+function resolveQueryCall(result, captureSlot) {
+	const pending = globalThis[ILHA_QUERY_PENDING];
+	globalThis[ILHA_QUERY_PENDING] = void 0;
+	return captureSlot.queryCall ?? pending ?? (isQueryCall(result) ? result : void 0);
+}
+function runBrandedQuery(queryCall, abortSignal, env) {
+	const writeEnv = (next) => {
+		if (abortSignal.aborted) return;
+		const prevSub = setActiveSub(void 0);
+		env(next);
+		setActiveSub(prevSub);
+	};
+	const run = queryCall[ILHA_QUERY_RUN];
+	if (typeof run !== "function") {
+		writeEnv({
+			loading: false,
+			value: void 0,
+			error: /* @__PURE__ */ new Error("[@ilha] branded query is missing a callable runner")
+		});
+		return;
+	}
+	try {
+		run.call(queryCall, abortSignal, {
+			onResult: (value) => {
+				writeEnv({
+					loading: false,
+					value,
+					error: void 0
+				});
+			},
+			onError: (err) => {
+				writeEnv({
+					loading: false,
+					value: void 0,
+					error: err
+				});
+			},
+			onFetchStart: () => {
+				const prevSub = setActiveSub(void 0);
+				env({
+					loading: true,
+					value: env().value,
+					error: void 0
+				});
+				setActiveSub(prevSub);
+			}
+		});
+	} catch (err) {
+		writeEnv({
+			loading: false,
+			value: void 0,
+			error: err instanceof Error ? err : new Error(String(err))
+		});
+	}
+}
 function createDerivedProxy({ entries, state, input, derivedSnapshot }) {
 	const envelopes = /* @__PURE__ */ new Map();
 	for (const entry of entries) {
 		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")) {
+		else if (entry.fn.constructor.name === "AsyncFunction" || entry.fn.constructor.name === "AsyncGeneratorFunction") initialEnvelope = {
+			loading: true,
+			value: void 0,
+			error: void 0
+		};
+		else {
 			const ac = new AbortController();
+			const captureSlot = {};
+			const stack = queryCaptureStack();
+			globalThis[ILHA_QUERY_PENDING] = void 0;
+			stack.push(captureSlot);
 			try {
 				const result = entry.fn({
 					state,
 					input,
 					signal: ac.signal
 				});
-				if (!(result instanceof Promise)) initialEnvelope = {
-					loading: false,
-					value: result,
+				if (resolveQueryCall(result, captureSlot)) initialEnvelope = {
+					loading: true,
+					value: void 0,
 					error: void 0
 				};
-				else {
+				else if (result instanceof Promise) {
 					initialEnvelope = {
 						loading: true,
 						value: void 0,
 						error: void 0
 					};
 					result.catch(() => {});
-				}
+				} else initialEnvelope = {
+					loading: false,
+					value: result,
+					error: void 0
+				};
 			} catch (err) {
+				globalThis[ILHA_QUERY_PENDING] = void 0;
 				initialEnvelope = {
 					loading: false,
 					value: void 0,
 					error: err instanceof Error ? err : new Error(String(err))
 				};
 			} finally {
+				stack.pop();
 				ac.abort();
 			}
-		} else initialEnvelope = {
-			loading: true,
-			value: void 0,
-			error: void 0
-		};
+		}
 		const env = signal(initialEnvelope);
 		envelopes.set(entry.key, env);
 	}
@@ -1148,6 +1233,10 @@ function createDerivedProxy({ entries, state, input, derivedSnapshot }) {
 				ac = new AbortController();
 				const currentAc = ac;
 				let result;
+				const captureSlot = {};
+				const stack = queryCaptureStack();
+				globalThis[ILHA_QUERY_PENDING] = void 0;
+				stack.push(captureSlot);
 				try {
 					result = entry.fn({
 						state,
@@ -1155,6 +1244,7 @@ function createDerivedProxy({ entries, state, input, derivedSnapshot }) {
 						signal: currentAc.signal
 					});
 				} catch (err) {
+					globalThis[ILHA_QUERY_PENDING] = void 0;
 					if (skipFirst) {
 						skipFirst = false;
 						return;
@@ -1167,12 +1257,19 @@ function createDerivedProxy({ entries, state, input, derivedSnapshot }) {
 					});
 					setActiveSub(prevSub);
 					return;
+				} finally {
+					stack.pop();
 				}
+				const queryCall = resolveQueryCall(result, captureSlot);
 				if (skipFirst) {
 					skipFirst = false;
 					if (result instanceof Promise) result.catch(() => {});
 					return;
 				}
+				if (queryCall) {
+					runBrandedQuery(queryCall, currentAc.signal, env);
+					return;
+				}
 				if (!(result instanceof Promise)) {
 					const prevSub = setActiveSub(void 0);
 					env({
@@ -1193,6 +1290,16 @@ function createDerivedProxy({ entries, state, input, derivedSnapshot }) {
 				setActiveSub(prevSub);
 				result.then((value) => {
 					if (currentAc.signal.aborted) return;
+					if (isQueryCall(value)) {
+						runBrandedQuery(value, currentAc.signal, env);
+						return;
+					}
+					const latePending = globalThis[ILHA_QUERY_PENDING];
+					globalThis[ILHA_QUERY_PENDING] = void 0;
+					if (latePending) {
+						runBrandedQuery(latePending, currentAc.signal, env);
+						return;
+					}
 					env({
 						loading: false,
 						value,
@@ -1374,7 +1481,7 @@ function applyJsxEvents({ host, records, reportError, unmountSignal, onceFired }
 	}
 	return () => cleanups.forEach((cleanup) => cleanup());
 }
-function applyTemplateBindings(host, binds) {
+function applyTemplateBindings(host, binds, phase = "all") {
 	if (binds.length === 0) return () => {};
 	const cleanups = [];
 	const elements = [];
@@ -1389,14 +1496,16 @@ function applyTemplateBindings(host, binds) {
 			const { event, read, write } = resolveBindOps(el, spec.kind);
 			const accessor = record.accessor;
 			if (spec.kind === "this") {
-				accessor(el);
-				cleanups.push(() => accessor(null));
+				if (phase !== "listen") {
+					accessor(el);
+					cleanups.push(() => accessor(null));
+				}
 				continue;
 			}
-			try {
+			if (phase !== "listen") try {
 				write(el, accessor());
 			} catch (err) {}
-			if (event === null) continue;
+			if (phase === "reflect" || event === null) continue;
 			const listener = () => {
 				const raw = read(el);
 				if (spec.kind === "group") {
@@ -1621,7 +1730,7 @@ var IlhaBuilder = class IlhaBuilder {
 	}
 	render(fn) {
 		const { schema, defaultInput, states, deriveds, actions, ons, effects, onMounts, onErrors, transition, css: cssSource, as: slotAs } = this._cfg;
-		const stylePrefix = cssSource != null ? buildScopedStyle(cssSource) : "";
+		const stylePrefix = cssSource == null ? "" : buildScopedStyle(cssSource);
 		const configuredSlotTag = slotAs ?? "div";
 		function resolveInput(props) {
 			const merged = {
@@ -1724,6 +1833,7 @@ var IlhaBuilder = class IlhaBuilder {
 			if (onMounts.length === 0) return;
 			if (currentRenderCtx()) return;
 			const host = createSsrOnMountHost();
+			const controller = new AbortController();
 			const ssrCleanups = [];
 			for (const entry of onMounts) {
 				const prevSub = setActiveSub(void 0);
@@ -1735,7 +1845,8 @@ var IlhaBuilder = class IlhaBuilder {
 						action,
 						input,
 						host,
-						hydrated: false
+						hydrated: false,
+						signal: controller.signal
 					});
 				} catch (err) {
 					const error = err instanceof Error ? err : new Error(String(err));
@@ -1759,6 +1870,7 @@ var IlhaBuilder = class IlhaBuilder {
 				}
 				if (typeof userCleanup === "function") ssrCleanups.push(userCleanup);
 			}
+			controller.abort();
 			for (const teardown of ssrCleanups.reverse()) try {
 				teardown();
 			} catch (err) {
@@ -2246,7 +2358,8 @@ var IlhaBuilder = class IlhaBuilder {
 							action,
 							input,
 							host,
-							hydrated
+							hydrated,
+							signal: unmountController.signal
 						});
 					} catch (err) {
 						reportError(err, "mount");
@@ -2278,7 +2391,8 @@ var IlhaBuilder = class IlhaBuilder {
 				liveHost: preserveSSRDom ? host : void 0
 			});
 			if (!preserveSSRDom) host.innerHTML = stylePrefix + initial.html;
-			let stopBindings = applyTemplateBindings(host, initial.binds);
+			const stopInitialBindingReflection = applyTemplateBindings(host, initial.binds, "reflect");
+			let stopBindings = stopInitialBindingReflection;
 			cleanups.push(() => stopBindings());
 			let stopJsxEvents = applyJsxEvents({
 				host,
@@ -2292,6 +2406,11 @@ var IlhaBuilder = class IlhaBuilder {
 			cleanups.push(() => mountedSlots.forEach((entry) => entry.unmount()));
 			attachListeners();
 			if (!hydrated && onMounts.length > 0) invokeOnMounts();
+			const stopInitialBindingListeners = applyTemplateBindings(host, initial.binds, "listen");
+			stopBindings = () => {
+				stopInitialBindingListeners();
+				stopInitialBindingReflection();
+			};
 			for (const entry of effects) {
 				let userCleanup;
 				let runController = null;
@@ -2527,6 +2646,8 @@ var IlhaBuilder = class IlhaBuilder {
 			return keyed;
 		};
 		island[ISLAND] = true;
+		const astroRendererName = globalThis[ASTRO_RENDERER_GLOBAL];
+		if (typeof astroRendererName === "string") island[Symbol.for("astro:renderer")] = astroRendererName;
 		island.define = (tagName, options) => {
 			if (typeof customElements === "undefined" || typeof HTMLElement === "undefined") {
 				`${tagName}`;

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

@@ -1,2 +1,2 @@
-import { a as JSX, r as jsxDEV, t as Fragment } from "./jsx-runtime-DJ2B4fvA.js";
+import { a as JSX, r as jsxDEV, t as Fragment } from "./jsx-runtime-C6R6IiOD.js";
 export { Fragment, type JSX, jsxDEV };

package/dist/{jsx-runtime-DJ2B4fvA.d.ts → jsx-runtime-C6R6IiOD.d.ts}

@@ -1,4 +1,4 @@
-import { C as NativeEventModifier, E as SignalAccessor, O as SignalWriter, S as NativeEventHandler, T as RawHtml } from "./index-Bi_I3qEL.js";
+import { C as NativeEventModifier, E as SignalAccessor, O as SignalWriter, S as NativeEventHandler, T as RawHtml } from "./index-BDM797j2.js";
 //#region src/jsx-types.d.ts
 declare namespace JSX {
   export type Child = unknown;

package/dist/jsx-runtime.d.ts

@@ -1,2 +1,2 @@
-import { a as JSX, i as jsxs, n as jsx, r as jsxDEV, t as Fragment } from "./jsx-runtime-DJ2B4fvA.js";
+import { a as JSX, i as jsxs, n as jsx, r as jsxDEV, t as Fragment } from "./jsx-runtime-C6R6IiOD.js";
 export { Fragment, type JSX, jsx, jsxDEV, jsxs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilha",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "description": "A tiny, framework-free island architecture library",
   "keywords": [
     "framework-free",
@@ -53,6 +53,7 @@
   },
   "scripts": {
     "build": "tsc && tsdown",
+    "cleanup": "rimraf dist node_modules",
     "test": "bun test"
   },
   "dependencies": {