@typed/router 0.2.1 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/router",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -19,16 +19,16 @@
     }
   },
   "dependencies": {
-    "@effect/data": "^0.2.0",
-    "@effect/io": "^0.3.0",
-    "@typed/context": "0.2.1",
-    "@typed/dom": "8.2.1",
-    "@typed/fx": "1.2.1",
-    "@typed/html": "3.2.1",
-    "@typed/path": "0.0.8",
-    "@typed/route": "0.1.1"
+    "@effect/data": "^0.7.4",
+    "@effect/io": "^0.15.1",
+    "@typed/context": "0.4.0",
+    "@typed/dom": "8.4.0",
+    "@typed/fx": "1.4.0",
+    "@typed/html": "3.4.0",
+    "@typed/path": "0.1.0",
+    "@typed/route": "0.3.0"
   },
-  "gitHead": "08436346feac1b2e5d91ac88d4610780027d89b8",
+  "gitHead": "2a6519605c0d9842989f18647b430d00bd5af14d",
   "publishConfig": {
     "access": "public"
   },

package/src/Link.ts

@@ -12,7 +12,7 @@ export function Link<R = never, E = never, R2 = never>(
   return Fx.gen(function* ($) {
     const useBase = props.useBase ?? true
     const href = useBase ? pathJoin(yield* $(getBasePath), props.href) || '/' : props.href
-    const router = yield* $(Router.get)
+    const router = yield* $(Router)
     const clickHandler = (event: MouseEvent & { currentTarget: HTMLAnchorElement }) =>
       Effect.gen(function* ($) {
         if (props.fullReload) {

package/src/RouteMatcher.ts

@@ -112,7 +112,7 @@ export function RouteMatcher<R, E>(routes: RouteMatcher<R, E>['routes']): RouteM
     ) =>
       Router.withFx((router) =>
         Fx.gen(function* ($) {
-          const { environment } = yield* $(RenderContext.get)
+          const { environment } = yield* $(RenderContext)
           // Create stable references to the route matchers
           const matchers = Array.from(routes.values()).map(
             (v) =>
@@ -138,7 +138,7 @@ 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.get)
+              const { outlet } = yield* $(Router)
               const previous = samplePreviousValues()
 
               // Update the previous values

package/src/router.ts

@@ -197,8 +197,8 @@ export const makeRouter = (
   currentPath?: Fx.RefSubject<string>,
 ): Effect.Effect<Location | History | Window | Document | Scope.Scope, never, Router> =>
   Effect.gen(function* ($) {
-    const history = yield* $(History.get)
-    const location = yield* $(Location.get)
+    const history = yield* $(History)
+    const location = yield* $(Location)
 
     if (!currentPath) {
       currentPath = Fx.RefSubject.unsafeMake(() => getCurrentPathFromLocation(location))
@@ -225,19 +225,17 @@ export const makeRouter = (
       pipe(
         currentPath,
         Fx.skipRepeats,
-        Fx.observe((path) =>
-          Effect.sync(() => {
-            if (path !== getCurrentPathFromLocation(location)) {
-              history.pushState({}, '', path)
-            }
-          }),
-        ),
+        Fx.observeSync((path) => {
+          if (path !== getCurrentPathFromLocation(location)) {
+            history.pushState({}, '', path)
+          }
+        }),
         Effect.forkScoped,
       ),
     )
 
     // Find the configured base path
-    const document = yield* $(Document.get)
+    const document = yield* $(Document)
     const base = document.querySelector('base')
     const baseHref = base ? getBasePathFromHref(base.href) : '/'
 
@@ -269,10 +267,11 @@ export const getBasePath = Router.with((r) => {
 })
 
 const patchHistory = Effect.gen(function* ($) {
-  const history = yield* $(History.get)
+  const history = yield* $(History)
   const historyEvents = Fx.Subject.unsafeMake<never, void>()
   const runtime = yield* $(Effect.runtime<never>())
-  const cleanup = patchHistory_(history, () => Runtime.runFork(runtime)(historyEvents.event()))
+  const runFork = Runtime.runFork(runtime)
+  const cleanup = patchHistory_(history, () => runFork(historyEvents.event()))
 
   // unpatch history upon finalization
   yield* $(Effect.addFinalizer(() => Effect.sync(cleanup)))