@typed/router 0.27.6 → 0.28.0

package/MatchInput/package.json

@@ -0,0 +1,6 @@
+{
+  "main": "../dist/cjs/MatchInput.js",
+  "module": "../dist/esm/MatchInput.js",
+  "types": "../dist/dts/MatchInput.d.ts",
+  "sideEffects": []
+}

package/RouteGuard/package.json

@@ -0,0 +1,6 @@
+{
+  "main": "../dist/cjs/RouteGuard.js",
+  "module": "../dist/esm/RouteGuard.js",
+  "types": "../dist/dts/RouteGuard.d.ts",
+  "sideEffects": []
+}

package/RouteMatch/package.json

@@ -0,0 +1,6 @@
+{
+  "main": "../dist/cjs/RouteMatch.js",
+  "module": "../dist/esm/RouteMatch.js",
+  "types": "../dist/dts/RouteMatch.d.ts",
+  "sideEffects": []
+}

package/dist/cjs/CurrentRoute.js

@@ -4,21 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.browser = exports.CurrentState = exports.CurrentSearchParams = exports.CurrentRoute = exports.CurrentParams = void 0;
+exports.decode = decode;
 exports.isActive = isActive;
 exports.layer = layer;
-exports.make = make;
+exports.makeCurrentRoute = makeCurrentRoute;
 exports.makeHref = makeHref;
 exports.withCurrentRoute = exports.server = void 0;
 var Context = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/context"));
 var Document = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/dom/Document"));
 var RefSubject = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/fx/RefSubject"));
 var _navigation = /*#__PURE__*/require("@typed/navigation");
-var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
+var Route = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/route"));
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
 var _Function = /*#__PURE__*/require("effect/Function");
-var Route = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/route"));
+var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * @since 1.0.0
  */
