@typed/router 0.27.6 → 0.28.0

package/dist/esm/Matcher.js

@@ -1,92 +1,64 @@
 /**
  * @since 1.0.0
  */
-import { CurrentEnvironment } from "@typed/environment";
 import * as Fx from "@typed/fx/Fx";
 import * as Match from "@typed/fx/Match";
-import * as RefSubject from "@typed/fx/RefSubject";
-import * as Guard from "@typed/guard";
-import * as Navigation from "@typed/navigation";
-import * as Route from "@typed/route";
+import { CurrentPath, isRedirectError, navigate, RedirectError } from "@typed/navigation";
+import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
+import { dual, pipe } from "effect/Function";
 import * as Option from "effect/Option";
-import { makeHref, withCurrentRoute } from "./CurrentRoute.js";
+import { hasProperty } from "effect/Predicate";
+import * as Unify from "effect/Unify";
+import { makeHref } from "./CurrentRoute.js";
+import * as RouteMatch from "./RouteMatch.js";
+/**
+ * @since 1.0.0
+ */
+export const RouteMatcherTypeId = Symbol.for("@typed/router/RouteMatcher");
 class RouteMatcherImpl {
-    guards;
-    constructor(guards) {
-        this.guards = guards;
+    matches;
+    [RouteMatcherTypeId] = RouteMatcherTypeId;
+    constructor(matches) {
+        this.matches = matches;
+        this.add = this.add.bind(this);
         this.match = this.match.bind(this);
+        this.switch = this.switch.bind(this);
+        this.effect = this.effect.bind(this);
         this.to = this.to.bind(this);
-        this.notFound = this.notFound.bind(this);
-        this.redirect = this.redirect.bind(this);
     }
-    match(...args) {
-        const route = getRoute(args[0]);
-        if (args.length === 2) {
-            return new RouteMatcherImpl([...this.guards, {
-                    route,
-                    guard: getGuard(route),
-                    match: (ref) => Fx.scoped(args[1](ref))
-                }]);
-        }
-        else {
-            return new RouteMatcherImpl([...this.guards, {
-                    route,
-                    guard: getGuard(route, args[1]),
-                    match: (ref) => Fx.scoped(args[2](ref))
-                }]);
-        }
+    add(match) {
+        return new RouteMatcherImpl([...this.matches, match]);
     }
-    to(...args) {
-        const route = getRoute(args[0]);
-        if (args.length === 2) {
-            return this.match(route, (ref) => RefSubject.map(ref, args[1]));
-        }
-        else {
-            return this.match(route, args[1], (ref) => RefSubject.map(ref, args[2]));
-        }
+    match(input, match) {
+        return this.add(RouteMatch.fromInput(input, match));
     }
-    notFound(f) {
-        return Fx.fromFxEffect(CurrentEnvironment.with((env) => {
-            const onNotFound = Fx.scoped(f(Navigation.CurrentEntry));
-            let matcher = Match
-                .value(
-            // Only if we're rendering in a DOM-based environment should we allow for routing to last indefinitely
-            env === "dom" || env === "test:dom" ? Navigation.CurrentPath : Fx.take(Navigation.CurrentPath, 1));
-            for (const { guard, match, route } of this.guards) {
-                matcher = matcher.when(guard, (ref) => Fx.middleware(match(ref), withCurrentRoute(route)));
-            }
-            return Fx.filterMapErrorEffect(matcher.getOrElse(() => onNotFound), (e) => Navigation.isRedirectError(e)
-                // Fork the redirect to ensure it does not occur within the same runUpdates as the initial navigation
-                ? Effect.as(Effect.forkScoped(Navigation.handleRedirect(e)), Option.none())
-                : Effect.succeedSome(e));
-        }));
+    switch(input, match) {
+        return this.match(input, Fx.switchMap(match));
     }
-    redirect(route, ...params) {
-        return this.notFound(() => RefSubject.mapEffect(makeHref(route, ...params), (s) => Effect.fail(Navigation.redirectToPath(s))));
-    }
-}
-function getGuard(path, guard) {
-    if (guard) {
-        return Guard.compose(path, guard);
+    effect(input, match) {
+        return this.match(input, Fx.switchMapEffect(match));
     }
-    else {
-        return path.asGuard();
+    to(input, f) {
+        return this.match(input, Fx.map(f));
     }
 }
-function getRoute(route) {
-    return typeof route === "string" ? Route.fromPath(route) : route;
-}
 /**
  * @since 1.0.0
  */
-export function empty() {
-    return new RouteMatcherImpl([]);
+export function make(matches) {
+    return new RouteMatcherImpl(matches);
 }
 /**
- * @since 1.18.0
+ * @since 1.0.0
+ */
+export const empty = make([]);
+const { effect, match, switch: switch_, to } = empty;
+export { 
+/**
+ * @since 1.0.0
  */
-export const { 
+effect, 
 /**
  * @since 1.0.0
  */
@@ -94,5 +66,61 @@ match,
 /**
  * @since 1.0.0
  */
-to } = empty();
+switch_ as switch, 
+/**
+ * @since 1.0.0
+ */
+to };
+/**
+ * @since 1.0.0
+ */
+export const catchRedirectError = (fx) => Fx.filterMapErrorEffect(fx, Unify.unify((_) => isRedirectError(_)
+    ? Effect.as(Effect.forkScoped(Effect.ignoreLogged(navigate(_.path, _.options))), Option.none())
+    : Effect.succeedSome(_)));
+/**
+ * @since 1.0.0
+ */
+export const notFound = dual(2, function notFound(router, onNotFound) {
+    let matcher = Match.value(CurrentPath);
+    for (const match of router.matches) {
+        matcher = matcher.when(match.guard, match.match);
+    }
+    return catchRedirectError(matcher.getOrElse(() => onNotFound));
+});
+/**
+ * @since 1.0.0
+ */
+export const notFoundWith = dual(2, function notFoundWith(router, onNotFound) {
+    return notFound(router, Fx.fromEffect(onNotFound));
+});
+/**
+ * @since 1.0.0
+ */
+export function isRouteMatcher(value) {
+    return hasProperty(value, RouteMatcherTypeId);
+}
+/**
+ * @since 1.0.0
+ */
+export const redirectWith = dual(2, function redirectWith(router, effect) {
+    return notFoundWith(router, Effect.flatMap(effect, (path) => new RedirectError({ path })));
+});
+/**
+ * @since 1.0.0
+ */
+export const redirectTo = dual((args) => isRouteMatcher(args[0]), function redirect(router, route, ...params) {
+    return redirectWith(router, pipe(Effect.catchTag(makeHref(route, ...params), "NoSuchElementException", () => Effect.fail(new RedirectRouteMatchError(route, (params[0] || {})))), Effect.flatMap((path) => new RedirectError({ path }))));
+});
+/**
+ * @since 1.0.0
+ */
+export class RedirectRouteMatchError extends Data.TaggedError("RedirectRouteMatchError") {
+    route;
+    params;
+    constructor(route, params) {
+        super();
+        this.route = route;
+        this.params = params;
+    }
+}
 //# sourceMappingURL=Matcher.js.map

package/dist/esm/Matcher.js.map

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

package/dist/esm/RouteGuard.js

@@ -0,0 +1,57 @@
+/**
+ * @since 1.0.0
+ */
+import * as Guard from "@typed/guard";
+import * as Route from "@typed/route";
+import * as Effect from "effect/Effect";
+import { dual, flow } from "effect/Function";
+import * as Option from "effect/Option";
+/**
+ * @since 1.0.0
+ */
+export function make(route, guard) {
+    return { route, guard };
+}
+/**
+ * @since 1.0.0
+ */
+export function fromRoute(route) {
+    return make(route, flow(Route.decode_(route), Effect.optionFromOptional));
+}
+/**
+ * @since 1.0.0
+ */
+export const map = dual(2, function map(self, f) {
+    return make(self.route, Guard.map(self.guard, f));
+});
+/**
+ * @since 1.0.0
+ */
+export const mapEffect = dual(2, function mapEffect(self, f) {
+    return make(self.route, Guard.mapEffect(self.guard, f));
+});
+/**
+ * @since 1.0.0
+ */
+export const filter = dual(2, function filter(self, f) {
+    return make(self.route, Guard.filter(self.guard, f));
+});
+/**
+ * @since 1.0.0
+ */
+export const filterMap = dual(2, function filterMap(self, f) {
+    return make(self.route, Guard.filterMap(self.guard, f));
+});
+/**
+ * @since 1.0.0
+ */
+export const flatMap = dual(2, function flatMap(self, guard) {
+    return make(self.route, Guard.compose(self.guard, guard));
+});
+/**
+ * @since 1.0.0
+ */
+export const concat = dual(2, function concat(self, other) {
+    return make(Route.concat(self.route, other.route), (input) => Effect.Do.pipe(Effect.bind("a", () => self.guard(input)), Effect.bind("b", () => other.guard(input)), Effect.map((options) => Option.map(Option.all(options), ({ a, b }) => ({ ...a, ...b })))));
+});
+//# sourceMappingURL=RouteGuard.js.map

package/dist/esm/RouteGuard.js.map

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

package/dist/esm/RouteMatch.js

@@ -0,0 +1,29 @@
+/**
+ * @since 1.0.0
+ */
+import { middleware } from "@typed/fx/Fx";
+import { flow } from "effect/Function";
+import { withCurrentRoute } from "./CurrentRoute.js";
+import { asRouteGuard } from "./MatchInput.js";
+import * as RouteGuard from "./RouteGuard.js";
+/**
+ * @since 1.0.0
+ */
+export function make(route, guard, match) {
+    return { route, guard, match: flow(match, middleware(withCurrentRoute(route))) };
+}
+/**
+ * @since 1.0.0
+ */
+export function fromRoute(route, match) {
+    const { guard } = RouteGuard.fromRoute(route);
+    return make(route, guard, match);
+}
+/**
+ * @since 1.0.0
+ */
+export function fromInput(input, match) {
+    const { guard, route } = asRouteGuard(input);
+    return make(route, guard, match);
+}
+//# sourceMappingURL=RouteMatch.js.map

package/dist/esm/RouteMatch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RouteMatch.js","sourceRoot":"","sources":["../../src/RouteMatch.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAW,UAAU,EAAE,MAAM,cAAc,CAAA;AAIlD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAqB,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AA0C7C;;GAEG;AACH,MAAM,UAAU,IAAI,CAClB,KAAQ,EACR,KAA+B,EAC/B,KAA4C;IAE5C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;AAClF,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,SAAS,CACvB,KAAQ,EACR,KAA8D;IAU9D,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAE7C,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;AAClC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,SAAS,CACvB,KAAQ,EACR,KAA8D;IAU9D,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;IAE5C,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;AAClC,CAAC"}

package/dist/esm/index.js

@@ -9,4 +9,16 @@ export * from "./CurrentRoute.js";
  * @since 1.0.0
  */
 export * from "./Matcher.js";
+/**
+ * @since 1.0.0
+ */
+export * from "./MatchInput.js";
+/**
+ * @since 1.0.0
+ */
+export * as RouteGuard from "./RouteGuard.js";
+/**
+ * @since 1.0.0
+ */
+export * as RouteMatch from "./RouteMatch.js";
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,cAAc,mBAAmB,CAAA;AAEjC;;GAEG;AACH,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,cAAc,mBAAmB,CAAA;AAEjC;;GAEG;AACH,cAAc,cAAc,CAAA;AAE5B;;GAEG;AACH,cAAc,iBAAiB,CAAA;AAE/B;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/router",
-  "version": "0.27.6",
+  "version": "0.28.0",
   "description": "",
   "license": "MIT",
   "repository": {
@@ -10,15 +10,16 @@
   "sideEffects": [],
   "author": "Typed contributors",
   "dependencies": {
-    "effect": "^2.4.1",
-    "@typed/context": "0.25.1",
-    "@typed/dom": "13.0.1",
-    "@typed/environment": "0.6.3",
-    "@typed/fx": "1.27.3",
-    "@typed/guard": "0.1.3",
-    "@typed/navigation": "0.13.4",
-    "@typed/path": "0.10.2",
-    "@typed/route": "4.0.3"
+    "@effect/schema": "^0.66.10",
+    "effect": "^3.0.7",
+    "@typed/context": "0.26.0",
+    "@typed/dom": "14.0.0",
+    "@typed/environment": "0.7.0",
+    "@typed/fx": "1.28.0",
+    "@typed/guard": "0.2.0",
+    "@typed/navigation": "0.14.0",
+    "@typed/path": "0.11.0",
+    "@typed/route": "5.0.0"
   },
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -35,10 +36,25 @@
       "import": "./dist/esm/CurrentRoute.js",
       "default": "./dist/cjs/CurrentRoute.js"
     },
+    "./MatchInput": {
+      "types": "./dist/dts/MatchInput.d.ts",
+      "import": "./dist/esm/MatchInput.js",
+      "default": "./dist/cjs/MatchInput.js"
+    },
     "./Matcher": {
       "types": "./dist/dts/Matcher.d.ts",
       "import": "./dist/esm/Matcher.js",
       "default": "./dist/cjs/Matcher.js"
+    },
+    "./RouteGuard": {
+      "types": "./dist/dts/RouteGuard.d.ts",
+      "import": "./dist/esm/RouteGuard.js",
+      "default": "./dist/cjs/RouteGuard.js"
+    },
+    "./RouteMatch": {
+      "types": "./dist/dts/RouteMatch.d.ts",
+      "import": "./dist/esm/RouteMatch.js",
+      "default": "./dist/cjs/RouteMatch.js"
     }
   },
   "typesVersions": {
@@ -46,8 +62,17 @@
       "CurrentRoute": [
         "./dist/dts/CurrentRoute.d.ts"
       ],
+      "MatchInput": [
+        "./dist/dts/MatchInput.d.ts"
+      ],
       "Matcher": [
         "./dist/dts/Matcher.d.ts"
+      ],
+      "RouteGuard": [
+        "./dist/dts/RouteGuard.d.ts"
+      ],
+      "RouteMatch": [
+        "./dist/dts/RouteMatch.d.ts"
       ]
     }
   }