@effectweb/tanstack-router 0.8.1 → 0.9.0

package/README.md

@@ -6,7 +6,7 @@ EffectWeb adapter for TanStack Router Core.
 - `RootRoute` and `Route` expose TanStack's route constructors: matching, params, validated search, redirects, loaders and errors remain in the core.
 - `mountRouter(router)` owns the history subscription in an Effect scope and returns an EffectWeb `Source` of router state.
 - The store adapter batches publications and copies plain state before EffectWeb freezes it. It never freezes TanStack's internal match records.
-- The host program subscribes to that Source and renders its own matching views. Scope cleanup releases the Source, subscriptions and owned history.
+- The host program subscribes to that Source and renders its own matching views. Scope cleanup interrupts loaders, before-load hooks and preloads, settles pending navigation, and releases the Source, subscriptions and owned history. Mount each router only once.
 - `createLink(router)` returns a typed `<Link>`: `to`, `params` and `search` are checked against the route tree. It renders a real `<a href>` (middle-click, copy link and screen readers keep working) and navigates in place on plain left clicks. Pass `active` from your route model to set `aria-current="page"`.
 
 ```tsx
@@ -20,3 +20,5 @@ const Link = createLink(router);
 Prefer `<Link>` to buttons that call `navigate(path: string)`: string paths lose route typing, and buttons are not links for keyboard, assistive technology or new-tab navigation.
 
 Currently there is no JSX Outlet API, route-level view/error boundary system, SSR adapter or file-route generator. Those can build on this binding without introducing a second route matcher.
+
+Link preloading and automatic active matching are not exposed as link props. Call `router.preloadRoute(options)` explicitly when needed, and derive `active` from the route model.

package/dist/index.js

@@ -33,6 +33,7 @@ const snapshotCopy = (value, seen = /* @__PURE__ */ new WeakMap()) => {
   return copy;
 };
 const publications = /* @__PURE__ */ new WeakMap();
+const closedRouters = /* @__PURE__ */ new WeakSet();
 const createRouter = (options) => {
   const listeners = /* @__PURE__ */ new Set();
   let batchDepth = 0;
@@ -67,9 +68,36 @@ const createRouter = (options) => {
       }
     }
   }));
+  const load = instance.load;
+  const navigate = instance.navigate;
+  const preload = instance.preloadRoute;
+  const closed = () => new Error("Cannot use a disposed router");
+  instance.load = (...args) => closedRouters.has(instance) ? Promise.reject(closed()) : load(...args);
+  instance.navigate = (...args) => closedRouters.has(instance) ? Promise.reject(closed()) : navigate(...args);
+  instance.preloadRoute = (...args) => closedRouters.has(instance) ? Promise.reject(closed()) : preload(...args);
   publications.set(instance, listeners);
   return instance;
 };
+const mountedRouters = /* @__PURE__ */ new WeakSet();
+function stopRouter(router) {
+  closedRouters.add(router);
+  const transaction = router._tx;
+  const preflight = router._preflight;
+  const flights = [...router._flights?.values() ?? []];
+  delete router._tx;
+  delete router._preflight;
+  router._flights?.clear();
+  if (router._pending?.[3] !== void 0) clearTimeout(router._pending[3]);
+  delete router._pending;
+  const rendered = router._rendered;
+  delete router._rendered;
+  rendered?.[1]?.(false);
+  preflight?.abort();
+  transaction?.[0].abort();
+  for (const flight of flights) flight[1].abort();
+  router.clearCache();
+  router._commitPromise?.resolve();
+}
 const mountRouter = (router) => Effect.gen(function* () {
   const source = yield* Effect.acquireRelease(
     Effect.sync(() => {
@@ -77,6 +105,8 @@ const mountRouter = (router) => Effect.gen(function* () {
       const history = router.history;
       if (!listeners)
         throw new Error("Use @effectweb/tanstack-router.createRouter before mountRouter");
+      if (mountedRouters.has(router)) throw new Error("A router can only be mounted once");
+      mountedRouters.add(router);
       const source2 = projectionSource({
         project: () => snapshotCopy(router.state)
       });
@@ -91,6 +121,7 @@ const mountRouter = (router) => Effect.gen(function* () {
           unsubscribe();
           listeners.delete(source2.changed);
           source2.dispose();
+          stopRouter(router);
           history.flush();
           history.destroy();
         }

package/dist/link.d.ts

@@ -1,15 +1,21 @@
 import { type AnyRouter, type LinkOptions } from '@tanstack/router-core';
 import type { JSX } from 'effectweb';
 import { jsxComponent } from 'effectweb/jsx';
+type SupportedLinkOptions<R extends AnyRouter, F extends string, T extends string | undefined> = LinkOptions<R, F, T> & {
+    readonly preload?: never;
+    readonly preloadDelay?: never;
+    readonly preloadIntentProximity?: never;
+    readonly activeOptions?: never;
+};
 type Anchor = Omit<JSX.IntrinsicElements['a'], 'href' | 'onClick' | 'target' | 'children'>;
-export type LinkProps<Router extends AnyRouter, From extends string = string, To extends string | undefined = '.'> = LinkOptions<Router, From, To> & Anchor & {
+export type LinkProps<Router extends AnyRouter, From extends string = string, To extends string | undefined = '.'> = SupportedLinkOptions<Router, From, To> & Anchor & {
     /** Mark the link as the current page (`aria-current="page"`). Derive it from your route model. */
     readonly active?: boolean;
     readonly children?: JSX.Element;
 };
 type ClickEvent = Pick<MouseEvent, 'button' | 'metaKey' | 'altKey' | 'ctrlKey' | 'shiftKey' | 'defaultPrevented' | 'preventDefault'>;
 /** Resolve a typed destination to an href and a click handler that navigates in place. */
-export declare function linkTarget(router: AnyRouter, props: LinkOptions<AnyRouter, string, string> & Pick<Anchor, 'download'>): {
+export declare function linkTarget(router: AnyRouter, props: SupportedLinkOptions<AnyRouter, string, string> & Pick<Anchor, 'download'>): {
     href: string | undefined;
     onClick: (event: ClickEvent) => void;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectweb/tanstack-router",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "@tanstack/router-core": "1.171.34"
   },
   "peerDependencies": {
-    "effect": "4.0.0-rc.118",
-    "effectweb": "^0.8.1"
+    "effect": "^4.0.0",
+    "effectweb": "0.9.0"
   }
 }