@typed/router 0.13.0 → 0.15.0

package/dist/cjs/matchRoutes.js

@@ -0,0 +1,77 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchRoutes = void 0;
+const Function_1 = require("@effect/data/Function");
+const Option = __importStar(require("@effect/data/Option"));
+const Effect = __importStar(require("@effect/io/Effect"));
+const Fx = __importStar(require("@typed/fx"));
+const html_1 = require("@typed/html");
+const Redirect_js_1 = require("./Redirect.js");
+const router_js_1 = require("./router.js");
+function matchRoutes(matches, onNotFound = () => Fx.empty()) {
+    return Fx.gen(function* ($) {
+        const { environment } = yield* $(html_1.RenderContext);
+        const isBrowser = environment === 'browser';
+        const router = yield* $(router_js_1.Router);
+        const notFound = onNotFound(router.params);
+        const matchers = matches.map((match) => {
+            const nestedRouter = router.define(match.route);
+            const render = (0, Function_1.pipe)(nestedRouter.params, match.render, Fx.provideService(router_js_1.Router, nestedRouter), Fx.scoped);
+            return [
+                match.route,
+                render,
+                match.options?.guard,
+                match.options?.onMatch,
+            ];
+        });
+        const length = matchers.length;
+        const matched = yield* $(Fx.makeRef(Effect.succeed(Fx.empty())));
+        const matchPath = (path) => Effect.gen(function* ($) {
+            for (let i = 0; i < length; ++i) {
+                const [route, render, guard, onMatch] = matchers[i];
+                const params = route.match(path);
+                if (Option.isSome(params)) {
+                    // If there is a guard and it fails, continue to next route
+                    if (guard && !(yield* $(guard(params.value)))) {
+                        continue;
+                    }
+                    // If there is an onMatch handler, run it and catch any errors
+                    // This is useful when you want to add tracking when a route is matched
+                    if (onMatch) {
+                        yield* $(onMatch(params.value), Effect.catchAllCause((cause) => matched.error(cause)), Effect.forkScoped);
+                    }
+                    return yield* $(matched.set(render));
+                }
+            }
+            return yield* $(matched.set(notFound));
+        });
+        // Match a Route when navigation occurs
+        yield* $(router.navigation.onNavigation((event) => matchPath((0, router_js_1.getCurrentPathFromUrl)(event.destination.url))));
+        return (0, Function_1.pipe)(matched, isBrowser ? Function_1.identity : Fx.take(1), Redirect_js_1.Redirect.switchMatch((r) => Fx.as(Fx.fromEffect(router.navigation.navigate(r.url, r.options)), Option.none()), Fx.map(Option.some)), Fx.compact);
+    });
+}
+exports.matchRoutes = matchRoutes;
+//# sourceMappingURL=matchRoutes.js.map

package/dist/cjs/matchRoutes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"matchRoutes.js","sourceRoot":"","sources":["../../src/matchRoutes.ts"],"names":[],"mappings":"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"}

package/dist/cjs/router.d.ts

@@ -1,76 +1,37 @@
 import * as Option from '@effect/data/Option';
