raf-effect-atom 0.2.0 → 0.2.2

package/CHANGELOG.md

@@ -1,14 +1,35 @@
 # Changelog
 
+## [0.2.2](https://github.com/KATT/raf-effect-atom/compare/raf-effect-atom%400.2.1...raf-effect-atom%400.2.2) (2026-10-23)
+
+### Features
+
+* **raf-effect-atom:** stop a loader's wait when its request is aborted ([b1f2f16](https://github.com/KATT/raf-effect-atom/commit/b1f2f16fcce9cd5dd1ba18fa653b40c805eebd93)), references [#41](https://github.com/KATT/raf-effect-atom/issues/41) [#40](https://github.com/KATT/raf-effect-atom/issues/40) [#40](https://github.com/KATT/raf-effect-atom/issues/40) [#41](https://github.com/KATT/raf-effect-atom/issues/41)
+
+### Bug Fixes
+
+* **raf-effect-atom:** refuse to hydrate a shared registry during server rendering ([2f793a6](https://github.com/KATT/raf-effect-atom/commit/2f793a63627482bdf2f0e2891829f5191077cfc7))
+
+### Documentation
+
+* **raf-effect-atom:** date clientAtomsMiddleware to 0.2.1, the release it shipped in ([c2a4288](https://github.com/KATT/raf-effect-atom/commit/c2a4288f4c5b63575e019712edc9fdc49a052bd2))
+* record that the packages' module state is keyed by what one request owns ([22b23f9](https://github.com/KATT/raf-effect-atom/commit/22b23f947544f8c4459ef172e8b21499403059c4))
+
+## [0.2.1](https://github.com/KATT/raf-effect-atom/compare/raf-effect-atom%400.2.0...raf-effect-atom%400.2.1) (2026-10-23)
+
+### Features
+
+- **raf-effect-atom:** run React Router loaders in the browser after the first page ([bee00a9](https://github.com/KATT/raf-effect-atom/commit/bee00a981fd24fcdc9d746053dcd73dbc7ebc853)), references [#41](https://github.com/KATT/raf-effect-atom/issues/41) [#41](https://github.com/KATT/raf-effect-atom/issues/41)
+
 ## [0.2.0](https://github.com/KATT/raf-effect-atom/compare/raf-effect-atom%400.1.0...raf-effect-atom%400.2.0) (2026-10-23)
 
 ### ⚠ BREAKING CHANGES
 
-* **raf-effect-atom:** `dehydrate()` from `raf-effect-atom/next` returns a
+- **raf-effect-atom:** `dehydrate()` from `raf-effect-atom/next` returns a
 
 ### Features
 
-* **raf-effect-atom:** seed each request registry, async seeds included ([62b6180](https://github.com/KATT/raf-effect-atom/commit/62b618098df87e711ddb4c1d633e191ba3353438))
+- **raf-effect-atom:** seed each request registry, async seeds included ([62b6180](https://github.com/KATT/raf-effect-atom/commit/62b618098df87e711ddb4c1d633e191ba3353438))
 
 ## 0.1.0 (2026-10-23)
 

package/README.md

@@ -53,7 +53,7 @@ Each framework has a subpath that gives every server request its own registry an
 
 - `raf-effect-atom/tanstack-router`, for TanStack Router and TanStack Start: `setupRouterAtoms({ router, registry })` in `getRouter`, with `Loader.make(registry)` on the router context.
 - `raf-effect-atom/next`, for the App Router: `prefetch`, `ensure` and `fetch` in server components, which pass the handles to client components as props, and `<HydrateAtoms state={await dehydrate()}>` around them. `makeRequestAtoms({ seed })` makes the same functions over a registry seeded from the request, such as with its cookie.
-- `raf-effect-atom/react-router`, for Framework Mode: `atomsMiddleware(atomsContext)` as the root middleware, loaders that return `atoms.dehydrate()` with their handles, and `HydrationBoundary` in the route component.
+- `raf-effect-atom/react-router`, for Framework Mode: `atomsMiddleware(atomsContext)` as the root middleware and `clientAtomsMiddleware(atomsContext)` as its client middleware, loaders that return `atoms.dehydrate()` with their handles and double as client loaders, and `HydrationBoundary` in the route component.
 
 In development, `useAtomResult` reports a read that starts an atom nothing started, a request waterfall. `<WaterfallDetection mode="throw">` at the root makes it throw to the nearest error boundary. `useWaterfall(source, ...args)` starts an atom whose input exists only in render, marks it as a known waterfall, and returns its handle.
 

package/dist/Hooks.mjs

@@ -1,16 +1,13 @@
 "use client";
 import { stream } from "./internal/pending.mjs";
 import { hydrated } from "./Hydration.mjs";
-import { isDevelopment } from "./internal/development.mjs";
 import { keyOf, release } from "./internal/leases.mjs";
 import { atomOf } from "./internal/handles.mjs";
-import { isRequestRegistry } from "./RequestRegistry.mjs";
-import { isServer } from "./internal/registry.mjs";
+import { requireRequestRegistry } from "./internal/registry.mjs";
 import { ModeContext, check } from "./internal/waterfalls.mjs";
 import * as Atom from "effect/reactivity/Atom";
 import * as Predicate from "effect/Predicate";
 import * as Cause from "effect/Cause";
-import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as AsyncResult from "effect/reactivity/AsyncResult";
 import { RegistryContext, useAtomSuspense } from "@effect/atom-react";
@@ -111,7 +108,7 @@ const sourceOf = (atom) => {
 const useAtomResult = (source, handle) => {
 	const registry = React.useContext(RegistryContext);
 	const atom = atomOf(source, handle.args);
-	if (isServer() && !isRequestRegistry(registry) && Effect.runSync(isDevelopment)) throw new Error("raf-effect-atom: useAtomResult rendered on the server without a request registry, so results would be shared between requests. Provide RequestRegistry.make() through RegistryContext, as the framework integrations do.");
+	requireRequestRegistry(registry, "useAtomResult");
 	const target = sourceOf(atom);
 	const started = hydrated(target);
 	const read = target === atom ? hydrated(atom) : atom;

package/dist/Loader.d.mts

@@ -5,7 +5,7 @@ import * as Effect from "effect/Effect";
 import * as AsyncResult from "effect/reactivity/AsyncResult";
 import * as AtomRegistry from "effect/reactivity/AtomRegistry";
 declare namespace Loader_d_exports {
-  export { LeaseTTL, Loader, SettledResult, ensure, fetch, make, prefetch, result };
+  export { LeaseTTL, Loader, MakeOptions, SettledResult, ensure, fetch, make, prefetch, result };
 }
 /**
  * A settled `AsyncResult`: what `ensure` and `fetch` return.
@@ -166,6 +166,23 @@ export interface Loader {
    */
   readonly prefetch: <S extends Source>(source: S, ...args: ArgsOf<S>) => Handle<S>;
 }
+/**
+ * Options for `make`.
+ *
+ * @stability unstable
+ * @category models
+ * @since 0.3.0
+ */
+export interface MakeOptions {
+  /** How long a lease lasts in the browser. See {@link LeaseTTL}. */
+  readonly leaseTTL?: Duration.Input | undefined;
+  /**
+   * The request's or the navigation's abort signal. Aborting it interrupts
+   * the `ensure` and `fetch` calls still waiting, which reject with its
+   * reason. The atoms they started keep loading.
+   */
+  readonly signal?: AbortSignal | undefined;
+}
 /**
  * Creates the Promise verbs over one registry.
  *
@@ -174,15 +191,22 @@ export interface Loader {
  * Use in a framework integration, in loaders that are async functions, or
  * in an event handler that starts an atom before the state change that
  * renders its reader, for state that can't be in the URL, such as a
- * search-as-you-type query. In Effect code, use
- * the verbs directly with the `AtomRegistry` provided.
+ * search-as-you-type query. In Effect code, use the verbs directly with the
+ * `AtomRegistry` provided.
+ *
+ * **Details**
+ *
+ * With a `signal`, an aborted request or navigation stops waiting: `ensure`
+ * and `fetch` reject with the signal's reason, and the atoms they started
+ * keep loading. The React Router and Next.js integrations pass the
+ * request's.
  *
  * **Example**
  *
  * ```ts
  * import { Loader, RequestRegistry } from "raf-effect-atom"
  *
- * const loader = Loader.make(RequestRegistry.make())
+ * const loader = Loader.make(RequestRegistry.make(), { signal: request.signal })
  * const comments = loader.prefetch(commentPage, 1, 0)
  * const issueHandle = await loader.ensure(issue, 1)
  * ```
@@ -191,7 +215,5 @@ export interface Loader {
  * @category constructors
  * @since 0.1.0
  */
-export declare const make: (registry: AtomRegistry.AtomRegistry, options?: {
-  readonly leaseTTL?: Duration.Input | undefined;
-}) => Loader;
+export declare const make: (registry: AtomRegistry.AtomRegistry, options?: MakeOptions) => Loader;
 export { Loader_d_exports };

package/dist/Loader.mjs

@@ -250,6 +250,9 @@ const result = (handle) => {
 	if (settledResult === void 0) throw new Error("raf-effect-atom: Loader.result got a handle that no ensure or fetch returned here. Only the code that ran the verb has its result: a handle that crossed the network is a copy. Read it with useAtomResult instead.");
 	return settledResult;
 };
+const runPromise = (effect, signal) => Effect.runPromise(effect, { signal }).catch((error) => {
+	throw signal?.aborted ? signal.reason : error;
+});
 /**
 * Creates the Promise verbs over one registry.
 *
@@ -258,15 +261,22 @@ const result = (handle) => {
 * Use in a framework integration, in loaders that are async functions, or
 * in an event handler that starts an atom before the state change that
 * renders its reader, for state that can't be in the URL, such as a
-* search-as-you-type query. In Effect code, use
-* the verbs directly with the `AtomRegistry` provided.
+* search-as-you-type query. In Effect code, use the verbs directly with the
+* `AtomRegistry` provided.
+*
+* **Details**
+*
+* With a `signal`, an aborted request or navigation stops waiting: `ensure`
+* and `fetch` reject with the signal's reason, and the atoms they started
+* keep loading. The React Router and Next.js integrations pass the
+* request's.
 *
 * **Example**
 *
 * ```ts
 * import { Loader, RequestRegistry } from "raf-effect-atom"
 *
-* const loader = Loader.make(RequestRegistry.make())
+* const loader = Loader.make(RequestRegistry.make(), { signal: request.signal })
 * const comments = loader.prefetch(commentPage, 1, 0)
 * const issueHandle = await loader.ensure(issue, 1)
 * ```
@@ -277,13 +287,14 @@ const result = (handle) => {
 */
 const make = (registry, options) => {
 	const leaseTTL = options?.leaseTTL === void 0 ? void 0 : Duration.fromInputUnsafe(options.leaseTTL);
+	const signal = options?.signal;
 	const provide = (effect) => {
 		const provided = Effect.provideService(effect, AtomRegistry.AtomRegistry, registry);
 		return leaseTTL === void 0 ? provided : Effect.provideService(provided, LeaseTTL, leaseTTL);
 	};
 	return {
-		ensure: (source, ...args) => Effect.runPromise(provide(ensure(source, ...args))),
-		fetch: (source, ...args) => Effect.runPromise(provide(fetch(source, ...args))),
+		ensure: (source, ...args) => runPromise(provide(ensure(source, ...args)), signal),
+		fetch: (source, ...args) => runPromise(provide(fetch(source, ...args)), signal),
 		prefetch: (source, ...args) => {
 			const atom = atomOf(source, args);
 			afterSeed(registry, () => {

package/dist/Next.d.mts

@@ -67,7 +67,9 @@ export declare const makeRequestAtoms: (options?: Options) => RequestAtoms;
  *
  * Made once per request through React's `cache`, and disposed through
  * `cacheSignal` when React finishes the render, after the last streamed
- * result has been sent.
+ * result has been sent. The verbs take the same signal: when React aborts
+ * the render, such as for a navigation the browser left, the `ensure` and
+ * `fetch` calls still waiting reject with its reason.
  *
  * **Gotchas**
  *

package/dist/Next.mjs

@@ -48,7 +48,9 @@ const atoms = make();
 *
 * Made once per request through React's `cache`, and disposed through
 * `cacheSignal` when React finishes the render, after the last streamed
-* result has been sent.
+* result has been sent. The verbs take the same signal: when React aborts
+* the render, such as for a navigation the browser left, the `ensure` and
+* `fetch` calls still waiting reject with its reason.
 *
 * **Gotchas**
 *

package/dist/ReactHydration.d.mts

@@ -35,6 +35,12 @@ export interface HydrationBoundaryProps {
  * there, so an `effect-atom-boundary` boundary sees their failures before
  * its children read them and renders its handler on the server.
  *
+ * **Gotchas**
+ *
+ * In development, it throws during server rendering when the registry isn't
+ * a request registry, such as `@effect/atom-react`'s default one, which
+ * every request shares: one request's state would reach the others.
+ *
  * **Example**
  *
  * ```tsx

package/dist/ReactHydration.mjs

@@ -1,7 +1,7 @@
 "use client";
 import { split } from "./internal/pending.mjs";
 import { sourceOf } from "./internal/sources.mjs";
-import { isServer } from "./internal/registry.mjs";
+import { isServer, requireRequestRegistry } from "./internal/registry.mjs";
 import { HydrationBoundary, RegistryContext } from "@effect/atom-react";
 import * as React from "react";
 import { jsx } from "react/jsx-runtime";
@@ -36,6 +36,12 @@ import { jsx } from "react/jsx-runtime";
 * there, so an `effect-atom-boundary` boundary sees their failures before
 * its children read them and renders its handler on the server.
 *
+* **Gotchas**
+*
+* In development, it throws during server rendering when the registry isn't
+* a request registry, such as `@effect/atom-react`'s default one, which
+* every request shares: one request's state would reach the others.
+*
 * **Example**
 *
 * ```tsx
@@ -55,6 +61,7 @@ const HydrationBoundary$1 = (props) => {
 	const state = props.state;
 	const source = isServer() ? sourceOf(state) : void 0;
 	const registry = source ?? context;
+	requireRequestRegistry(registry, "HydrationBoundary");
 	const settled = React.useMemo(() => state === void 0 || source !== void 0 ? void 0 : split(registry, state), [
 		registry,
 		source,

package/dist/ReactRouter.d.mts

@@ -3,7 +3,9 @@ import { RegistryProvider } from "./RegistryProvider.mjs";
 import * as EffectHydration from "effect/reactivity/Hydration";
 import * as AtomRegistry from "effect/reactivity/AtomRegistry";
 /**
- * One request's registry, with the loader verbs over it.
+ * One request's registry, with the loader verbs over it. In a client loader,
+ * the browser's registry, whose `dehydrate` returns nothing: its atoms are
+ * already where the components read them.
  *
  * @stability unstable
  * @category models
@@ -68,11 +70,14 @@ export interface AtomsMiddlewareOptions {
  * `seed` runs on the new registry before `next`, so every loader's atoms
  * start with what it sets.
  *
+ * The verbs take the request's `signal`: when the client goes before the
+ * response, such as a navigation that leaves while its loaders wait, the
+ * `ensure` and `fetch` calls still waiting reject with its reason.
+ *
  * **Gotchas**
  *
  * It's server middleware: export it as the root route's `middleware`, not
- * `clientMiddleware`. In the browser, the root's `RegistryProvider` holds
- * the registry.
+ * `clientMiddleware`, which takes `clientAtomsMiddleware`.
  *
  * **Example**
  *
@@ -91,4 +96,49 @@ export interface AtomsMiddlewareOptions {
  * @since 0.1.0
  */
 export declare const atomsMiddleware: (context: AtomsContext, options?: AtomsMiddlewareOptions) => <Result>(args: MiddlewareArgs, next: () => Promise<Result>) => Promise<Result>;
+/**
+ * Creates a root client middleware that gives client loaders the browser's
+ * registry, under the context `atomsMiddleware` uses on the server.
+ *
+ * **When to use**
+ *
+ * Export it as the root route's `clientMiddleware`, and each route's loader
+ * function as both its `loader` and its `clientLoader`. The first page's loaders run on
+ * the server and stream their atoms in; after that, navigations run the
+ * loaders in the browser. `ensure` then renders what the browser's registry
+ * holds without a request, and a link's prefetch doesn't fetch a route's
+ * `.data` that the click would fetch again.
+ *
+ * **Details**
+ *
+ * The registry is the one the mounted `RegistryProvider` provides. Its
+ * `dehydrate` returns nothing, so a loader's data has the same shape in
+ * the browser and on the server, and `HydrationBoundary` has nothing to do.
+ * The verbs take the navigation's `signal`: when another navigation
+ * interrupts it, the `ensure` and `fetch` calls still waiting reject with
+ * its reason, and the atoms keep loading.
+ *
+ * **Gotchas**
+ *
+ * The atoms run in the browser, so their RPC protocol must reach the server
+ * from there, as it does for anything a component starts.
+ *
+ * **Example**
+ *
+ * ```ts
+ * // app/root.tsx
+ * export const middleware = [atomsMiddleware(atomsContext)]
+ * export const clientMiddleware = [clientAtomsMiddleware(atomsContext)]
+ *
+ * // app/routes/issue.tsx: one function for both, since React Router
+ * // removes `loader` from the browser's bundle.
+ * export const loader = load
+ * export const clientLoader = load
+ * ```
+ *
+ * @stability unstable
+ * @category integrations
+ * @since 0.2.1
+ */
+export declare const clientAtomsMiddleware: (context: AtomsContext) => <Result>(args: MiddlewareArgs, next: () => Promise<Result>) => Promise<Result>;
 export { RegistryProvider };

package/dist/ReactRouter.mjs

@@ -1,6 +1,7 @@
 import { dehydrate } from "./Hydration.mjs";
 import { make, settled } from "./RequestRegistry.mjs";
 import { make as make$1 } from "./Loader.mjs";
+import { current } from "./internal/registry.mjs";
 import { RegistryProvider } from "./RegistryProvider.mjs";
 import * as Predicate from "effect/Predicate";
 // src/ReactRouter.ts
@@ -10,8 +11,11 @@ import * as Predicate from "effect/Predicate";
 * A root `middleware` gives each server request its own registry, under a
 * router context the app creates. Loaders start atoms with its verbs and
 * return its `dehydrate()` with their data; the route component hydrates it
-* with `HydrationBoundary`, inside the root's `RegistryProvider`. Nothing is
-* imported from `react-router`.
+* with `HydrationBoundary`, inside the root's `RegistryProvider`. A root
+* `clientMiddleware` puts the browser's registry under the same context, so
+* one function can be both the route's `loader` and its `clientLoader`: after the first
+* page, loaders run in the browser, where `ensure` finds what the registry
+* already holds. Nothing is imported from `react-router`.
 *
 * **Example**
 *
@@ -26,14 +30,18 @@ import * as Predicate from "effect/Predicate";
 * import { atomsMiddleware } from "raf-effect-atom/react-router"
 *
 * export const middleware = [atomsMiddleware(atomsContext)]
+* export const clientMiddleware = [clientAtomsMiddleware(atomsContext)]
 *
 * // app/routes/issue.tsx
-* export async function loader(args: Route.LoaderArgs) {
+* async function load(args: Route.LoaderArgs) {
 *   const atoms = args.context.get(atomsContext)
 *   const handle = await atoms.ensure(issue, Number(args.params.id))
 *   return { atoms: atoms.dehydrate(), issue: handle }
 * }
 *
+* export const loader = load
+* export const clientLoader = load
+*
 * export default function IssueRoute(props: Route.ComponentProps) {
 *   return (
 *     <HydrationBoundary state={props.loaderData.atoms}>
@@ -61,11 +69,14 @@ import * as Predicate from "effect/Predicate";
 * `seed` runs on the new registry before `next`, so every loader's atoms
 * start with what it sets.
 *
+* The verbs take the request's `signal`: when the client goes before the
+* response, such as a navigation that leaves while its loaders wait, the
+* `ensure` and `fetch` calls still waiting reject with its reason.
+*
 * **Gotchas**
 *
 * It's server middleware: export it as the root route's `middleware`, not
-* `clientMiddleware`. In the browser, the root's `RegistryProvider` holds
-* the registry.
+* `clientMiddleware`, which takes `clientAtomsMiddleware`.
 *
 * **Example**
 *
@@ -92,7 +103,7 @@ const atomsMiddleware = (context, options) => async (args, next) => {
 		registry.dispose();
 		throw error;
 	}
-	const loader = make$1(registry);
+	const loader = make$1(registry, { signal: args.request.signal });
 	args.context.set(context, {
 		...loader,
 		dehydrate: () => dehydrate(registry),
@@ -135,4 +146,58 @@ const disposeAfter = (body, registry) => {
 		}
 	});
 };
-export { RegistryProvider, atomsMiddleware };
+/**
+* Creates a root client middleware that gives client loaders the browser's
+* registry, under the context `atomsMiddleware` uses on the server.
+*
+* **When to use**
+*
+* Export it as the root route's `clientMiddleware`, and each route's loader
+* function as both its `loader` and its `clientLoader`. The first page's loaders run on
+* the server and stream their atoms in; after that, navigations run the
+* loaders in the browser. `ensure` then renders what the browser's registry
+* holds without a request, and a link's prefetch doesn't fetch a route's
+* `.data` that the click would fetch again.
+*
+* **Details**
+*
+* The registry is the one the mounted `RegistryProvider` provides. Its
+* `dehydrate` returns nothing, so a loader's data has the same shape in
+* the browser and on the server, and `HydrationBoundary` has nothing to do.
+* The verbs take the navigation's `signal`: when another navigation
+* interrupts it, the `ensure` and `fetch` calls still waiting reject with
+* its reason, and the atoms keep loading.
+*
+* **Gotchas**
+*
+* The atoms run in the browser, so their RPC protocol must reach the server
+* from there, as it does for anything a component starts.
+*
+* **Example**
+*
+* ```ts
+* // app/root.tsx
+* export const middleware = [atomsMiddleware(atomsContext)]
+* export const clientMiddleware = [clientAtomsMiddleware(atomsContext)]
+*
+* // app/routes/issue.tsx: one function for both, since React Router
+* // removes `loader` from the browser's bundle.
+* export const loader = load
+* export const clientLoader = load
+* ```
+*
+* @stability unstable
+* @category integrations
+* @since 0.2.1
+*/
+const clientAtomsMiddleware = (context) => (args, next) => {
+	const registry = current();
+	if (registry === void 0) throw new Error("clientAtomsMiddleware found no mounted RegistryProvider: render raf-effect-atom/react-router's RegistryProvider around the app in the root layout.");
+	args.context.set(context, {
+		...make$1(registry, { signal: args.request.signal }),
+		dehydrate: () => [],
+		registry
+	});
+	return next();
+};
+export { RegistryProvider, atomsMiddleware, clientAtomsMiddleware };

package/dist/RegistryProvider.d.mts

@@ -18,6 +18,9 @@ import * as React from "react";
  * It's read once, when the registry is made. The server's request registry
  * lives for one request, so it has none.
  *
+ * In the browser, React Router's `clientAtomsMiddleware` gives client
+ * loaders the registry of the mounted provider.
+ *
  * **Example**
  *
  * ```tsx

package/dist/RegistryProvider.mjs

@@ -1,5 +1,5 @@
 "use client";
-import { make } from "./internal/registry.mjs";
+import { make, mount } from "./internal/registry.mjs";
 import { RegistryContext } from "@effect/atom-react";
 import * as React from "react";
 import { jsx } from "react/jsx-runtime";
@@ -29,6 +29,9 @@ import { jsx } from "react/jsx-runtime";
 * It's read once, when the registry is made. The server's request registry
 * lives for one request, so it has none.
 *
+* In the browser, React Router's `clientAtomsMiddleware` gives client
+* loaders the registry of the mounted provider.
+*
 * **Example**
 *
 * ```tsx
@@ -47,6 +50,7 @@ import { jsx } from "react/jsx-runtime";
 */
 const RegistryProvider = (props) => {
 	const [registry] = React.useState(() => make({ defaultIdleTTL: props.defaultIdleTTL }));
+	React.useEffect(() => mount(registry), [registry]);
 	return /* @__PURE__ */ jsx(RegistryContext.Provider, {
 		value: registry,
 		children: props.children

package/dist/internal/next.mjs

@@ -3,13 +3,16 @@ import { make as make$1, settled } from "../RequestRegistry.mjs";
 import { make as make$2 } from "../Loader.mjs";
 import * as React from "react";
 // src/internal/next.ts
+const renderSignal = () => {
+	return React.cacheSignal();
+};
 const make = (options) => {
 	const getRegistry = React.cache(() => {
 		const registry = make$1(options);
-		React.cacheSignal()?.addEventListener("abort", () => registry.dispose(), { once: true });
+		renderSignal()?.addEventListener("abort", () => registry.dispose(), { once: true });
 		return registry;
 	});
-	const getLoader = React.cache(() => make$2(getRegistry()));
+	const getLoader = React.cache(() => make$2(getRegistry(), { signal: renderSignal() ?? void 0 }));
 	return {
 		dehydrate: async () => {
 			const registry = getRegistry();

package/dist/internal/registry.mjs

@@ -1,8 +1,18 @@
-import { make as make$1 } from "../RequestRegistry.mjs";
+import { isDevelopment } from "./development.mjs";
+import { isRequestRegistry, make as make$1 } from "../RequestRegistry.mjs";
+import * as Effect from "effect/Effect";
 import * as AtomRegistry from "effect/reactivity/AtomRegistry";
 import { scheduleTask } from "@effect/atom-react";
 // src/internal/registry.ts
 const isServer = () => !("window" in globalThis);
+/**
+* In development, throws when `rendered` renders on the server without a
+* request registry: in one every request shares, such as
+* `@effect/atom-react`'s default `RegistryContext`.
+*/
+const requireRequestRegistry = (registry, rendered) => {
+	if (isServer() && !isRequestRegistry(registry) && Effect.runSync(isDevelopment)) throw new Error(`raf-effect-atom: ${rendered} rendered on the server without a request registry, so results would be shared between requests. Provide RequestRegistry.make() through RegistryContext, as the framework integrations do.`);
+};
 /** `@effect/atom-react`'s default registry keeps an unused atom this long. */
 const defaultIdleTTL = 400;
 /**
@@ -13,4 +23,18 @@ const make = (options) => isServer() ? make$1({ seed: options?.seed }) : AtomReg
 	defaultIdleTTL: options?.defaultIdleTTL ?? defaultIdleTTL,
 	scheduleTask
 });
-export { isServer, make };
+let mounted;
+/**
+* Records the browser registry a `RegistryProvider` provides while it's
+* mounted, for code outside React, such as React Router's client
+* middleware. Returns the cleanup that forgets it.
+*/
+const mount = (registry) => {
+	mounted = registry;
+	return () => {
+		if (mounted === registry) mounted = void 0;
+	};
+};
+/** The browser registry of the mounted `RegistryProvider`, if one is. */
+const current = () => mounted;
+export { current, isServer, make, mount, requireRequestRegistry };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "raf-effect-atom",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Render-as-you-fetch for Effect Atom: start atoms from route loaders and stream them into the browser, typed failures intact",
   "keywords": [
     "effect",
@@ -58,7 +58,7 @@
     "@types/react-dom": "19.3.0",
     "@vitest/coverage-v8": "5.0.5",
     "effect": "4.0.6",
-    "effect-atom-boundary": "0.1.0",
+    "effect-atom-boundary": "0.1.1",
     "happy-dom": "21.0.4",
     "react": "19.3.1",
     "react-dom": "19.3.1",