@tschk/moonshine-react 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tschk/moonshine-react",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "React renderer, islands, and signal hooks for Moonshine",
   "license": "ISC",
   "type": "module",
@@ -16,8 +16,8 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@tschk/moonshine": "^0.3.1",
-    "@tschk/moonshine-framework": "^0.3.1",
+    "@tschk/moonshine": "^0.3.3",
+    "@tschk/moonshine-framework": "^0.3.3",
     "react": "^19.1.0",
     "react-dom": "^19.1.0"
   },

package/src/client.tsx

@@ -1,5 +1,6 @@
 import {
   createElement,
+  useCallback,
   useSyncExternalStore,
   type ComponentType,
   type ReactNode,
@@ -93,9 +94,14 @@ export function useSignal<T>(
   source: Subscribable<T>,
   getServerSnapshot?: () => T,
 ): T {
-  const subscribe = (onStoreChange: () => void) =>
-    source.subscribe(onStoreChange);
-  const getSnapshot = () => source();
+  // A fresh `subscribe` identity makes useSyncExternalStore resubscribe on
+  // every render, and dropping a memo's last listener tears down its whole
+  // upstream chain, so keep it stable for as long as the source is.
+  const subscribe = useCallback(
+    (onStoreChange: () => void) => source.subscribe(onStoreChange),
+    [source],
+  );
+  const getSnapshot = useCallback(() => source(), [source]);
   const server =
     getServerSnapshot ??
     (() =>

package/src/index.ts

@@ -1,4 +1,4 @@
-export { reactRenderer } from "./renderer";
+export { reactRenderer, registerRouteModules } from "./renderer";
 export type { RenderContext, Renderer } from "@tschk/moonshine-framework";
 export {
   batch,

package/src/renderer.tsx

@@ -28,9 +28,22 @@ type LayoutProps = PageProps & {
   children?: ReactNode;
 };
 
+const routeModules = new Map<string, unknown>();
+
+/**
+ * Supplies statically bundled route modules. Runtimes that cannot resolve a
+ * dynamic `import(file)` — Cloudflare Workers most notably — register the map
+ * their build already produced instead.
+ */
+export function registerRouteModules(modules: Record<string, unknown>): void {
+  for (const [key, mod] of Object.entries(modules)) routeModules.set(key, mod);
+}
+
 async function loadComponent(file: string): Promise<ComponentType<unknown>> {
-  const mod = await import(file);
-  return (mod.default ?? mod) as ComponentType<unknown>;
+  const registered = routeModules.get(file);
+  const mod = registered ?? (await import(file));
+  return ((mod as { default?: unknown }).default ??
+    mod) as ComponentType<unknown>;
 }
 
 async function buildBody(

package/src/serialize.ts

@@ -14,16 +14,21 @@ function escapeHtmlValue(value: string): string {
 }
 
 export function serializeIslandProps(value: unknown): string {
-  const seen = new WeakSet<object>();
+  // Ancestor chain, not a visited set: a value repeated in sibling positions
+  // is shared, not cyclic, and must still serialize.
+  const ancestors: unknown[] = [];
   function replacer(this: object, _key: string, v: unknown): unknown {
     if (v === undefined) return undefined;
     const type = typeof v;
     if (type === "function" || type === "symbol" || type === "bigint") {
       throw new TypeError(`cannot serialize ${type}`);
     }
-    if (v !== null && (typeof v === "object" || Array.isArray(v))) {
-      if (seen.has(v)) throw new TypeError("cyclic reference");
-      seen.add(v);
+    if (v !== null && typeof v === "object") {
+      while (ancestors.length > 0 && ancestors[ancestors.length - 1] !== this) {
+        ancestors.pop();
+      }
+      if (ancestors.includes(v)) throw new TypeError("cyclic reference");
+      ancestors.push(v);
     }
     return v;
   }