-import * as Effect from '@effect/io/Effect';
-import type * as Layer from '@effect/io/Layer';
-import type * as Scope from '@effect/io/Scope';
-import * as Context from '@typed/context';
-import { Document, Location, History } from '@typed/dom';
-import * as Fx from '@typed/fx';
-import type * as html from '@typed/html';
-import { RenderContext } from '@typed/html';
-import * as Path from '@typed/path';
-import * as Route from '@typed/route';
-export interface Router<out R = never, out E = never, in out P extends string = string> {
+import * as Layer from '@effect/io/Layer';
+import { Tag } from '@typed/context';
+import { DomServicesElementParams } from '@typed/dom';
+import { Filtered } from '@typed/fx';
+import * as Navigation from '@typed/navigation';
+import { ParamsOf, PathJoin } from '@typed/path';
+import { Route } from '@typed/route';
+export interface Router<in out P extends string = string> {
     /**
-     * The base route the Router is starting from.
+     * The base Route for this Router instance.
      */
-    readonly route: Route.Route<R, E, P>;
+    readonly route: Route<P>;
     /**
-     * The current path of the application
+     * The current params for the current path.
      */
-    readonly currentPath: Fx.RefSubject<never, string>;
+    readonly params: Filtered<never, never, ParamsOf<P>>;
     /**
-     * The current matched params of the router
+     * Construct a new Router instance by defining a new Route which is concatenated
+     * to the current Route.
      */
-    readonly params: Fx.Fx<R, E, Path.ParamsOf<P>>;
+    readonly define: <P2 extends string>(route: Route<P2>) => Router<PathJoin<[P, P2]>>;
     /**
-     * The current outlet of this Router
+     * The parent Router instance if one exists.
      */
-    readonly outlet: Fx.RefSubject<Redirect, html.Renderable>;
+    readonly parent: Option.Option<Router<string>>;
     /**
-     * Helper for constructing a path from a route relative to the router.
+     * The Navigation Service
      */
-    readonly createPath: <R2 extends Route.Route<any, any, string>, P extends Route.ParamsOf<R2>>(route: R2, ...[params]: [keyof P] extends [never] ? [] : [P]) => Effect.Effect<R, never, Path.PathJoin<[
-        Path.Interpolate<Route.PathOf<R>, Route.ParamsOf<R>>,
-        Path.Interpolate<Route.PathOf<R2>, P>
-    ]>>;
-    /**
-     * Helper for constructing a nested router
-     */
-    readonly define: <R2, E2, Path2 extends string>(route: Route.Route<R2, E2, Path2>) => Router<R | R2, E | E2, Path.PathJoin<[P, Path2]>>;
-    /**
-     * The parent router if one exists
-     */
-    readonly parent: Option.Option<Router<any, string>>;
-    /**
-     * Provide all the resources needed for a Router
-     */
-    readonly provideContext: (environment: Context.Context<R>) => Router<never, E, P>;
-}
-export declare const Router: Context.Tag<Router<never, never, string>, Router<never, never, string>> & {
-    make: <R = never, E = never, P extends string = string>(route: Route.Route<R, E, P>, currentPath: Fx.RefSubject<never, string>, parent?: Option.Option<Router<any, any, string>>) => Router<R, E, P>;
-};
-export declare const outlet: Fx.Fx<RenderContext | Router, Redirect, html.Renderable>;
-export declare const currentPath: Fx.Fx<Router, never, string>;
-export declare function provideContext<R>(environment: Context.Context<R>): <E, P extends string>(router: Router<R, E, P>) => Router<never, E, P>;
-export interface Redirect {
-    readonly _tag: 'Redirect';
-    readonly path: string;
-}
-export declare namespace Redirect {
-    const make: (path: string) => Redirect;
-    const is: (r: unknown) => r is Redirect;
-}
-export declare function redirect(path: string): Effect.Effect<never, Redirect, never>;
-export declare namespace redirect {
-    var fx: (path: string) => Fx.Fx<never, Redirect, never>;
+    readonly navigation: Navigation.Navigation;
 }
-export declare const redirectTo: {
-    <R, E, P extends string>(route: Route.Route<R, E, P>, ...[params]: [keyof Path.PartsToParams<Path.PathToParts<P>, {}>] extends [never] ? [({} | undefined)?] : [Path.PartsToParams<Path.PathToParts<P>, {}> extends infer T ? { readonly [K in keyof T]: Path.PartsToParams<Path.PathToParts<P>, {}>[K]; } : never]): Effect.Effect<Router, Redirect, never>;
-    fx<R_1, E_1, P_1 extends string>(route: Route.Route<R_1, E_1, P_1>, ...params: [keyof Path.PartsToParams<Path.PathToParts<P_1>, {}>] extends [never] ? [({} | undefined)?] : [(path: string) => Path.PartsToParams<Path.PathToParts<P_1>, {}> extends infer T_1 ? { readonly [K_1 in keyof T_1]: Path.PartsToParams<Path.PathToParts<P_1>, {}>[K_1]; } : never]): Fx.Fx<Router, Redirect, never>;
-};
-export declare const makeRouter: (currentPath?: Fx.RefSubject<never, string>) => Effect.Effect<Location | History | Window | Document | Scope.Scope, never, Router>;
-export declare const live: (currentPath?: Fx.RefSubject<never, string>) => Layer.Layer<Location | History | Window | Document, never, Router<never, never, string>>;
-export declare function getCurrentPathFromLocation(location: Location | HTMLAnchorElement | URL): string;
-export declare const getCurrentPath: Effect.Effect<Router<never, never, string>, never, string>;
-export declare const getBasePath: Effect.Effect<Router<never, never, string>, never, string>;
+export declare const Router: Tag<Router<string>, Router<string>>;
+export declare const navigation: Layer.Layer<Navigation.Navigation, never, Router>;
+export declare function getCurrentPathFromUrl(url: URL): string;
+export declare const dom: (options?: Navigation.DomNavigationOptions & DomServicesElementParams) => Layer.Layer<Navigation.NavigationServices, never, Navigation.Navigation | Router>;
+export declare const memory: (options: Navigation.MemoryNavigationOptions) => Layer.Layer<never, never, Navigation.Navigation | Router>;
 //# sourceMappingURL=router.d.ts.map

package/dist/cjs/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAA;AAE7C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAEpC,MAAM,WAAW,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IACtD;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;IAExB;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IAEpD;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAEnF;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAE9C;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAA;CAC3C;AAED,eAAO,MAAM,MAAM,qCAAwB,CAAA;AAE3C,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAyBxE,CAAA;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAEtD;AAED,eAAO,MAAM,GAAG,aACJ,WAAW,oBAAoB,GAAG,wBAAwB,KACnE,WAAW,CAAC,WAAW,kBAAkB,EAAE,KAAK,EAAE,qBAAqB,GAAG,MAAM,CAC1B,CAAA;AAEzD,eAAO,MAAM,MAAM,YACR,WAAW,uBAAuB,KAC1C,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,qBAAqB,GAAG,MAAM,CACC,CAAA"}

package/dist/cjs/router.js

@@ -23,173 +23,35 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBasePath = exports.getCurrentPath = exports.getCurrentPathFromLocation = exports.live = exports.makeRouter = exports.redirectTo = exports.redirect = exports.Redirect = exports.provideContext = exports.currentPath = exports.outlet = exports.Router = void 0;
-/* eslint-disable @typescript-eslint/ban-types */
-const Function_1 = require("@effect/data/Function");
+exports.memory = exports.dom = exports.getCurrentPathFromUrl = exports.navigation = exports.Router = void 0;
 const Option = __importStar(require("@effect/data/Option"));
 const Effect = __importStar(require("@effect/io/Effect"));
-const Runtime = __importStar(require("@effect/io/Runtime"));
-const Context = __importStar(require("@typed/context"));
-const dom_1 = require("@typed/dom");
-const Fx = __importStar(require("@typed/fx"));
-const html_1 = require("@typed/html");
-const Path = __importStar(require("@typed/path"));
-const Route = __importStar(require("@typed/route"));
-exports.Router = Object.assign(Context.Tag('@typed/router/Router'), {
-    make: function makeRouter(route, currentPath, parent = Option.none()) {
-        const outlet = Fx.RefSubject.unsafeMake(Effect.sync(() => null));
-        const createPath = (other, ...[params]) => Effect.gen(function* ($) {
-            const path = yield* $(currentPath.get);
-            const baseParams = yield* $(route.match(path));
-            if (Option.isNone(baseParams)) {
-                return yield* $(Effect.dieMessage(`Can not create path when the parent can not be matched.
-                Parent Route: ${route.path}
-                Current Route: ${other.path}
-                Current Path: ${path}`));
-            }
-            return route.concat(other).make({ ...baseParams.value, ...params });
-        });
+const Layer = __importStar(require("@effect/io/Layer"));
+const context_1 = require("@typed/context");
+const Navigation = __importStar(require("@typed/navigation"));
+const route_1 = require("@typed/route");
+exports.Router = (0, context_1.Tag)('Router');
+exports.navigation = exports.Router.layer(Effect.gen(function* ($) {
+    const navigation = yield* $(Navigation.Navigation);
+    const currentPath = navigation.currentEntry.map((destination) => getCurrentPathFromUrl(destination.url));
+    function makeRouter(route, parent) {
         const router = {
             route,
-            currentPath,
-            params: (0, Function_1.pipe)(currentPath, Fx.switchMapEffect(route.match), Fx.compact, Fx.hold),
-            outlet,
-            createPath: createPath,
-            define: (other) => makeRouter(route.concat(other), currentPath, Option.some(router)),
-            provideContext: (env) => provideContext(env)(router),
+            navigation,
+            params: currentPath.filterMap(route.match),
+            define: (other) => makeRouter(route.concat(other), Option.some(router)),
             parent,
         };
         return router;
-    },
-});
-exports.outlet = html_1.RenderContext.withFx(({ environment }) => exports.Router.withFx((r) => environment === 'browser'
-    ? r.outlet
-    : (0, Function_1.pipe)(r.outlet, Fx.skipUntil((x) => x !== null), Fx.take(1))));
-exports.currentPath = exports.Router.withFx((r) => r.currentPath);
-function provideContext(environment) {
-    return (router) => {
-        const provided = {
-            ...router,
-            params: (0, Function_1.pipe)(router.params, Fx.provideContext(environment)),
-            route: Route.provideContext(environment)(router.route),
-            createPath: ((other, ...params) => Effect.provideContext(environment)(router.createPath(other, ...params))),
-            provideContext: (env) => provideContext(env)(provided),
-        };
-        return provided;
-    };
-}
-exports.provideContext = provideContext;
-var Redirect;
-(function (Redirect) {
-    Redirect.make = (path) => ({ _tag: 'Redirect', path });
-    Redirect.is = (r) => typeof r === 'object' && r !== null && '_tag' in r && r._tag === 'Redirect';
-})(Redirect = exports.Redirect || (exports.Redirect = {}));
-function redirect(path) {
-    return Effect.fail(Redirect.make(path));
-}
-exports.redirect = redirect;
-redirect.fx = (path) => Fx.fail(Redirect.make(path));
-const redirectTo = (route, ...[params]) => (0, Function_1.pipe)(exports.Router.withEffect((r) => r.createPath(route, params)), Effect.flatMap(redirect));
-exports.redirectTo = redirectTo;
-exports.redirectTo.fx = (route, ...params) => (0, Function_1.pipe)(exports.Router.withEffect((r) => r.createPath(route, params)), Fx.fromEffect, Fx.switchMap(redirect.fx));
-// TOOD: Add support for reading <base> tag for default Router path.
-const makeRouter = (currentPath) => Effect.gen(function* ($) {
-    const history = yield* $(dom_1.History);
-    const location = yield* $(dom_1.Location);
-    if (!currentPath) {
-        currentPath = Fx.RefSubject.unsafeMake(Effect.sync(() => getCurrentPathFromLocation(location)));
-    }
-    // Patch history events to emit an event when the path changes
-    const historyEvents = yield* $(patchHistory);
-    // Update the current path when events occur:
-    // - popstate
-    // - hashchange
-    // - history events
-    yield* $(Fx.mergeAll((0, dom_1.addWindowListener)('popstate'), (0, dom_1.addWindowListener)('hashchange'), historyEvents), 
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    Fx.switchMapEffect(() => currentPath.set(getCurrentPathFromLocation(location))), Fx.drain, Effect.forkScoped);
-    // Listen to path changes and update the current history location, if necessary
-    yield* $((0, Function_1.pipe)(currentPath, Fx.skipRepeats, Fx.observe((path) => Effect.sync(() => {
-        if (path !== getCurrentPathFromLocation(location)) {
-            history.pushState({}, '', path);
-        }
-    })), Effect.forkScoped));
-    // Find the configured base path
-    const document = yield* $(dom_1.Document);
-    const base = document.querySelector('base');
-    const baseHref = base ? getBasePathFromHref(base.href) : '/';
-    // Make our base router
-    return exports.Router.make(Route.Route(baseHref), currentPath);
-});
-exports.makeRouter = makeRouter;
-const live = (currentPath) => exports.Router.layerScoped((0, exports.makeRouter)(currentPath));
-exports.live = live;
-function getCurrentPathFromLocation(location) {
-    return location.pathname + location.search + location.hash;
-}
-exports.getCurrentPathFromLocation = getCurrentPathFromLocation;
-exports.getCurrentPath = exports.Router.withEffect((r) => r.currentPath.get);
-exports.getBasePath = exports.Router.with((r) => {
-    const routers = [r];
-    let current = r;
-    while (Option.isSome(current.parent)) {
-        current = current.parent.value;
-        routers.push(current);
-    }
-    return routers.reduceRight((acc, r) => Path.pathJoin(r.route.path, acc), '');
-});
-const patchHistory = Effect.gen(function* ($) {
-    const history = yield* $(dom_1.History);
-    const historyEvents = Fx.makeSubject();
-    const runtime = yield* $(Effect.runtime());
-    const runFork = Runtime.runFork(runtime);
-    const cleanup = patchHistory_(history, () => runFork(historyEvents.event()));
-    // unpatch history upon finalization
-    yield* $(Effect.addFinalizer(() => Effect.sync(cleanup)));
-    return historyEvents;
-});
-function patchHistory_(history, sendEvent) {
-    const pushState = history.pushState.bind(history);
-    const replaceState = history.replaceState.bind(history);
-    const go = history.go.bind(history);
-    const back = history.back.bind(history);
-    const forward = history.forward.bind(history);
-    history.pushState = function (state, title, url) {
-        pushState(state, title, url);
-        sendEvent();
-    };
-    history.replaceState = function (state, title, url) {
-        replaceState(state, title, url);
-        sendEvent();
-    };
-    history.go = function (delta) {
-        go(delta);
-        sendEvent();
-    };
-    history.back = function () {
-        back();
-        sendEvent();
-    };
-    history.forward = function () {
-        forward();
-        sendEvent();
-    };
-    // Reset history to original state
-    return () => {
-        history.pushState = pushState;
-        history.replaceState = replaceState;
-        history.go = go;
-        history.back = back;
-        history.forward = forward;
-    };
-}
-function getBasePathFromHref(href) {
-    try {
-        const url = new URL(href);
-        return getCurrentPathFromLocation(url);
-    }
-    catch {
-        return href;
     }
+    return makeRouter((0, route_1.Route)(navigation.base), Option.none());
+}));
+function getCurrentPathFromUrl(url) {
+    return url.pathname + url.search + url.hash;
 }
+exports.getCurrentPathFromUrl = getCurrentPathFromUrl;
+const dom = (options) => Layer.provideMerge(Navigation.dom(options), exports.navigation);
+exports.dom = dom;
+const memory = (options) => Layer.provideMerge(Navigation.memory(options), exports.navigation);
+exports.memory = memory;
 //# sourceMappingURL=router.js.map

package/dist/cjs/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA6C;AAC7C,0DAA2C;AAC3C,wDAAyC;AACzC,4CAAoC;AAGpC,8DAA+C;AAE/C,wCAAoC;AA8BvB,QAAA,MAAM,GAAG,IAAA,aAAG,EAAS,QAAQ,CAAC,CAAA;AAE9B,QAAA,UAAU,GAAsD,cAAM,CAAC,KAAK,CACvF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IACrB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IAClD,MAAM,WAAW,GAAG,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAC9D,qBAAqB,CAAC,WAAW,CAAC,GAAG,CAAC,CACvC,CAAA;IAED,SAAS,UAAU,CACjB,KAAe,EACf,MAAkC;QAElC,MAAM,MAAM,GAAc;YACxB,KAAK;YACL,UAAU;YACV,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;YAC1C,MAAM,EAAE,CAAoB,KAAgB,EAA6B,EAAE,CACzE,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtD,MAAM;SACP,CAAA;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,OAAO,UAAU,CAAC,IAAA,aAAK,EAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;AAC1D,CAAC,CAAC,CACH,CAAA;AAED,SAAgB,qBAAqB,CAAC,GAAQ;IAC5C,OAAO,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,IAAI,CAAA;AAC7C,CAAC;AAFD,sDAEC;AAEM,MAAM,GAAG,GAAG,CACjB,OAAoE,EACe,EAAE,CACrF,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,kBAAU,CAAC,CAAA;AAH5C,QAAA,GAAG,OAGyC;AAElD,MAAM,MAAM,GAAG,CACpB,OAA2C,EACgB,EAAE,CAC7D,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,kBAAU,CAAC,CAAA;AAH/C,QAAA,MAAM,UAGyC"}

package/dist/index.d.ts

@@ -1,5 +1,9 @@
-export * from './router.js';
 export * from './Link.js';
-export * from './RouteMatcher.js';
-export * from './RouteMatch.js';
+export * from './Match.js';
+export * from './Matcher.js';
+export * from './matchRoutes.js';
+export * from './Navigation.js';
+export * from './Redirect.js';
+export * from './router.js';
+export * from './ScrollRestoration.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,wBAAwB,CAAA"}

package/dist/index.js

@@ -1,5 +1,9 @@
-export * from './router.js';
 export * from './Link.js';
-export * from './RouteMatcher.js';
-export * from './RouteMatch.js';
+export * from './Match.js';
+export * from './Matcher.js';
+export * from './matchRoutes.js';
+export * from './Navigation.js';
+export * from './Redirect.js';
+export * from './router.js';
+export * from './ScrollRestoration.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,wBAAwB,CAAA"}

package/dist/matchRoutes.d.ts

@@ -0,0 +1,8 @@
+import * as Scope from '@effect/io/Scope';
+import * as Fx from '@typed/fx';
+import { RenderContext } from '@typed/html';
+import { Match } from './Match.js';
+import { Redirect } from './Redirect.js';
+import { Router } from './router.js';
+export declare function matchRoutes<const Matches extends ReadonlyArray<Match.Any>, R = never, E = never, A = never>(matches: Matches, onNotFound?: (params: Fx.Filtered<never, never, Readonly<Record<string, string>>>) => Fx.Fx<R, E, A>): Fx.Fx<Router | RenderContext | Scope.Scope | R | Match.Context<Matches[number]>, Exclude<E | Match.Error<Matches[number]>, Redirect>, A | Match.Success<Matches[number]>>;
+//# sourceMappingURL=matchRoutes.d.ts.map

package/dist/matchRoutes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"matchRoutes.d.ts","sourceRoot":"","sources":["../src/matchRoutes.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAI3C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,MAAM,EAAyB,MAAM,aAAa,CAAA;AAE3D,wBAAgB,WAAW,CACzB,KAAK,CAAC,OAAO,SAAS,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,EAC9C,CAAC,GAAG,KAAK,EACT,CAAC,GAAG,KAAK,EACT,CAAC,GAAG,KAAK,EAET,OAAO,EAAE,OAAO,EAChB,UAAU,GAAE,CACV,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,KAChE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAoB,GACrC,EAAE,CAAC,EAAE,CACN,MAAM,GAAG,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EACzE,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,EACnD,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CACnC,CAoFA"}

package/dist/matchRoutes.js

@@ -0,0 +1,50 @@
+import { identity, pipe } from '@effect/data/Function';
+import * as Option from '@effect/data/Option';
+import * as Effect from '@effect/io/Effect';
+import * as Fx from '@typed/fx';
+import { RenderContext } from '@typed/html';
+import { Redirect } from './Redirect.js';
+import { Router, getCurrentPathFromUrl } from './router.js';
+export function matchRoutes(matches, onNotFound = () => Fx.empty()) {
+    return Fx.gen(function* ($) {
+        const { environment } = yield* $(RenderContext);
+        const isBrowser = environment === 'browser';
+        const router = yield* $(Router);
+        const notFound = onNotFound(router.params);
+        const matchers = matches.map((match) => {
+            const nestedRouter = router.define(match.route);
+            const render = pipe(nestedRouter.params, match.render, Fx.provideService(Router, nestedRouter), Fx.scoped);
+            return [
+                match.route,
+                render,
+                match.options?.guard,
+                match.options?.onMatch,
+            ];
+        });
+        const length = matchers.length;
+        const matched = yield* $(Fx.makeRef(Effect.succeed(Fx.empty())));
+        const matchPath = (path) => Effect.gen(function* ($) {
+            for (let i = 0; i < length; ++i) {
+                const [route, render, guard, onMatch] = matchers[i];
+                const params = route.match(path);
+                if (Option.isSome(params)) {
+                    // If there is a guard and it fails, continue to next route
+                    if (guard && !(yield* $(guard(params.value)))) {
+                        continue;
+                    }
+                    // If there is an onMatch handler, run it and catch any errors
+                    // This is useful when you want to add tracking when a route is matched
+                    if (onMatch) {
+                        yield* $(onMatch(params.value), Effect.catchAllCause((cause) => matched.error(cause)), Effect.forkScoped);
+                    }
+                    return yield* $(matched.set(render));
+                }
+            }
+            return yield* $(matched.set(notFound));
+        });
+        // Match a Route when navigation occurs
+        yield* $(router.navigation.onNavigation((event) => matchPath(getCurrentPathFromUrl(event.destination.url))));
+        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.compact);
+    });
+}
+//# sourceMappingURL=matchRoutes.js.map

package/dist/matchRoutes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"matchRoutes.js","sourceRoot":"","sources":["../src/matchRoutes.ts"],"names":[],"mappings":"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"}