@typed/router 0.12.6 → 0.14.0

package/tsconfig.cjs.build.json

@@ -13,12 +13,18 @@
     {
       "path": "../dom/tsconfig.cjs.build.json"
     },
+    {
+      "path": "../error/tsconfig.cjs.build.json"
+    },
     {
       "path": "../fx/tsconfig.cjs.build.json"
     },
     {
       "path": "../html/tsconfig.cjs.build.json"
     },
+    {
+      "path": "../navigation/tsconfig.cjs.build.json"
+    },
     {
       "path": "../path/tsconfig.cjs.build.json"
     },

package/tsconfig.json

@@ -17,12 +17,18 @@
     {
       "path": "../dom/tsconfig.build.json"
     },
+    {
+      "path": "../error/tsconfig.build.json"
+    },
     {
       "path": "../fx/tsconfig.build.json"
     },
     {
       "path": "../html/tsconfig.build.json"
     },
+    {
+      "path": "../navigation/tsconfig.build.json"
+    },
     {
       "path": "../path/tsconfig.build.json"
     },

package/vite.config.js

@@ -0,0 +1,3 @@
+import config from '../../vite.config.js'
+
+export default config

package/src/RouteMatch.ts

@@ -1,56 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-types */
-import { flow } from '@effect/data/Function'
-import type * as Layer from '@effect/io/Layer'
-import * as Context from '@typed/context'
-import * as Fx from '@typed/fx'
-import type * as html from '@typed/html'
-import type * as Path from '@typed/path'
-import * as Route from '@typed/route'
-
-export interface RouteMatch<R, E, P extends string> {
-  readonly route: Route.Route<R, E, P>
-
-  readonly layout?: Fx.Fx<R, E, html.Renderable>
-
-  readonly match: (params: Fx.Fx<never, never, Path.ParamsOf<P>>) => Fx.Fx<R, E, html.Renderable>
-
-  readonly provideContext: (environment: Context.Context<R>) => RouteMatch<never, E, P>
-
-  readonly provideService: <S>(tag: Context.Tag<S>, service: S) => RouteMatch<Exclude<R, S>, E, P>
-
-  readonly provideSomeLayer: <R2, S>(
-    layer: Layer.Layer<R2, never, S>,
-  ) => RouteMatch<R2 | Exclude<R, S>, E, P>
-}
-
-export function RouteMatch<R, E, P extends string, R2, E2, R3, E3>(
-  route: Route.Route<R, E, P>,
-  match: (params: Fx.Fx<never, never, Path.ParamsOf<P>>) => Fx.Fx<R2, E2, html.Renderable>,
-  layout?: Fx.Fx<R3, E3, html.Renderable>,
-): RouteMatch<R | R2 | R3, E | E2 | E3, P> {
-  const routeMatch: RouteMatch<R | R2 | R3, E | E2 | E3, P> = {
-    route,
-    match,
-    layout,
-    provideContext: (env) =>
-      RouteMatch(
-        Route.provideContext(env)(route),
-        flow(match, Fx.provideSomeContext(env)),
-        layout ? Fx.provideContext(env)(layout) : undefined,
-      ),
-    provideService: (tag, service) =>
-      RouteMatch(
-        Route.provideService(tag, service)(route),
-        flow(match, Fx.provideService(tag, service)),
-        layout ? Fx.provideService(tag, service)(layout) : undefined,
-      ),
-    provideSomeLayer: (layer) =>
-      RouteMatch(
-        Route.provideSomeLayer(layer)(route),
-        flow(match, Fx.provideSomeLayer(layer)),
-        layout ? Fx.provideSomeLayer(layer)(layout) : undefined,
-      ),
-  }
-
-  return routeMatch
-}

package/src/RouteMatcher.ts

