@typed/router 0.4.1 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/router",
-  "version": "0.4.1",
+  "version": "0.5.1",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -19,16 +19,16 @@
     }
   },
   "dependencies": {
-    "@effect/data": "^0.7.4",
-    "@effect/io": "^0.15.1",
-    "@typed/context": "0.4.1",
-    "@typed/dom": "8.4.1",
-    "@typed/fx": "1.4.1",
-    "@typed/html": "3.4.1",
+    "@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.3.0"
+    "@typed/route": "0.4.0"
   },
-  "gitHead": "045d1a1cbd6ebed153f24f946b14fd2c638fdb4c",
+  "gitHead": "eb7de6339939cb3cad08520f2b1d179d333d10ca",
   "publishConfig": {
     "access": "public"
   },

package/src/RouteMatcher.ts

@@ -112,6 +112,7 @@ export function RouteMatcher<R, E>(routes: RouteMatcher<R, E>['routes']): RouteM
     ) =>
       Router.withFx((router) =>
         Fx.gen(function* ($) {
+          const { outlet } = yield* $(Router)
           const { environment } = yield* $(RenderContext)
           // Create stable references to the route matchers
           const matchers = Array.from(routes.values()).map(
@@ -138,13 +139,11 @@ export function RouteMatcher<R, E>(routes: RouteMatcher<R, E>['routes']): RouteM
             layout?: Fx.Fx<any, any, html.Renderable>,
           ): Effect.Effect<any, any, Option.Option<Fx.Fx<any, any, html.Renderable>>> =>
             Effect.gen(function* ($) {
-              const { outlet } = yield* $(Router)
               const previous = samplePreviousValues()
 
               // Update the previous values
               previousRender = render
               previousLayout = layout
-              previousFiber = undefined
 
               // Skip rerendering if the render function is the same
               if (previous.render === render && previous.layout === layout) {
@@ -154,6 +153,7 @@ export function RouteMatcher<R, E>(routes: RouteMatcher<R, E>['routes']): RouteM
               // Interrupt the previous fiber if it exists
               if (previous.render !== render && previous.fiber) {
                 yield* $(Fiber.interrupt(previous.fiber))
+                previousFiber = undefined
               }
 
               // If we have a layout, we need to render it and use the route outlet.
@@ -166,10 +166,10 @@ export function RouteMatcher<R, E>(routes: RouteMatcher<R, E>['routes']): RouteM
                       Fx.observe(outlet.set),
                       Effect.onError((cause) =>
                         Cause.isInterruptedOnly(cause)
-                          ? Effect.unit()
+                          ? outlet.set(null)
                           : outlet.error(cause as Cause.Cause<never>),
                       ),
-                      Effect.forkScoped,
+                      Effect.forkDaemon,
                     ),
                   )
                 }