@ilha/router 0.11.0 → 0.11.2

package/dist/{plugin-C3AAI3e_.js → plugin-Bfnn44nu.js}

@@ -1,4 +1,4 @@
-import { C as runWithIslandRequest, a as authorizeFrameRequest, b as setFrameAuth, c as frameScopedUrl, f as isSafeFramePath, h as parseFrameProps, n as FrameError, s as frameEnvelope, u as getFrameGuard, x as setFrameGuard, y as renderServerIslandResult } from "./ssr-WA3bSsCo.js";
+import { C as runWithIslandRequest, a as authorizeFrameRequest, b as setFrameAuth, c as frameScopedUrl, f as isSafeFramePath, h as parseFrameProps, n as FrameError, s as frameEnvelope, u as getFrameGuard, x as setFrameGuard, y as renderServerIslandResult } from "./ssr-CV_vNpS3.js";
 import { existsSync, readFileSync, statSync, watch } from "node:fs";
 import { basename, dirname, extname, join, relative, resolve, sep } from "node:path";
 import * as Result from "effect/Result";
@@ -8,6 +8,22 @@ import { createHash } from "node:crypto";
 
 //#region src/server-islands.ts
 /**
+* Build-time support for server-defined islands. The plugin scans
+* `*.server.ts(x)` modules for island exports (`export const X = ilha…`),
+* generates a client virtual module per file that re-creates those exports as
+* proxies wired to tacho stubs, and rewrites client-graph import sites so
+* island bindings resolve to the proxy while everything else keeps flowing
+* through oxidejs's tacho stub replacement.
+*/
+/** Oxide RPC client key — basename without `.server.*` (oxide indexes by module name). */
+function serverModuleRpcKey(spec) {
+	return basename(spec).replace(/\.server\.(?:[jt]sx?)$/i, "");
+}
+/** Client repaint group key — full normalized path so same-basename files stay distinct. */
+function serverModuleRepaintKey(spec) {
+	return spec.replace(/\\/g, "/").replace(/\.server\.(?:[jt]sx?)$/i, "");
+}
+/**
 * Replace identity `action(` wrappers of exported server actions with the
 * capture-aware shim on ALREADY-COMPILED module code. Must run inside the
 * SSR transform so upstream JSX/TS output is preserved.
@@ -165,11 +181,12 @@ function serverIslandPublicId(spec, name) {
 	return createHash("sha256").update(`${spec}#${name}`).digest("base64url");
 }
 function generateServerIslandModule(spec, scan) {
-	const moduleKey = basename(spec).replace(/\.server\.(?:[jt]sx?)$/i, "");
+	const rpcKey = serverModuleRpcKey(spec);
+	const repaintKey = serverModuleRepaintKey(spec);
 	const lines = [
 		`import { client as $$rpc } from "virtual:oxide/client";`,
 		`import { __ilhaApplyHead, __ilhaServerIsland } from "@ilha/router/server-island";`,
-		`const $$call = (method, args) => { const opts = args.at(-1); return opts && typeof opts === "object" && opts.signal instanceof AbortSignal && Object.keys(opts).length === 1 ? $$rpc[${JSON.stringify(moduleKey)}][method](args.slice(0, -1), opts) : $$rpc[${JSON.stringify(moduleKey)}][method](args); };`,
+		`const $$call = (method, args) => { const opts = args.at(-1); return opts && typeof opts === "object" && opts.signal instanceof AbortSignal && Object.keys(opts).length === 1 ? $$rpc[${JSON.stringify(rpcKey)}][method](...args.slice(0, -1), opts) : $$rpc[${JSON.stringify(rpcKey)}][method](...args); };`,
 		...scan.clientRefs.map((ref, index) => ref.imported === "default" ? `import $$child${index} from ${JSON.stringify(ref.spec)};` : `import { ${ref.imported} as $$child${index} } from ${JSON.stringify(ref.spec)};`)
 	];
 	for (const name of scan.exports) if (!scan.islands.some((island) => island.name === name)) lines.push(`export const ${name} = (...args) => $$call(${JSON.stringify(name)}, args);`);
@@ -186,7 +203,7 @@ function generateServerIslandModule(spec, scan) {
 		if (scan.clientRefs.length) wiring.push(`children: { ${scan.clientRefs.map((ref, index) => `${JSON.stringify(ref.id)}: $$child${index}`).join(", ")} }`);
 		const id = serverIslandPublicId(spec, island.name);
 		wiring.push(`frame: (props) => fetch("/__ilha/frame", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ id: ${JSON.stringify(id)}, path: location.pathname + location.search, props }) }).then((r) => { if (!r.ok) throw new Error("frame failed"); return r.json(); }).then((j) => { if (j.redirect) { try { const u = new URL(j.redirect, location.href); if (u.origin === location.origin) location.assign(u.pathname + u.search + u.hash); } catch {} throw new Error("frame redirected"); } __ilhaApplyHead(j.head); return j.html; })`);
-		const call = `__ilhaServerIsland(${JSON.stringify(id)}, ${JSON.stringify(island.as)}, { ${wiring.join(", ")} })`;
+		const call = `__ilhaServerIsland(${JSON.stringify(id)}, ${JSON.stringify(island.as)}, { ${wiring.join(", ")} }, ${JSON.stringify(repaintKey)})`;
 		if (island.name === "default") lines.push(`export default ${call};`);
 		else lines.push(`export const ${island.name} = ${call};`);
 	}

package/dist/rsbuild.js

@@ -1,4 +1,4 @@
-import { t as ilhaPages } from "./plugin-C3AAI3e_.js";
+import { t as ilhaPages } from "./plugin-Bfnn44nu.js";
 
 //#region src/rsbuild.ts
 /** Rsbuild plugin — use via `@ilha/router/rsbuild`. */