@@ -30,9 +31,9 @@ const CurrentRoute = exports.CurrentRoute = /*#__PURE__*/Context.Tagged("@typed/
 /**
  * @since 1.0.0
  */
-function make(route, parent = Option.none()) {
+function makeCurrentRoute(route, parent = Option.none()) {
   return {
-    route: getRoute(route),
+    route,
     parent
   };
 }
@@ -40,26 +41,23 @@ function make(route, parent = Option.none()) {
  * @since 1.0.0
  */
 function layer(route, parent = Option.none()) {
-  return CurrentRoute.layer(make(route, parent));
-}
-function getRoute(route) {
-  return typeof route === "string" ? Route.fromPath(route) : route;
+  return CurrentRoute.layer(makeCurrentRoute(route, parent));
 }
 /**
  * @since 1.0.0
  */
-const CurrentParams = exports.CurrentParams = /*#__PURE__*/RefSubject.filterMapEffect(_navigation.CurrentPath, path => CurrentRoute.with(({
+const CurrentParams = exports.CurrentParams = /*#__PURE__*/RefSubject.filteredFromTag(_navigation.Navigation, nav => RefSubject.filterMapEffect(nav.currentEntry, e => CurrentRoute.with(({
   route
-}) => route.match(path)));
+}) => route.match((0, _navigation.getCurrentPathFromUrl)(e.url)))));
 /**
  * @since 1.0.0
  */
 const withCurrentRoute = exports.withCurrentRoute = /*#__PURE__*/(0, _Function.dual)(2, (effect, route) => Effect.contextWithEffect(ctx => {
   const parent = Context.getOption(ctx, CurrentRoute);
-  if (Option.isNone(parent)) return (0, _Function.pipe)(effect, CurrentRoute.provide(make(route)));
-  return (0, _Function.pipe)(effect, CurrentRoute.provide(make(parent.value.route.concat(route), parent)));
+  if (Option.isNone(parent)) return (0, _Function.pipe)(effect, CurrentRoute.provide(makeCurrentRoute(route)));
+  return (0, _Function.pipe)(effect, CurrentRoute.provide(makeCurrentRoute(parent.value.route.concat(route), parent)));
 }));
-const makeHref_ = (currentPath, currentRoute, route, ...[params]) => {
+const makeHref_ = (currentPath, currentRoute, route, params = {}) => {
   const currentMatch = currentRoute.match(currentPath);
   if (Option.isNone(currentMatch)) return Option.none();
   const fullRoute = currentRoute.concat(route);
@@ -67,16 +65,15 @@ const makeHref_ = (currentPath, currentRoute, route, ...[params]) => {
     ...currentMatch.value,
     ...params
   };
-  return Option.some(fullRoute.make(fullParams));
+  return Option.some(fullRoute.interpolate(fullParams));
 };
 /**
  * @since 1.0.0
  */
-function makeHref(pathOrRoute, ...params) {
-  const route = typeof pathOrRoute === "string" ? Route.fromPath(pathOrRoute) : pathOrRoute;
-  return RefSubject.filterMapEffect(_navigation.CurrentPath, currentPath => Effect.map(CurrentRoute, currentRoute => makeHref_(currentPath, currentRoute.route, route, ...params)));
+function makeHref(route, ...[params]) {
+  return RefSubject.filterMapEffect(_navigation.CurrentPath, currentPath => Effect.map(CurrentRoute, currentRoute => makeHref_(currentPath, currentRoute.route, route, params)));
 }
-const isActive_ = (currentPath, currentRoute, route, ...params) => {
+const isActive_ = (currentPath, currentRoute, route, params = {}) => {
   const currentMatch = currentRoute.match(currentPath);
   if (Option.isNone(currentMatch)) return false;
   const fullRoute = currentRoute.concat(route);
@@ -84,33 +81,53 @@ const isActive_ = (currentPath, currentRoute, route, ...params) => {
     ...currentMatch.value,
     ...params
   };
-  const fullPath = fullRoute.make(fullParams);
-  return fullPath === currentPath || currentPath.startsWith(fullPath);
+  const fullPath = fullRoute.interpolate(fullParams);
+  const currentPathWithoutSearch = currentPath.split("?")[0] || "/";
+  const fullPathWithoutSearch = fullPath.split("?")[0] || "/";
+  if (fullPathWithoutSearch === currentPathWithoutSearch) {
+    return true;
+  } else if (route.routeOptions.end) {
+    return false;
+  } else {
+    return currentPathWithoutSearch.startsWith(fullPathWithoutSearch);
+  }
 };
+function isActive(route, ...[params]) {
+  return RefSubject.mapEffect(_navigation.CurrentPath, currentPath => CurrentRoute.with(currentRoute => isActive_(currentPath, currentRoute.route, route, params)));
+}
 /**
  * @since 1.0.0
  */
-function isActive(pathOrRoute, ...params) {
-  const route = typeof pathOrRoute === "string" ? Route.fromPath(pathOrRoute) : pathOrRoute;
-  return RefSubject.mapEffect(_navigation.CurrentPath, currentPath => Effect.map(CurrentRoute, currentRoute => isActive_(currentPath, currentRoute.route, route, ...params)));
+function decode(route) {
+  return RefSubject.filteredFromTag(_navigation.Navigation, nav => RefSubject.filterMapEffect(nav.currentEntry, e => Effect.flatMap(CurrentRoute, ({
+    route: parent
+  }) => Effect.optionFromOptional(Route.decode(parent.concat(route), (0, _navigation.getCurrentPathFromUrl)(e.url))))));
 }
 /**
  * @since 1.0.0
  */
-const browser = exports.browser = /*#__PURE__*/CurrentRoute.layer( /*#__PURE__*/Effect.gen(function* (_) {
-  const document = yield* _(Document.Document);
+const browser = exports.browser = /*#__PURE__*/CurrentRoute.layer( /*#__PURE__*/Effect.gen(function* () {
+  const document = yield* Document.Document;
   const base = document.querySelector("base");
-  const baseHref = base ? base.href : "/";
+  const baseHref = base ? getBasePathname(base.href) : "/";
   return {
-    route: Route.fromPath(baseHref),
+    route: Route.parse(baseHref),
     parent: Option.none()
   };
 }));
+function getBasePathname(base) {
+  try {
+    const url = new URL(base);
+    return url.pathname;
+  } catch {
+    return base;
+  }
+}
 /**
  * @since 1.0.0
  */
 const server = (base = "/") => CurrentRoute.layer({
-  route: Route.fromPath(base),
+  route: Route.parse(base),
   parent: Option.none()
 });
 exports.server = server;
@@ -122,5 +139,5 @@ const CurrentSearchParams = exports.CurrentSearchParams = /*#__PURE__*/RefSubjec
 /**
  * @since 1.0.0
  */
-const CurrentState = exports.CurrentState = /*#__PURE__*/RefSubject.map(_navigation.CurrentEntry, d => d.state);
+const CurrentState = exports.CurrentState = /*#__PURE__*/RefSubject.computedFromTag(_navigation.Navigation, n => RefSubject.map(n.currentEntry, e => e.state));
 //# sourceMappingURL=CurrentRoute.js.map

package/dist/cjs/CurrentRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"CurrentRoute.js","names":["Context","_interopRequireWildcard","require","Document","RefSubject","_navigation","Option","Effect","_Function","Route","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","CurrentRoute","exports","Tagged","make","route","parent","none","getRoute","layer","fromPath","CurrentParams","filterMapEffect","CurrentPath","path","with","match","withCurrentRoute","dual","effect","contextWithEffect","ctx","getOption","isNone","pipe","provide","value","concat","makeHref_","currentPath","currentRoute","params","currentMatch","fullRoute","fullParams","some","makeHref","pathOrRoute","map","isActive_","fullPath","startsWith","isActive","mapEffect","browser","gen","_","document","base","querySelector","baseHref","href","server","getSearchParams","destination","fromEntries","url","searchParams","CurrentSearchParams","CurrentEntry","CurrentState","d","state"],"sources":["../../src/CurrentRoute.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"CurrentRoute.js","names":["Context","_interopRequireWildcard","require","Document","RefSubject","_navigation","Route","Effect","_Function","Option","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","CurrentRoute","exports","Tagged","makeCurrentRoute","route","parent","none","layer","CurrentParams","filteredFromTag","Navigation","nav","filterMapEffect","currentEntry","with","match","getCurrentPathFromUrl","url","withCurrentRoute","dual","effect","contextWithEffect","ctx","getOption","isNone","pipe","provide","value","concat","makeHref_","currentPath","currentRoute","params","currentMatch","fullRoute","fullParams","some","interpolate","makeHref","CurrentPath","map","isActive_","fullPath","currentPathWithoutSearch","split","fullPathWithoutSearch","routeOptions","end","startsWith","isActive","mapEffect","decode","flatMap","optionFromOptional","browser","gen","document","base","querySelector","baseHref","getBasePathname","href","parse","URL","pathname","server","getSearchParams","destination","fromEntries","searchParams","CurrentSearchParams","CurrentEntry","CurrentState","computedFromTag","state"],"sources":["../../src/CurrentRoute.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/MatchInput.js

@@ -0,0 +1,96 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.asRouteGuard = asRouteGuard;
+exports.concat = concat;
+exports.flatMap = exports.filterMap = exports.filter = void 0;
+exports.getPath = getPath;
+exports.getPathSchema = getPathSchema;
+exports.getQuerySchema = getQuerySchema;
+exports.getRoute = getRoute;
+exports.getSchema = getSchema;
+exports.mapEffect = exports.map = void 0;
+var Route = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/route"));
+var _Function = /*#__PURE__*/require("effect/Function");
+var RouteGuard = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./RouteGuard.js"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+/**
+ * @since 1.0.0
+ */
+
+/**
+ * @since 1.0.0
+ */
+function asRouteGuard(input) {
+  return Route.isRoute(input) ? RouteGuard.fromRoute(input) : input;
+}
+/**
+ * @since 1.0.0
+ */
+const map = exports.map = /*#__PURE__*/(0, _Function.dual)(2, function map(input, f) {
+  return RouteGuard.map(asRouteGuard(input), f);
+});
+/**
+ * @since 1.0.0
+ */
+const mapEffect = exports.mapEffect = /*#__PURE__*/(0, _Function.dual)(2, function mapEffect(input, f) {
+  return RouteGuard.mapEffect(asRouteGuard(input), f);
+});
+/**
+ * @since 1.0.0
+ */
+const filter = exports.filter = /*#__PURE__*/(0, _Function.dual)(2, function filter(input, f) {
+  return RouteGuard.filter(asRouteGuard(input), f);
+});
+/**
+ * @since 1.0.0
+ */
+const filterMap = exports.filterMap = /*#__PURE__*/(0, _Function.dual)(2, function filterMap(input, f) {
+  return RouteGuard.filterMap(asRouteGuard(input), f);
+});
+/**
+ * @since 1.0.0
+ */
+const flatMap = exports.flatMap = /*#__PURE__*/(0, _Function.dual)(2, function flatMap(input, guard) {
+  return RouteGuard.flatMap(asRouteGuard(input), guard);
+});
+/**
+ * @since 1.0.0
+ */
+function concat(left, right) {
+  return RouteGuard.concat(asRouteGuard(left), asRouteGuard(right));
+}
+/**
+ * @since 1.0.0
+ */
+function getRoute(input) {
+  return asRouteGuard(input).route;
+}
+/**
+ * @since 1.0.0
+ */
+function getSchema(input) {
+  return asRouteGuard(input).route.schema;
+}
+/**
+ * @since 1.0.0
+ */
+function getPathSchema(input) {
+  return asRouteGuard(input).route.pathSchema;
+}
+/**
+ * @since 1.0.0
+ */
+function getQuerySchema(input) {
+  return asRouteGuard(input).route.querySchema;
+}
+/**
+ * @since 1.0.0
+ */
+function getPath(input) {
+  return asRouteGuard(input).route.path;
+}
+//# sourceMappingURL=MatchInput.js.map

package/dist/cjs/MatchInput.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MatchInput.js","names":["Route","_interopRequireWildcard","require","_Function","RouteGuard","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","asRouteGuard","input","isRoute","fromRoute","map","exports","dual","f","mapEffect","filter","filterMap","flatMap","guard","concat","left","right","getRoute","route","getSchema","schema","getPathSchema","pathSchema","getQuerySchema","querySchema","getPath","path"],"sources":["../../src/MatchInput.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;AAOA,IAAAA,KAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAEA,IAAAC,SAAA,gBAAAD,OAAA;AAEA,IAAAE,UAAA,gBAAAH,uBAAA,eAAAC,OAAA;AAA6C,SAAAG,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAL,wBAAAK,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAX7C;;;;AA0GA;;;AAGM,SAAUW,YAAYA,CAC1BC,KAAQ;EAER,OAAO1B,KAAK,CAAC2B,OAAO,CAACD,KAAK,CAAC,GAAGtB,UAAU,CAACwB,SAAS,CAACF,KAAK,CAAQ,GAAGA,KAAK;AAC1E;AAEA;;;AAGO,MAAMG,GAAG,GAAAC,OAAA,CAAAD,GAAA,gBASZ,IAAAE,cAAI,EAAC,CAAC,EAAE,SAASF,GAAGA,CACtBH,KAAQ,EACRM,CAAkC;EAElC,OAAO5B,UAAU,CAACyB,GAAG,CAGnBJ,YAAY,CAAIC,KAAK,CAAC,EAAEM,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF;;;AAGO,MAAMC,SAAS,GAAAH,OAAA,CAAAG,SAAA,gBASlB,IAAAF,cAAI,EAAC,CAAC,EAAE,SAASE,SAASA,CAC5BP,KAAQ,EACRM,CAAyD;EAEzD,OAAO5B,UAAU,CAAC6B,SAAS,CAKzBR,YAAY,CAAIC,KAAK,CAAC,EAAEM,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF;;;AAGO,MAAME,MAAM,GAAAJ,OAAA,CAAAI,MAAA,gBAWf,IAAAH,cAAI,EAAC,CAAC,EAAE,SAASG,MAAMA,CACzBR,KAAQ,EACRM,CAAwC;EAExC,OAAO5B,UAAU,CAAC8B,MAAM,CAEtBT,YAAY,CAAIC,KAAK,CAAC,EAAEM,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF;;;AAGO,MAAMG,SAAS,GAAAL,OAAA,CAAAK,SAAA,gBASlB,IAAAJ,cAAI,EAAC,CAAC,EAAE,SAASI,SAASA,CAC5BT,KAAQ,EACRM,CAAiD;EAEjD,OAAO5B,UAAU,CAAC+B,SAAS,CAGzBV,YAAY,CAAIC,KAAK,CAAC,EAAEM,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF;;;AAGO,MAAMI,OAAO,GAAAN,OAAA,CAAAM,OAAA,gBAShB,IAAAL,cAAI,EAAC,CAAC,EAAE,SAASK,OAAOA,CAC1BV,KAAQ,EACRW,KAA8C;EAE9C,OAAOjC,UAAU,CAACgC,OAAO,CAKvBX,YAAY,CAAIC,KAAK,CAAC,EAAEW,KAAK,CAAC;AAClC,CAAC,CAAC;AAEF;;;AAGM,SAAUC,MAAMA,CACpBC,IAAO,EACPC,KAAQ;EAOR,OAAOpC,UAAU,CAACkC,MAAM,CAGtBb,YAAY,CAAIc,IAAI,CAAC,EAAEd,YAAY,CAAIe,KAAK,CAAC,CAAC;AAClD;AAEA;;;AAGM,SAAUC,QAAQA,CAA2Bf,KAAQ;EACzD,OAAOD,YAAY,CAAIC,KAAK,CAAC,CAACgB,KAAK;AACrC;AAEA;;;AAGM,SAAUC,SAASA,CAA2BjB,KAAQ;EAC1D,OAAOD,YAAY,CAAIC,KAAK,CAAC,CAACgB,KAAK,CAACE,MAAM;AAC5C;AAEA;;;AAGM,SAAUC,aAAaA,CAA2BnB,KAAQ;EAC9D,OAAOD,YAAY,CAAIC,KAAK,CAAC,CAACgB,KAAK,CAACI,UAAsC;AAC5E;AAEA;;;AAGM,SAAUC,cAAcA,CAA2BrB,KAAQ;EAC/D,OAAOD,YAAY,CAAIC,KAAK,CAAC,CAACgB,KAAK,CAACM,WAAwC;AAC9E;AAEA;;;AAGM,SAAUC,OAAOA,CAA2BvB,KAAQ;EACxD,OAAOD,YAAY,CAAIC,KAAK,CAAC,CAACgB,KAAK,CAACQ,IAAI;AAC1C","ignoreList":[]}

package/dist/cjs/Matcher.js

@@ -3,108 +3,132 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.empty = empty;
-exports.to = exports.match = void 0;
-var _environment = /*#__PURE__*/require("@typed/environment");
+exports.empty = exports.effect = exports.catchRedirectError = exports.RouteMatcherTypeId = exports.RedirectRouteMatchError = void 0;
+exports.isRouteMatcher = isRouteMatcher;
+exports.make = make;
+exports.to = exports.switch = exports.redirectWith = exports.redirectTo = exports.notFoundWith = exports.notFound = exports.match = void 0;
 var Fx = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/fx/Fx"));
 var Match = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/fx/Match"));
-var RefSubject = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/fx/RefSubject"));
-var Guard = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/guard"));
-var Navigation = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/navigation"));
-var Route = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@typed/route"));
+var _navigation = /*#__PURE__*/require("@typed/navigation");
+var Data = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Data"));
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
+var _Function = /*#__PURE__*/require("effect/Function");
 var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
+var _Predicate = /*#__PURE__*/require("effect/Predicate");
+var Unify = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Unify"));
 var _CurrentRoute = /*#__PURE__*/require("./CurrentRoute.js");
+var RouteMatch = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./RouteMatch.js"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * @since 1.0.0
  */
 
+/**
+ * @since 1.0.0
+ */
+const RouteMatcherTypeId = exports.RouteMatcherTypeId = /*#__PURE__*/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(_environment.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), (0, _CurrentRoute.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((0, _CurrentRoute.makeHref)(route, ...params), s => Effect.fail(Navigation.redirectToPath(s))));
+  effect(input, match) {
+    return this.match(input, Fx.switchMapEffect(match));
   }
-}
-function getGuard(path, guard) {
-  if (guard) {
-    return Guard.compose(path, guard);
-  } 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
  */
-function empty() {
-  return new RouteMatcherImpl([]);
+function make(matches) {
+  return new RouteMatcherImpl(matches);
 }
 /**
- * @since 1.18.0
+ * @since 1.0.0
  */
+const empty = exports.empty = /*#__PURE__*/make([]);
 const {
-  /**
-   * @since 1.0.0
-   */
+  effect,
   match,
-  /**
-   * @since 1.0.0
-   */
+  switch: switch_,
   to
-} = /*#__PURE__*/empty();
+} = empty;
 exports.to = to;
+exports.switch = switch_;
 exports.match = match;
+exports.effect = effect;
+/**
+ * @since 1.0.0
+ */
+const catchRedirectError = fx => Fx.filterMapErrorEffect(fx, Unify.unify(_ => (0, _navigation.isRedirectError)(_) ? Effect.as(Effect.forkScoped(Effect.ignoreLogged((0, _navigation.navigate)(_.path, _.options))), Option.none()) : Effect.succeedSome(_)));
+/**
+ * @since 1.0.0
+ */
+exports.catchRedirectError = catchRedirectError;
+const notFound = exports.notFound = /*#__PURE__*/(0, _Function.dual)(2, function notFound(router, onNotFound) {
+  let matcher = Match.value(_navigation.CurrentPath);
+  for (const match of router.matches) {
+    matcher = matcher.when(match.guard, match.match);
+  }
+  return catchRedirectError(matcher.getOrElse(() => onNotFound));
+});
+/**
+ * @since 1.0.0
+ */
+const notFoundWith = exports.notFoundWith = /*#__PURE__*/(0, _Function.dual)(2, function notFoundWith(router, onNotFound) {
+  return notFound(router, Fx.fromEffect(onNotFound));
+});
+/**
+ * @since 1.0.0
+ */
+function isRouteMatcher(value) {
+  return (0, _Predicate.hasProperty)(value, RouteMatcherTypeId);
+}
+/**
+ * @since 1.0.0
+ */
+const redirectWith = exports.redirectWith = /*#__PURE__*/(0, _Function.dual)(2, function redirectWith(router, effect) {
+  return notFoundWith(router, Effect.flatMap(effect, path => new _navigation.RedirectError({
+    path
+  })));
+});
+/**
+ * @since 1.0.0
+ */
+const redirectTo = exports.redirectTo = /*#__PURE__*/(0, _Function.dual)(args => isRouteMatcher(args[0]), function redirect(router, route, ...params) {
+  return redirectWith(router, (0, _Function.pipe)(Effect.catchTag((0, _CurrentRoute.makeHref)(route, ...params), "NoSuchElementException", () => Effect.fail(new RedirectRouteMatchError(route, params[0] || {}))), Effect.flatMap(path => new _navigation.RedirectError({
+    path
+  }))));
+});
+/**
+ * @since 1.0.0
+ */
+class RedirectRouteMatchError extends Data.TaggedError("RedirectRouteMatchError") {
+  route;
+  params;
+  constructor(route, params) {
+    super();
+    this.route = route;
+    this.params = params;
+  }
+}
+exports.RedirectRouteMatchError = RedirectRouteMatchError;
 //# sourceMappingURL=Matcher.js.map

package/dist/cjs/Matcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"Matcher.js","names":["_environment","require","Fx","_interopRequireWildcard","Match","RefSubject","Guard","Navigation","Route","Effect","Option","_CurrentRoute","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RouteMatcherImpl","guards","constructor","match","bind","to","notFound","redirect","args","route","getRoute","length","guard","getGuard","ref","scoped","map","f","fromFxEffect","CurrentEnvironment","with","env","onNotFound","CurrentEntry","matcher","value","CurrentPath","take","when","middleware","withCurrentRoute","filterMapErrorEffect","getOrElse","isRedirectError","as","forkScoped","handleRedirect","none","succeedSome","params","mapEffect","makeHref","s","fail","redirectToPath","path","compose","asGuard","fromPath","empty","exports"],"sources":["../../src/Matcher.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Matcher.js","names":["Fx","_interopRequireWildcard","require","Match","_navigation","Data","Effect","_Function","Option","_Predicate","Unify","_CurrentRoute","RouteMatch","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","RouteMatcherTypeId","exports","Symbol","for","RouteMatcherImpl","matches","constructor","add","bind","match","switch","effect","to","input","fromInput","switchMap","switchMapEffect","f","map","make","empty","switch_","catchRedirectError","fx","filterMapErrorEffect","unify","_","isRedirectError","as","forkScoped","ignoreLogged","navigate","path","options","none","succeedSome","notFound","dual","router","onNotFound","matcher","value","CurrentPath","when","guard","getOrElse","notFoundWith","fromEffect","isRouteMatcher","hasProperty","redirectWith","flatMap","RedirectError","redirectTo","args","redirect","route","params","pipe","catchTag","makeHref","fail","RedirectRouteMatchError","TaggedError"],"sources":["../../src/Matcher.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}