@remix-run/router - npm Package Compare versions

Comparing version 0.0.0-experimental-48058118 to 0.0.0-experimental-5f6f59a6

CHANGELOG.md

 # `@remix-run/router`
 
+## 1.4.0-pre.0
+
+### Minor Changes
+
+- **Introducing Lazy Route Modules!** ([#10045](https://github.com/remix-run/react-router/pull/10045))
+
+  In order to keep your application bundles small and support code-splitting of your routes, we've introduced a new `lazy()` route property. This is an async function that resolves the non-route-matching portions of your route definition (`loader`, `action`, `element`/`Component`, `errorElement`/`ErrorBoundary`, `shouldRevalidate`, `handle`).
+
+  Lazy routes are resolved on initial load and during the `loading` or `submitting` phase of a navigation or fetcher call. You cannot lazily define route-matching properties (`path`, `index`, `children`) since we only execute your lazy route functions after we've matched known routes.
+
+  Your `lazy` functions will typically return the result of a dynamic import.
+
+  ```jsx
+  // In this example, we assume most folks land on the homepage so we include that
+  // in our critical-path bundle, but then we lazily load modules for /a and /b so
+  // they don't load until the user navigates to those routes
+  let routes = createRoutesFromElements(
+    <Route path="/" element={<Layout />}>
+      <Route index element={<Home />} />
+      <Route path="a" lazy={() => import("./a")} />
+      <Route path="b" lazy={() => import("./b")} />
+    </Route>
+  );
+  ```
+
+  Then in your lazy route modules, export the properties you want defined for the route:
+
+  ```jsx
+  export async function loader({ request }) {
+    let data = await fetchData(request);
+    return json(data);
+  }
+
+  // Export a `Component` directly instead of needing to create a React Element from it
+  export function Component() {
+    let data = useLoaderData();
+
+    return (
+      <>
+        <h1>You made it!</h1>
+        <p>{data}</p>
+      </>
+    );
+  }
+
+  // Export an `ErrorBoundary` directly instead of needing to create a React Element from it
+  export function ErrorBoundary() {
+    let error = useRouteError();
+    return isRouteErrorResponse(error) ? (
+      <h1>
+        {error.status} {error.statusText}
+      </h1>
+    ) : (
+      <h1>{error.message || error}</h1>
+    );
+  }
+  ```
+
+  An example of this in action can be found in the [`examples/lazy-loading-router-provider`](https://github.com/remix-run/react-router/tree/main/examples/lazy-loading-router-provider) directory of the repository.
+
+  🙌 Huge thanks to @rossipedia for the [Initial Proposal](https://github.com/remix-run/react-router/discussions/9826) and [POC Implementation](https://github.com/remix-run/react-router/pull/9830).
+
+### Patch Changes
+
+- Fix `generatePath` incorrectly applying parameters in some cases ([`bc6fefa1`](https://github.com/remix-run/react-router/commit/bc6fefa19019ce9f5250c8b5af9b8c5d3390e9d1))
+
+## 1.3.3
+
+### Patch Changes
+
+- Correctly perform a hard redirect for same-origin absolute URLs outside of the router `basename` ([#10076](https://github.com/remix-run/react-router/pull/10076))
+- Ensure status code and headers are maintained for `defer` loader responses in `createStaticHandler`'s `query()` method ([#10077](https://github.com/remix-run/react-router/pull/10077))
+- Change `invariant` to an `UNSAFE_invariant` export since it's only intended for internal use ([#10066](https://github.com/remix-run/react-router/pull/10066))
+- Add internal API for custom HMR implementations ([#9996](https://github.com/remix-run/react-router/pull/9996))
+
+## 1.3.2
+
+### Patch Changes
+
+- Remove inaccurate console warning for POP navigations and update active blocker logic ([#10030](https://github.com/remix-run/react-router/pull/10030))
+- Only check for differing origin on absolute URL redirects ([#10033](https://github.com/remix-run/react-router/pull/10033))
+
 ## 1.3.1
@@ -4,0 +86,0 @@

dist/history.d.ts

@@ -232,2 +232,3 @@ /**
 export declare function invariant<T>(value: T | null | undefined, message?: string): asserts value is T;
+export declare function warning(cond: any, message: string): void;
 /**
@@ -234,0 +235,0 @@ * Creates a Location object with a unique key from the given Path

dist/index.d.ts

@@ -1,7 +0,9 @@
-export type { ActionFunction, ActionFunctionArgs, ActionFunctionWithMiddleware, ActionFunctionArgsWithMiddleware, AgnosticDataIndexRouteObject, AgnosticDataNonIndexRouteObject, AgnosticDataRouteMatch, AgnosticDataRouteObject, AgnosticIndexRouteObject, AgnosticNonIndexRouteObject, AgnosticRouteMatch, AgnosticRouteObject, TrackedPromise, FormEncType, FormMethod, JsonFunction, LoaderFunction, LoaderFunctionArgs, LoaderFunctionWithMiddleware, LoaderFunctionArgsWithMiddleware, MiddlewareContext, MiddlewareFunction, MiddlewareFunctionArgs, ParamParseKey, Params, PathMatch, PathPattern, RedirectFunction, ShouldRevalidateFunction, Submission, } from "./utils";
-export { AbortedDeferredError, ErrorResponse, createMiddlewareContext, defer, generatePath, getToPathname, isRouteErrorResponse, joinPaths, json, matchPath, matchRoutes, normalizePathname, redirect, resolvePath, resolveTo, stripBasename, warning, } from "./utils";
+export type { ActionFunction, ActionFunctionArgs, AgnosticDataIndexRouteObject, AgnosticDataNonIndexRouteObject, AgnosticDataRouteMatch, AgnosticDataRouteObject, AgnosticIndexRouteObject, AgnosticNonIndexRouteObject, AgnosticRouteMatch, AgnosticRouteObject, LazyRouteFunction, TrackedPromise, FormEncType, FormMethod, JsonFunction, LoaderFunction, LoaderFunctionArgs, ParamParseKey, Params, PathMatch, PathPattern, RedirectFunction, ShouldRevalidateFunction, Submission, } from "./utils";
+export { AbortedDeferredError, ErrorResponse, defer, generatePath, getToPathname, isRouteErrorResponse, joinPaths, json, matchPath, matchRoutes, normalizePathname, redirect, resolvePath, resolveTo, stripBasename, } from "./utils";
 export type { BrowserHistory, BrowserHistoryOptions, HashHistory, HashHistoryOptions, History, InitialEntry, Location, MemoryHistory, MemoryHistoryOptions, Path, To, } from "./history";
-export { Action, createBrowserHistory, createPath, createHashHistory, createMemoryHistory, invariant, parsePath, } from "./history";
+export { Action, createBrowserHistory, createPath, createHashHistory, createMemoryHistory, parsePath, } from "./history";
 export * from "./router";
 /** @internal */
-export { DeferredData as UNSAFE_DeferredData, convertRoutesToDataRoutes as UNSAFE_convertRoutesToDataRoutes, getPathContributingMatches as UNSAFE_getPathContributingMatches, createMiddlewareStore as UNSAFE_createMiddlewareStore, } from "./utils";
+export type { RouteManifest as UNSAFE_RouteManifest } from "./utils";
+export { DeferredData as UNSAFE_DeferredData, convertRoutesToDataRoutes as UNSAFE_convertRoutesToDataRoutes, getPathContributingMatches as UNSAFE_getPathContributingMatches, } from "./utils";
+export { invariant as UNSAFE_invariant, warning as UNSAFE_warning, } from "./history";

dist/router.d.ts

 import type { History, Location, Path, To } from "./history";
 import { Action as HistoryAction } from "./history";
-import type { AgnosticDataRouteMatch, AgnosticDataRouteObject, AgnosticRouteMatch, AgnosticRouteObject, FormEncType, FormMethod, MiddlewareContext, RouteData } from "./utils";
+import type { AgnosticDataRouteMatch, AgnosticDataRouteObject, FormEncType, FormMethod, DetectErrorBoundaryFunction, RouteData, AgnosticRouteObject, AgnosticRouteMatch } from "./utils";
 import { DeferredData } from "./utils";
@@ -154,2 +154,10 @@ /**
      *
+     * HMR needs to pass in-flight route updates to React Router
+     * TODO: Replace this with granular route update APIs (addRoute, updateRoute, deleteRoute)
+     */
+    _internalSetRoutes(routes: AgnosticRouteObject[]): void;
+    /**
+     * @internal
+     * PRIVATE - DO NOT USE
+     *
      * Internal fetch AbortControllers accessed by unit tests
@@ -233,8 +241,2 @@ */
 /**
- * Future flags to toggle on new feature behavior
- */
-export interface FutureConfig {
-    unstable_middleware: boolean;
-}
-/**
  * Initialization options for createRouter
@@ -247,3 +249,3 @@ */
     hydrationData?: HydrationState;
-    future?: FutureConfig;
+    detectErrorBoundary?: DetectErrorBoundaryFunction;
 }
@@ -266,9 +268,2 @@ /**
 }
-interface StaticHandlerQueryOpts {
-    requestContext?: unknown;
-    middlewareContext?: MiddlewareContext;
-}
-interface StaticHandlerQueryRouteOpts extends StaticHandlerQueryOpts {
-    routeId?: string;
-}
 /**
@@ -279,4 +274,9 @@ * A StaticHandler instance manages a singular SSR navigation/fetch event
     dataRoutes: AgnosticDataRouteObject[];
-    query(request: Request, opts?: StaticHandlerQueryOpts): Promise<StaticHandlerContext | Response>;
-    queryRoute(request: Request, opts?: StaticHandlerQueryRouteOpts): Promise<any>;
+    query(request: Request, opts?: {
+        requestContext?: unknown;
+    }): Promise<StaticHandlerContext | Response>;
+    queryRoute(request: Request, opts?: {
+        routeId?: string;
+        requestContext?: unknown;
+    }): Promise<any>;
 }
@@ -378,3 +378,2 @@ /**
         data: TData | undefined;
-        " _hasFetcherDoneAnything "?: boolean;
     };
@@ -388,3 +387,2 @@ Loading: {
         data: TData | undefined;
-        " _hasFetcherDoneAnything "?: boolean;
     };
@@ -398,3 +396,2 @@ Submitting: {
         data: TData | undefined;
-        " _hasFetcherDoneAnything "?: boolean;
     };
@@ -435,7 +432,7 @@ };
 export declare const UNSAFE_DEFERRED_SYMBOL: unique symbol;
-export interface StaticHandlerInit {
+export interface CreateStaticHandlerOptions {
     basename?: string;
-    future?: FutureConfig;
+    detectErrorBoundary?: DetectErrorBoundaryFunction;
 }
-export declare function createStaticHandler(routes: AgnosticRouteObject[], init?: StaticHandlerInit): StaticHandler;
+export declare function createStaticHandler(routes: AgnosticRouteObject[], opts?: CreateStaticHandlerOptions): StaticHandler;
 /**
@@ -442,0 +439,0 @@ * Given an existing StaticHandlerContext and an error thrown at render time,

dist/router.umd.min.js

 /**
- * @remix-run/router v0.0.0-experimental-48058118
+ * @remix-run/router v0.0.0-experimental-5f6f59a6
  *
@@ -11,3 +11,3 @@ * Copyright (c) Remix Software Inc.
  */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).RemixRouter={})}(this,(function(e){"use strict";function t(){return t=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var a in r)Object.prototype.hasOwnProperty.call(r,a)&&(e[a]=r[a])}return e},t.apply(this,arguments)}var r;e.Action=void 0,(r=e.Action||(e.Action={})).Pop="POP",r.Push="PUSH",r.Replace="REPLACE";const a="popstate";function n(e,t){if(!1===e||null==e)throw new Error(t)}function o(e,t){if(!e){"undefined"!=typeof console&&console.warn(t);try{throw new Error(t)}catch(e){}}}function i(e,t){return{usr:e.state,key:e.key,idx:t}}function s(e,r,a,n){return void 0===a&&(a=null),t({pathname:"string"==typeof e?e:e.pathname,search:"",hash:""},"string"==typeof r?c(r):r,{state:a,key:r&&r.key||n||Math.random().toString(36).substr(2,8)})}function l(e){let{pathname:t="/",search:r="",hash:a=""}=e;return r&&"?"!==r&&(t+="?"===r.charAt(0)?r:"?"+r),a&&"#"!==a&&(t+="#"===a.charAt(0)?a:"#"+a),t}function c(e){let t={};if(e){let r=e.indexOf("#");r>=0&&(t.hash=e.substr(r),e=e.substr(0,r));let a=e.indexOf("?");a>=0&&(t.search=e.substr(a),e=e.substr(0,a)),e&&(t.pathname=e)}return t}function d(r,o,c,d){void 0===d&&(d={});let{window:u=document.defaultView,v5Compat:h=!1}=d,f=u.history,p=e.Action.Pop,m=null,g=v();function v(){return(f.state||{idx:null}).idx}function y(){p=e.Action.Pop;let t=v(),r=null==t?null:t-g;g=t,m&&m({action:p,location:b.location,delta:r})}function w(e){let t="null"!==u.location.origin?u.location.origin:u.location.href,r="string"==typeof e?e:l(e);return n(t,"No window.location.(origin|href) available to create URL for href: "+r),new URL(r,t)}null==g&&(g=0,f.replaceState(t({},f.state,{idx:g}),""));let b={get action(){return p},get location(){return r(u,f)},listen(e){if(m)throw new Error("A history only accepts one active listener");return u.addEventListener(a,y),m=e,()=>{u.removeEventListener(a,y),m=null}},createHref:e=>o(u,e),createURL:w,encodeLocation(e){let t=w(e);return{pathname:t.pathname,search:t.search,hash:t.hash}},push:function(t,r){p=e.Action.Push;let a=s(b.location,t,r);c&&c(a,t),g=v()+1;let n=i(a,g),o=b.createHref(a);try{f.pushState(n,"",o)}catch(e){u.location.assign(o)}h&&m&&m({action:p,location:b.location,delta:1})},replace:function(t,r){p=e.Action.Replace;let a=s(b.location,t,r);c&&c(a,t),g=v();let n=i(a,g),o=b.createHref(a);f.replaceState(n,"",o),h&&m&&m({action:p,location:b.location,delta:0})},go:e=>f.go(e)};return b}let u;function h(e,r,a){return void 0===r&&(r=[]),void 0===a&&(a=new Set),e.map(((e,o)=>{let i=[...r,o],s="string"==typeof e.id?e.id:i.join("-");if(n(!0!==e.index||!e.children,"Cannot specify children on an index route"),n(!a.has(s),'Found a route id collision on id "'+s+"\".  Route id's must be globally unique within Data Router usages"),a.add(s),function(e){return!0===e.index}(e)){return t({},e,{id:s})}return t({},e,{id:s,children:e.children?h(e.children,i,a):void 0})}))}function f(e,t,r){void 0===r&&(r="/");let a=A(("string"==typeof t?c(t):t).pathname||"/",r);if(null==a)return null;let n=p(e);!function(e){e.sort(((e,t)=>e.score!==t.score?t.score-e.score:function(e,t){return e.length===t.length&&e.slice(0,-1).every(((e,r)=>e===t[r]))?e[e.length-1]-t[t.length-1]:0}(e.routesMeta.map((e=>e.childrenIndex)),t.routesMeta.map((e=>e.childrenIndex)))))}(n);let o=null;for(let e=0;null==o&&e<n.length;++e)o=w(n[e],D(a));return o}function p(e,t,r,a){void 0===t&&(t=[]),void 0===r&&(r=[]),void 0===a&&(a="");let o=(e,o,i)=>{let s={relativePath:void 0===i?e.path||"":i,caseSensitive:!0===e.caseSensitive,childrenIndex:o,route:e};s.relativePath.startsWith("/")&&(n(s.relativePath.startsWith(a),'Absolute route path "'+s.relativePath+'" nested under path "'+a+'" is not valid. An absolute child route path must start with the combined path of all its parent routes.'),s.relativePath=s.relativePath.slice(a.length));let l=x([a,s.relativePath]),c=r.concat(s);e.children&&e.children.length>0&&(n(!0!==e.index,'Index routes must not have child routes. Please remove all child routes from route path "'+l+'".'),p(e.children,t,c,l)),(null!=e.path||e.index)&&t.push({path:l,score:y(l,e.index),routesMeta:c})};return e.forEach(((e,t)=>{var r;if(""!==e.path&&null!=(r=e.path)&&r.includes("?"))for(let r of m(e.path))o(e,t,r);else o(e,t)})),t}function m(e){let t=e.split("/");if(0===t.length)return[];let[r,...a]=t,n=r.endsWith("?"),o=r.replace(/\?$/,"");if(0===a.length)return n?[o,""]:[o];let i=m(a.join("/")),s=[];return s.push(...i.map((e=>""===e?o:[o,e].join("/")))),n&&s.push(...i),s.map((t=>e.startsWith("/")&&""===t?"/":t))}!function(e){e.data="data",e.deferred="deferred",e.redirect="redirect",e.error="error"}(u||(u={}));const g=/^:\w+$/,v=e=>"*"===e;function y(e,t){let r=e.split("/"),a=r.length;return r.some(v)&&(a+=-2),t&&(a+=2),r.filter((e=>!v(e))).reduce(((e,t)=>e+(g.test(t)?3:""===t?1:10)),a)}function w(e,t){let{routesMeta:r}=e,a={},n="/",o=[];for(let e=0;e<r.length;++e){let i=r[e],s=e===r.length-1,l="/"===n?t:t.slice(n.length)||"/",c=b({path:i.relativePath,caseSensitive:i.caseSensitive,end:s},l);if(!c)return null;Object.assign(a,c.params);let d=i.route;o.push({params:a,pathname:x([n,c.pathname]),pathnameBase:L(x([n,c.pathnameBase])),route:d}),"/"!==c.pathnameBase&&(n=x([n,c.pathnameBase]))}return o}function b(e,t){"string"==typeof e&&(e={path:e,caseSensitive:!1,end:!0});let[r,a]=function(e,t,r){void 0===t&&(t=!1);void 0===r&&(r=!0);R("*"===e||!e.endsWith("*")||e.endsWith("/*"),'Route path "'+e+'" will be treated as if it were "'+e.replace(/\*$/,"/*")+'" because the `*` character must always follow a `/` in the pattern. To get rid of this warning, please change the route path to "'+e.replace(/\*$/,"/*")+'".');let a=[],n="^"+e.replace(/\/*\*?$/,"").replace(/^\/*/,"/").replace(/[\\.*+^$?{}|()[\]]/g,"\\$&").replace(/\/:(\w+)/g,((e,t)=>(a.push(t),"/([^\\/]+)")));e.endsWith("*")?(a.push("*"),n+="*"===e||"/*"===e?"(.*)$":"(?:\\/(.+)|\\/*)$"):r?n+="\\/*$":""!==e&&"/"!==e&&(n+="(?:(?=\\/|$))");return[new RegExp(n,t?void 0:"i"),a]}(e.path,e.caseSensitive,e.end),n=t.match(r);if(!n)return null;let o=n[0],i=o.replace(/(.)\/+$/,"$1"),s=n.slice(1);return{params:a.reduce(((e,t,r)=>{if("*"===t){let e=s[r]||"";i=o.slice(0,o.length-e.length).replace(/(.)\/+$/,"$1")}return e[t]=function(e,t){try{return decodeURIComponent(e)}catch(r){return R(!1,'The value for the URL param "'+t+'" will not be decoded because the string "'+e+'" is a malformed URL segment. This is probably due to a bad percent encoding ('+r+")."),e}}(s[r]||"",t),e}),{}),pathname:o,pathnameBase:i,pattern:e}}function D(e){try{return decodeURI(e)}catch(t){return R(!1,'The URL path "'+e+'" could not be decoded because it is is a malformed URL segment. This is probably due to a bad percent encoding ('+t+")."),e}}function A(e,t){if("/"===t)return e;if(!e.toLowerCase().startsWith(t.toLowerCase()))return null;let r=t.endsWith("/")?t.length-1:t.length,a=e.charAt(r);return a&&"/"!==a?null:e.slice(r)||"/"}function R(e,t){if(!e){"undefined"!=typeof console&&console.warn(t);try{throw new Error(t)}catch(e){}}}function E(e,t){void 0===t&&(t="/");let{pathname:r,search:a="",hash:n=""}="string"==typeof e?c(e):e,o=r?r.startsWith("/")?r:function(e,t){let r=t.replace(/\/+$/,"").split("/");return e.split("/").forEach((e=>{".."===e?r.length>1&&r.pop():"."!==e&&r.push(e)})),r.length>1?r.join("/"):"/"}(r,t):t;return{pathname:o,search:k(a),hash:C(n)}}function M(e,t,r,a){return"Cannot include a '"+e+"' character in a manually specified `to."+t+"` field ["+JSON.stringify(a)+"].  Please separate it out to the `to."+r+'` field. Alternatively you may provide the full path as a string in <Link to="..."> and the router will parse it for you.'}function P(e){return e.filter(((e,t)=>0===t||e.route.path&&e.route.path.length>0))}function S(e,r,a,o){let i;void 0===o&&(o=!1),"string"==typeof e?i=c(e):(i=t({},e),n(!i.pathname||!i.pathname.includes("?"),M("?","pathname","search",i)),n(!i.pathname||!i.pathname.includes("#"),M("#","pathname","hash",i)),n(!i.search||!i.search.includes("#"),M("#","search","hash",i)));let s,l=""===e||""===i.pathname,d=l?"/":i.pathname;if(o||null==d)s=a;else{let e=r.length-1;if(d.startsWith("..")){let t=d.split("/");for(;".."===t[0];)t.shift(),e-=1;i.pathname=t.join("/")}s=e>=0?r[e]:"/"}let u=E(i,s),h=d&&"/"!==d&&d.endsWith("/"),f=(l||"."===d)&&a.endsWith("/");return u.pathname.endsWith("/")||!h&&!f||(u.pathname+="/"),u}const x=e=>e.join("/").replace(/\/\/+/g,"/"),L=e=>e.replace(/\/+$/,"").replace(/^\/*/,"/"),k=e=>e&&"?"!==e?e.startsWith("?")?e:"?"+e:"",C=e=>e&&"#"!==e?e.startsWith("#")?e:"#"+e:"";class U extends Error{}class _{constructor(e,t){let r;this.pendingKeysSet=new Set,this.subscribers=new Set,this.deferredKeys=[],n(e&&"object"==typeof e&&!Array.isArray(e),"defer() only accepts plain objects"),this.abortPromise=new Promise(((e,t)=>r=t)),this.controller=new AbortController;let a=()=>r(new U("Deferred data aborted"));this.unlistenAbortSignal=()=>this.controller.signal.removeEventListener("abort",a),this.controller.signal.addEventListener("abort",a),this.data=Object.entries(e).reduce(((e,t)=>{let[r,a]=t;return Object.assign(e,{[r]:this.trackPromise(r,a)})}),{}),this.done&&this.unlistenAbortSignal(),this.init=t}trackPromise(e,t){if(!(t instanceof Promise))return t;this.deferredKeys.push(e),this.pendingKeysSet.add(e);let r=Promise.race([t,this.abortPromise]).then((t=>this.onSettle(r,e,null,t)),(t=>this.onSettle(r,e,t)));return r.catch((()=>{})),Object.defineProperty(r,"_tracked",{get:()=>!0}),r}onSettle(e,t,r,a){return this.controller.signal.aborted&&r instanceof U?(this.unlistenAbortSignal(),Object.defineProperty(e,"_error",{get:()=>r}),Promise.reject(r)):(this.pendingKeysSet.delete(t),this.done&&this.unlistenAbortSignal(),r?(Object.defineProperty(e,"_error",{get:()=>r}),this.emit(!1,t),Promise.reject(r)):(Object.defineProperty(e,"_data",{get:()=>a}),this.emit(!1,t),a))}emit(e,t){this.subscribers.forEach((r=>r(e,t)))}subscribe(e){return this.subscribers.add(e),()=>this.subscribers.delete(e)}cancel(){this.controller.abort(),this.pendingKeysSet.forEach(((e,t)=>this.pendingKeysSet.delete(t))),this.emit(!0)}async resolveData(e){let t=!1;if(!this.done){let r=()=>this.cancel();e.addEventListener("abort",r),t=await new Promise((t=>{this.subscribe((a=>{e.removeEventListener("abort",r),(a||this.done)&&t(a)}))}))}return t}get done(){return 0===this.pendingKeysSet.size}get unwrappedData(){return n(null!==this.data&&this.done,"Can only unwrap data on initialized and settled deferreds"),Object.entries(this.data).reduce(((e,t)=>{let[r,a]=t;return Object.assign(e,{[r]:T(a)})}),{})}get pendingKeys(){return Array.from(this.pendingKeysSet)}}function T(e){if(!function(e){return e instanceof Promise&&!0===e._tracked}(e))return e;if(e._error)throw e._error;return e._data}class j{constructor(e,t,r,a){void 0===a&&(a=!1),this.status=e,this.statusText=t||"",this.internal=a,r instanceof Error?(this.data=r.toString(),this.error=r):this.data=r}}function O(e){return null!=e&&"number"==typeof e.status&&"string"==typeof e.statusText&&"boolean"==typeof e.internal&&"data"in e}class F{constructor(e){void 0!==e&&(this.defaultValue=e)}getDefaultValue(){if(void 0===this.defaultValue)throw new Error("Unable to find a value in the middleware context");return this.defaultValue}}function H(e){let t=new Map(null==e?void 0:e.entries());return{get:e=>t.has(e)?t.get(e):e.getDefaultValue(),set(e,r){if(void 0===r)throw new Error("You cannot set an undefined value in the middleware context");t.set(e,r)},next:()=>{},entries:()=>t.entries()}}const I={unstable_middleware:!1},q=["post","put","patch","delete"],W=new Set(q),$=["get",...q],N=new Set($),B=new Set([301,302,303,307,308]),z=new Set([307,308]),K={state:"idle",location:void 0,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0},Y={state:"idle",data:void 0,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0},V={state:"unblocked",proceed:void 0,reset:void 0,location:void 0},J=/^(?:[a-z][a-z0-9+.-]*:|\/\/)/i,G="undefined"!=typeof window&&void 0!==window.document&&void 0!==window.document.createElement,X=!G;const Q=Symbol("deferred");function Z(e,t,r){void 0===r&&(r=!1);let a,n="string"==typeof e?e:l(e);if(!t||!function(e){return null!=e&&"formData"in e}(t))return{path:n};if(t.formMethod&&!Re(t.formMethod))return{path:n,error:me(405,{method:t.formMethod})};if(t.formData&&(a={formMethod:t.formMethod||"get",formAction:ve(n),formEncType:t&&t.formEncType||"application/x-www-form-urlencoded",formData:t.formData},Ee(a.formMethod)))return{path:n,submission:a};let o=c(n),i=ce(t.formData);return r&&o.search&&Se(o.search)&&i.append("index",""),o.search="?"+i,{path:l(o),submission:a}}function ee(e,t){let r=e;if(t){let a=e.findIndex((e=>e.route.id===t));a>=0&&(r=e.slice(0,a))}return r}function te(e,r,a,n,o,i,s,l,c,d,u){let h=d?Object.values(d)[0]:c?Object.values(c)[0]:void 0,f=e.createURL(r.location),p=e.createURL(o),m=i||f.toString()===p.toString()||f.search!==p.search,g=d?Object.keys(d)[0]:void 0,v=ee(a,g).filter(((e,a)=>{if(null==e.route.loader)return!1;if(function(e,t,r){let a=!t||r.route.id!==t.route.id,n=void 0===e[r.route.id];return a||n}(r.loaderData,r.matches[a],e)||s.some((t=>t===e.route.id)))return!0;let o=r.matches[a],i=e;return ae(e,t({currentUrl:f,currentParams:o.params,nextUrl:p,nextParams:i.params},n,{actionResult:h,defaultShouldRevalidate:m||re(o,i)}))})),y=[];return u&&u.forEach(((e,o)=>{if(a.some((t=>t.route.id===e.routeId)))if(l.includes(o))y.push(t({key:o},e));else{ae(e.match,t({currentUrl:f,currentParams:r.matches[r.matches.length-1].params,nextUrl:p,nextParams:a[a.length-1].params},n,{actionResult:h,defaultShouldRevalidate:m}))&&y.push(t({key:o},e))}})),[v,y]}function re(e,t){let r=e.route.path;return e.pathname!==t.pathname||null!=r&&r.endsWith("*")&&e.params["*"]!==t.params["*"]}function ae(e,t){if(e.route.shouldRevalidate){let r=e.route.shouldRevalidate(t);if("boolean"==typeof r)return r}return t.defaultShouldRevalidate}async function ne(e,t,r,a,n){if(e.signal.aborted)throw new Error("Request aborted");if(0===t.length)return a.next=()=>{throw new Error("You may only call `next()` once per middleware and you may not call it in an action or loader")},n({request:e,params:r,context:a});let o=!1,i=()=>(o=!0,ne(e,t.slice(1),r,a,n));if(!t[0].route.middleware)return i();a.next=i;let s=await t[0].route.middleware({request:e,params:r,context:a});return o?s:i()}function oe(){throw new Error("Middleware must be enabled via the `future.unstable_middleware` flag)")}const ie={get:oe,set:oe,next:oe};async function se(e,t,r,a,o,i,s,c,d,h){let f,p,m;void 0===o&&(o="/"),void 0===s&&(s=!1),void 0===c&&(c=!1);let g=new Promise(((e,t)=>m=t)),v=()=>m();t.signal.addEventListener("abort",v);try{let o=r.route[e];n(o,"Could not find the "+e+' to run on the "'+r.route.id+'" route');let s,l=a.findIndex((e=>e.route.id===r.route.id));s=i?ne(t,a.slice(0,l+1),a[0].params,H(h),o):o({request:t,params:r.params,context:d||ie}),p=await Promise.race([s,g]),n(void 0!==p,"You defined "+("action"===e?"an action":"a loader")+' for route "'+r.route.id+"\" but didn't return anything from your `"+e+"` function. Please return a value or `null`.")}catch(e){f=u.error,p=e}finally{t.signal.removeEventListener("abort",v)}if(De(p)){let e,i=p.status;if(B.has(i)){let e=p.headers.get("Location");if(n(e,"Redirects returned/thrown from loaders/actions must have a Location header"),J.test(e)){if(!s){let r=new URL(t.url),a=e.startsWith("//")?new URL(r.protocol+e):new URL(e);a.origin===r.origin&&(e=a.pathname+a.search+a.hash)}}else{let i=S(e,P(a.slice(0,a.indexOf(r)+1)).map((e=>e.pathnameBase)),new URL(t.url).pathname);if(n(l(i),"Unable to resolve redirect location: "+e),o){let e=i.pathname;i.pathname="/"===e?o:x([o,e])}e=l(i)}if(s)throw p.headers.set("Location",e),p;return{type:u.redirect,status:i,location:e,revalidate:null!==p.headers.get("X-Remix-Revalidate")}}if(c)throw{type:f||u.data,response:p};let d=p.headers.get("Content-Type");return e=d&&/\bapplication\/json\b/.test(d)?await p.json():await p.text(),f===u.error?{type:f,error:new j(i,p.statusText,e),headers:p.headers}:{type:u.data,data:e,statusCode:p.status,headers:p.headers}}return f===u.error?{type:f,error:p}:p instanceof _?{type:u.deferred,deferredData:p}:{type:u.data,data:p}}function le(e,t,r,a){let n=e.createURL(ve(t)).toString(),o={signal:r};if(a&&Ee(a.formMethod)){let{formMethod:e,formEncType:t,formData:r}=a;o.method=e.toUpperCase(),o.body="application/x-www-form-urlencoded"===t?ce(r):r}return new Request(n,o)}function ce(e){let t=new URLSearchParams;for(let[r,a]of e.entries())t.append(r,a instanceof File?a.name:a);return t}function de(e,t,r,a,o){let i,s={},l=null,c=!1,d={};return r.forEach(((r,u)=>{let h=t[u].route.id;if(n(!be(r),"Cannot handle redirect results in processLoaderData"),we(r)){let t=fe(e,h),n=r.error;a&&(n=Object.values(a)[0],a=void 0),l=l||{},null==l[t.route.id]&&(l[t.route.id]=n),s[h]=void 0,c||(c=!0,i=O(r.error)?r.error.status:500),r.headers&&(d[h]=r.headers)}else ye(r)?(o.set(h,r.deferredData),s[h]=r.deferredData.data):s[h]=r.data,null==r.statusCode||200===r.statusCode||c||(i=r.statusCode),r.headers&&(d[h]=r.headers)})),a&&(l=a,s[Object.keys(a)[0]]=void 0),{loaderData:s,errors:l,statusCode:i||200,loaderHeaders:d}}function ue(e,r,a,o,i,s,l,c){let{loaderData:d,errors:u}=de(r,a,o,i,c);for(let r=0;r<s.length;r++){let{key:a,match:o}=s[r];n(void 0!==l&&void 0!==l[r],"Did not find corresponding fetcher result");let i=l[r];if(we(i)){let r=fe(e.matches,o.route.id);u&&u[r.route.id]||(u=t({},u,{[r.route.id]:i.error})),e.fetchers.delete(a)}else if(be(i))n(!1,"Unhandled fetcher revalidation redirect");else if(ye(i))n(!1,"Unhandled fetcher deferred data");else{let t={state:"idle",data:i.data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0," _hasFetcherDoneAnything ":!0};e.fetchers.set(a,t)}}return{loaderData:d,errors:u}}function he(e,r,a,n){let o=t({},r);for(let t of a){let a=t.route.id;if(r.hasOwnProperty(a)?void 0!==r[a]&&(o[a]=r[a]):void 0!==e[a]&&(o[a]=e[a]),n&&n.hasOwnProperty(a))break}return o}function fe(e,t){return(t?e.slice(0,e.findIndex((e=>e.route.id===t))+1):[...e]).reverse().find((e=>!0===e.route.hasErrorBoundary))||e[0]}function pe(e){let t=e.find((e=>e.index||!e.path||"/"===e.path))||{id:"__shim-error-route__"};return{matches:[{params:{},pathname:"",pathnameBase:"",route:t}],route:t}}function me(e,t){let{pathname:r,routeId:a,method:n,type:o}=void 0===t?{}:t,i="Unknown Server Error",s="Unknown @remix-run/router error";return 400===e?(i="Bad Request",n&&r&&a?s="You made a "+n+' request to "'+r+'" but did not provide a `loader` for route "'+a+'", so there is no way to handle the request.':"defer-action"===o&&(s="defer() is not supported in actions")):403===e?(i="Forbidden",s='Route "'+a+'" does not match URL "'+r+'"'):404===e?(i="Not Found",s='No route matches URL "'+r+'"'):405===e&&(i="Method Not Allowed",n&&r&&a?s="You made a "+n.toUpperCase()+' request to "'+r+'" but did not provide an `action` for route "'+a+'", so there is no way to handle the request.':n&&(s='Invalid request method "'+n.toUpperCase()+'"')),new j(e||500,i,new Error(s),!0)}function ge(e){for(let t=e.length-1;t>=0;t--){let r=e[t];if(be(r))return r}}function ve(e){return l(t({},"string"==typeof e?c(e):e,{hash:""}))}function ye(e){return e.type===u.deferred}function we(e){return e.type===u.error}function be(e){return(e&&e.type)===u.redirect}function De(e){return null!=e&&"number"==typeof e.status&&"string"==typeof e.statusText&&"object"==typeof e.headers&&void 0!==e.body}function Ae(e){if(!De(e))return!1;let t=e.status,r=e.headers.get("Location");return t>=300&&t<=399&&null!=r}function Re(e){return N.has(e)}function Ee(e){return W.has(e)}async function Me(e,t,r,a,n,o){for(let i=0;i<r.length;i++){let s=r[i],l=t[i],c=e.find((e=>e.route.id===l.route.id)),d=null!=c&&!re(c,l)&&void 0!==(o&&o[l.route.id]);ye(s)&&(n||d)&&await Pe(s,a,n).then((e=>{e&&(r[i]=e||r[i])}))}}async function Pe(e,t,r){if(void 0===r&&(r=!1),!await e.deferredData.resolveData(t)){if(r)try{return{type:u.data,data:e.deferredData.unwrappedData}}catch(e){return{type:u.error,error:e}}return{type:u.data,data:e.deferredData.data}}}function Se(e){return new URLSearchParams(e).getAll("index").some((e=>""===e))}function xe(e,t){let{route:r,pathname:a,params:n}=e;return{id:r.id,pathname:a,params:n,data:t[r.id],handle:r.handle}}function Le(e,t){let r="string"==typeof t?c(t).search:t.search;if(e[e.length-1].route.index&&Se(r||""))return e[e.length-1];let a=P(e);return a[a.length-1]}e.AbortedDeferredError=U,e.ErrorResponse=j,e.IDLE_BLOCKER=V,e.IDLE_FETCHER=Y,e.IDLE_NAVIGATION=K,e.UNSAFE_DEFERRED_SYMBOL=Q,e.UNSAFE_DeferredData=_,e.UNSAFE_convertRoutesToDataRoutes=h,e.UNSAFE_createMiddlewareStore=H,e.UNSAFE_getPathContributingMatches=P,e.createBrowserHistory=function(e){return void 0===e&&(e={}),d((function(e,t){let{pathname:r,search:a,hash:n}=e.location;return s("",{pathname:r,search:a,hash:n},t.state&&t.state.usr||null,t.state&&t.state.key||"default")}),(function(e,t){return"string"==typeof t?t:l(t)}),null,e)},e.createHashHistory=function(e){return void 0===e&&(e={}),d((function(e,t){let{pathname:r="/",search:a="",hash:n=""}=c(e.location.hash.substr(1));return s("",{pathname:r,search:a,hash:n},t.state&&t.state.usr||null,t.state&&t.state.key||"default")}),(function(e,t){let r=e.document.querySelector("base"),a="";if(r&&r.getAttribute("href")){let t=e.location.href,r=t.indexOf("#");a=-1===r?t:t.slice(0,r)}return a+"#"+("string"==typeof t?t:l(t))}),(function(e,t){o("/"===e.pathname.charAt(0),"relative pathnames are not supported in hash history.push("+JSON.stringify(t)+")")}),e)},e.createMemoryHistory=function(t){void 0===t&&(t={});let r,{initialEntries:a=["/"],initialIndex:n,v5Compat:i=!1}=t;r=a.map(((e,t)=>m(e,"string"==typeof e?null:e.state,0===t?"default":void 0)));let d=f(null==n?r.length-1:n),u=e.Action.Pop,h=null;function f(e){return Math.min(Math.max(e,0),r.length-1)}function p(){return r[d]}function m(e,t,a){void 0===t&&(t=null);let n=s(r?p().pathname:"/",e,t,a);return o("/"===n.pathname.charAt(0),"relative pathnames are not supported in memory history: "+JSON.stringify(e)),n}function g(e){return"string"==typeof e?e:l(e)}return{get index(){return d},get action(){return u},get location(){return p()},createHref:g,createURL:e=>new URL(g(e),"http://localhost"),encodeLocation(e){let t="string"==typeof e?c(e):e;return{pathname:t.pathname||"",search:t.search||"",hash:t.hash||""}},push(t,a){u=e.Action.Push;let n=m(t,a);d+=1,r.splice(d,r.length,n),i&&h&&h({action:u,location:n,delta:1})},replace(t,a){u=e.Action.Replace;let n=m(t,a);r[d]=n,i&&h&&h({action:u,location:n,delta:0})},go(t){u=e.Action.Pop;let a=f(d+t),n=r[a];d=a,h&&h({action:u,location:n,delta:t})},listen:e=>(h=e,()=>{h=null})}},e.createMiddlewareContext=function(e){return new F(e)},e.createPath=l,e.createRouter=function(r){n(r.routes.length>0,"You must provide a non-empty routes array to createRouter");let a=h(r.routes),o=t({},I,r.future),i=null,l=new Set,c=null,d=null,p=null,m=null!=r.hydrationData,g=f(a,r.history.location,r.basename),v=null;if(null==g){let e=me(404,{pathname:r.history.location.pathname}),{matches:t,route:n}=pe(a);g=t,v={[n.id]:e}}let y,w,b=!g.some((e=>e.route.loader))||null!=r.hydrationData,D={historyAction:r.history.action,location:r.history.location,matches:g,initialized:b,navigation:K,restoreScrollPosition:null==r.hydrationData&&null,preventScrollReset:!1,revalidation:"idle",loaderData:r.hydrationData&&r.hydrationData.loaderData||{},actionData:r.hydrationData&&r.hydrationData.actionData||null,errors:r.hydrationData&&r.hydrationData.errors||v,fetchers:new Map,blockers:new Map},A=e.Action.Pop,E=!1,M=!1,P=!1,S=[],x=[],L=new Map,k=0,C=-1,U=new Map,_=new Set,T=new Map,j=new Map,O=new Map,F=!1;function H(e){D=t({},D,e),l.forEach((e=>e(D)))}function q(a,n){var o,i;let s,l=null!=D.actionData&&null!=D.navigation.formMethod&&Ee(D.navigation.formMethod)&&"loading"===D.navigation.state&&!0!==(null==(o=a.state)?void 0:o._isRedirect);s=n.actionData?Object.keys(n.actionData).length>0?n.actionData:null:l?D.actionData:null;let c=n.loaderData?he(D.loaderData,n.loaderData,n.matches||[],n.errors):D.loaderData;for(let[e]of O)ie(e);let d=!0===E||null!=D.navigation.formMethod&&Ee(D.navigation.formMethod)&&!0!==(null==(i=a.state)?void 0:i._isRedirect);H(t({},n,{actionData:s,loaderData:c,historyAction:A,location:a,initialized:!0,navigation:K,revalidation:"idle",restoreScrollPosition:De(a,n.matches||D.matches),preventScrollReset:d,blockers:new Map(D.blockers)})),M||A===e.Action.Pop||(A===e.Action.Push?r.history.push(a,a.state):A===e.Action.Replace&&r.history.replace(a,a.state)),A=e.Action.Pop,E=!1,M=!1,P=!1,S=[],x=[]}async function W(i,s,l){w&&w.abort(),w=null,A=i,M=!0===(l&&l.startUninterruptedRevalidation),function(e,t){if(c&&d&&p){let r=t.map((e=>xe(e,D.loaderData))),a=d(e,r)||e.key;c[a]=p()}}(D.location,D.matches),E=!0===(l&&l.preventScrollReset);let h=l&&l.overrideNavigation,m=f(a,s,r.basename);if(!m){let e=me(404,{pathname:s.pathname}),{matches:t,route:r}=pe(a);return ve(),void q(s,{matches:t,loaderData:{},errors:{[r.id]:e}})}if(!(g=D.location,v=s,g.pathname!==v.pathname||g.search!==v.search||g.hash===v.hash||l&&l.submission&&Ee(l.submission.formMethod)))return void q(s,{matches:m});var g,v;w=new AbortController;let b,R,U=le(r.history,s,w.signal,l&&l.submission);if(l&&l.pendingError)R={[fe(m).route.id]:l.pendingError};else if(l&&l.submission&&Ee(l.submission.formMethod)){let r=await async function(r,a,n,i,s){let l;Q(),H({navigation:t({state:"submitting",location:a},n)});let c=Le(i,a);if(c.route.action){if(l=await se("action",r,c,i,y.basename,o.unstable_middleware),r.signal.aborted)return{shortCircuited:!0}}else l={type:u.error,error:me(405,{method:r.method,pathname:a.pathname,routeId:c.route.id})};if(be(l)){let e;return e=s&&null!=s.replace?s.replace:l.location===D.location.pathname+D.location.search,await N(D,l,{submission:n,replace:e}),{shortCircuited:!0}}if(we(l)){let t=fe(i,c.route.id);return!0!==(s&&s.replace)&&(A=e.Action.Push),{pendingActionData:{},pendingActionError:{[t.route.id]:l.error}}}if(ye(l))throw me(400,{type:"defer-action"});return{pendingActionData:{[c.route.id]:l.data}}}(U,s,l.submission,m,{replace:l.replace});if(r.shortCircuited)return;b=r.pendingActionData,R=r.pendingActionError,h=t({state:"loading",location:s},l.submission),U=new Request(U.url,{signal:U.signal})}let{shortCircuited:O,loaderData:F,errors:I}=await async function(e,a,o,i,s,l,c,d){let u=i;if(!u){u=t({state:"loading",location:a,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0},s)}let h=s||(u.formMethod&&u.formAction&&u.formData&&u.formEncType?{formMethod:u.formMethod,formAction:u.formAction,formData:u.formData,formEncType:u.formEncType}:void 0),[f,p]=te(r.history,D,o,h,a,P,S,x,c,d,T);if(ve((e=>!(o&&o.some((t=>t.route.id===e)))||f&&f.some((t=>t.route.id===e)))),0===f.length&&0===p.length)return q(a,t({matches:o,loaderData:{},errors:d||null},c?{actionData:c}:{})),{shortCircuited:!0};if(!M){p.forEach((e=>{let t=D.fetchers.get(e.key),r={state:"loading",data:t&&t.data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0," _hasFetcherDoneAnything ":!0};D.fetchers.set(e.key,r)}));let e=c||D.actionData;H(t({navigation:u},e?0===Object.keys(e).length?{actionData:null}:{actionData:e}:{},p.length>0?{fetchers:new Map(D.fetchers)}:{}))}C=++k,p.forEach((e=>L.set(e.key,w)));let{results:m,loaderResults:g,fetcherResults:v}=await B(D.matches,o,f,p,e);if(e.signal.aborted)return{shortCircuited:!0};p.forEach((e=>L.delete(e.key)));let y=ge(m);if(y)return await N(D,y,{replace:l}),{shortCircuited:!0};let{loaderData:b,errors:A}=ue(D,o,f,g,d,p,v,j);j.forEach(((e,t)=>{e.subscribe((r=>{(r||e.done)&&j.delete(t)}))})),function(){let e=[];for(let t of _){let r=D.fetchers.get(t);n(r,"Expected fetcher: "+t),"loading"===r.state&&(_.delete(t),e.push(t))}ne(e)}();let R=oe(C);return t({loaderData:b,errors:A},R||p.length>0?{fetchers:new Map(D.fetchers)}:{})}(U,s,m,h,l&&l.submission,l&&l.replace,b,R);O||(w=null,q(s,t({matches:m},b?{actionData:b}:{},{loaderData:F,errors:I})))}function $(e){return D.fetchers.get(e)||Y}async function N(a,o,i){var l;let{submission:c,replace:d,isFetchActionRedirect:u}=void 0===i?{}:i;o.revalidate&&(P=!0);let h=s(a.location,o.location,t({_isRedirect:!0},u?{_isFetchActionRedirect:!0}:{}));if(n(h,"Expected a location on the redirect navigation"),J.test(o.location)&&G&&void 0!==(null==(l=window)?void 0:l.location)){let e=r.history.createURL(o.location).origin;if(window.location.origin!==e)return void(d?window.location.replace(o.location):window.location.assign(o.location))}w=null;let f=!0===d?e.Action.Replace:e.Action.Push,{formMethod:p,formAction:m,formEncType:g,formData:v}=a.navigation;!c&&p&&m&&v&&g&&(c={formMethod:p,formAction:m,formEncType:g,formData:v}),z.has(o.status)&&c&&Ee(c.formMethod)?await W(f,h,{submission:t({},c,{formAction:o.location}),preventScrollReset:E}):await W(f,h,{overrideNavigation:{state:"loading",location:h,formMethod:c?c.formMethod:void 0,formAction:c?c.formAction:void 0,formEncType:c?c.formEncType:void 0,formData:c?c.formData:void 0},preventScrollReset:E})}async function B(e,t,a,n,i){let s=await Promise.all([...a.map((e=>se("loader",i,e,t,y.basename,o.unstable_middleware))),...n.map((e=>se("loader",le(r.history,e.path,i.signal),e.match,e.matches,y.basename,o.unstable_middleware)))]),l=s.slice(0,a.length),c=s.slice(a.length);return await Promise.all([Me(e,a,l,i.signal,!1,D.loaderData),Me(e,n.map((e=>e.match)),c,i.signal,!0)]),{results:s,loaderResults:l,fetcherResults:c}}function Q(){P=!0,S.push(...ve()),T.forEach(((e,t)=>{L.has(t)&&(x.push(t),ae(t))}))}function ee(e,t,r){let a=fe(D.matches,t);re(e),H({errors:{[a.route.id]:r},fetchers:new Map(D.fetchers)})}function re(e){L.has(e)&&ae(e),T.delete(e),U.delete(e),_.delete(e),D.fetchers.delete(e)}function ae(e){let t=L.get(e);n(t,"Expected fetch controller: "+e),t.abort(),L.delete(e)}function ne(e){for(let t of e){let e={state:"idle",data:$(t).data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0," _hasFetcherDoneAnything ":!0};D.fetchers.set(t,e)}}function oe(e){let t=[];for(let[r,a]of U)if(a<e){let e=D.fetchers.get(r);n(e,"Expected fetcher: "+r),"loading"===e.state&&(ae(r),U.delete(r),t.push(r))}return ne(t),t.length>0}function ie(e){D.blockers.delete(e),O.delete(e)}function ce(e,t){let r=D.blockers.get(e)||V;n("unblocked"===r.state&&"blocked"===t.state||"blocked"===r.state&&"blocked"===t.state||"blocked"===r.state&&"proceeding"===t.state||"blocked"===r.state&&"unblocked"===t.state||"proceeding"===r.state&&"unblocked"===t.state,"Invalid blocker state transition: "+r.state+" -> "+t.state),D.blockers.set(e,t),H({blockers:new Map(D.blockers)})}function de(e){let{currentLocation:t,nextLocation:r,historyAction:a}=e;if(0===O.size)return;O.size>1&&R(!1,"A router only supports one blocker at a time");let n=Array.from(O.entries()),[o,i]=n[n.length-1],s=D.blockers.get(o);return s&&"proceeding"===s.state?void 0:i({currentLocation:t,nextLocation:r,historyAction:a})?o:void 0}function ve(e){let t=[];return j.forEach(((r,a)=>{e&&!e(a)||(r.cancel(),t.push(a),j.delete(a))})),t}function De(e,t){if(c&&d&&p){let r=t.map((e=>xe(e,D.loaderData))),a=d(e,r)||e.key,n=c[a];if("number"==typeof n)return n}return null}return y={get basename(){return r.basename},get state(){return D},get routes(){return a},initialize:function(){return i=r.history.listen((e=>{let{action:t,location:a,delta:n}=e;if(F)return void(F=!1);R(0===O.size||null!=n,"You are trying to use a blocker on a POP navigation to a location that was not created by @remix-run/router. This will fail silently in production. This can happen if you are navigating outside the router via `window.history.pushState`/`window.location.hash` instead of using router navigation APIs.  This can also happen if you are using createHashRouter and the user manually changes the URL.");let o=de({currentLocation:D.location,nextLocation:a,historyAction:t});return o&&null!=n?(F=!0,r.history.go(-1*n),void ce(o,{state:"blocked",location:a,proceed(){ce(o,{state:"proceeding",proceed:void 0,reset:void 0,location:a}),r.history.go(n)},reset(){ie(o),H({blockers:new Map(y.state.blockers)})}})):W(t,a)})),D.initialized||W(e.Action.Pop,D.location),y},subscribe:function(e){return l.add(e),()=>l.delete(e)},enableScrollRestoration:function(e,t,r){if(c=e,p=t,d=r||(e=>e.key),!m&&D.navigation===K){m=!0;let e=De(D.location,D.matches);null!=e&&H({restoreScrollPosition:e})}return()=>{c=null,p=null,d=null}},navigate:async function a(n,o){if("number"==typeof n)return void r.history.go(n);let{path:i,submission:l,error:c}=Z(n,o),d=D.location,u=s(D.location,i,o&&o.state);u=t({},u,r.history.encodeLocation(u));let h=o&&null!=o.replace?o.replace:void 0,f=e.Action.Push;!0===h?f=e.Action.Replace:!1===h||null!=l&&Ee(l.formMethod)&&l.formAction===D.location.pathname+D.location.search&&(f=e.Action.Replace);let p=o&&"preventScrollReset"in o?!0===o.preventScrollReset:void 0,m=de({currentLocation:d,nextLocation:u,historyAction:f});if(!m)return await W(f,u,{submission:l,pendingError:c,preventScrollReset:p,replace:o&&o.replace});ce(m,{state:"blocked",location:u,proceed(){ce(m,{state:"proceeding",proceed:void 0,reset:void 0,location:u}),a(n,o)},reset(){ie(m),H({blockers:new Map(D.blockers)})}})},fetch:function(e,i,s,l){if(X)throw new Error("router.fetch() was called during the server render, but it shouldn't be. You are likely calling a useFetcher() method in the body of your component. Try moving it to a useEffect or a callback.");L.has(e)&&ae(e);let c=f(a,s,r.basename);if(!c)return void ee(e,i,me(404,{pathname:s}));let{path:d,submission:u}=Z(s,l,!0),h=Le(c,d);return E=!0===(l&&l.preventScrollReset),u&&Ee(u.formMethod)?async function(e,i,s,l,c,d){if(Q(),T.delete(e),!l.route.action){let t=me(405,{method:d.formMethod,pathname:s,routeId:i});return void ee(e,i,t)}let u=D.fetchers.get(e),h=t({state:"submitting"},d,{data:u&&u.data," _hasFetcherDoneAnything ":!0});D.fetchers.set(e,h),H({fetchers:new Map(D.fetchers)});let p=new AbortController,m=le(r.history,s,p.signal,d);L.set(e,p);let g=await se("action",m,l,c,y.basename,o.unstable_middleware);if(m.signal.aborted)return void(L.get(e)===p&&L.delete(e));if(be(g)){L.delete(e),_.add(e);let r=t({state:"loading"},d,{data:void 0," _hasFetcherDoneAnything ":!0});return D.fetchers.set(e,r),H({fetchers:new Map(D.fetchers)}),N(D,g,{isFetchActionRedirect:!0})}if(we(g))return void ee(e,i,g.error);if(ye(g))throw me(400,{type:"defer-action"});let v=D.navigation.location||D.location,b=le(r.history,v,p.signal),R="idle"!==D.navigation.state?f(a,D.navigation.location,r.basename):D.matches;n(R,"Didn't find any matches after fetcher action");let E=++k;U.set(e,E);let M=t({state:"loading",data:g.data},d,{" _hasFetcherDoneAnything ":!0});D.fetchers.set(e,M);let[O,F]=te(r.history,D,R,d,v,P,S,x,{[l.route.id]:g.data},void 0,T);F.filter((t=>t.key!==e)).forEach((e=>{let t=e.key,r=D.fetchers.get(t),a={state:"loading",data:r&&r.data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0," _hasFetcherDoneAnything ":!0};D.fetchers.set(t,a),L.set(t,p)})),H({fetchers:new Map(D.fetchers)});let{results:I,loaderResults:W,fetcherResults:$}=await B(D.matches,R,O,F,b);if(p.signal.aborted)return;U.delete(e),L.delete(e),F.forEach((e=>L.delete(e.key)));let z=ge(I);if(z)return N(D,z);let{loaderData:K,errors:Y}=ue(D,D.matches,O,W,void 0,F,$,j),V={state:"idle",data:g.data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0," _hasFetcherDoneAnything ":!0};D.fetchers.set(e,V);let J=oe(E);"loading"===D.navigation.state&&E>C?(n(A,"Expected pending action"),w&&w.abort(),q(D.navigation.location,{matches:R,loaderData:K,errors:Y,fetchers:new Map(D.fetchers)})):(H(t({errors:Y,loaderData:he(D.loaderData,K,R,Y)},J?{fetchers:new Map(D.fetchers)}:{})),P=!1)}(e,i,d,h,c,u):(T.set(e,{routeId:i,path:d,match:h,matches:c}),async function(e,a,i,s,l,c){let d=D.fetchers.get(e),u=t({state:"loading",formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0},c,{data:d&&d.data," _hasFetcherDoneAnything ":!0});D.fetchers.set(e,u),H({fetchers:new Map(D.fetchers)});let h=new AbortController,f=le(r.history,i,h.signal);L.set(e,h);let p=await se("loader",f,s,l,y.basename,o.unstable_middleware);ye(p)&&(p=await Pe(p,f.signal,!0)||p);L.get(e)===h&&L.delete(e);if(f.signal.aborted)return;if(be(p))return void await N(D,p);if(we(p)){let t=fe(D.matches,a);return D.fetchers.delete(e),void H({fetchers:new Map(D.fetchers),errors:{[t.route.id]:p.error}})}n(!ye(p),"Unhandled fetcher deferred data");let m={state:"idle",data:p.data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0," _hasFetcherDoneAnything ":!0};D.fetchers.set(e,m),H({fetchers:new Map(D.fetchers)})}(e,i,d,h,c,u))},revalidate:function(){Q(),H({revalidation:"loading"}),"submitting"!==D.navigation.state&&("idle"!==D.navigation.state?W(A||D.historyAction,D.navigation.location,{overrideNavigation:D.navigation}):W(D.historyAction,D.location,{startUninterruptedRevalidation:!0}))},createHref:e=>r.history.createHref(e),encodeLocation:e=>r.history.encodeLocation(e),getFetcher:$,deleteFetcher:re,dispose:function(){i&&i(),l.clear(),w&&w.abort(),D.fetchers.forEach(((e,t)=>re(t))),D.blockers.forEach(((e,t)=>ie(t)))},getBlocker:function(e,t){let r=D.blockers.get(e)||V;return O.get(e)!==t&&O.set(e,t),r},deleteBlocker:ie,_internalFetchControllers:L,_internalActiveDeferreds:j},y},e.createStaticHandler=function(e,r){n(e.length>0,"You must provide a non-empty routes array to createStaticHandler");let a=h(e),o=(r?r.basename:null)||"/",i=t({},I,r&&r.future?r.future:null);async function c(e,r,a,s,l,c){n(e.signal,"query()/queryRoute() requests must contain an AbortController signal");try{if(Ee(e.method.toLowerCase())){let n=await async function(e,r,a,n,s,l){let c;if(a.route.action){if(c=await se("action",e,a,r,o,i.unstable_middleware,!0,l,n,s),e.signal.aborted){throw new Error((l?"queryRoute":"query")+"() call aborted")}}else{let t=me(405,{method:e.method,pathname:new URL(e.url).pathname,routeId:a.route.id});if(l)throw t;c={type:u.error,error:t}}if(be(c))throw new Response(null,{status:c.status,headers:{Location:c.location}});if(ye(c)){let e=me(400,{type:"defer-action"});if(l)throw e;c={type:u.error,error:e}}if(l){if(we(c))throw c.error;return{matches:[a],loaderData:{},actionData:{[a.route.id]:c.data},errors:null,statusCode:200,loaderHeaders:{},actionHeaders:{},activeDeferreds:null}}if(we(c)){let o=fe(r,a.route.id);return t({},await d(e,r,n,s,void 0,{[o.route.id]:c.error}),{statusCode:O(c.error)?c.error.status:500,actionData:null,actionHeaders:t({},c.headers?{[a.route.id]:c.headers}:{})})}let h=new Request(e.url,{headers:e.headers,redirect:e.redirect,signal:e.signal});return t({},await d(h,r,n,s),c.statusCode?{statusCode:c.statusCode}:{},{actionData:{[a.route.id]:c.data},actionHeaders:t({},c.headers?{[a.route.id]:c.headers}:{})})}(e,a,c||Le(a,r),s,l,null!=c);return n}let n=await d(e,a,s,l,c);return De(n)?n:t({},n,{actionData:null,actionHeaders:{}})}catch(e){if((h=e)&&De(h.response)&&(h.type===u.data||u.error)){if(e.type===u.error&&!Ae(e.response))throw e.response;return e.response}if(Ae(e))return e;throw e}var h}async function d(e,r,a,n,s,l){let c=null!=s;if(c&&(null==s||!s.route.loader))throw me(400,{method:e.method,pathname:new URL(e.url).pathname,routeId:null==s?void 0:s.route.id});let d=(s?[s]:ee(r,Object.keys(l||{})[0])).filter((e=>e.route.loader));if(0===d.length)return{matches:r,loaderData:r.reduce(((e,t)=>Object.assign(e,{[t.route.id]:null})),{}),errors:l||null,statusCode:200,loaderHeaders:{},activeDeferreds:null};let u=await Promise.all([...d.map((t=>se("loader",e,t,r,o,i.unstable_middleware,!0,c,a,n)))]);if(e.signal.aborted){throw new Error((c?"queryRoute":"query")+"() call aborted")}let h=new Map,f=de(r,d,u,l,h),p=new Set(d.map((e=>e.route.id)));return r.forEach((e=>{p.has(e.route.id)||(f.loaderData[e.route.id]=null)})),t({},f,{matches:r,activeDeferreds:h.size>0?Object.fromEntries(h.entries()):null})}return{dataRoutes:a,query:async function(e,r){let{requestContext:n,middlewareContext:i}=void 0===r?{}:r,d=new URL(e.url),u=e.method.toLowerCase(),h=s("",l(d),null,"default"),p=f(a,h,o);if(!Re(u)&&"head"!==u){let e=me(405,{method:u}),{matches:t,route:r}=pe(a);return{basename:o,location:h,matches:t,loaderData:{},actionData:null,errors:{[r.id]:e},statusCode:e.status,loaderHeaders:{},actionHeaders:{},activeDeferreds:null}}if(!p){let e=me(404,{pathname:h.pathname}),{matches:t,route:r}=pe(a);return{basename:o,location:h,matches:t,loaderData:{},actionData:null,errors:{[r.id]:e},statusCode:e.status,loaderHeaders:{},actionHeaders:{},activeDeferreds:null}}let m=await c(e,h,p,n,i);return De(m)?m:t({location:h,basename:o},m)},queryRoute:async function(e,t){let{routeId:r,requestContext:n,middlewareContext:i}=void 0===t?{}:t,d=new URL(e.url),u=e.method.toLowerCase(),h=s("",l(d),null,"default"),p=f(a,h,o);if(!Re(u)&&"head"!==u&&"options"!==u)throw me(405,{method:u});if(!p)throw me(404,{pathname:h.pathname});let m=r?p.find((e=>e.route.id===r)):Le(p,h);if(r&&!m)throw me(403,{pathname:h.pathname,routeId:r});if(!m)throw me(404,{pathname:h.pathname});let g=await c(e,h,p,n,i,m);if(De(g))return g;let v=g.errors?Object.values(g.errors)[0]:void 0;if(void 0!==v)throw v;if(g.actionData)return Object.values(g.actionData)[0];if(g.loaderData){var y;let e=Object.values(g.loaderData)[0];return null!=(y=g.activeDeferreds)&&y[m.route.id]&&(e[Q]=g.activeDeferreds[m.route.id]),e}}}},e.defer=function(e,t){return void 0===t&&(t={}),new _(e,"number"==typeof t?{status:t}:t)},e.generatePath=function(e,t){void 0===t&&(t={});let r=e;return r.endsWith("*")&&"*"!==r&&!r.endsWith("/*")&&(R(!1,'Route path "'+r+'" will be treated as if it were "'+r.replace(/\*$/,"/*")+'" because the `*` character must always follow a `/` in the pattern. To get rid of this warning, please change the route path to "'+r.replace(/\*$/,"/*")+'".'),r=r.replace(/\*$/,"/*")),r.replace(/^:(\w+)(\??)/g,((e,r,a)=>{let o=t[r];return"?"===a?null==o?"":o:(null==o&&n(!1,'Missing ":'+r+'" param'),o)})).replace(/\/:(\w+)(\??)/g,((e,r,a)=>{let o=t[r];return"?"===a?null==o?"":"/"+o:(null==o&&n(!1,'Missing ":'+r+'" param'),"/"+o)})).replace(/\?/g,"").replace(/(\/?)\*/,((e,r,a,n)=>null==t["*"]?"/*"===n?"/":"":""+r+t["*"]))},e.getStaticContextFromError=function(e,r,a){return t({},r,{statusCode:500,errors:{[r._deepestRenderedBoundaryId||e[0].id]:a}})},e.getToPathname=function(e){return""===e||""===e.pathname?"/":"string"==typeof e?c(e).pathname:e.pathname},e.invariant=n,e.isRouteErrorResponse=O,e.joinPaths=x,e.json=function(e,r){void 0===r&&(r={});let a="number"==typeof r?{status:r}:r,n=new Headers(a.headers);return n.has("Content-Type")||n.set("Content-Type","application/json; charset=utf-8"),new Response(JSON.stringify(e),t({},a,{headers:n}))},e.matchPath=b,e.matchRoutes=f,e.normalizePathname=L,e.parsePath=c,e.redirect=function(e,r){void 0===r&&(r=302);let a=r;"number"==typeof a?a={status:a}:void 0===a.status&&(a.status=302);let n=new Headers(a.headers);return n.set("Location",e),new Response(null,t({},a,{headers:n}))},e.resolvePath=E,e.resolveTo=S,e.stripBasename=A,e.warning=R,Object.defineProperty(e,"__esModule",{value:!0})}));
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).RemixRouter={})}(this,(function(e){"use strict";function t(){return t=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var a in r)Object.prototype.hasOwnProperty.call(r,a)&&(e[a]=r[a])}return e},t.apply(this,arguments)}var r;e.Action=void 0,(r=e.Action||(e.Action={})).Pop="POP",r.Push="PUSH",r.Replace="REPLACE";const a="popstate";function o(e,t){if(!1===e||null==e)throw new Error(t)}function n(e,t){if(!e){"undefined"!=typeof console&&console.warn(t);try{throw new Error(t)}catch(e){}}}function i(e,t){return{usr:e.state,key:e.key,idx:t}}function s(e,r,a,o){return void 0===a&&(a=null),t({pathname:"string"==typeof e?e:e.pathname,search:"",hash:""},"string"==typeof r?c(r):r,{state:a,key:r&&r.key||o||Math.random().toString(36).substr(2,8)})}function l(e){let{pathname:t="/",search:r="",hash:a=""}=e;return r&&"?"!==r&&(t+="?"===r.charAt(0)?r:"?"+r),a&&"#"!==a&&(t+="#"===a.charAt(0)?a:"#"+a),t}function c(e){let t={};if(e){let r=e.indexOf("#");r>=0&&(t.hash=e.substr(r),e=e.substr(0,r));let a=e.indexOf("?");a>=0&&(t.search=e.substr(a),e=e.substr(0,a)),e&&(t.pathname=e)}return t}function d(r,n,c,d){void 0===d&&(d={});let{window:u=document.defaultView,v5Compat:h=!1}=d,f=u.history,p=e.Action.Pop,m=null,v=y();function y(){return(f.state||{idx:null}).idx}function g(){p=e.Action.Pop;let t=y(),r=null==t?null:t-v;v=t,m&&m({action:p,location:w.location,delta:r})}function b(e){let t="null"!==u.location.origin?u.location.origin:u.location.href,r="string"==typeof e?e:l(e);return o(t,"No window.location.(origin|href) available to create URL for href: "+r),new URL(r,t)}null==v&&(v=0,f.replaceState(t({},f.state,{idx:v}),""));let w={get action(){return p},get location(){return r(u,f)},listen(e){if(m)throw new Error("A history only accepts one active listener");return u.addEventListener(a,g),m=e,()=>{u.removeEventListener(a,g),m=null}},createHref:e=>n(u,e),createURL:b,encodeLocation(e){let t=b(e);return{pathname:t.pathname,search:t.search,hash:t.hash}},push:function(t,r){p=e.Action.Push;let a=s(w.location,t,r);c&&c(a,t),v=y()+1;let o=i(a,v),n=w.createHref(a);try{f.pushState(o,"",n)}catch(e){u.location.assign(n)}h&&m&&m({action:p,location:w.location,delta:1})},replace:function(t,r){p=e.Action.Replace;let a=s(w.location,t,r);c&&c(a,t),v=y();let o=i(a,v),n=w.createHref(a);f.replaceState(o,"",n),h&&m&&m({action:p,location:w.location,delta:0})},go:e=>f.go(e)};return w}let u;!function(e){e.data="data",e.deferred="deferred",e.redirect="redirect",e.error="error"}(u||(u={}));const h=new Set(["lazy","caseSensitive","path","id","index","children"]);function f(e,r,a,n){return void 0===a&&(a=[]),void 0===n&&(n={}),e.map(((e,i)=>{let s=[...a,i],l="string"==typeof e.id?e.id:s.join("-");if(o(!0!==e.index||!e.children,"Cannot specify children on an index route"),o(!n[l],'Found a route id collision on id "'+l+"\".  Route id's must be globally unique within Data Router usages"),function(e){return!0===e.index}(e)){let a=t({},e,{hasErrorBoundary:r(e),id:l});return n[l]=a,a}{let a=t({},e,{id:l,hasErrorBoundary:r(e),children:void 0});return n[l]=a,e.children&&(a.children=f(e.children,r,s,n)),a}}))}function p(e,t,r){void 0===r&&(r="/");let a=E(("string"==typeof t?c(t):t).pathname||"/",r);if(null==a)return null;let o=m(e);!function(e){e.sort(((e,t)=>e.score!==t.score?t.score-e.score:function(e,t){return e.length===t.length&&e.slice(0,-1).every(((e,r)=>e===t[r]))?e[e.length-1]-t[t.length-1]:0}(e.routesMeta.map((e=>e.childrenIndex)),t.routesMeta.map((e=>e.childrenIndex)))))}(o);let n=null;for(let e=0;null==n&&e<o.length;++e)n=w(o[e],R(a));return n}function m(e,t,r,a){void 0===t&&(t=[]),void 0===r&&(r=[]),void 0===a&&(a="");let n=(e,n,i)=>{let s={relativePath:void 0===i?e.path||"":i,caseSensitive:!0===e.caseSensitive,childrenIndex:n,route:e};s.relativePath.startsWith("/")&&(o(s.relativePath.startsWith(a),'Absolute route path "'+s.relativePath+'" nested under path "'+a+'" is not valid. An absolute child route path must start with the combined path of all its parent routes.'),s.relativePath=s.relativePath.slice(a.length));let l=L([a,s.relativePath]),c=r.concat(s);e.children&&e.children.length>0&&(o(!0!==e.index,'Index routes must not have child routes. Please remove all child routes from route path "'+l+'".'),m(e.children,t,c,l)),(null!=e.path||e.index)&&t.push({path:l,score:b(l,e.index),routesMeta:c})};return e.forEach(((e,t)=>{var r;if(""!==e.path&&null!=(r=e.path)&&r.includes("?"))for(let r of v(e.path))n(e,t,r);else n(e,t)})),t}function v(e){let t=e.split("/");if(0===t.length)return[];let[r,...a]=t,o=r.endsWith("?"),n=r.replace(/\?$/,"");if(0===a.length)return o?[n,""]:[n];let i=v(a.join("/")),s=[];return s.push(...i.map((e=>""===e?n:[n,e].join("/")))),o&&s.push(...i),s.map((t=>e.startsWith("/")&&""===t?"/":t))}const y=/^:\w+$/,g=e=>"*"===e;function b(e,t){let r=e.split("/"),a=r.length;return r.some(g)&&(a+=-2),t&&(a+=2),r.filter((e=>!g(e))).reduce(((e,t)=>e+(y.test(t)?3:""===t?1:10)),a)}function w(e,t){let{routesMeta:r}=e,a={},o="/",n=[];for(let e=0;e<r.length;++e){let i=r[e],s=e===r.length-1,l="/"===o?t:t.slice(o.length)||"/",c=D({path:i.relativePath,caseSensitive:i.caseSensitive,end:s},l);if(!c)return null;Object.assign(a,c.params);let d=i.route;n.push({params:a,pathname:L([o,c.pathname]),pathnameBase:k(L([o,c.pathnameBase])),route:d}),"/"!==c.pathnameBase&&(o=L([o,c.pathnameBase]))}return n}function D(e,t){"string"==typeof e&&(e={path:e,caseSensitive:!1,end:!0});let[r,a]=function(e,t,r){void 0===t&&(t=!1);void 0===r&&(r=!0);n("*"===e||!e.endsWith("*")||e.endsWith("/*"),'Route path "'+e+'" will be treated as if it were "'+e.replace(/\*$/,"/*")+'" because the `*` character must always follow a `/` in the pattern. To get rid of this warning, please change the route path to "'+e.replace(/\*$/,"/*")+'".');let a=[],o="^"+e.replace(/\/*\*?$/,"").replace(/^\/*/,"/").replace(/[\\.*+^$?{}|()[\]]/g,"\\$&").replace(/\/:(\w+)/g,((e,t)=>(a.push(t),"/([^\\/]+)")));e.endsWith("*")?(a.push("*"),o+="*"===e||"/*"===e?"(.*)$":"(?:\\/(.+)|\\/*)$"):r?o+="\\/*$":""!==e&&"/"!==e&&(o+="(?:(?=\\/|$))");return[new RegExp(o,t?void 0:"i"),a]}(e.path,e.caseSensitive,e.end),o=t.match(r);if(!o)return null;let i=o[0],s=i.replace(/(.)\/+$/,"$1"),l=o.slice(1);return{params:a.reduce(((e,t,r)=>{if("*"===t){let e=l[r]||"";s=i.slice(0,i.length-e.length).replace(/(.)\/+$/,"$1")}return e[t]=function(e,t){try{return decodeURIComponent(e)}catch(r){return n(!1,'The value for the URL param "'+t+'" will not be decoded because the string "'+e+'" is a malformed URL segment. This is probably due to a bad percent encoding ('+r+")."),e}}(l[r]||"",t),e}),{}),pathname:i,pathnameBase:s,pattern:e}}function R(e){try{return decodeURI(e)}catch(t){return n(!1,'The URL path "'+e+'" could not be decoded because it is is a malformed URL segment. This is probably due to a bad percent encoding ('+t+")."),e}}function E(e,t){if("/"===t)return e;if(!e.toLowerCase().startsWith(t.toLowerCase()))return null;let r=t.endsWith("/")?t.length-1:t.length,a=e.charAt(r);return a&&"/"!==a?null:e.slice(r)||"/"}function A(e,t){void 0===t&&(t="/");let{pathname:r,search:a="",hash:o=""}="string"==typeof e?c(e):e,n=r?r.startsWith("/")?r:function(e,t){let r=t.replace(/\/+$/,"").split("/");return e.split("/").forEach((e=>{".."===e?r.length>1&&r.pop():"."!==e&&r.push(e)})),r.length>1?r.join("/"):"/"}(r,t):t;return{pathname:n,search:x(a),hash:C(o)}}function P(e,t,r,a){return"Cannot include a '"+e+"' character in a manually specified `to."+t+"` field ["+JSON.stringify(a)+"].  Please separate it out to the `to."+r+'` field. Alternatively you may provide the full path as a string in <Link to="..."> and the router will parse it for you.'}function S(e){return e.filter(((e,t)=>0===t||e.route.path&&e.route.path.length>0))}function M(e,r,a,n){let i;void 0===n&&(n=!1),"string"==typeof e?i=c(e):(i=t({},e),o(!i.pathname||!i.pathname.includes("?"),P("?","pathname","search",i)),o(!i.pathname||!i.pathname.includes("#"),P("#","pathname","hash",i)),o(!i.search||!i.search.includes("#"),P("#","search","hash",i)));let s,l=""===e||""===i.pathname,d=l?"/":i.pathname;if(n||null==d)s=a;else{let e=r.length-1;if(d.startsWith("..")){let t=d.split("/");for(;".."===t[0];)t.shift(),e-=1;i.pathname=t.join("/")}s=e>=0?r[e]:"/"}let u=A(i,s),h=d&&"/"!==d&&d.endsWith("/"),f=(l||"."===d)&&a.endsWith("/");return u.pathname.endsWith("/")||!h&&!f||(u.pathname+="/"),u}const L=e=>e.join("/").replace(/\/\/+/g,"/"),k=e=>e.replace(/\/+$/,"").replace(/^\/*/,"/"),x=e=>e&&"?"!==e?e.startsWith("?")?e:"?"+e:"",C=e=>e&&"#"!==e?e.startsWith("#")?e:"#"+e:"";class U extends Error{}class j{constructor(e,t){let r;this.pendingKeysSet=new Set,this.subscribers=new Set,this.deferredKeys=[],o(e&&"object"==typeof e&&!Array.isArray(e),"defer() only accepts plain objects"),this.abortPromise=new Promise(((e,t)=>r=t)),this.controller=new AbortController;let a=()=>r(new U("Deferred data aborted"));this.unlistenAbortSignal=()=>this.controller.signal.removeEventListener("abort",a),this.controller.signal.addEventListener("abort",a),this.data=Object.entries(e).reduce(((e,t)=>{let[r,a]=t;return Object.assign(e,{[r]:this.trackPromise(r,a)})}),{}),this.done&&this.unlistenAbortSignal(),this.init=t}trackPromise(e,t){if(!(t instanceof Promise))return t;this.deferredKeys.push(e),this.pendingKeysSet.add(e);let r=Promise.race([t,this.abortPromise]).then((t=>this.onSettle(r,e,null,t)),(t=>this.onSettle(r,e,t)));return r.catch((()=>{})),Object.defineProperty(r,"_tracked",{get:()=>!0}),r}onSettle(e,t,r,a){return this.controller.signal.aborted&&r instanceof U?(this.unlistenAbortSignal(),Object.defineProperty(e,"_error",{get:()=>r}),Promise.reject(r)):(this.pendingKeysSet.delete(t),this.done&&this.unlistenAbortSignal(),r?(Object.defineProperty(e,"_error",{get:()=>r}),this.emit(!1,t),Promise.reject(r)):(Object.defineProperty(e,"_data",{get:()=>a}),this.emit(!1,t),a))}emit(e,t){this.subscribers.forEach((r=>r(e,t)))}subscribe(e){return this.subscribers.add(e),()=>this.subscribers.delete(e)}cancel(){this.controller.abort(),this.pendingKeysSet.forEach(((e,t)=>this.pendingKeysSet.delete(t))),this.emit(!0)}async resolveData(e){let t=!1;if(!this.done){let r=()=>this.cancel();e.addEventListener("abort",r),t=await new Promise((t=>{this.subscribe((a=>{e.removeEventListener("abort",r),(a||this.done)&&t(a)}))}))}return t}get done(){return 0===this.pendingKeysSet.size}get unwrappedData(){return o(null!==this.data&&this.done,"Can only unwrap data on initialized and settled deferreds"),Object.entries(this.data).reduce(((e,t)=>{let[r,a]=t;return Object.assign(e,{[r]:T(a)})}),{})}get pendingKeys(){return Array.from(this.pendingKeysSet)}}function T(e){if(!function(e){return e instanceof Promise&&!0===e._tracked}(e))return e;if(e._error)throw e._error;return e._data}class O{constructor(e,t,r,a){void 0===a&&(a=!1),this.status=e,this.statusText=t||"",this.internal=a,r instanceof Error?(this.data=r.toString(),this.error=r):this.data=r}}function _(e){return null!=e&&"number"==typeof e.status&&"string"==typeof e.statusText&&"boolean"==typeof e.internal&&"data"in e}const z=["post","put","patch","delete"],H=new Set(z),I=["get",...z],B=new Set(I),q=new Set([301,302,303,307,308]),$=new Set([307,308]),W={state:"idle",location:void 0,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0},N={state:"idle",data:void 0,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0},F={state:"unblocked",proceed:void 0,reset:void 0,location:void 0},K=/^(?:[a-z][a-z0-9+.-]*:|\/\/)/i,Y="undefined"!=typeof window&&void 0!==window.document&&void 0!==window.document.createElement,J=!Y,V=e=>Boolean(e.hasErrorBoundary);const G=Symbol("deferred");function X(e,t,r){void 0===r&&(r=!1);let a,o="string"==typeof e?e:l(e);if(!t||!function(e){return null!=e&&"formData"in e}(t))return{path:o};if(t.formMethod&&!be(t.formMethod))return{path:o,error:ue(405,{method:t.formMethod})};if(t.formData&&(a={formMethod:t.formMethod||"get",formAction:fe(o),formEncType:t&&t.formEncType||"application/x-www-form-urlencoded",formData:t.formData},we(a.formMethod)))return{path:o,submission:a};let n=c(o),i=ne(t.formData);return r&&n.search&&Ee(n.search)&&i.append("index",""),n.search="?"+i,{path:l(n),submission:a}}function Q(e,t){let r=e;if(t){let a=e.findIndex((e=>e.route.id===t));a>=0&&(r=e.slice(0,a))}return r}function Z(e,r,a,o,n,i,s,l,c,d,u,h,f){let m=f?Object.values(f)[0]:h?Object.values(h)[0]:void 0,v=e.createURL(r.location),y=e.createURL(n),g=i||v.toString()===y.toString()||v.search!==y.search,b=f?Object.keys(f)[0]:void 0,w=Q(a,b).filter(((e,a)=>{if(e.route.lazy)return!0;if(null==e.route.loader)return!1;if(function(e,t,r){let a=!t||r.route.id!==t.route.id,o=void 0===e[r.route.id];return a||o}(r.loaderData,r.matches[a],e)||s.some((t=>t===e.route.id)))return!0;let n=r.matches[a],i=e;return te(e,t({currentUrl:v,currentParams:n.params,nextUrl:y,nextParams:i.params},o,{actionResult:m,defaultShouldRevalidate:g||ee(n,i)}))})),D=[];return c.forEach(((e,n)=>{if(!a.some((t=>t.route.id===e.routeId)))return;let i=p(d,e.path,u);if(!i)return void D.push(t({key:n},e,{matches:null,match:null}));let s=Pe(i,e.path);(l.includes(n)||te(s,t({currentUrl:v,currentParams:r.matches[r.matches.length-1].params,nextUrl:y,nextParams:a[a.length-1].params},o,{actionResult:m,defaultShouldRevalidate:g})))&&D.push(t({key:n,matches:i,match:s},e))})),[w,D]}function ee(e,t){let r=e.route.path;return e.pathname!==t.pathname||null!=r&&r.endsWith("*")&&e.params["*"]!==t.params["*"]}function te(e,t){if(e.route.shouldRevalidate){let r=e.route.shouldRevalidate(t);if("boolean"==typeof r)return r}return t.defaultShouldRevalidate}async function re(e,r,a){if(!e.lazy)return;let i=await e.lazy();if(!e.lazy)return;let s=a[e.id];o(s,"No route found in manifest");let l={};for(let e in i){let t=void 0!==s[e]&&"hasErrorBoundary"!==e;n(!t,'Route "'+s.id+'" has a static property "'+e+'" defined but its lazy function is also returning a value for this property. The lazy route property "'+e+'" will be ignored.'),t||h.has(e)||(l[e]=i[e])}Object.assign(s,l),Object.assign(s,{hasErrorBoundary:r(t({},s)),lazy:void 0})}async function ae(e,t,r,a,n,i,s,c,d,h){let f,p,m;void 0===s&&(s="/"),void 0===c&&(c=!1),void 0===d&&(d=!1);let v=e=>{let a,o=new Promise(((e,t)=>a=t));return m=()=>a(),t.signal.addEventListener("abort",m),Promise.race([e({request:t,params:r.params,context:h}),o])};try{let a=r.route[e];if(r.route.lazy)if(a){p=(await Promise.all([v(a),re(r.route,i,n)]))[0]}else{if(await re(r.route,i,n),a=r.route[e],!a){if("action"===e)throw ue(405,{method:t.method,pathname:new URL(t.url).pathname,routeId:r.route.id});return{type:u.data,data:void 0}}p=await v(a)}else o(a,"Could not find the "+e+' to run on the "'+r.route.id+'" route'),p=await v(a);o(void 0!==p,"You defined "+("action"===e?"an action":"a loader")+' for route "'+r.route.id+"\" but didn't return anything from your `"+e+"` function. Please return a value or `null`.")}catch(e){f=u.error,p=e}finally{m&&t.signal.removeEventListener("abort",m)}if(ye(p)){let e,n=p.status;if(q.has(n)){let e=p.headers.get("Location");if(o(e,"Redirects returned/thrown from loaders/actions must have a Location header"),K.test(e)){if(!c){let r=new URL(t.url),a=e.startsWith("//")?new URL(r.protocol+e):new URL(e),o=null!=E(a.pathname,s);a.origin===r.origin&&o&&(e=a.pathname+a.search+a.hash)}}else{let n=M(e,S(a.slice(0,a.indexOf(r)+1)).map((e=>e.pathnameBase)),new URL(t.url).pathname);if(o(l(n),"Unable to resolve redirect location: "+e),s){let e=n.pathname;n.pathname="/"===e?s:L([s,e])}e=l(n)}if(c)throw p.headers.set("Location",e),p;return{type:u.redirect,status:n,location:e,revalidate:null!==p.headers.get("X-Remix-Revalidate")}}if(d)throw{type:f||u.data,response:p};let i=p.headers.get("Content-Type");return e=i&&/\bapplication\/json\b/.test(i)?await p.json():await p.text(),f===u.error?{type:f,error:new O(n,p.statusText,e),headers:p.headers}:{type:u.data,data:e,statusCode:p.status,headers:p.headers}}return f===u.error?{type:f,error:p}:p instanceof j?{type:u.deferred,deferredData:p,statusCode:null==(y=p.init)?void 0:y.status,headers:(null==(g=p.init)?void 0:g.headers)&&new Headers(p.init.headers)}:{type:u.data,data:p};var y,g}function oe(e,t,r,a){let o=e.createURL(fe(t)).toString(),n={signal:r};if(a&&we(a.formMethod)){let{formMethod:e,formEncType:t,formData:r}=a;n.method=e.toUpperCase(),n.body="application/x-www-form-urlencoded"===t?ne(r):r}return new Request(o,n)}function ne(e){let t=new URLSearchParams;for(let[r,a]of e.entries())t.append(r,a instanceof File?a.name:a);return t}function ie(e,t,r,a,n){let i,s={},l=null,c=!1,d={};return r.forEach(((r,u)=>{let h=t[u].route.id;if(o(!ve(r),"Cannot handle redirect results in processLoaderData"),me(r)){let t=ce(e,h),o=r.error;a&&(o=Object.values(a)[0],a=void 0),l=l||{},null==l[t.route.id]&&(l[t.route.id]=o),s[h]=void 0,c||(c=!0,i=_(r.error)?r.error.status:500),r.headers&&(d[h]=r.headers)}else pe(r)?(n.set(h,r.deferredData),s[h]=r.deferredData.data):s[h]=r.data,null==r.statusCode||200===r.statusCode||c||(i=r.statusCode),r.headers&&(d[h]=r.headers)})),a&&(l=a,s[Object.keys(a)[0]]=void 0),{loaderData:s,errors:l,statusCode:i||200,loaderHeaders:d}}function se(e,r,a,n,i,s,l,c){let{loaderData:d,errors:u}=ie(r,a,n,i,c);for(let r=0;r<s.length;r++){let{key:a,match:n}=s[r];o(void 0!==l&&void 0!==l[r],"Did not find corresponding fetcher result");let i=l[r];if(me(i)){let r=ce(e.matches,null==n?void 0:n.route.id);u&&u[r.route.id]||(u=t({},u,{[r.route.id]:i.error})),e.fetchers.delete(a)}else if(ve(i))o(!1,"Unhandled fetcher revalidation redirect");else if(pe(i))o(!1,"Unhandled fetcher deferred data");else{let t={state:"idle",data:i.data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0};e.fetchers.set(a,t)}}return{loaderData:d,errors:u}}function le(e,r,a,o){let n=t({},r);for(let t of a){let a=t.route.id;if(r.hasOwnProperty(a)?void 0!==r[a]&&(n[a]=r[a]):void 0!==e[a]&&t.route.loader&&(n[a]=e[a]),o&&o.hasOwnProperty(a))break}return n}function ce(e,t){return(t?e.slice(0,e.findIndex((e=>e.route.id===t))+1):[...e]).reverse().find((e=>!0===e.route.hasErrorBoundary))||e[0]}function de(e){let t=e.find((e=>e.index||!e.path||"/"===e.path))||{id:"__shim-error-route__"};return{matches:[{params:{},pathname:"",pathnameBase:"",route:t}],route:t}}function ue(e,t){let{pathname:r,routeId:a,method:o,type:n}=void 0===t?{}:t,i="Unknown Server Error",s="Unknown @remix-run/router error";return 400===e?(i="Bad Request",o&&r&&a?s="You made a "+o+' request to "'+r+'" but did not provide a `loader` for route "'+a+'", so there is no way to handle the request.':"defer-action"===n&&(s="defer() is not supported in actions")):403===e?(i="Forbidden",s='Route "'+a+'" does not match URL "'+r+'"'):404===e?(i="Not Found",s='No route matches URL "'+r+'"'):405===e&&(i="Method Not Allowed",o&&r&&a?s="You made a "+o.toUpperCase()+' request to "'+r+'" but did not provide an `action` for route "'+a+'", so there is no way to handle the request.':o&&(s='Invalid request method "'+o.toUpperCase()+'"')),new O(e||500,i,new Error(s),!0)}function he(e){for(let t=e.length-1;t>=0;t--){let r=e[t];if(ve(r))return r}}function fe(e){return l(t({},"string"==typeof e?c(e):e,{hash:""}))}function pe(e){return e.type===u.deferred}function me(e){return e.type===u.error}function ve(e){return(e&&e.type)===u.redirect}function ye(e){return null!=e&&"number"==typeof e.status&&"string"==typeof e.statusText&&"object"==typeof e.headers&&void 0!==e.body}function ge(e){if(!ye(e))return!1;let t=e.status,r=e.headers.get("Location");return t>=300&&t<=399&&null!=r}function be(e){return B.has(e)}function we(e){return H.has(e)}async function De(e,t,r,a,o,n){for(let i=0;i<r.length;i++){let s=r[i],l=t[i];if(!l)continue;let c=e.find((e=>e.route.id===l.route.id)),d=null!=c&&!ee(c,l)&&void 0!==(n&&n[l.route.id]);pe(s)&&(o||d)&&await Re(s,a,o).then((e=>{e&&(r[i]=e||r[i])}))}}async function Re(e,t,r){if(void 0===r&&(r=!1),!await e.deferredData.resolveData(t)){if(r)try{return{type:u.data,data:e.deferredData.unwrappedData}}catch(e){return{type:u.error,error:e}}return{type:u.data,data:e.deferredData.data}}}function Ee(e){return new URLSearchParams(e).getAll("index").some((e=>""===e))}function Ae(e,t){let{route:r,pathname:a,params:o}=e;return{id:r.id,pathname:a,params:o,data:t[r.id],handle:r.handle}}function Pe(e,t){let r="string"==typeof t?c(t).search:t.search;if(e[e.length-1].route.index&&Ee(r||""))return e[e.length-1];let a=S(e);return a[a.length-1]}e.AbortedDeferredError=U,e.ErrorResponse=O,e.IDLE_BLOCKER=F,e.IDLE_FETCHER=N,e.IDLE_NAVIGATION=W,e.UNSAFE_DEFERRED_SYMBOL=G,e.UNSAFE_DeferredData=j,e.UNSAFE_convertRoutesToDataRoutes=f,e.UNSAFE_getPathContributingMatches=S,e.UNSAFE_invariant=o,e.UNSAFE_warning=n,e.createBrowserHistory=function(e){return void 0===e&&(e={}),d((function(e,t){let{pathname:r,search:a,hash:o}=e.location;return s("",{pathname:r,search:a,hash:o},t.state&&t.state.usr||null,t.state&&t.state.key||"default")}),(function(e,t){return"string"==typeof t?t:l(t)}),null,e)},e.createHashHistory=function(e){return void 0===e&&(e={}),d((function(e,t){let{pathname:r="/",search:a="",hash:o=""}=c(e.location.hash.substr(1));return s("",{pathname:r,search:a,hash:o},t.state&&t.state.usr||null,t.state&&t.state.key||"default")}),(function(e,t){let r=e.document.querySelector("base"),a="";if(r&&r.getAttribute("href")){let t=e.location.href,r=t.indexOf("#");a=-1===r?t:t.slice(0,r)}return a+"#"+("string"==typeof t?t:l(t))}),(function(e,t){n("/"===e.pathname.charAt(0),"relative pathnames are not supported in hash history.push("+JSON.stringify(t)+")")}),e)},e.createMemoryHistory=function(t){void 0===t&&(t={});let r,{initialEntries:a=["/"],initialIndex:o,v5Compat:i=!1}=t;r=a.map(((e,t)=>m(e,"string"==typeof e?null:e.state,0===t?"default":void 0)));let d=f(null==o?r.length-1:o),u=e.Action.Pop,h=null;function f(e){return Math.min(Math.max(e,0),r.length-1)}function p(){return r[d]}function m(e,t,a){void 0===t&&(t=null);let o=s(r?p().pathname:"/",e,t,a);return n("/"===o.pathname.charAt(0),"relative pathnames are not supported in memory history: "+JSON.stringify(e)),o}function v(e){return"string"==typeof e?e:l(e)}return{get index(){return d},get action(){return u},get location(){return p()},createHref:v,createURL:e=>new URL(v(e),"http://localhost"),encodeLocation(e){let t="string"==typeof e?c(e):e;return{pathname:t.pathname||"",search:t.search||"",hash:t.hash||""}},push(t,a){u=e.Action.Push;let o=m(t,a);d+=1,r.splice(d,r.length,o),i&&h&&h({action:u,location:o,delta:1})},replace(t,a){u=e.Action.Replace;let o=m(t,a);r[d]=o,i&&h&&h({action:u,location:o,delta:0})},go(t){u=e.Action.Pop;let a=f(d+t),o=r[a];d=a,h&&h({action:u,location:o,delta:t})},listen:e=>(h=e,()=>{h=null})}},e.createPath=l,e.createRouter=function(r){o(r.routes.length>0,"You must provide a non-empty routes array to createRouter");let a,i=r.detectErrorBoundary||V,l={},c=f(r.routes,i,void 0,l),d=null,h=new Set,m=null,v=null,y=null,g=null!=r.hydrationData,b=p(c,r.history.location,r.basename),w=null;if(null==b){let e=ue(404,{pathname:r.history.location.pathname}),{matches:t,route:a}=de(c);b=t,w={[a.id]:e}}let D,R,A=!(b.some((e=>e.route.lazy))||b.some((e=>e.route.loader))&&null==r.hydrationData),P={historyAction:r.history.action,location:r.history.location,matches:b,initialized:A,navigation:W,restoreScrollPosition:null==r.hydrationData&&null,preventScrollReset:!1,revalidation:"idle",loaderData:r.hydrationData&&r.hydrationData.loaderData||{},actionData:r.hydrationData&&r.hydrationData.actionData||null,errors:r.hydrationData&&r.hydrationData.errors||w,fetchers:new Map,blockers:new Map},S=e.Action.Pop,M=!1,L=!1,k=!1,x=[],C=[],U=new Map,j=0,T=-1,O=new Map,_=new Set,z=new Map,H=new Map,I=new Map,B=!1;function q(e){P=t({},P,e),h.forEach((e=>e(P)))}function G(o,n){var i,s;let l,d=null!=P.actionData&&null!=P.navigation.formMethod&&we(P.navigation.formMethod)&&"loading"===P.navigation.state&&!0!==(null==(i=o.state)?void 0:i._isRedirect);l=n.actionData?Object.keys(n.actionData).length>0?n.actionData:null:d?P.actionData:null;let u=n.loaderData?le(P.loaderData,n.loaderData,n.matches||[],n.errors):P.loaderData;for(let[e]of I)Se(e);let h=!0===M||null!=P.navigation.formMethod&&we(P.navigation.formMethod)&&!0!==(null==(s=o.state)?void 0:s._isRedirect);a&&(c=a,a=void 0),q(t({},n,{actionData:l,loaderData:u,historyAction:S,location:o,initialized:!0,navigation:W,revalidation:"idle",restoreScrollPosition:xe(o,n.matches||P.matches),preventScrollReset:h,blockers:new Map(P.blockers)})),L||S===e.Action.Pop||(S===e.Action.Push?r.history.push(o,o.state):S===e.Action.Replace&&r.history.replace(o,o.state)),S=e.Action.Pop,M=!1,L=!1,k=!1,x=[],C=[]}async function Q(n,s,d){R&&R.abort(),R=null,S=n,L=!0===(d&&d.startUninterruptedRevalidation),function(e,t){if(m&&v&&y){let r=t.map((e=>Ae(e,P.loaderData))),a=v(e,r)||e.key;m[a]=y()}}(P.location,P.matches),M=!0===(d&&d.preventScrollReset);let h=a||c,f=d&&d.overrideNavigation,g=p(h,s,r.basename);if(!g){let e=ue(404,{pathname:s.pathname}),{matches:t,route:r}=de(h);return ke(),void G(s,{matches:t,loaderData:{},errors:{[r.id]:e}})}if(!(b=P.location,w=s,b.pathname!==w.pathname||b.search!==w.search||b.hash===w.hash||d&&d.submission&&we(d.submission.formMethod)))return void G(s,{matches:g});var b,w;R=new AbortController;let E,A,O=oe(r.history,s,R.signal,d&&d.submission);if(d&&d.pendingError)A={[ce(g).route.id]:d.pendingError};else if(d&&d.submission&&we(d.submission.formMethod)){let r=await async function(r,a,o,n,s){let c;ie(),q({navigation:t({state:"submitting",location:a},o)});let d=Pe(n,a);if(d.route.action||d.route.lazy){if(c=await ae("action",r,d,n,l,i,D.basename),r.signal.aborted)return{shortCircuited:!0}}else c={type:u.error,error:ue(405,{method:r.method,pathname:a.pathname,routeId:d.route.id})};if(ve(c)){let e;return e=s&&null!=s.replace?s.replace:c.location===P.location.pathname+P.location.search,await te(P,c,{submission:o,replace:e}),{shortCircuited:!0}}if(me(c)){let t=ce(n,d.route.id);return!0!==(s&&s.replace)&&(S=e.Action.Push),{pendingActionData:{},pendingActionError:{[t.route.id]:c.error}}}if(pe(c))throw ue(400,{type:"defer-action"});return{pendingActionData:{[d.route.id]:c.data}}}(O,s,d.submission,g,{replace:d.replace});if(r.shortCircuited)return;E=r.pendingActionData,A=r.pendingActionError,f=t({state:"loading",location:s},d.submission),O=new Request(O.url,{signal:O.signal})}let{shortCircuited:I,loaderData:B,errors:$}=await async function(e,n,i,s,l,d,u,h){let f=s;if(!f){f=t({state:"loading",location:n,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0},l)}let p=l||(f.formMethod&&f.formAction&&f.formData&&f.formEncType?{formMethod:f.formMethod,formAction:f.formAction,formData:f.formData,formEncType:f.formEncType}:void 0),m=a||c,[v,y]=Z(r.history,P,i,p,n,k,x,C,z,m,r.basename,u,h);if(ke((e=>!(i&&i.some((t=>t.route.id===e)))||v&&v.some((t=>t.route.id===e)))),0===v.length&&0===y.length)return G(n,t({matches:i,loaderData:{},errors:h||null},u?{actionData:u}:{})),{shortCircuited:!0};if(!L){y.forEach((e=>{let t=P.fetchers.get(e.key),r={state:"loading",data:t&&t.data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0};P.fetchers.set(e.key,r)}));let e=u||P.actionData;q(t({navigation:f},e?0===Object.keys(e).length?{actionData:null}:{actionData:e}:{},y.length>0?{fetchers:new Map(P.fetchers)}:{}))}T=++j,y.forEach((e=>U.set(e.key,R)));let{results:g,loaderResults:b,fetcherResults:w}=await ne(P.matches,i,v,y,e);if(e.signal.aborted)return{shortCircuited:!0};y.forEach((e=>U.delete(e.key)));let D=he(g);if(D)return await te(P,D,{replace:d}),{shortCircuited:!0};let{loaderData:E,errors:A}=se(P,i,v,b,h,y,w,H);H.forEach(((e,t)=>{e.subscribe((r=>{(r||e.done)&&H.delete(t)}))})),function(){let e=[];for(let t of _){let r=P.fetchers.get(t);o(r,"Expected fetcher: "+t),"loading"===r.state&&(_.delete(t),e.push(t))}be(e)}();let S=Ee(T);return t({loaderData:E,errors:A},S||y.length>0?{fetchers:new Map(P.fetchers)}:{})}(O,s,g,f,d&&d.submission,d&&d.replace,E,A);I||(R=null,G(s,t({matches:g},E?{actionData:E}:{},{loaderData:B,errors:$})))}function ee(e){return P.fetchers.get(e)||N}async function te(a,n,i){var l;let{submission:c,replace:d}=void 0===i?{}:i;n.revalidate&&(k=!0);let u=s(a.location,n.location,{_isRedirect:!0});if(o(u,"Expected a location on the redirect navigation"),K.test(n.location)&&Y&&void 0!==(null==(l=window)?void 0:l.location)){let e=r.history.createURL(n.location),t=null==E(e.pathname,r.basename||"/");if(window.location.origin!==e.origin||t)return void(d?window.location.replace(n.location):window.location.assign(n.location))}R=null;let h=!0===d?e.Action.Replace:e.Action.Push,{formMethod:f,formAction:p,formEncType:m,formData:v}=a.navigation;!c&&f&&p&&v&&m&&(c={formMethod:f,formAction:p,formEncType:m,formData:v}),$.has(n.status)&&c&&we(c.formMethod)?await Q(h,u,{submission:t({},c,{formAction:n.location}),preventScrollReset:M}):await Q(h,u,{overrideNavigation:{state:"loading",location:u,formMethod:c?c.formMethod:void 0,formAction:c?c.formAction:void 0,formEncType:c?c.formEncType:void 0,formData:c?c.formData:void 0},preventScrollReset:M})}async function ne(e,t,a,o,n){let s=await Promise.all([...a.map((e=>ae("loader",n,e,t,l,i,D.basename))),...o.map((e=>{if(e.matches&&e.match)return ae("loader",oe(r.history,e.path,n.signal),e.match,e.matches,l,i,D.basename);return{type:u.error,error:ue(404,{pathname:e.path})}}))]),c=s.slice(0,a.length),d=s.slice(a.length);return await Promise.all([De(e,a,c,n.signal,!1,P.loaderData),De(e,o.map((e=>e.match)),d,n.signal,!0)]),{results:s,loaderResults:c,fetcherResults:d}}function ie(){k=!0,x.push(...ke()),z.forEach(((e,t)=>{U.has(t)&&(C.push(t),ge(t))}))}function fe(e,t,r){let a=ce(P.matches,t);ye(e),q({errors:{[a.route.id]:r},fetchers:new Map(P.fetchers)})}function ye(e){U.has(e)&&ge(e),z.delete(e),O.delete(e),_.delete(e),P.fetchers.delete(e)}function ge(e){let t=U.get(e);o(t,"Expected fetch controller: "+e),t.abort(),U.delete(e)}function be(e){for(let t of e){let e={state:"idle",data:ee(t).data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0};P.fetchers.set(t,e)}}function Ee(e){let t=[];for(let[r,a]of O)if(a<e){let e=P.fetchers.get(r);o(e,"Expected fetcher: "+r),"loading"===e.state&&(ge(r),O.delete(r),t.push(r))}return be(t),t.length>0}function Se(e){P.blockers.delete(e),I.delete(e)}function Me(e,t){let r=P.blockers.get(e)||F;o("unblocked"===r.state&&"blocked"===t.state||"blocked"===r.state&&"blocked"===t.state||"blocked"===r.state&&"proceeding"===t.state||"blocked"===r.state&&"unblocked"===t.state||"proceeding"===r.state&&"unblocked"===t.state,"Invalid blocker state transition: "+r.state+" -> "+t.state),P.blockers.set(e,t),q({blockers:new Map(P.blockers)})}function Le(e){let{currentLocation:t,nextLocation:r,historyAction:a}=e;if(0===I.size)return;I.size>1&&n(!1,"A router only supports one blocker at a time");let o=Array.from(I.entries()),[i,s]=o[o.length-1],l=P.blockers.get(i);return l&&"proceeding"===l.state?void 0:s({currentLocation:t,nextLocation:r,historyAction:a})?i:void 0}function ke(e){let t=[];return H.forEach(((r,a)=>{e&&!e(a)||(r.cancel(),t.push(a),H.delete(a))})),t}function xe(e,t){if(m&&v&&y){let r=t.map((e=>Ae(e,P.loaderData))),a=v(e,r)||e.key,o=m[a];if("number"==typeof o)return o}return null}return D={get basename(){return r.basename},get state(){return P},get routes(){return c},initialize:function(){if(d=r.history.listen((e=>{let{action:t,location:a,delta:o}=e;if(B)return void(B=!1);n(0===I.size||null!=o,"You are trying to use a blocker on a POP navigation to a location that was not created by @remix-run/router. This will fail silently in production. This can happen if you are navigating outside the router via `window.history.pushState`/`window.location.hash` instead of using router navigation APIs.  This can also happen if you are using createHashRouter and the user manually changes the URL.");let i=Le({currentLocation:P.location,nextLocation:a,historyAction:t});return i&&null!=o?(B=!0,r.history.go(-1*o),void Me(i,{state:"blocked",location:a,proceed(){Me(i,{state:"proceeding",proceed:void 0,reset:void 0,location:a}),r.history.go(o)},reset(){Se(i),q({blockers:new Map(D.state.blockers)})}})):Q(t,a)})),P.initialized)return D;let t=P.matches.filter((e=>e.route.lazy));if(0===t.length)return Q(e.Action.Pop,P.location),D;let a=t.map((e=>re(e.route,i,l)));return Promise.all(a).then((()=>{!P.matches.some((e=>e.route.loader))||null!=r.hydrationData?q({initialized:!0}):Q(e.Action.Pop,P.location)})),D},subscribe:function(e){return h.add(e),()=>h.delete(e)},enableScrollRestoration:function(e,t,r){if(m=e,y=t,v=r||(e=>e.key),!g&&P.navigation===W){g=!0;let e=xe(P.location,P.matches);null!=e&&q({restoreScrollPosition:e})}return()=>{m=null,y=null,v=null}},navigate:async function a(o,n){if("number"==typeof o)return void r.history.go(o);let{path:i,submission:l,error:c}=X(o,n),d=P.location,u=s(P.location,i,n&&n.state);u=t({},u,r.history.encodeLocation(u));let h=n&&null!=n.replace?n.replace:void 0,f=e.Action.Push;!0===h?f=e.Action.Replace:!1===h||null!=l&&we(l.formMethod)&&l.formAction===P.location.pathname+P.location.search&&(f=e.Action.Replace);let p=n&&"preventScrollReset"in n?!0===n.preventScrollReset:void 0,m=Le({currentLocation:d,nextLocation:u,historyAction:f});if(!m)return await Q(f,u,{submission:l,pendingError:c,preventScrollReset:p,replace:n&&n.replace});Me(m,{state:"blocked",location:u,proceed(){Me(m,{state:"proceeding",proceed:void 0,reset:void 0,location:u}),a(o,n)},reset(){Se(m),q({blockers:new Map(P.blockers)})}})},fetch:function(e,n,s,d){if(J)throw new Error("router.fetch() was called during the server render, but it shouldn't be. You are likely calling a useFetcher() method in the body of your component. Try moving it to a useEffect or a callback.");U.has(e)&&ge(e);let u=p(a||c,s,r.basename);if(!u)return void fe(e,n,ue(404,{pathname:s}));let{path:h,submission:f}=X(s,d,!0),m=Pe(u,h);M=!0===(d&&d.preventScrollReset),f&&we(f.formMethod)?async function(e,n,s,d,u,h){if(ie(),z.delete(e),!d.route.action&&!d.route.lazy){let t=ue(405,{method:h.formMethod,pathname:s,routeId:n});return void fe(e,n,t)}let f=P.fetchers.get(e),m=t({state:"submitting"},h,{data:f&&f.data});P.fetchers.set(e,m),q({fetchers:new Map(P.fetchers)});let v=new AbortController,y=oe(r.history,s,v.signal,h);U.set(e,v);let g=await ae("action",y,d,u,l,i,D.basename);if(y.signal.aborted)return void(U.get(e)===v&&U.delete(e));if(ve(g)){U.delete(e),_.add(e);let r=t({state:"loading"},h,{data:void 0});return P.fetchers.set(e,r),q({fetchers:new Map(P.fetchers)}),te(P,g)}if(me(g))return void fe(e,n,g.error);if(pe(g))throw ue(400,{type:"defer-action"});let b=P.navigation.location||P.location,w=oe(r.history,b,v.signal),E=a||c,A="idle"!==P.navigation.state?p(E,P.navigation.location,r.basename):P.matches;o(A,"Didn't find any matches after fetcher action");let M=++j;O.set(e,M);let L=t({state:"loading",data:g.data},h);P.fetchers.set(e,L);let[I,B]=Z(r.history,P,A,h,b,k,x,C,z,E,r.basename,{[d.route.id]:g.data},void 0);B.filter((t=>t.key!==e)).forEach((e=>{let t=e.key,r=P.fetchers.get(t),a={state:"loading",data:r&&r.data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0};P.fetchers.set(t,a),U.set(t,v)})),q({fetchers:new Map(P.fetchers)});let{results:$,loaderResults:W,fetcherResults:N}=await ne(P.matches,A,I,B,w);if(v.signal.aborted)return;O.delete(e),U.delete(e),B.forEach((e=>U.delete(e.key)));let F=he($);if(F)return te(P,F);let{loaderData:K,errors:Y}=se(P,P.matches,I,W,void 0,B,N,H),J={state:"idle",data:g.data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0};P.fetchers.set(e,J);let V=Ee(M);"loading"===P.navigation.state&&M>T?(o(S,"Expected pending action"),R&&R.abort(),G(P.navigation.location,{matches:A,loaderData:K,errors:Y,fetchers:new Map(P.fetchers)})):(q(t({errors:Y,loaderData:le(P.loaderData,K,A,Y)},V?{fetchers:new Map(P.fetchers)}:{})),k=!1)}(e,n,h,m,u,f):(z.set(e,{routeId:n,path:h}),async function(e,a,n,s,c,d){let u=P.fetchers.get(e),h=t({state:"loading",formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0},d,{data:u&&u.data});P.fetchers.set(e,h),q({fetchers:new Map(P.fetchers)});let f=new AbortController,p=oe(r.history,n,f.signal);U.set(e,f);let m=await ae("loader",p,s,c,l,i,D.basename);pe(m)&&(m=await Re(m,p.signal,!0)||m);U.get(e)===f&&U.delete(e);if(p.signal.aborted)return;if(ve(m))return void await te(P,m);if(me(m)){let t=ce(P.matches,a);return P.fetchers.delete(e),void q({fetchers:new Map(P.fetchers),errors:{[t.route.id]:m.error}})}o(!pe(m),"Unhandled fetcher deferred data");let v={state:"idle",data:m.data,formMethod:void 0,formAction:void 0,formEncType:void 0,formData:void 0};P.fetchers.set(e,v),q({fetchers:new Map(P.fetchers)})}(e,n,h,m,u,f))},revalidate:function(){ie(),q({revalidation:"loading"}),"submitting"!==P.navigation.state&&("idle"!==P.navigation.state?Q(S||P.historyAction,P.navigation.location,{overrideNavigation:P.navigation}):Q(P.historyAction,P.location,{startUninterruptedRevalidation:!0}))},createHref:e=>r.history.createHref(e),encodeLocation:e=>r.history.encodeLocation(e),getFetcher:ee,deleteFetcher:ye,dispose:function(){d&&d(),h.clear(),R&&R.abort(),P.fetchers.forEach(((e,t)=>ye(t))),P.blockers.forEach(((e,t)=>Se(t)))},getBlocker:function(e,t){let r=P.blockers.get(e)||F;return I.get(e)!==t&&I.set(e,t),r},deleteBlocker:Se,_internalFetchControllers:U,_internalActiveDeferreds:H,_internalSetRoutes:function(e){a=e}},D},e.createStaticHandler=function(e,r){o(e.length>0,"You must provide a non-empty routes array to createStaticHandler");let a={},n=(null==r?void 0:r.detectErrorBoundary)||V,i=f(e,n,void 0,a),c=(r?r.basename:null)||"/";async function d(e,r,i,s,l){o(e.signal,"query()/queryRoute() requests must contain an AbortController signal");try{if(we(e.method.toLowerCase())){let o=await async function(e,r,o,i,s){let l;if(o.route.action||o.route.lazy){if(l=await ae("action",e,o,r,a,n,c,!0,s,i),e.signal.aborted){throw new Error((s?"queryRoute":"query")+"() call aborted")}}else{let t=ue(405,{method:e.method,pathname:new URL(e.url).pathname,routeId:o.route.id});if(s)throw t;l={type:u.error,error:t}}if(ve(l))throw new Response(null,{status:l.status,headers:{Location:l.location}});if(pe(l)){let e=ue(400,{type:"defer-action"});if(s)throw e;l={type:u.error,error:e}}if(s){if(me(l))throw l.error;return{matches:[o],loaderData:{},actionData:{[o.route.id]:l.data},errors:null,statusCode:200,loaderHeaders:{},actionHeaders:{},activeDeferreds:null}}if(me(l)){let a=ce(r,o.route.id);return t({},await h(e,r,i,void 0,{[a.route.id]:l.error}),{statusCode:_(l.error)?l.error.status:500,actionData:null,actionHeaders:t({},l.headers?{[o.route.id]:l.headers}:{})})}let d=new Request(e.url,{headers:e.headers,redirect:e.redirect,signal:e.signal});return t({},await h(d,r,i),l.statusCode?{statusCode:l.statusCode}:{},{actionData:{[o.route.id]:l.data},actionHeaders:t({},l.headers?{[o.route.id]:l.headers}:{})})}(e,i,l||Pe(i,r),s,null!=l);return o}let o=await h(e,i,s,l);return ye(o)?o:t({},o,{actionData:null,actionHeaders:{}})}catch(e){if((d=e)&&ye(d.response)&&(d.type===u.data||u.error)){if(e.type===u.error&&!ge(e.response))throw e.response;return e.response}if(ge(e))return e;throw e}var d}async function h(e,r,o,i,s){let l=null!=i;if(l&&(null==i||!i.route.loader)&&(null==i||!i.route.lazy))throw ue(400,{method:e.method,pathname:new URL(e.url).pathname,routeId:null==i?void 0:i.route.id});let d=(i?[i]:Q(r,Object.keys(s||{})[0])).filter((e=>e.route.loader||e.route.lazy));if(0===d.length)return{matches:r,loaderData:r.reduce(((e,t)=>Object.assign(e,{[t.route.id]:null})),{}),errors:s||null,statusCode:200,loaderHeaders:{},activeDeferreds:null};let u=await Promise.all([...d.map((t=>ae("loader",e,t,r,a,n,c,!0,l,o)))]);if(e.signal.aborted){throw new Error((l?"queryRoute":"query")+"() call aborted")}let h=new Map,f=ie(r,d,u,s,h),p=new Set(d.map((e=>e.route.id)));return r.forEach((e=>{p.has(e.route.id)||(f.loaderData[e.route.id]=null)})),t({},f,{matches:r,activeDeferreds:h.size>0?Object.fromEntries(h.entries()):null})}return{dataRoutes:i,query:async function(e,r){let{requestContext:a}=void 0===r?{}:r,o=new URL(e.url),n=e.method.toLowerCase(),u=s("",l(o),null,"default"),h=p(i,u,c);if(!be(n)&&"head"!==n){let e=ue(405,{method:n}),{matches:t,route:r}=de(i);return{basename:c,location:u,matches:t,loaderData:{},actionData:null,errors:{[r.id]:e},statusCode:e.status,loaderHeaders:{},actionHeaders:{},activeDeferreds:null}}if(!h){let e=ue(404,{pathname:u.pathname}),{matches:t,route:r}=de(i);return{basename:c,location:u,matches:t,loaderData:{},actionData:null,errors:{[r.id]:e},statusCode:e.status,loaderHeaders:{},actionHeaders:{},activeDeferreds:null}}let f=await d(e,u,h,a);return ye(f)?f:t({location:u,basename:c},f)},queryRoute:async function(e,t){let{routeId:r,requestContext:a}=void 0===t?{}:t,o=new URL(e.url),n=e.method.toLowerCase(),u=s("",l(o),null,"default"),h=p(i,u,c);if(!be(n)&&"head"!==n&&"options"!==n)throw ue(405,{method:n});if(!h)throw ue(404,{pathname:u.pathname});let f=r?h.find((e=>e.route.id===r)):Pe(h,u);if(r&&!f)throw ue(403,{pathname:u.pathname,routeId:r});if(!f)throw ue(404,{pathname:u.pathname});let m=await d(e,u,h,a,f);if(ye(m))return m;let v=m.errors?Object.values(m.errors)[0]:void 0;if(void 0!==v)throw v;if(m.actionData)return Object.values(m.actionData)[0];if(m.loaderData){var y;let e=Object.values(m.loaderData)[0];return null!=(y=m.activeDeferreds)&&y[f.route.id]&&(e[G]=m.activeDeferreds[f.route.id]),e}}}},e.defer=function(e,t){return void 0===t&&(t={}),new j(e,"number"==typeof t?{status:t}:t)},e.generatePath=function(e,t){void 0===t&&(t={});let r=e;return r.endsWith("*")&&"*"!==r&&!r.endsWith("/*")&&(n(!1,'Route path "'+r+'" will be treated as if it were "'+r.replace(/\*$/,"/*")+'" because the `*` character must always follow a `/` in the pattern. To get rid of this warning, please change the route path to "'+r.replace(/\*$/,"/*")+'".'),r=r.replace(/\*$/,"/*")),(r.startsWith("/")?"/":"")+r.split(/\/+/).map(((e,r,a)=>{if(r===a.length-1&&"*"===e){return t["*"]}const n=e.match(/^:(\w+)(\??)$/);if(n){const[,e,r]=n;let a=t[e];return"?"===r?null==a?"":a:(null==a&&o(!1,'Missing ":'+e+'" param'),a)}return e.replace(/\?$/g,"")})).filter((e=>!!e)).join("/")},e.getStaticContextFromError=function(e,r,a){return t({},r,{statusCode:500,errors:{[r._deepestRenderedBoundaryId||e[0].id]:a}})},e.getToPathname=function(e){return""===e||""===e.pathname?"/":"string"==typeof e?c(e).pathname:e.pathname},e.isRouteErrorResponse=_,e.joinPaths=L,e.json=function(e,r){void 0===r&&(r={});let a="number"==typeof r?{status:r}:r,o=new Headers(a.headers);return o.has("Content-Type")||o.set("Content-Type","application/json; charset=utf-8"),new Response(JSON.stringify(e),t({},a,{headers:o}))},e.matchPath=D,e.matchRoutes=p,e.normalizePathname=k,e.parsePath=c,e.redirect=function(e,r){void 0===r&&(r=302);let a=r;"number"==typeof a?a={status:a}:void 0===a.status&&(a.status=302);let o=new Headers(a.headers);return o.set("Location",e),new Response(null,t({},a,{headers:o}))},e.resolvePath=A,e.resolveTo=M,e.stripBasename=E,Object.defineProperty(e,"__esModule",{value:!0})}));
 //# sourceMappingURL=router.umd.min.js.map

dist/utils.d.ts

@@ -77,3 +77,2 @@ import type { Location, Path, To } from "./history";
 }
-declare type DataFunctionReturnValue = Promise<Response> | Response | Promise<any> | any;
 /**
@@ -93,3 +92,3 @@ * Arguments passed to loader functions
 export interface LoaderFunction {
-    (args: LoaderFunctionArgs): DataFunctionReturnValue;
+    (args: LoaderFunctionArgs): Promise<Response> | Response | Promise<any> | any;
 }
@@ -100,47 +99,5 @@ /**
 export interface ActionFunction {
-    (args: ActionFunctionArgs): DataFunctionReturnValue;
+    (args: ActionFunctionArgs): Promise<Response> | Response | Promise<any> | any;
 }
 /**
- * @private
- * Arguments passed to route loader/action functions when middleware is enabled.
- */
-interface DataFunctionArgsWithMiddleware {
-    request: Request;
-    params: Params;
-    context: MiddlewareContext;
-}
-/**
- * Arguments passed to middleware functions when middleware is enabled
- */
-export interface MiddlewareFunctionArgs extends DataFunctionArgsWithMiddleware {
-}
-/**
- * Route loader function signature when middleware is enabled
- */
-export interface MiddlewareFunction {
-    (args: MiddlewareFunctionArgs): DataFunctionReturnValue;
-}
-/**
- * Arguments passed to loader functions when middleware is enabled
- */
-export interface LoaderFunctionArgsWithMiddleware extends DataFunctionArgsWithMiddleware {
-}
-/**
- * Route loader function signature when middleware is enabled
- */
-export interface LoaderFunctionWithMiddleware {
-    (args: LoaderFunctionArgsWithMiddleware): DataFunctionReturnValue;
-}
-/**
- * Arguments passed to action functions when middleware is enabled
- */
-export interface ActionFunctionArgsWithMiddleware extends DataFunctionArgsWithMiddleware {
-}
-/**
- * Route action function signature when middleware is enabled
- */
-export interface ActionFunctionWithMiddleware {
-    (args: ActionFunctionArgsWithMiddleware): DataFunctionReturnValue;
-}
-/**
  * Route shouldRevalidate function signature.  This runs after any submission
@@ -167,2 +124,23 @@ * (navigation or fetcher), so we flatten the navigation/fetcher submission
 /**
+ * Function provided by the framework-aware layers to set `hasErrorBoundary`
+ * from the framework-aware `errorElement` prop
+ */
+export interface DetectErrorBoundaryFunction {
+    (route: AgnosticRouteObject): boolean;
+}
+/**
+ * Keys we cannot change from within a lazy() function. We spread all other keys
+ * onto the route. Either they're meaningful to the router, or they'll get
+ * ignored.
+ */
+export declare type ImmutableRouteKey = "lazy" | "caseSensitive" | "path" | "id" | "index" | "children";
+export declare const immutableRouteKeys: Set<ImmutableRouteKey>;
+/**
+ * lazy() function to load a route definition, which can add non-matching
+ * related properties to a route
+ */
+export interface LazyRouteFunction<R extends AgnosticRouteObject> {
+    (): Promise<Omit<R, ImmutableRouteKey>>;
+}
+/**
  * Base RouteObject with common props shared by all types of routes
@@ -174,8 +152,8 @@ */
     id?: string;
-    middleware?: MiddlewareFunction;
-    loader?: LoaderFunction | LoaderFunctionWithMiddleware;
-    action?: ActionFunction | ActionFunctionWithMiddleware;
+    loader?: LoaderFunction;
+    action?: ActionFunction;
     hasErrorBoundary?: boolean;
     shouldRevalidate?: ShouldRevalidateFunction;
     handle?: any;
+    lazy?: LazyRouteFunction<AgnosticBaseRouteObject>;
 };
@@ -212,2 +190,3 @@ /**
 export declare type AgnosticDataRouteObject = AgnosticDataIndexRouteObject | AgnosticDataNonIndexRouteObject;
+export declare type RouteManifest = Record<string, AgnosticDataRouteObject | undefined>;
 declare type _PathParam<Path extends string> = Path extends `${infer L}/${infer R}` ? _PathParam<L> | _PathParam<R> : Path extends `:${infer Param}` ? Param extends `${infer Optional}?` ? Optional : Param : never;
@@ -223,3 +202,3 @@ /**
  */
-declare type PathParam<Path extends string> = Path extends "*" ? "*" : Path extends `${infer Rest}/*` ? "*" | _PathParam<Rest> : _PathParam<Path>;
+declare type PathParam<Path extends string> = Path extends "*" | "/*" ? "*" : Path extends `${infer Rest}/*` ? "*" | _PathParam<Rest> : _PathParam<Path>;
 export declare type ParamParseKey<Segment extends string> = [
@@ -257,3 +236,3 @@ PathParam<Segment>
 }
-export declare function convertRoutesToDataRoutes(routes: AgnosticRouteObject[], parentPath?: number[], allIds?: Set<string>): AgnosticDataRouteObject[];
+export declare function convertRoutesToDataRoutes(routes: AgnosticRouteObject[], detectErrorBoundary: DetectErrorBoundaryFunction, parentPath?: number[], manifest?: RouteManifest): AgnosticDataRouteObject[];
 /**
@@ -326,6 +305,2 @@ * Matches the given routes to a location and returns the match data.
 /**
- * @private
- */
-export declare function warning(cond: any, message: string): void;
-/**
  * Returns a resolved path object relative to the given pathname.
@@ -442,50 +417,2 @@ *
 export declare function isRouteErrorResponse(error: any): error is ErrorResponse;
-/**
- * Context object passed through middleware functions and into action/loaders.
- *
- * Supports only key/value for now, eventually will be enhanced
- */
-export interface MiddlewareContext {
-    /**
-     * Retrieve a value from context
-     */
-    get<T>(key: MiddlewareContextInstance<T>): T;
-    /**
-     * Set a value from context
-     */
-    set<T>(key: MiddlewareContextInstance<T>, value: T): void;
-    /**
-     * Call any child middlewares and the destination loader/action
-     */
-    next: () => DataFunctionReturnValue;
-    /**
-     * @internal
-     * PRIVATE - DO NOT USE
-     *
-     * Return the entries - needed so we can copy values from the serverMiddleware
-     * context into route-specific contexts
-     */
-    entries(): IterableIterator<[MiddlewareContextInstance<unknown>, unknown]>;
-}
-/**
- * Generic class to "hold" a default middleware value and the generic type so
- * we can enforce typings on middleware.get/set
- */
-export declare class MiddlewareContextInstance<T> {
-    private defaultValue;
-    constructor(defaultValue?: T);
-    getDefaultValue(): T;
-}
-/**
- * Create a middleware context that can be used as a "key" to set/get middleware
- * values in a strongly-typed fashion
- */
-export declare function createMiddlewareContext<T extends unknown>(defaultValue?: T): MiddlewareContextInstance<T>;
-/**
- * @internal
- * PRIVATE - DO NOT USE
- *
- * Create a middleware "context" to store values and provide a next() hook
- */
-export declare function createMiddlewareStore(initialMiddlewareContext?: MiddlewareContext): MiddlewareContext;
 export {};

history.ts

@@ -484,3 +484,3 @@ ////////////////////////////////////////////////////////////////////////////////
 
-function warning(cond: any, message: string) {
+export function warning(cond: any, message: string) {
   if (!cond) {
@@ -487,0 +487,0 @@ // eslint-disable-next-line no-console

index.ts

 export type {
   ActionFunction,
   ActionFunctionArgs,
-  ActionFunctionWithMiddleware,
-  ActionFunctionArgsWithMiddleware,
   AgnosticDataIndexRouteObject,
@@ -14,2 +12,3 @@ AgnosticDataNonIndexRouteObject,
   AgnosticRouteObject,
+  LazyRouteFunction,
   TrackedPromise,
@@ -21,7 +20,2 @@ FormEncType,
   LoaderFunctionArgs,
-  LoaderFunctionWithMiddleware,
-  LoaderFunctionArgsWithMiddleware,
-  MiddlewareContext,
-  MiddlewareFunction,
-  MiddlewareFunctionArgs,
   ParamParseKey,
@@ -39,3 +33,2 @@ Params,
   ErrorResponse,
-  createMiddlewareContext,
   defer,
@@ -54,3 +47,2 @@ generatePath,
   stripBasename,
-  warning,
 } from "./utils";
@@ -78,3 +70,2 @@
   createMemoryHistory,
-  invariant,
   parsePath,
@@ -93,2 +84,3 @@ } from "./history";
 /** @internal */
+export type { RouteManifest as UNSAFE_RouteManifest } from "./utils";
 export {
@@ -98,3 +90,7 @@ DeferredData as UNSAFE_DeferredData,
   getPathContributingMatches as UNSAFE_getPathContributingMatches,
-  createMiddlewareStore as UNSAFE_createMiddlewareStore,
 } from "./utils";
+
+export {
+  invariant as UNSAFE_invariant,
+  warning as UNSAFE_warning,
+} from "./history";

package.json

 {
   "name": "@remix-run/router",
-  "version": "0.0.0-experimental-48058118",
+  "version": "0.0.0-experimental-5f6f59a6",
   "description": "Nested/Data-driven/Framework-agnostic Routing",
@@ -5,0 +5,0 @@ "keywords": [

utils.ts

 import type { Location, Path, To } from "./history";
-import { invariant, parsePath } from "./history";
+import { warning, invariant, parsePath } from "./history";
 
@@ -96,8 +96,2 @@ /**
 
-type DataFunctionReturnValue =
-  | Promise<Response>
-  | Response
-  | Promise<any>
-  | any;
-
 /**
@@ -117,3 +111,3 @@ * Arguments passed to loader functions
 export interface LoaderFunction {
-  (args: LoaderFunctionArgs): DataFunctionReturnValue;
+  (args: LoaderFunctionArgs): Promise<Response> | Response | Promise<any> | any;
 }
@@ -125,55 +119,6 @@
 export interface ActionFunction {
-  (args: ActionFunctionArgs): DataFunctionReturnValue;
+  (args: ActionFunctionArgs): Promise<Response> | Response | Promise<any> | any;
 }
 
 /**
- * @private
- * Arguments passed to route loader/action functions when middleware is enabled.
- */
-interface DataFunctionArgsWithMiddleware {
-  request: Request;
-  params: Params;
-  context: MiddlewareContext;
-}
-
-/**
- * Arguments passed to middleware functions when middleware is enabled
- */
-export interface MiddlewareFunctionArgs
-  extends DataFunctionArgsWithMiddleware {}
-
-/**
- * Route loader function signature when middleware is enabled
- */
-export interface MiddlewareFunction {
-  (args: MiddlewareFunctionArgs): DataFunctionReturnValue;
-}
-
-/**
- * Arguments passed to loader functions when middleware is enabled
- */
-export interface LoaderFunctionArgsWithMiddleware
-  extends DataFunctionArgsWithMiddleware {}
-
-/**
- * Route loader function signature when middleware is enabled
- */
-export interface LoaderFunctionWithMiddleware {
-  (args: LoaderFunctionArgsWithMiddleware): DataFunctionReturnValue;
-}
-
-/**
- * Arguments passed to action functions when middleware is enabled
- */
-export interface ActionFunctionArgsWithMiddleware
-  extends DataFunctionArgsWithMiddleware {}
-
-/**
- * Route action function signature when middleware is enabled
- */
-export interface ActionFunctionWithMiddleware {
-  (args: ActionFunctionArgsWithMiddleware): DataFunctionReturnValue;
-}
-
-/**
  * Route shouldRevalidate function signature.  This runs after any submission
@@ -201,2 +146,40 @@ * (navigation or fetcher), so we flatten the navigation/fetcher submission
 /**
+ * Function provided by the framework-aware layers to set `hasErrorBoundary`
+ * from the framework-aware `errorElement` prop
+ */
+export interface DetectErrorBoundaryFunction {
+  (route: AgnosticRouteObject): boolean;
+}
+
+/**
+ * Keys we cannot change from within a lazy() function. We spread all other keys
+ * onto the route. Either they're meaningful to the router, or they'll get
+ * ignored.
+ */
+export type ImmutableRouteKey =
+  | "lazy"
+  | "caseSensitive"
+  | "path"
+  | "id"
+  | "index"
+  | "children";
+
+export const immutableRouteKeys = new Set<ImmutableRouteKey>([
+  "lazy",
+  "caseSensitive",
+  "path",
+  "id",
+  "index",
+  "children",
+]);
+
+/**
+ * lazy() function to load a route definition, which can add non-matching
+ * related properties to a route
+ */
+export interface LazyRouteFunction<R extends AgnosticRouteObject> {
+  (): Promise<Omit<R, ImmutableRouteKey>>;
+}
+
+/**
  * Base RouteObject with common props shared by all types of routes
@@ -208,8 +191,8 @@ */
   id?: string;
-  middleware?: MiddlewareFunction;
-  loader?: LoaderFunction | LoaderFunctionWithMiddleware;
-  action?: ActionFunction | ActionFunctionWithMiddleware;
+  loader?: LoaderFunction;
+  action?: ActionFunction;
   hasErrorBoundary?: boolean;
   shouldRevalidate?: ShouldRevalidateFunction;
   handle?: any;
+  lazy?: LazyRouteFunction<AgnosticBaseRouteObject>;
 };
@@ -257,2 +240,4 @@
 
+export type RouteManifest = Record<string, AgnosticDataRouteObject | undefined>;
+
 // Recursive helper for finding path parameters in the absence of wildcards
@@ -282,3 +267,3 @@ type _PathParam<Path extends string> =
   // check if path is just a wildcard
-  Path extends "*"
+  Path extends "*" | "/*"
     ? "*"
@@ -343,4 +328,5 @@ : // look for wildcard at the end of the path
   routes: AgnosticRouteObject[],
+  detectErrorBoundary: DetectErrorBoundaryFunction,
   parentPath: number[] = [],
-  allIds: Set<string> = new Set<string>()
+  manifest: RouteManifest = {}
 ): AgnosticDataRouteObject[] {
@@ -355,10 +341,14 @@ return routes.map((route, index) => {
     invariant(
-      !allIds.has(id),
+      !manifest[id],
       `Found a route id collision on id "${id}".  Route ` +
         "id's must be globally unique within Data Router usages"
     );
-    allIds.add(id);
 
     if (isIndexRoute(route)) {
-      let indexRoute: AgnosticDataIndexRouteObject = { ...route, id };
+      let indexRoute: AgnosticDataIndexRouteObject = {
+        ...route,
+        hasErrorBoundary: detectErrorBoundary(route),
+        id,
+      };
+      manifest[id] = indexRoute;
       return indexRoute;
@@ -369,6 +359,16 @@ } else {
         id,
-        children: route.children
-          ? convertRoutesToDataRoutes(route.children, treePath, allIds)
-          : undefined,
+        hasErrorBoundary: detectErrorBoundary(route),
+        children: undefined,
       };
+      manifest[id] = pathOrLayoutRoute;
+
+      if (route.children) {
+        pathOrLayoutRoute.children = convertRoutesToDataRoutes(
+          route.children,
+          detectErrorBoundary,
+          treePath,
+          manifest
+        );
+      }
+
       return pathOrLayoutRoute;
@@ -690,3 +690,3 @@ }
 ): string {
-  let path = originalPath;
+  let path: string = originalPath;
   if (path.endsWith("*") && path !== "*" && !path.endsWith("/*")) {
@@ -703,45 +703,42 @@ warning(
 
-  return (
-    path
-      .replace(
-        /^:(\w+)(\??)/g,
-        (_, key: PathParam<Path>, optional: string | undefined) => {
-          let param = params[key];
-          if (optional === "?") {
-            return param == null ? "" : param;
-          }
-          if (param == null) {
-            invariant(false, `Missing ":${key}" param`);
-          }
-          return param;
+  // ensure `/` is added at the beginning if the path is absolute
+  const prefix = path.startsWith("/") ? "/" : "";
+
+  const segments = path
+    .split(/\/+/)
+    .map((segment, index, array) => {
+      const isLastSegment = index === array.length - 1;
+
+      // only apply the splat if it's the last segment
+      if (isLastSegment && segment === "*") {
+        const star = "*" as PathParam<Path>;
+        const starParam = params[star];
+
+        // Apply the splat
+        return starParam;
+      }
+
+      const keyMatch = segment.match(/^:(\w+)(\??)$/);
+      if (keyMatch) {
+        const [, key, optional] = keyMatch;
+        let param = params[key as PathParam<Path>];
+
+        if (optional === "?") {
+          return param == null ? "" : param;
         }
-      )
-      .replace(
-        /\/:(\w+)(\??)/g,
-        (_, key: PathParam<Path>, optional: string | undefined) => {
-          let param = params[key];
-          if (optional === "?") {
-            return param == null ? "" : `/${param}`;
-          }
-          if (param == null) {
-            invariant(false, `Missing ":${key}" param`);
-          }
-          return `/${param}`;
+
+        if (param == null) {
+          invariant(false, `Missing ":${key}" param`);
         }
-      )
+
+        return param;
+      }
+
       // Remove any optional markers from optional static segments
-      .replace(/\?/g, "")
-      .replace(/(\/?)\*/, (_, prefix, __, str) => {
-        const star = "*" as PathParam<Path>;
+      return segment.replace(/\?$/g, "");
+    })
+    // Remove empty segments
+    .filter((segment) => !!segment);
 
-        if (params[star] == null) {
-          // If no splat was provided, trim the trailing slash _unless_ it's
-          // the entire path
-          return str === "/*" ? "/" : "";
-        }
-
-        // Apply the splat
-        return `${prefix}${params[star]}`;
-      })
-  );
+  return prefix + segments.join("/");
 }
@@ -963,22 +960,2 @@
 /**
- * @private
- */
-export function warning(cond: any, message: string): void {
-  if (!cond) {
-    // eslint-disable-next-line no-console
-    if (typeof console !== "undefined") console.warn(message);
-
-    try {
-      // Welcome to debugging @remix-run/router!
-      //
-      // This error is thrown as a convenience so you can more easily
-      // find the source for a warning that appears in the console by
-      // enabling "pause on exceptions" in your JavaScript debugger.
-      throw new Error(message);
-      // eslint-disable-next-line no-empty
-    } catch (e) {}
-  }
-}
-
-/**
  * Returns a resolved path object relative to the given pathname.
@@ -1483,91 +1460,1 @@ *
 }
-
-/**
- * Context object passed through middleware functions and into action/loaders.
- *
- * Supports only key/value for now, eventually will be enhanced
- */
-export interface MiddlewareContext {
-  /**
-   * Retrieve a value from context
-   */
-  get<T>(key: MiddlewareContextInstance<T>): T;
-  /**
-   * Set a value from context
-   */
-  set<T>(key: MiddlewareContextInstance<T>, value: T): void;
-  /**
-   * Call any child middlewares and the destination loader/action
-   */
-  next: () => DataFunctionReturnValue;
-  /**
-   * @internal
-   * PRIVATE - DO NOT USE
-   *
-   * Return the entries - needed so we can copy values from the serverMiddleware
-   * context into route-specific contexts
-   */
-  entries(): IterableIterator<[MiddlewareContextInstance<unknown>, unknown]>;
-}
-
-/**
- * Generic class to "hold" a default middleware value and the generic type so
- * we can enforce typings on middleware.get/set
- */
-export class MiddlewareContextInstance<T> {
-  private defaultValue: T | undefined;
-
-  constructor(defaultValue?: T) {
-    if (typeof defaultValue !== "undefined") {
-      this.defaultValue = defaultValue;
-    }
-  }
-
-  getDefaultValue(): T {
-    if (typeof this.defaultValue === "undefined") {
-      throw new Error("Unable to find a value in the middleware context");
-    }
-    return this.defaultValue;
-  }
-}
-
-/**
- * Create a middleware context that can be used as a "key" to set/get middleware
- * values in a strongly-typed fashion
- */
-export function createMiddlewareContext<T extends unknown>(
-  defaultValue?: T
-): MiddlewareContextInstance<T> {
-  return new MiddlewareContextInstance<T>(defaultValue);
-}
-
-/**
- * @internal
- * PRIVATE - DO NOT USE
- *
- * Create a middleware "context" to store values and provide a next() hook
- */
-export function createMiddlewareStore(
-  initialMiddlewareContext?: MiddlewareContext
-) {
-  let store = new Map(initialMiddlewareContext?.entries());
-  let middlewareContext: MiddlewareContext = {
-    get<T>(k: MiddlewareContextInstance<T>) {
-      if (store.has(k)) {
-        return store.get(k) as T;
-      }
-      return k.getDefaultValue();
-    },
-    set<T>(k: MiddlewareContextInstance<T>, v: T) {
-      if (typeof v === "undefined") {
-        throw new Error(
-          "You cannot set an undefined value in the middleware context"
-        );
-      }
-      store.set(k, v);
-    },
-    next: () => {},
-    entries: () => store.entries(),
-  };
-  return middlewareContext;
-}

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1941739

increased by1.33%

Worsened metrics

Lines of code

17325

decreased by-0.18%

No dependency changes