@@ -1,264 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-types */
-import { identity, pipe } from '@effect/data/Function'
-import * as Option from '@effect/data/Option'
-import * as Effect from '@effect/io/Effect'
-import * as Fiber from '@effect/io/Fiber'
-import type * as Layer from '@effect/io/Layer'
-import type * as Context from '@typed/context'
-import * as Fx from '@typed/fx'
-import type * as html from '@typed/html'
-import { RenderContext } from '@typed/html'
-import type * as Path from '@typed/path'
-import type * as Route from '@typed/route'
-
-import { RouteMatch } from './RouteMatch.js'
-import { Redirect, redirectTo, Router } from './router.js'
-
-export interface RouteMatcher<R = never, E = never> {
-  // Where things are actually stored immutably
-  readonly routes: ReadonlyMap<Route.Route<any, any, any>, RouteMatch<any, any, any>>
-
-  // Add Routes
-
-  readonly match: <R2, E2, P extends string, R3, E3>(
-    route: Route.Route<R2, E2, P>,
-    f: (params: Path.ParamsOf<P>) => Fx.Fx<R3, E3, html.Renderable>,
-  ) => RouteMatcher<R | R2 | R3, E | E2 | E3>
-
-  readonly matchFx: <R2, E2, P extends string, R3, E3>(
-    route: Route.Route<R2, E2, P>,
-    f: (params: Fx.Fx<never, never, Path.ParamsOf<P>>) => Fx.Fx<R3, E3, html.Renderable>,
-  ) => RouteMatcher<R | R2 | R3, E | E2 | E3>
-
-  readonly matchEffect: <R2, E2, P extends string, R3, E3>(
-    route: Route.Route<R2, E2, P>,
-    f: (params: Path.ParamsOf<P>) => Effect.Effect<R3, E3, html.Renderable>,
-  ) => RouteMatcher<R | R2 | R3, E | E2 | E3>
-
-  // Add Layout
-
-  readonly withLayout: <R2, E2>(fx: Fx.Fx<R2, E2, html.Renderable>) => RouteMatcher<R | R2, E | E2>
-
-  // Provide resources
-
-  readonly provideContext: <R2>(environment: Context.Context<R2>) => RouteMatcher<Exclude<R, R2>, E>
-
-  readonly provideService: <R2>(
-    tag: Context.Tag<R2>,
-    service: R2,
-  ) => RouteMatcher<Exclude<R, R2>, E>
-
-  readonly provideSomeLayer: <R2, S>(
-    layer: Layer.Layer<R2, never, S>,
-  ) => RouteMatcher<Exclude<R, S> | R2, E>
-
-  // Runners that turn a RouterMatcher back into an Fx.
-  // Error handling should be handled after converting to an Fx for maximum flexibility.
-
-  readonly notFound: <R2, E2, R3 = never, E3 = never>(
-    f: (path: string) => Fx.Fx<R2, E2, html.Renderable>,
-    options?: FallbackOptions<R3, E3>,
-  ) => Fx.Fx<Router | R | R2 | R3, E | E2 | E3, html.Renderable>
-
-  readonly notFoundEffect: <R2, E2, R3 = never, E3 = never>(
-    f: (path: string) => Effect.Effect<R2, E2, html.Renderable>,
-    options?: FallbackOptions<R3, E3>,
-  ) => Fx.Fx<Router | R | R2 | R3, E | E2 | E3, html.Renderable>
-
-  readonly redirectTo: <R2, E2, P extends string>(
-    route: Route.Route<R2, E2, P>,
-    ...params: [keyof Path.ParamsOf<P>] extends [never]
-      ? // eslint-disable-next-line @typescript-eslint/ban-types
-        [{}?]
-      : [(path: string) => Path.ParamsOf<P>]
-  ) => Fx.Fx<Router | R | R2, E | Redirect, html.Renderable>
-
-  readonly run: Fx.Fx<Router | R, E | Redirect, html.Renderable | null>
-}
-
-export interface FallbackOptions<R, E> {
-  readonly layout?: Fx.Fx<R, E, html.Renderable>
-}
-
-export function RouteMatcher<R, E>(routes: RouteMatcher<R, E>['routes']): RouteMatcher<R, E> {
-  const matcher: RouteMatcher<R, E> = {
-    routes,
-    matchFx: (route, f) => RouteMatcher(new Map(routes).set(route, RouteMatch(route, f))),
-    match: (route, f) =>
-      RouteMatcher(new Map(routes).set(route, RouteMatch(route, Fx.switchMap(f)))),
-    matchEffect: (route, f) =>
-      RouteMatcher(new Map(routes).set(route, RouteMatch(route, Fx.switchMapEffect(f)))),
-    withLayout: (layout) =>
-      RouteMatcher(
-        new Map(
-          Array.from(routes).map(([k, match]) => [
-            k,
-            RouteMatch(match.route, match.match, match.layout ?? layout),
-          ]),
-        ),
-      ),
-    provideContext: (environment) =>
-      RouteMatcher(new Map(Array.from(routes).map(([k, v]) => [k, v.provideContext(environment)]))),
-    provideService: (tag, service) =>
-      RouteMatcher(
-        new Map(Array.from(routes).map(([k, v]) => [k, v.provideService(tag, service)])),
-      ),
-    provideSomeLayer: (layer) =>
-      RouteMatcher(new Map(Array.from(routes).map(([k, v]) => [k, v.provideSomeLayer(layer)]))),
-    notFound: <R2, E2, R3, E3>(
-      f: (path: string) => Fx.Fx<R2, E2, html.Renderable>,
-      options: FallbackOptions<R3, E3> = {},
-    ) =>
-      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(
-            (v) => [v, runRouteMatch(router, v)] as const,
-          )
-
-          const renderFallback = Fx.switchMap(f)(router.currentPath)
-
-          let previousFiber: Fiber.RuntimeFiber<any, any> | undefined
-          let previousLayout: Fx.Fx<any, any, html.Renderable> | undefined
-          let previousRender: Fx.Fx<any, any, html.Renderable> | undefined
-
-          const samplePreviousValues = () => ({
-            fiber: previousFiber,
-            layout: previousLayout,
-            render: previousRender,
-          })
-
-          // This function helps us to ensure shared layouts are only rendered once
-          // and the outlet content is changed
-          const verifyShouldRerender = (
-            render: Fx.Fx<any, any, html.Renderable>,
-            layout?: Fx.Fx<any, any, html.Renderable>,
-          ): Effect.Effect<any, any, Option.Option<Fx.Fx<any, any, html.Renderable>>> =>
-            Effect.gen(function* ($) {
-              const previous = samplePreviousValues()
-
-              // Update the previous values
-              previousRender = render
-              previousLayout = layout
-
-              // Skip rerendering if the render function is the same
-              if (previous.render === render && previous.layout === layout) {
-                return Option.none()
-              }
-
-              // 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.
-              if (layout) {
-                // Render into the route outlet
-                if (previous.render !== render) {
-                  previousFiber = yield* $(
-                    pipe(
-                      render,
-                      Fx.observe(outlet.set),
-                      Effect.catchAll((e: Redirect) =>
-                        Redirect.is(e) ? router.currentPath.set(e.path) : Effect.fail(e),
-                      ),
-                      Effect.onError(outlet.error),
-                      Effect.forkDaemon,
-                    ),
-                  )
-                }
-
-                return Option.some(layout)
-              }
-
-              // If we don't have a layout, but we did, we need to clear the outlet
-              if (previous.layout) {
-                yield* $(outlet.set(null))
-              }
-
-              // Otherwise use the render function directly
-              return Option.some(render)
-            })
-
-          return pipe(
-            router.currentPath,
-            environment === 'browser' ? identity : Fx.take(1),
-            Fx.switchMapEffect((path) =>
-              Effect.gen(function* ($) {
-                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.logInfo(`[@typed/router] Matching path: ${currentPath}`))
-
-                // Attempt to find the best match
-                for (const [match, render] of matchers) {
-                  yield* $(Effect.logInfo(`[@typed/router] Matching against: ${match.route.path}`))
-
-                  const result = yield* $(match.route.match(currentPath))
-
-                  if (Option.isSome(result)) {
-                    yield* $(Effect.logInfo(`[@typed/router] Matched against: ${match.route.path}`))
-
-                    return yield* $(verifyShouldRerender(render, match.layout))
-                  }
-                }
-
-                yield* $(Effect.logInfo(`[@typed/router] Rendering fallback`))
-
-                // If we didn't find a match, render the not found page
-                return yield* $(verifyShouldRerender(renderFallback, options.layout))
-              }),
-            ),
-            Fx.compact,
-            Fx.skipRepeats, // Stable render references are used to avoid mounting the same component twice
-            Fx.switchLatest,
-          )
-        }),
-      ),
-    notFoundEffect: (f) => matcher.notFound((path) => Fx.fromEffect(f(path))),
-    redirectTo: ((route, ...params) =>
-      matcher.notFound(() => redirectTo.fx(route, ...params))) as RouteMatcher<R, E>['redirectTo'],
-    run: Fx.suspend(() => matcher.notFound(() => Fx.succeed(null))),
-  }
-
-  return matcher
-}
-
-export namespace RouteMatcher {
-  export const empty = RouteMatcher<never, never>(new Map())
-
-  export const concat = <R, E, R2, E2>(
-    matcher: RouteMatcher<R, E>,
-    matcher2: RouteMatcher<R2, E2>,
-  ): RouteMatcher<R | R2, E | E2> => RouteMatcher(new Map([...matcher.routes, ...matcher2.routes]))
-}
-
-export const { matchFx, match, matchEffect } = RouteMatcher<never, never>(new Map())
-
-function runRouteMatch<R, E, P extends string>(
-  router: Router,
-  { route, match }: RouteMatch<R, E, P>,
-): Fx.Fx<R, E, html.Renderable> {
-  return Fx.gen(function* ($) {
-    const env = yield* $(Effect.context<R>())
-    const nestedRouter = router.define(route)
-    const params = pipe(nestedRouter.params, Fx.provideContext(env))
-    const render = pipe(
-      match(params as unknown as Fx.Fx<never, never, Path.ParamsOf<P>>),
-      Router.provideFx(nestedRouter as Router),
-      Fx.provideContext(env),
-    )
-
-    return render
-  })
-}