@typed/router 0.5.1 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/router",
-  "version": "0.5.1",
+  "version": "0.5.6",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -21,14 +21,14 @@
   "dependencies": {
     "@effect/data": "^0.10.3",
     "@effect/io": "^0.17.0",
-    "@typed/context": "0.5.1",
-    "@typed/dom": "8.5.1",
-    "@typed/fx": "1.5.1",
-    "@typed/html": "3.5.1",
-    "@typed/path": "0.1.0",
-    "@typed/route": "0.4.0"
+    "@typed/context": "^0.5.5",
+    "@typed/dom": "^8.5.5",
+    "@typed/fx": "^1.5.5",
+    "@typed/html": "^3.5.5",
+    "@typed/path": "^0.1.2",
+    "@typed/route": "^0.4.2"
   },
-  "gitHead": "eb7de6339939cb3cad08520f2b1d179d333d10ca",
+  "gitHead": "1087e5682c3fb0cf3ded66e7a84ed8306fb6339d",
   "publishConfig": {
     "access": "public"
   },

package/src/RouteMatcher.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import { pipe } from '@effect/data/Function'
+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'
@@ -116,8 +116,7 @@ export function RouteMatcher<R, E>(routes: RouteMatcher<R, E>['routes']): RouteM
           const { environment } = yield* $(RenderContext)
           // Create stable references to the route matchers
           const matchers = Array.from(routes.values()).map(
-            (v) =>
-              [{ ...v, route: router.route.concat(v.route) }, runRouteMatch(router, v)] as const,
+            (v) => [v, runRouteMatch(router, v)] as const,
           )
 
           const renderFallback = Fx.switchMap(f)(router.currentPath)
@@ -188,16 +187,26 @@ export function RouteMatcher<R, E>(routes: RouteMatcher<R, E>['routes']): RouteM
 
           return pipe(
             router.currentPath,
-            environment === 'browser' ? Fx.skipRepeats : Fx.take(1),
+            environment === 'browser' ? identity : Fx.take(1),
             Fx.switchMapEffect((path) =>
               Effect.gen(function* ($) {
-                yield* $(Effect.logDebug(`[@typed/router] Matching path: ${path}`))
+                const currentParams = yield* $(router.route.match(path))
+
+                if (Option.isNone(currentParams)) {
+                  return Option.none()
+                }
+
+                const matchedPath: string = router.route.make(currentParams.value)
+                const currentPath =
+                  matchedPath === '/' ? path : path.replace(matchedPath, '') || '/'
+
+                yield* $(Effect.logDebug(`[@typed/router] Matching path: ${currentPath}`))
 
                 // Attempt to find the best match
                 for (const [match, render] of matchers) {
                   yield* $(Effect.logDebug(`[@typed/router] Matching against: ${match.route.path}`))
 
-                  const result = yield* $(match.route.match(path))
+                  const result = yield* $(match.route.match(currentPath))
 
                   if (Option.isSome(result)) {
                     yield* $(
@@ -250,8 +259,8 @@ function runRouteMatch<R, E, P extends string>(
     const params = pipe(nestedRouter.params, Fx.provideContext(env))
     const render = pipe(
       match(params as unknown as Fx.Fx<never, never, Path.ParamsOf<P>>),
-      Fx.provideContext(env),
       Router.provideFx(nestedRouter as Router),
+      Fx.provideContext(env),
     )
 
     return render