@typed/router 0.6.4 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/router",
-  "version": "0.6.4",
+  "version": "0.8.1",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -19,16 +19,16 @@
     }
   },
   "dependencies": {
-    "@effect/data": "^0.11.5",
+    "@effect/data": "^0.11.7",
     "@effect/io": "^0.19.2",
-    "@typed/context": "0.6.3",
-    "@typed/dom": "8.6.4",
-    "@typed/fx": "1.6.3",
-    "@typed/html": "3.6.4",
-    "@typed/path": "0.1.2",
-    "@typed/route": "0.4.3"
+    "@typed/context": "0.8.1",
+    "@typed/dom": "8.8.1",
+    "@typed/fx": "1.8.1",
+    "@typed/html": "3.8.1",
+    "@typed/path": "0.3.0",
+    "@typed/route": "0.6.0"
   },
-  "gitHead": "465332ee7c30a7eae517e4c79b4a984f38cdb5a6",
+  "gitHead": "77671d9c890b6635f3ee49bfb63473ac31032a84",
   "publishConfig": {
     "access": "public"
   },

package/src/RouteMatch.ts

@@ -35,7 +35,7 @@ export function RouteMatch<R, E, P extends string, R2, E2, R3, E3>(
     provideContext: (env) =>
       RouteMatch(
         Route.provideContext(env)(route),
-        flow(match, Fx.contramapContext(Context.merge(env))),
+        flow(match, Fx.provideSomeContext(env)),
         layout ? Fx.provideContext(env)(layout) : undefined,
       ),
     provideService: (tag, service) =>

package/src/RouteMatcher.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-types */
 import { identity, pipe } from '@effect/data/Function'
 import * as Option from '@effect/data/Option'
-import * as Cause from '@effect/io/Cause'
 import * as Effect from '@effect/io/Effect'
 import * as Fiber from '@effect/io/Fiber'
 import type * as Layer from '@effect/io/Layer'
@@ -163,11 +162,10 @@ export function RouteMatcher<R, E>(routes: RouteMatcher<R, E>['routes']): RouteM
                     pipe(
                       render,
                       Fx.observe(outlet.set),
-                      Effect.onError((cause) =>
-                        Cause.isInterruptedOnly(cause)
-                          ? outlet.set(null)
-                          : outlet.error(cause as Cause.Cause<never>),
+                      Effect.catchAll((e: Redirect) =>
+                        Redirect.is(e) ? router.currentPath.set(e.path) : Effect.fail(e),
                       ),
+                      Effect.onError(outlet.error),
                       Effect.forkDaemon,
                     ),
                   )

package/src/router.ts

@@ -172,7 +172,8 @@ export function redirect(path: string) {
   return Effect.fail<Redirect>(Redirect.make(path))
 }
 
-redirect.fx = (path: string) => Fx.fail<Redirect>(Redirect.make(path))
+redirect.fx = (path: string): Fx.Fx<never, Redirect, never> =>
+  Fx.fail<Redirect>(Redirect.make(path))
 
 export const redirectTo = <R, E, P extends string>(
   route: Route.Route<R, E, P>,
@@ -273,7 +274,7 @@ export const getBasePath = Router.with((r) => {
 
 const patchHistory = Effect.gen(function* ($) {
   const history = yield* $(History)
-  const historyEvents = Fx.Subject.unsafeMake<never, void>()
+  const historyEvents = Fx.makeSubject<never, void>()
   const runtime = yield* $(Effect.runtime<never>())
   const runFork = Runtime.runFork(runtime)
   const cleanup = patchHistory_(history, () => runFork(historyEvents.event()))