@typed/router 0.17.5 → 0.17.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/router",
-  "version": "0.17.5",
+  "version": "0.17.7",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -22,15 +22,15 @@
     "@effect/data": "^0.17.1",
     "@effect/io": "^0.38.0",
     "@typed/context": "0.17.1",
-    "@typed/dom": "8.17.1",
+    "@typed/dom": "8.17.2",
     "@typed/error": "0.16.1",
     "@typed/fx": "1.16.1",
-    "@typed/html": "3.17.4",
-    "@typed/navigation": "0.4.1",
-    "@typed/path": "0.6.1",
-    "@typed/route": "0.13.1"
+    "@typed/html": "3.17.6",
+    "@typed/navigation": "0.4.2",
+    "@typed/path": "0.6.2",
+    "@typed/route": "0.13.2"
   },
-  "gitHead": "cd3a198eaae31cd7b8b55509e9c959ad1ed1685b",
+  "gitHead": "9083c6af485d129f95e5f7b07d1bfb285668b7dd",
   "publishConfig": {
     "access": "public"
   },

package/src/Redirect.ts

@@ -11,11 +11,17 @@ export class Redirect extends E.tagged('@typed/router/Redirect') {
     super(`Redirect to ${url}`)
   }
 
-  static redirect(url: string, options?: NavigateOptions): Effect.Effect<never, Redirect, never> {
+  static redirect(
+    url: string,
+    options: NavigateOptions = { history: 'replace' },
+  ): Effect.Effect<never, Redirect, never> {
     return Effect.fail(new Redirect(url, options))
   }
 
-  static redirectFx(url: string, options?: NavigateOptions): Fx.Fx<never, Redirect, never> {
+  static redirectFx(
+    url: string,
+    options: NavigateOptions = { history: 'replace' },
+  ): Fx.Fx<never, Redirect, never> {
     return Fx.fail(new Redirect(url, options))
   }
 }

package/src/matchRoutes.ts

@@ -47,7 +47,8 @@ export function matchRoutes<
       ) as RENDERABLE
 
       return [
-        nestedRouter.route,
+        // If the route is the a single slash, use the route directly to keep any parsing options.
+        match.route.path === '/' ? match.route : nestedRouter.route,
         render,
         match.options?.guard as
           | ((params: ParamsOf<string>) => Effect.Effect<_R, NavigationError, boolean>)
@@ -105,11 +106,12 @@ export function matchRoutes<
     return pipe(
       matched,
       isBrowser ? identity : Fx.take(1),
-      Redirect.switchMatch(
-        (r) => Fx.as(Fx.fromEffect(router.navigation.navigate(r.url, r.options)), Option.none()),
-        Fx.map(Option.some),
+      Fx.switchLatest,
+      Redirect.switchCatch((redirect) =>
+        Fx.fromFxEffect(
+          Effect.map(router.navigation.navigate(redirect.url, redirect.options), () => Fx.never()),
+        ),
       ),
-      Fx.compact,
     )
   })
 }