package/dist/server-island.d.ts

@@ -15,6 +15,8 @@
  *   `data-ilha-actions` manifest emitted by `hydratable()`.
  */
 declare const ISLAND_CALL: unique symbol;
+/** @internal Repaint every mounted island from the same `*.server` module. */
+export declare function __ilhaRepaintServerModule(moduleKey: string): void;
 export type ServerStreamFn = (signal: AbortSignal) => AsyncGenerator<unknown> | Generator<unknown>;
 export interface ServerIslandWiring {
     /** Stream key → client transport. The plugin wires these to tacho stubs. */
@@ -52,5 +54,5 @@ export type ServerIslandCallable = Record<symbol, unknown> & ((props?: Record<st
     toString: () => string;
     key: (slotKey: string) => (props?: Record<string, unknown>) => IslandCallShape;
 };
-export declare function __ilhaServerIsland(id: string, as: string, wiring?: ServerIslandWiring): ServerIslandCallable;
+export declare function __ilhaServerIsland(id: string, as: string, wiring?: ServerIslandWiring, moduleKey?: string): ServerIslandCallable;
 export {};

package/dist/server-island.js

@@ -27,6 +27,23 @@ const EVENT_SENTINEL_ATTR = "data-ilha-on";
 const ACTIONS_ATTR = "data-ilha-actions";
 const PROPS_ATTR = "data-ilha-props";
 const CLIENT_REF_ATTR = "data-ilha-client-ref";
+const moduleRepaints = /* @__PURE__ */ new Map();
+/** @internal Repaint every mounted island from the same `*.server` module. */
+function __ilhaRepaintServerModule(moduleKey) {
+	for (const repaint of moduleRepaints.get(moduleKey) ?? []) repaint();
+}
+function linkServerModuleRepaints(moduleKey, repaint) {
+	let set = moduleRepaints.get(moduleKey);
+	if (!set) {
+		set = /* @__PURE__ */ new Set();
+		moduleRepaints.set(moduleKey, set);
+	}
+	set.add(repaint);
+	return () => {
+		set.delete(repaint);
+		if (set.size === 0) moduleRepaints.delete(moduleKey);
+	};
+}
 /** @internal Apply head entries returned with a server-page frame. */
 function __ilhaApplyHead(entries) {
 	if (Array.isArray(entries)) applyHeadEntriesToDocument(entries);
@@ -85,7 +102,7 @@ async function startServerStream(fn, signal) {
 	}
 	throw last;
 }
-function hydrateServerIsland(host, id, wiring, props) {
+function hydrateServerIsland(host, id, wiring, props, moduleKey) {
 	const controller = new AbortController();
 	const cleanups = [];
 	cleanups.push(() => controller.abort());
@@ -115,6 +132,11 @@ function hydrateServerIsland(host, id, wiring, props) {
 			if (!controller.signal.aborted) console.error(`[ilha-router] frame render failed for "${id}":`, err);
 		});
 	};
+	const repaintModule = () => {
+		if (moduleKey) __ilhaRepaintServerModule(moduleKey);
+		else scheduleRepaint();
+	};
+	if (moduleKey) cleanups.push(linkServerModuleRepaints(moduleKey, scheduleRepaint));
 	const attached = [];
 	const readManifest = () => {
 		const raw = host.querySelector(`:scope > template[${ACTIONS_ATTR}], template[${ACTIONS_ATTR}]`)?.getAttribute(ACTIONS_ATTR) ?? host.getAttribute(ACTIONS_ATTR) ?? null;
@@ -145,7 +167,7 @@ function hydrateServerIsland(host, id, wiring, props) {
 				const action = actionKey == null ? void 0 : wiring.actions?.[actionKey];
 				if (!action) continue;
 				const listener = () => {
-					Promise.resolve(action(...callArgs)).then(() => scheduleRepaint()).catch((err) => {
+					Promise.resolve(action(...callArgs)).then(() => repaintModule()).catch((err) => {
 						console.error(`[ilha-router] action "${String(actionKey)}" failed:`, err);
 					});
 				};
@@ -170,7 +192,7 @@ function hydrateServerIsland(host, id, wiring, props) {
 			if (!action) continue;
 			const args = Array.isArray(marker.a) ? marker.a : [];
 			props[key] = (..._runtimeArgs) => Promise.resolve(action(...args)).then((result) => {
-				scheduleRepaint();
+				repaintModule();
 				return result;
 			});
 		}
@@ -204,7 +226,7 @@ function hydrateServerIsland(host, id, wiring, props) {
 					const { done, value } = step;
 					if (controller.signal.aborted || done) break;
 					state[key] = value;
-					scheduleRepaint();
+					repaintModule();
 					step = await gen.next();
 				}
 			} catch (err) {
@@ -232,7 +254,7 @@ function hydrateServerIsland(host, id, wiring, props) {
 		}
 	};
 }
-function __ilhaServerIsland(id, as, wiring = {}) {
+function __ilhaServerIsland(id, as, wiring = {}, moduleKey) {
 	const slotTag = assertValidTag(as);
 	const island = ((props) => {
 		return "";
@@ -250,10 +272,10 @@ function __ilhaServerIsland(id, as, wiring = {}) {
 			key: slotKey
 		});
 	};
-	island[ISLAND_MOUNT_INTERNAL] = (host, mountProps) => hydrateServerIsland(host, id, wiring, mountProps);
-	island.mount = (host, mountProps) => hydrateServerIsland(host, id, wiring, mountProps).unmount;
+	island[ISLAND_MOUNT_INTERNAL] = (host, mountProps) => hydrateServerIsland(host, id, wiring, mountProps, moduleKey);
+	island.mount = (host, mountProps) => hydrateServerIsland(host, id, wiring, mountProps, moduleKey).unmount;
 	return island;
 }
 
 //#endregion
-export { __ilhaApplyHead, __ilhaServerIsland };
+export { __ilhaApplyHead, __ilhaRepaintServerModule, __ilhaServerIsland };

package/dist/server-islands.d.ts

@@ -6,6 +6,10 @@
  * island bindings resolve to the proxy while everything else keeps flowing
  * through oxidejs's tacho stub replacement.
  */
+/** Oxide RPC client key — basename without `.server.*` (oxide indexes by module name). */
+export declare function serverModuleRpcKey(spec: string): string;
+/** Client repaint group key — full normalized path so same-basename files stay distinct. */
+export declare function serverModuleRepaintKey(spec: string): string;
 export interface ScannedServerIsland {
     /** Export binding name, or `"default"` for `export default ilha…`. */
     name: string;

package/dist/{ssr-WA3bSsCo.js → ssr-CV_vNpS3.js}

@@ -5,6 +5,7 @@ import * as Result from "effect/Result";
 import { AsyncLocalStorage } from "node:async_hooks";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
+import { action, brandServerAction } from "oxidejs";
 
 //#region src/request-scope.ts
 /**
@@ -184,19 +185,10 @@ function frameEnvelope(status, body) {
 		body: JSON.stringify(body)
 	};
 }
-const ACTION_CALL = Symbol.for("ilha.actionCall");
 /** @internal Brand an exported server action with its generated RPC transport key. */
 function __ilhaServerAction(key, fn) {
-	const wrapped = ((...args) => fn(...args));
-	wrapped.with = (...args) => {
-		const handler = ((..._ev) => wrapped(...args));
-		handler[ACTION_CALL] = {
-			k: key,
-			a: args
-		};
-		return handler;
-	};
-	return wrapped;
+	const handle = typeof fn === "function" && fn.$$atom === 1 ? fn : action(fn);
+	return brandServerAction(key, handle);
 }
 function registerServerIsland(id, render) {
 	registry().set(id, { render });

package/dist/ssr.d.ts

@@ -110,9 +110,7 @@ export interface FrameEnvelope {
 }
 export declare function frameEnvelope(status: number, body: Record<string, unknown>): FrameEnvelope;
 /** @internal Brand an exported server action with its generated RPC transport key. */
-export declare function __ilhaServerAction<A extends unknown[], R>(key: string, fn: (...args: A) => R): ((...args: A) => R) & {
-    with: (...args: A) => (...ev: unknown[]) => R;
-};
+export declare function __ilhaServerAction<A extends unknown[], R>(key: string, fn: (...args: A) => R | Promise<R>): import("oxidejs").ServerActionHandle<A, Awaited<Awaited<R>>>;
 export declare function registerServerIsland(id: string, render: () => unknown): void;
 export declare function getServerIslandEntry(id: string): ServerIslandEntry | undefined;
 declare const FrameError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {

package/dist/ssr.js

@@ -1,3 +1,3 @@
-import { S as ssr, _ as registerServerIsland, a as authorizeFrameRequest, b as setFrameAuth, c as frameScopedUrl, d as getServerIslandEntry, f as isSafeFramePath, g as readBodyBounded, h as parseFrameProps, i as __ilhaServerAction, l as getFrameAuth, m as json, n as FrameError, o as forwardIdentityHeaders, p as isTrustedOrigin, r as MAX_BODY, s as frameEnvelope, t as FRAME_ENDPOINT, u as getFrameGuard, v as renderServerIsland, x as setFrameGuard, y as renderServerIslandResult } from "./ssr-WA3bSsCo.js";
+import { S as ssr, _ as registerServerIsland, a as authorizeFrameRequest, b as setFrameAuth, c as frameScopedUrl, d as getServerIslandEntry, f as isSafeFramePath, g as readBodyBounded, h as parseFrameProps, i as __ilhaServerAction, l as getFrameAuth, m as json, n as FrameError, o as forwardIdentityHeaders, p as isTrustedOrigin, r as MAX_BODY, s as frameEnvelope, t as FRAME_ENDPOINT, u as getFrameGuard, v as renderServerIsland, x as setFrameGuard, y as renderServerIslandResult } from "./ssr-CV_vNpS3.js";
 
 export { FRAME_ENDPOINT, FrameError, MAX_BODY, __ilhaServerAction, authorizeFrameRequest, ssr as default, forwardIdentityHeaders, frameEnvelope, frameScopedUrl, getFrameAuth, getFrameGuard, getServerIslandEntry, isSafeFramePath, isTrustedOrigin, json, parseFrameProps, readBodyBounded, registerServerIsland, renderServerIsland, renderServerIslandResult, setFrameAuth, setFrameGuard };

package/dist/vite.js

@@ -1,4 +1,4 @@
-import { t as ilhaPages } from "./plugin-C3AAI3e_.js";
+import { t as ilhaPages } from "./plugin-Bfnn44nu.js";
 
 //#region src/vite.ts
 /** Vite plugin — use via `@ilha/router/vite`. */

package/oxlint.cjs

@@ -1,6 +1,5 @@
-const PRIMITIVES = new Set(["atom", "when", "watch", "wait"]);
-// when/watch/wait return Instructions — they are only consumable by a generator frame.
-const INSTRUCTIONS = new Set(["when", "watch", "wait"]);
+const PRIMITIVES = new Set(["atom", "watch", "when"]);
+const INSTRUCTIONS = new Set(["when"]);
 const CONDITIONAL = new Set([
   "IfStatement",
   "ForStatement",
@@ -38,8 +37,48 @@ function ancestorsOf(context, node) {
   return [];
 }
 
-function calleeName(node) {
-  return node.type === "Identifier" ? node.name : null;
+function blockBody(node) {
+  if (node.type === "BlockStatement") return node.body;
+  if (
+    node.type === "FunctionDeclaration" ||
+    node.type === "FunctionExpression" ||
+    node.type === "ArrowFunctionExpression"
+  ) {
+    const body = node.body;
+    if (body?.type === "BlockStatement") return body.body;
+  }
+  return null;
+}
+
+function bindingInitType(name, ancestors) {
+  for (let i = ancestors.length - 1; i >= 0; i--) {
+    const a = ancestors[i];
+    if (a.type === "VariableDeclarator" && a.id?.type === "Identifier" && a.id.name === name) {
+      return a.init?.type ?? "none";
+    }
+    if (a.type === "FunctionDeclaration" && a.id?.name === name) {
+      return "FunctionDeclaration";
+    }
+    const stmts = blockBody(a);
+    if (stmts) {
+      for (const stmt of stmts) {
+        if (stmt.type !== "VariableDeclaration") continue;
+        for (const decl of stmt.declarations) {
+          if (decl.id?.type === "Identifier" && decl.id.name === name) {
+            return decl.init?.type ?? "none";
+          }
+        }
+      }
+    }
+  }
+  return null;
+}
+
+function isFunctionBinding(name, ancestors, moduleFns) {
+  const local = bindingInitType(name, ancestors);
+  if (local === "FunctionDeclaration") return true;
+  if (local !== null) return FN_TYPES.has(local);
+  return moduleFns.has(name);
 }
 
 function enclosingFunctions(ancestors) {
@@ -49,7 +88,7 @@ function enclosingFunctions(ancestors) {
 const noConditionalPrimitive = {
   meta: {
     type: "problem",
-    docs: { description: "Disallow atom/when/watch/wait inside conditionals or loops" },
+    docs: { description: "Disallow atom/watch/when inside conditionals or loops" },
     messages: {
       conditional:
         "Do not call {{name}}() inside a condition or loop. Primitive registration order must be stable — put the branch inside the primitive or the view.",
@@ -83,7 +122,7 @@ const noPrimitiveOutsideComponent = {
   meta: {
     type: "problem",
     docs: {
-      description: "Call atom/when/watch/wait inside a component, never at module top level",
+      description: "Call atom/watch/when inside a component, never at module top level",
     },
     messages: {
       outside:
@@ -112,7 +151,7 @@ const noPrimitiveOutsideComponent = {
 const noInstructionOutsideGenerator = {
   meta: {
     type: "problem",
-    docs: { description: "Use when/watch/wait only inside a generator, with yield*" },
+    docs: { description: "Use when only inside a generator, with yield*" },
     messages: {
       notGenerator:
         "{{name}}() returns an instruction that only a generator frame can run. Make the enclosing component a generator and yield* it.",
@@ -186,18 +225,20 @@ const preferLowercaseEvents = {
 const functionInAtom = {
   meta: {
     type: "problem",
-    docs: { description: "atom(fn) is a computed initializer — wrap function values" },
+    docs: {
+      description:
+        "atom(fn) and atom(() => …) are invalid — use atom.lazy, Atom.map, or Atom.transform",
+    },
     messages: {
-      init: "atom({{name}}) treats the function as a computed initializer. Wrap it: atom(() => {{name}}).",
-      set: "{{setter}}({{name}}) is fine as a value, but computed atoms reject set(). Store a function with a plain wrapper if you really mean it.",
+      init: "atom({{name}}) is not valid. Use atom.lazy(() => {{name}}) to store a function value.",
+      derived:
+        "atom(() => …) is not supported. Use atom(Atom.map(...)) or atom(Atom.transform(...)) for derived values, or atom.lazy() for one-time init.",
     },
     schema: [],
   },
   create(context) {
     const b = bindings();
     const fns = new Set();
-    const atoms = new Set();
-    const computed = new Set();
     return {
       ImportDeclaration(node) {
         takeImport(b, node);
@@ -215,23 +256,26 @@ const functionInAtom = {
           fns.add(node.id.name);
         }
         if (!init || primitiveName(init, b) !== "atom") return;
-        atoms.add(node.id.name);
-        // atom(() => …) or atom(function…) — computed; flag set() on it.
-        if (init.arguments[0] && FN_TYPES.has(init.arguments[0].type)) computed.add(node.id.name);
+        const arg = init.arguments[0];
+        if (arg && FN_TYPES.has(arg.type)) {
+          context.report({ node: arg, messageId: "derived" });
+        }
+        if (
+          arg?.type === "Identifier" &&
+          isFunctionBinding(arg.name, ancestorsOf(context, arg), fns)
+        ) {
+          context.report({ node: arg, messageId: "init", data: { name: arg.name } });
+        }
       },
       CallExpression(node) {
         if (node.arguments.length === 0) return;
         const arg = node.arguments[0];
-        if (arg.type !== "Identifier" || !fns.has(arg.name)) return;
-        if (primitiveName(node, b) === "atom") {
+        if (arg.type !== "Identifier") return;
+        if (
+          primitiveName(node, b) === "atom" &&
+          isFunctionBinding(arg.name, ancestorsOf(context, arg), fns)
+        ) {
           context.report({ node: arg, messageId: "init", data: { name: arg.name } });
-          return;
-        }
-        const setter = calleeName(node.callee);
-        // set(fn) on a computed atom never makes sense; on a writable atom it
-        // is the classic "I meant to store this function" mistake.
-        if (setter && atoms.has(setter) && computed.has(setter)) {
-          context.report({ node: arg, messageId: "set", data: { setter, name: arg.name } });
         }
       },
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ilha/router",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "A tiny SPA router for Ilha",
   "keywords": [
     "frontend",
@@ -69,14 +69,21 @@
     "test": "bun test"
   },
   "dependencies": {
-    "effect": "^4.0.0-rc.112",
+    "effect": "4.0.0-rc.112",
     "unplugin": "3.3.0"
   },
   "devDependencies": {
-    "ilha": "0.14.0",
+    "ilha": "^0.14.2",
+    "oxidejs": "^0.3.0",
     "vite": "^8.2.2"
   },
   "peerDependencies": {
-    "ilha": ">=0.14.0"
+    "ilha": ">=0.14.2",
+    "oxidejs": ">=0.3.0"
+  },
+  "peerDependenciesMeta": {
+    "oxidejs": {
+      "optional": true
+    }
   }
 }