@tanstack/router-core 0.0.1-beta.2 → 0.0.1-beta.21

package/build/cjs/packages/router-core/src/index.js

@@ -41,7 +41,6 @@ exports.trimPathLeft = path.trimPathLeft;
 exports.trimPathRight = path.trimPathRight;
 exports.decode = qss.decode;
 exports.encode = qss.encode;
-exports.cascadeLoaderData = route.cascadeLoaderData;
 exports.createRoute = route.createRoute;
 exports.createRouteConfig = routeConfig.createRouteConfig;
 exports.rootRouteId = routeConfig.rootRouteId;
@@ -53,6 +52,7 @@ exports.parseSearchWith = searchParams.parseSearchWith;
 exports.stringifySearchWith = searchParams.stringifySearchWith;
 exports.functionalUpdate = utils.functionalUpdate;
 exports.last = utils.last;
+exports.pick = utils.pick;
 exports.replaceEqualDeep = utils.replaceEqualDeep;
 exports.warning = utils.warning;
 //# sourceMappingURL=index.js.map

package/build/cjs/packages/router-core/src/qss.js

@@ -42,6 +42,7 @@ function toValue(mix) {
   var str = decodeURIComponent(mix);
   if (str === 'false') return false;
   if (str === 'true') return true;
+  if (str.charAt(0) === '0') return str;
   return +str * 0 === 0 ? +str : str;
 }
 

package/build/cjs/packages/router-core/src/qss.js.map

@@ -1 +1 @@
-{"version":3,"file":"qss.js","sources":["../../../../../src/qss.ts"],"sourcesContent":["// @ts-nocheck\n\n// qss has been slightly modified and inlined here for our use cases (and compression's sake). We've included it as a hard dependency for MIT license attribution.\n\nexport function encode(obj, pfx?: string) {\n  var k,\n    i,\n    tmp,\n    str = ''\n\n  for (k in obj) {\n    if ((tmp = obj[k]) !== void 0) {\n      if (Array.isArray(tmp)) {\n        for (i = 0; i < tmp.length; i++) {\n          str && (str += '&')\n          str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp[i])\n        }\n      } else {\n        str && (str += '&')\n        str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp)\n      }\n    }\n  }\n\n  return (pfx || '') + str\n}\n\nfunction toValue(mix) {\n  if (!mix) return ''\n  var str = decodeURIComponent(mix)\n  if (str === 'false') return false\n  if (str === 'true') return true\n  return +str * 0 === 0 ? +str : str\n}\n\nexport function decode(str) {\n  var tmp,\n    k,\n    out = {},\n    arr = str.split('&')\n\n  while ((tmp = arr.shift())) {\n    tmp = tmp.split('=')\n    k = tmp.shift()\n    if (out[k] !== void 0) {\n      out[k] = [].concat(out[k], toValue(tmp.shift()))\n    } else {\n      out[k] = toValue(tmp.shift())\n    }\n  }\n\n  return out\n}\n"],"names":["encode","obj","pfx","k","i","tmp","str","Array","isArray","length","encodeURIComponent","toValue","mix","decodeURIComponent","decode","out","arr","split","shift","concat"],"mappings":";;;;;;;;;;;;;;AAAA;AAEA;AAEO,SAASA,MAAT,CAAgBC,GAAhB,EAAqBC,GAArB,EAAmC;AACxC,EAAA,IAAIC,CAAJ;AAAA,MACEC,CADF;AAAA,MAEEC,GAFF;MAGEC,GAAG,GAAG,EAHR,CAAA;;EAKA,KAAKH,CAAL,IAAUF,GAAV,EAAe;IACb,IAAI,CAACI,GAAG,GAAGJ,GAAG,CAACE,CAAD,CAAV,MAAmB,KAAK,CAA5B,EAA+B;AAC7B,MAAA,IAAII,KAAK,CAACC,OAAN,CAAcH,GAAd,CAAJ,EAAwB;AACtB,QAAA,KAAKD,CAAC,GAAG,CAAT,EAAYA,CAAC,GAAGC,GAAG,CAACI,MAApB,EAA4BL,CAAC,EAA7B,EAAiC;AAC/BE,UAAAA,GAAG,KAAKA,GAAG,IAAI,GAAZ,CAAH,CAAA;AACAA,UAAAA,GAAG,IAAII,kBAAkB,CAACP,CAAD,CAAlB,GAAwB,GAAxB,GAA8BO,kBAAkB,CAACL,GAAG,CAACD,CAAD,CAAJ,CAAvD,CAAA;AACD,SAAA;AACF,OALD,MAKO;AACLE,QAAAA,GAAG,KAAKA,GAAG,IAAI,GAAZ,CAAH,CAAA;QACAA,GAAG,IAAII,kBAAkB,CAACP,CAAD,CAAlB,GAAwB,GAAxB,GAA8BO,kBAAkB,CAACL,GAAD,CAAvD,CAAA;AACD,OAAA;AACF,KAAA;AACF,GAAA;;AAED,EAAA,OAAO,CAACH,GAAG,IAAI,EAAR,IAAcI,GAArB,CAAA;AACD,CAAA;;AAED,SAASK,OAAT,CAAiBC,GAAjB,EAAsB;AACpB,EAAA,IAAI,CAACA,GAAL,EAAU,OAAO,EAAP,CAAA;AACV,EAAA,IAAIN,GAAG,GAAGO,kBAAkB,CAACD,GAAD,CAA5B,CAAA;AACA,EAAA,IAAIN,GAAG,KAAK,OAAZ,EAAqB,OAAO,KAAP,CAAA;AACrB,EAAA,IAAIA,GAAG,KAAK,MAAZ,EAAoB,OAAO,IAAP,CAAA;EACpB,OAAO,CAACA,GAAD,GAAO,CAAP,KAAa,CAAb,GAAiB,CAACA,GAAlB,GAAwBA,GAA/B,CAAA;AACD,CAAA;;AAEM,SAASQ,MAAT,CAAgBR,GAAhB,EAAqB;AAC1B,EAAA,IAAID,GAAJ;AAAA,MACEF,CADF;MAEEY,GAAG,GAAG,EAFR;AAAA,MAGEC,GAAG,GAAGV,GAAG,CAACW,KAAJ,CAAU,GAAV,CAHR,CAAA;;AAKA,EAAA,OAAQZ,GAAG,GAAGW,GAAG,CAACE,KAAJ,EAAd,EAA4B;AAC1Bb,IAAAA,GAAG,GAAGA,GAAG,CAACY,KAAJ,CAAU,GAAV,CAAN,CAAA;AACAd,IAAAA,CAAC,GAAGE,GAAG,CAACa,KAAJ,EAAJ,CAAA;;AACA,IAAA,IAAIH,GAAG,CAACZ,CAAD,CAAH,KAAW,KAAK,CAApB,EAAuB;AACrBY,MAAAA,GAAG,CAACZ,CAAD,CAAH,GAAS,EAAGgB,CAAAA,MAAH,CAAUJ,GAAG,CAACZ,CAAD,CAAb,EAAkBQ,OAAO,CAACN,GAAG,CAACa,KAAJ,EAAD,CAAzB,CAAT,CAAA;AACD,KAFD,MAEO;MACLH,GAAG,CAACZ,CAAD,CAAH,GAASQ,OAAO,CAACN,GAAG,CAACa,KAAJ,EAAD,CAAhB,CAAA;AACD,KAAA;AACF,GAAA;;AAED,EAAA,OAAOH,GAAP,CAAA;AACD;;;;;"}
+{"version":3,"file":"qss.js","sources":["../../../../../src/qss.ts"],"sourcesContent":["// @ts-nocheck\n\n// qss has been slightly modified and inlined here for our use cases (and compression's sake). We've included it as a hard dependency for MIT license attribution.\n\nexport function encode(obj, pfx?: string) {\n  var k,\n    i,\n    tmp,\n    str = ''\n\n  for (k in obj) {\n    if ((tmp = obj[k]) !== void 0) {\n      if (Array.isArray(tmp)) {\n        for (i = 0; i < tmp.length; i++) {\n          str && (str += '&')\n          str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp[i])\n        }\n      } else {\n        str && (str += '&')\n        str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp)\n      }\n    }\n  }\n\n  return (pfx || '') + str\n}\n\nfunction toValue(mix) {\n  if (!mix) return ''\n  var str = decodeURIComponent(mix)\n  if (str === 'false') return false\n  if (str === 'true') return true\n  if (str.charAt(0) === '0') return str\n  return +str * 0 === 0 ? +str : str\n}\n\nexport function decode(str) {\n  var tmp,\n    k,\n    out = {},\n    arr = str.split('&')\n\n  while ((tmp = arr.shift())) {\n    tmp = tmp.split('=')\n    k = tmp.shift()\n    if (out[k] !== void 0) {\n      out[k] = [].concat(out[k], toValue(tmp.shift()))\n    } else {\n      out[k] = toValue(tmp.shift())\n    }\n  }\n\n  return out\n}\n"],"names":["encode","obj","pfx","k","i","tmp","str","Array","isArray","length","encodeURIComponent","toValue","mix","decodeURIComponent","charAt","decode","out","arr","split","shift","concat"],"mappings":";;;;;;;;;;;;;;AAAA;AAEA;AAEO,SAASA,MAAT,CAAgBC,GAAhB,EAAqBC,GAArB,EAAmC;AACxC,EAAA,IAAIC,CAAJ;AAAA,MACEC,CADF;AAAA,MAEEC,GAFF;MAGEC,GAAG,GAAG,EAHR,CAAA;;EAKA,KAAKH,CAAL,IAAUF,GAAV,EAAe;IACb,IAAI,CAACI,GAAG,GAAGJ,GAAG,CAACE,CAAD,CAAV,MAAmB,KAAK,CAA5B,EAA+B;AAC7B,MAAA,IAAII,KAAK,CAACC,OAAN,CAAcH,GAAd,CAAJ,EAAwB;AACtB,QAAA,KAAKD,CAAC,GAAG,CAAT,EAAYA,CAAC,GAAGC,GAAG,CAACI,MAApB,EAA4BL,CAAC,EAA7B,EAAiC;AAC/BE,UAAAA,GAAG,KAAKA,GAAG,IAAI,GAAZ,CAAH,CAAA;AACAA,UAAAA,GAAG,IAAII,kBAAkB,CAACP,CAAD,CAAlB,GAAwB,GAAxB,GAA8BO,kBAAkB,CAACL,GAAG,CAACD,CAAD,CAAJ,CAAvD,CAAA;AACD,SAAA;AACF,OALD,MAKO;AACLE,QAAAA,GAAG,KAAKA,GAAG,IAAI,GAAZ,CAAH,CAAA;QACAA,GAAG,IAAII,kBAAkB,CAACP,CAAD,CAAlB,GAAwB,GAAxB,GAA8BO,kBAAkB,CAACL,GAAD,CAAvD,CAAA;AACD,OAAA;AACF,KAAA;AACF,GAAA;;AAED,EAAA,OAAO,CAACH,GAAG,IAAI,EAAR,IAAcI,GAArB,CAAA;AACD,CAAA;;AAED,SAASK,OAAT,CAAiBC,GAAjB,EAAsB;AACpB,EAAA,IAAI,CAACA,GAAL,EAAU,OAAO,EAAP,CAAA;AACV,EAAA,IAAIN,GAAG,GAAGO,kBAAkB,CAACD,GAAD,CAA5B,CAAA;AACA,EAAA,IAAIN,GAAG,KAAK,OAAZ,EAAqB,OAAO,KAAP,CAAA;AACrB,EAAA,IAAIA,GAAG,KAAK,MAAZ,EAAoB,OAAO,IAAP,CAAA;EACpB,IAAIA,GAAG,CAACQ,MAAJ,CAAW,CAAX,CAAkB,KAAA,GAAtB,EAA2B,OAAOR,GAAP,CAAA;EAC3B,OAAO,CAACA,GAAD,GAAO,CAAP,KAAa,CAAb,GAAiB,CAACA,GAAlB,GAAwBA,GAA/B,CAAA;AACD,CAAA;;AAEM,SAASS,MAAT,CAAgBT,GAAhB,EAAqB;AAC1B,EAAA,IAAID,GAAJ;AAAA,MACEF,CADF;MAEEa,GAAG,GAAG,EAFR;AAAA,MAGEC,GAAG,GAAGX,GAAG,CAACY,KAAJ,CAAU,GAAV,CAHR,CAAA;;AAKA,EAAA,OAAQb,GAAG,GAAGY,GAAG,CAACE,KAAJ,EAAd,EAA4B;AAC1Bd,IAAAA,GAAG,GAAGA,GAAG,CAACa,KAAJ,CAAU,GAAV,CAAN,CAAA;AACAf,IAAAA,CAAC,GAAGE,GAAG,CAACc,KAAJ,EAAJ,CAAA;;AACA,IAAA,IAAIH,GAAG,CAACb,CAAD,CAAH,KAAW,KAAK,CAApB,EAAuB;AACrBa,MAAAA,GAAG,CAACb,CAAD,CAAH,GAAS,EAAGiB,CAAAA,MAAH,CAAUJ,GAAG,CAACb,CAAD,CAAb,EAAkBQ,OAAO,CAACN,GAAG,CAACc,KAAJ,EAAD,CAAzB,CAAT,CAAA;AACD,KAFD,MAEO;MACLH,GAAG,CAACb,CAAD,CAAH,GAASQ,OAAO,CAACN,GAAG,CAACc,KAAJ,EAAD,CAAhB,CAAA;AACD,KAAA;AACF,GAAA;;AAED,EAAA,OAAOH,GAAP,CAAA;AACD;;;;;"}

package/build/cjs/packages/router-core/src/route.js

@@ -13,7 +13,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
-var utils = require('./utils.js');
 
 function createRoute(routeConfig, options, parent, router) {
   const {
@@ -25,7 +24,7 @@ function createRoute(routeConfig, options, parent, router) {
 
   const action = router.state.actions[id] || (() => {
     router.state.actions[id] = {
-      pending: [],
+      submissions: [],
       submit: async (submission, actionOpts) => {
         var _actionOpts$invalidat;
 
@@ -34,18 +33,20 @@ function createRoute(routeConfig, options, parent, router) {
         }
 
         const invalidate = (_actionOpts$invalidat = actionOpts == null ? void 0 : actionOpts.invalidate) != null ? _actionOpts$invalidat : true;
+
+        if (!(actionOpts != null && actionOpts.multi)) {
+          action.submissions = action.submissions.filter(d => d.isMulti);
+        }
+
         const actionState = {
           submittedAt: Date.now(),
           status: 'pending',
-          submission
+          submission,
+          isMulti: !!(actionOpts != null && actionOpts.multi)
         };
         action.current = actionState;
         action.latest = actionState;
-        action.pending.push(actionState);
-        router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, {
-          currentAction: actionState,
-          latestAction: actionState
-        });
+        action.submissions.push(actionState);
         router.notify();
 
         try {
@@ -67,11 +68,6 @@ function createRoute(routeConfig, options, parent, router) {
           actionState.error = err;
           actionState.status = 'error';
         } finally {
-          action.pending = action.pending.filter(d => d !== actionState);
-          router.removeActionQueue.push({
-            action,
-            actionState
-          });
           router.notify();
         }
       }
@@ -146,16 +142,6 @@ function createRoute(routeConfig, options, parent, router) {
   });
   return route;
 }
-function cascadeLoaderData(matches) {
-  matches.forEach((match, index) => {
-    const parent = matches[index - 1];
-
-    if (parent) {
-      match.loaderData = utils.replaceEqualDeep(match.loaderData, _rollupPluginBabelHelpers["extends"]({}, parent.loaderData, match.routeLoaderData));
-    }
-  });
-}
 
-exports.cascadeLoaderData = cascadeLoaderData;
 exports.createRoute = createRoute;
 //# sourceMappingURL=route.js.map

package/build/cjs/packages/router-core/src/route.js.map

@@ -1 +1 @@
-{"version":3,"file":"route.js","sources":["../../../../../src/route.ts"],"sourcesContent":["import {\n  CheckRelativePath,\n  LinkInfo,\n  LinkOptions,\n  ResolveRelativePath,\n  ToOptions,\n} from './link'\nimport { LoaderContext, RouteConfig, RouteOptions } from './routeConfig'\nimport {\n  AnyAllRouteInfo,\n  AnyRouteInfo,\n  DefaultAllRouteInfo,\n  RouteInfo,\n  RouteInfoByPath,\n} from './routeInfo'\nimport { RouteMatch } from './routeMatch'\nimport {\n  Action,\n  ActionState,\n  Loader,\n  LoaderState,\n  MatchRouteOptions,\n  Router,\n} from './router'\nimport { NoInfer, replaceEqualDeep } from './utils'\n\nexport interface AnyRoute extends Route<any, any> {}\n\nexport interface Route<\n  TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n  TRouteInfo extends AnyRouteInfo = RouteInfo,\n> {\n  routeId: TRouteInfo['id']\n  routeRouteId: TRouteInfo['routeId']\n  routePath: TRouteInfo['path']\n  fullPath: TRouteInfo['fullPath']\n  parentRoute?: AnyRoute\n  childRoutes?: AnyRoute[]\n  options: RouteOptions\n  router: Router<TAllRouteInfo['routeConfig'], TAllRouteInfo>\n  buildLink: <TTo extends string = '.'>(\n    options: Omit<\n      LinkOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo>,\n      'from'\n    >,\n  ) => LinkInfo\n  matchRoute: <\n    TTo extends string = '.',\n    TResolved extends string = ResolveRelativePath<TRouteInfo['id'], TTo>,\n  >(\n    matchLocation: CheckRelativePath<\n      TAllRouteInfo,\n      TRouteInfo['fullPath'],\n      NoInfer<TTo>\n    > &\n      Omit<ToOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo>, 'from'>,\n    opts?: MatchRouteOptions,\n  ) => RouteInfoByPath<TAllRouteInfo, TResolved>['allParams']\n  navigate: <TTo extends string = '.'>(\n    options: Omit<LinkOptions<TAllRouteInfo, TRouteInfo['id'], TTo>, 'from'>,\n  ) => Promise<void>\n  action: unknown extends TRouteInfo['actionResponse']\n    ?\n        | Action<TRouteInfo['actionPayload'], TRouteInfo['actionResponse']>\n        | undefined\n    : Action<TRouteInfo['actionPayload'], TRouteInfo['actionResponse']>\n  loader: unknown extends TRouteInfo['routeLoaderData']\n    ?\n        | Action<\n            LoaderContext<\n              TRouteInfo['fullSearchSchema'],\n              TRouteInfo['allParams']\n            >,\n            TRouteInfo['routeLoaderData']\n          >\n        | undefined\n    : Loader<\n        TRouteInfo['fullSearchSchema'],\n        TRouteInfo['allParams'],\n        TRouteInfo['routeLoaderData']\n      >\n}\n\nexport function createRoute<\n  TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n  TRouteInfo extends AnyRouteInfo = RouteInfo,\n>(\n  routeConfig: RouteConfig,\n  options: TRouteInfo['options'],\n  parent: undefined | Route<TAllRouteInfo, any>,\n  router: Router<TAllRouteInfo['routeConfig'], TAllRouteInfo>,\n): Route<TAllRouteInfo, TRouteInfo> {\n  const { id, routeId, path: routePath, fullPath } = routeConfig\n\n  const action =\n    router.state.actions[id] ||\n    (() => {\n      router.state.actions[id] = {\n        pending: [],\n        submit: async <T, U>(\n          submission: T,\n          actionOpts?: { invalidate?: boolean },\n        ) => {\n          if (!route) {\n            return\n          }\n\n          const invalidate = actionOpts?.invalidate ?? true\n\n          const actionState: ActionState<T, U> = {\n            submittedAt: Date.now(),\n            status: 'pending',\n            submission,\n          }\n\n          action.current = actionState\n          action.latest = actionState\n          action.pending.push(actionState)\n\n          router.state = {\n            ...router.state,\n            currentAction: actionState,\n            latestAction: actionState,\n          }\n\n          router.notify()\n\n          try {\n            const res = await route.options.action?.(submission)\n            actionState.data = res as U\n            if (invalidate) {\n              router.invalidateRoute({ to: '.', fromCurrent: true })\n              await router.reload()\n            }\n            actionState.status = 'success'\n            return res\n          } catch (err) {\n            console.error(err)\n            actionState.error = err\n            actionState.status = 'error'\n          } finally {\n            action.pending = action.pending.filter((d) => d !== actionState)\n            router.removeActionQueue.push({ action, actionState })\n            router.notify()\n          }\n        },\n      }\n      return router.state.actions[id]!\n    })()\n\n  const loader =\n    router.state.loaders[id] ||\n    (() => {\n      router.state.loaders[id] = {\n        pending: [],\n        fetch: (async (loaderContext: LoaderContext<any, any>) => {\n          if (!route) {\n            return\n          }\n\n          const loaderState: LoaderState<any, any> = {\n            loadedAt: Date.now(),\n            loaderContext,\n          }\n\n          loader.current = loaderState\n          loader.latest = loaderState\n          loader.pending.push(loaderState)\n\n          // router.state = {\n          //   ...router.state,\n          //   currentAction: loaderState,\n          //   latestAction: loaderState,\n          // }\n\n          router.notify()\n\n          try {\n            return await route.options.loader?.(loaderContext)\n          } finally {\n            loader.pending = loader.pending.filter((d) => d !== loaderState)\n            // router.removeActionQueue.push({ loader, loaderState })\n            router.notify()\n          }\n        }) as any,\n      }\n      return router.state.loaders[id]!\n    })()\n\n  let route: Route<TAllRouteInfo, TRouteInfo> = {\n    routeId: id,\n    routeRouteId: routeId,\n    routePath,\n    fullPath,\n    options,\n    router,\n    childRoutes: undefined!,\n    parentRoute: parent,\n    action,\n    loader: loader as any,\n\n    buildLink: (options) => {\n      return router.buildLink({\n        ...options,\n        from: fullPath,\n      } as any) as any\n    },\n\n    navigate: (options) => {\n      return router.navigate({\n        ...options,\n        from: fullPath,\n      } as any) as any\n    },\n\n    matchRoute: (matchLocation, opts) => {\n      return router.matchRoute(\n        {\n          ...matchLocation,\n          from: fullPath,\n        } as any,\n        opts,\n      )\n    },\n  }\n\n  router.options.createRoute?.({ router, route })\n\n  return route\n}\n\nexport function cascadeLoaderData(matches: RouteMatch<any, any>[]) {\n  matches.forEach((match, index) => {\n    const parent = matches[index - 1]\n\n    if (parent) {\n      match.loaderData = replaceEqualDeep(match.loaderData, {\n        ...parent.loaderData,\n        ...match.routeLoaderData,\n      })\n    }\n  })\n}\n"],"names":["createRoute","routeConfig","options","parent","router","id","routeId","path","routePath","fullPath","action","state","actions","pending","submit","submission","actionOpts","route","invalidate","actionState","submittedAt","Date","now","status","current","latest","push","currentAction","latestAction","notify","res","data","invalidateRoute","to","fromCurrent","reload","err","console","error","filter","d","removeActionQueue","loader","loaders","fetch","loaderContext","loaderState","loadedAt","routeRouteId","childRoutes","undefined","parentRoute","buildLink","_extends","from","navigate","matchRoute","matchLocation","opts","cascadeLoaderData","matches","forEach","match","index","loaderData","replaceEqualDeep","routeLoaderData"],"mappings":"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"}
+{"version":3,"file":"route.js","sources":["../../../../../src/route.ts"],"sourcesContent":["import {\n  CheckRelativePath,\n  LinkInfo,\n  LinkOptions,\n  ResolveRelativePath,\n  ToOptions,\n} from './link'\nimport { LoaderContext, RouteConfig, RouteOptions } from './routeConfig'\nimport {\n  AnyAllRouteInfo,\n  AnyRouteInfo,\n  DefaultAllRouteInfo,\n  RouteInfo,\n  RouteInfoByPath,\n} from './routeInfo'\nimport {\n  Action,\n  ActionState,\n  Loader,\n  LoaderState,\n  MatchRouteOptions,\n  Router,\n} from './router'\nimport { NoInfer } from './utils'\n\nexport interface AnyRoute extends Route<any, any> {}\n\nexport interface Route<\n  TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n  TRouteInfo extends AnyRouteInfo = RouteInfo,\n> {\n  routeId: TRouteInfo['id']\n  routeRouteId: TRouteInfo['routeId']\n  routePath: TRouteInfo['path']\n  fullPath: TRouteInfo['fullPath']\n  parentRoute?: AnyRoute\n  childRoutes?: AnyRoute[]\n  options: RouteOptions\n  router: Router<TAllRouteInfo['routeConfig'], TAllRouteInfo>\n  buildLink: <TTo extends string = '.'>(\n    options: Omit<\n      LinkOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo>,\n      'from'\n    >,\n  ) => LinkInfo\n  matchRoute: <\n    TTo extends string = '.',\n    TResolved extends string = ResolveRelativePath<TRouteInfo['id'], TTo>,\n  >(\n    matchLocation: CheckRelativePath<\n      TAllRouteInfo,\n      TRouteInfo['fullPath'],\n      NoInfer<TTo>\n    > &\n      Omit<ToOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo>, 'from'>,\n    opts?: MatchRouteOptions,\n  ) => RouteInfoByPath<TAllRouteInfo, TResolved>['allParams']\n  navigate: <TTo extends string = '.'>(\n    options: Omit<LinkOptions<TAllRouteInfo, TRouteInfo['id'], TTo>, 'from'>,\n  ) => Promise<void>\n  action: unknown extends TRouteInfo['actionResponse']\n    ?\n        | Action<TRouteInfo['actionPayload'], TRouteInfo['actionResponse']>\n        | undefined\n    : Action<TRouteInfo['actionPayload'], TRouteInfo['actionResponse']>\n  loader: unknown extends TRouteInfo['routeLoaderData']\n    ?\n        | Action<\n            LoaderContext<\n              TRouteInfo['fullSearchSchema'],\n              TRouteInfo['allParams']\n            >,\n            TRouteInfo['routeLoaderData']\n          >\n        | undefined\n    : Loader<\n        TRouteInfo['fullSearchSchema'],\n        TRouteInfo['allParams'],\n        TRouteInfo['routeLoaderData']\n      >\n}\n\nexport function createRoute<\n  TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n  TRouteInfo extends AnyRouteInfo = RouteInfo,\n>(\n  routeConfig: RouteConfig,\n  options: TRouteInfo['options'],\n  parent: undefined | Route<TAllRouteInfo, any>,\n  router: Router<TAllRouteInfo['routeConfig'], TAllRouteInfo>,\n): Route<TAllRouteInfo, TRouteInfo> {\n  const { id, routeId, path: routePath, fullPath } = routeConfig\n\n  const action =\n    router.state.actions[id] ||\n    (() => {\n      router.state.actions[id] = {\n        submissions: [],\n        submit: async <T, U>(\n          submission: T,\n          actionOpts?: { invalidate?: boolean; multi?: boolean },\n        ) => {\n          if (!route) {\n            return\n          }\n\n          const invalidate = actionOpts?.invalidate ?? true\n\n          if (!actionOpts?.multi) {\n            action.submissions = action.submissions.filter((d) => d.isMulti)\n          }\n\n          const actionState: ActionState<T, U> = {\n            submittedAt: Date.now(),\n            status: 'pending',\n            submission,\n            isMulti: !!actionOpts?.multi,\n          }\n\n          action.current = actionState\n          action.latest = actionState\n          action.submissions.push(actionState)\n\n          router.notify()\n\n          try {\n            const res = await route.options.action?.(submission)\n            actionState.data = res as U\n\n            if (invalidate) {\n              router.invalidateRoute({ to: '.', fromCurrent: true })\n              await router.reload()\n            }\n            actionState.status = 'success'\n            return res\n          } catch (err) {\n            console.error(err)\n            actionState.error = err\n            actionState.status = 'error'\n          } finally {\n            router.notify()\n          }\n        },\n      }\n      return router.state.actions[id]!\n    })()\n\n  const loader =\n    router.state.loaders[id] ||\n    (() => {\n      router.state.loaders[id] = {\n        pending: [],\n        fetch: (async (loaderContext: LoaderContext<any, any>) => {\n          if (!route) {\n            return\n          }\n\n          const loaderState: LoaderState<any, any> = {\n            loadedAt: Date.now(),\n            loaderContext,\n          }\n\n          loader.current = loaderState\n          loader.latest = loaderState\n          loader.pending.push(loaderState)\n\n          // router.state = {\n          //   ...router.state,\n          //   currentAction: loaderState,\n          //   latestAction: loaderState,\n          // }\n\n          router.notify()\n\n          try {\n            return await route.options.loader?.(loaderContext)\n          } finally {\n            loader.pending = loader.pending.filter((d) => d !== loaderState)\n            // router.removeActionQueue.push({ loader, loaderState })\n            router.notify()\n          }\n        }) as any,\n      }\n      return router.state.loaders[id]!\n    })()\n\n  let route: Route<TAllRouteInfo, TRouteInfo> = {\n    routeId: id,\n    routeRouteId: routeId,\n    routePath,\n    fullPath,\n    options,\n    router,\n    childRoutes: undefined!,\n    parentRoute: parent,\n    action,\n    loader: loader as any,\n\n    buildLink: (options) => {\n      return router.buildLink({\n        ...options,\n        from: fullPath,\n      } as any) as any\n    },\n\n    navigate: (options) => {\n      return router.navigate({\n        ...options,\n        from: fullPath,\n      } as any) as any\n    },\n\n    matchRoute: (matchLocation, opts) => {\n      return router.matchRoute(\n        {\n          ...matchLocation,\n          from: fullPath,\n        } as any,\n        opts,\n      )\n    },\n  }\n\n  router.options.createRoute?.({ router, route })\n\n  return route\n}\n"],"names":["createRoute","routeConfig","options","parent","router","id","routeId","path","routePath","fullPath","action","state","actions","submissions","submit","submission","actionOpts","route","invalidate","multi","filter","d","isMulti","actionState","submittedAt","Date","now","status","current","latest","push","notify","res","data","invalidateRoute","to","fromCurrent","reload","err","console","error","loader","loaders","pending","fetch","loaderContext","loaderState","loadedAt","routeRouteId","childRoutes","undefined","parentRoute","buildLink","_extends","from","navigate","matchRoute","matchLocation","opts"],"mappings":"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"}

package/build/cjs/packages/router-core/src/routeConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"routeConfig.js","sources":["../../../../../src/routeConfig.ts"],"sourcesContent":["import { GetFrameworkGeneric } from './frameworks'\nimport { ParsePathParams } from './link'\nimport { joinPaths, trimPath, trimPathRight } from './path'\nimport { RouteInfo } from './routeInfo'\nimport { RouteMatch } from './routeMatch'\nimport {\n  DeepAwaited,\n  Expand,\n  IsAny,\n  NoInfer,\n  PickUnsafe,\n  Values,\n} from './utils'\n\nexport const rootRouteId = '__root__' as const\nexport type RootRouteId = typeof rootRouteId\n\nexport type AnyLoaderData = {}\nexport type AnyPathParams = {}\nexport type AnySearchSchema = {}\nexport interface RouteMeta {}\n\n// The parse type here allows a zod schema to be passed directly to the validator\nexport type SearchSchemaValidator<TReturn, TParentSchema> =\n  | SearchSchemaValidatorObj<TReturn, TParentSchema>\n  | SearchSchemaValidatorFn<TReturn, TParentSchema>\n\nexport type SearchSchemaValidatorObj<TReturn, TParentSchema> = {\n  parse?: SearchSchemaValidatorFn<TReturn, TParentSchema>\n}\n\nexport type SearchSchemaValidatorFn<TReturn, TParentSchema> = (\n  searchObj: Record<string, unknown>,\n) => {} extends TParentSchema\n  ? TReturn\n  : keyof TReturn extends keyof TParentSchema\n  ? {\n      error: 'Top level search params cannot be redefined by child routes!'\n      keys: keyof TReturn & keyof TParentSchema\n    }\n  : TReturn\n\nexport type DefinedPathParamWarning =\n  'Path params cannot be redefined by child routes!'\n\nexport type ParentParams<TParentParams> = AnyPathParams extends TParentParams\n  ? {}\n  : {\n      [Key in keyof TParentParams]?: DefinedPathParamWarning\n    }\n\nexport type LoaderFn<\n  TRouteLoaderData extends AnyLoaderData,\n  TFullSearchSchema extends AnySearchSchema = {},\n  TAllParams extends AnyPathParams = {},\n> = (\n  loaderContext: LoaderContext<TFullSearchSchema, TAllParams>,\n) => Promise<TRouteLoaderData>\n\nexport interface LoaderContext<\n  TFullSearchSchema extends AnySearchSchema = {},\n  TAllParams extends AnyPathParams = {},\n> {\n  params: TAllParams\n  search: TFullSearchSchema\n  signal?: AbortSignal\n}\n\nexport type ActionFn<TActionPayload = unknown, TActionResponse = unknown> = (\n  submission: TActionPayload,\n) => TActionResponse | Promise<TActionResponse>\n\nexport type UnloaderFn<TPath extends string> = (\n  routeMatch: RouteMatch<any, RouteInfo<string, TPath>>,\n) => void\n\nexport type RouteOptions<\n  TRouteId extends string = string,\n  TPath extends string = string,\n  TRouteLoaderData extends AnyLoaderData = {},\n  TLoaderData extends AnyLoaderData = {},\n  TActionPayload = unknown,\n  TActionResponse = unknown,\n  TParentSearchSchema extends {} = {},\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = TSearchSchema,\n  TParentParams extends AnyPathParams = {},\n  TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n    ParsePathParams<TPath>,\n    string\n  >,\n  TAllParams extends AnyPathParams = {},\n> = (\n  | {\n      // The path to match (relative to the nearest parent `Route` component or root basepath)\n      path: TPath\n    }\n  | {\n      id: TRouteId\n    }\n) & {\n  // If true, this route will be matched as case-sensitive\n  caseSensitive?: boolean\n  validateSearch?: SearchSchemaValidator<TSearchSchema, TParentSearchSchema>\n  // Filter functions that can manipulate search params *before* they are passed to links and navigate\n  // calls that match this route.\n  preSearchFilters?: SearchFilter<TFullSearchSchema>[]\n  // Filter functions that can manipulate search params *after* they are passed to links and navigate\n  // calls that match this route.\n  postSearchFilters?: SearchFilter<TFullSearchSchema>[]\n  // The duration to wait during `loader` execution before showing the `pendingElement`\n  pendingMs?: number\n  // _If the `pendingElement` is shown_, the minimum duration for which it will be visible.\n  pendingMinMs?: number\n  // The content to be rendered when the route is matched. If no element is provided, defaults to `<Outlet />`\n  element?: GetFrameworkGeneric<'SyncOrAsyncElement'> // , NoInfer<TLoaderData>>\n  // The content to be rendered when `loader` encounters an error\n  errorElement?: GetFrameworkGeneric<'SyncOrAsyncElement'> // , NoInfer<TLoaderData>>\n  // The content to be rendered when rendering encounters an error\n  catchElement?: GetFrameworkGeneric<'SyncOrAsyncElement'> // , NoInfer<TLoaderData>>\n  // The content to be rendered when the duration of `loader` execution surpasses the `pendingMs` duration\n  pendingElement?: GetFrameworkGeneric<'SyncOrAsyncElement'> //, NoInfer<TLoaderData>>\n  // An asynchronous function responsible for preparing or fetching data for the route before it is rendered\n  loader?: LoaderFn<TRouteLoaderData, TFullSearchSchema, TAllParams>\n  // The max age to consider loader data fresh (not-stale) for this route in milliseconds from the time of fetch\n  // Defaults to 0. Only stale loader data is refetched.\n  loaderMaxAge?: number\n  // The max age to cache the loader data for this route in milliseconds from the time of route inactivity\n  // before it is garbage collected.\n  loaderGcMaxAge?: number\n  // An asynchronous function made available to the route for performing asynchronous or mutative actions that\n  // might invalidate the route's data.\n  action?: ActionFn<TActionPayload, TActionResponse>\n  // Set this to true to rethrow errors up the component tree to either the nearest error boundary or\n  // route with error element, whichever comes first.\n  useErrorBoundary?: boolean\n  // This function is called\n  // when moving from an inactive state to an active one. Likewise, when moving from\n  // an active to an inactive state, the return function (if provided) is called.\n  onMatch?: (matchContext: {\n    params: TAllParams\n    search: TFullSearchSchema\n  }) =>\n    | void\n    | undefined\n    | ((match: { params: TAllParams; search: TFullSearchSchema }) => void)\n  // This function is called when the route remains active from one transition to the next.\n  onTransition?: (match: {\n    params: TAllParams\n    search: TFullSearchSchema\n  }) => void\n  // An object of whatever you want! This object is accessible anywhere matches are.\n  meta?: RouteMeta // TODO: Make this nested and mergeable\n} & (\n    | {\n        parseParams?: never\n        stringifyParams?: never\n      }\n    | {\n        // Parse params optionally receives path params as strings and returns them in a parsed format (like a number or boolean)\n        parseParams: (\n          rawParams: IsAny<TPath, any, Record<ParsePathParams<TPath>, string>>,\n        ) => TParams\n        stringifyParams: (\n          params: TParams,\n        ) => Record<ParsePathParams<TPath>, string>\n      }\n  ) &\n  (PickUnsafe<TParentParams, ParsePathParams<TPath>> extends never // Detect if an existing path param is being redefined\n    ? {}\n    : 'Cannot redefined path params in child routes!')\n\nexport type SearchFilter<T, U = T> = (prev: T) => U\n\nexport interface RouteConfig<\n  TId extends string = string,\n  TRouteId extends string = string,\n  TPath extends string = string,\n  TFullPath extends string = string,\n  TRouteLoaderData extends AnyLoaderData = AnyLoaderData,\n  TLoaderData extends AnyLoaderData = AnyLoaderData,\n  TActionPayload = unknown,\n  TActionResponse = unknown,\n  TParentSearchSchema extends {} = {},\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = {},\n  TParentParams extends AnyPathParams = {},\n  TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n    ParsePathParams<TPath>,\n    string\n  >,\n  TAllParams extends AnyPathParams = {},\n  TKnownChildren = unknown,\n> {\n  id: TId\n  routeId: TRouteId\n  path: NoInfer<TPath>\n  fullPath: TFullPath\n  options: RouteOptions<\n    TRouteId,\n    TPath,\n    TRouteLoaderData,\n    TLoaderData,\n    TActionPayload,\n    TActionResponse,\n    TParentSearchSchema,\n    TSearchSchema,\n    TFullSearchSchema,\n    TParentParams,\n    TParams,\n    TAllParams\n  >\n  children?: TKnownChildren\n  addChildren: IsAny<\n    TId,\n    any,\n    <TNewChildren extends any>(\n      children: TNewChildren extends AnyRouteConfig[]\n        ? TNewChildren\n        : { error: 'Invalid route detected'; route: TNewChildren },\n    ) => RouteConfig<\n      TId,\n      TRouteId,\n      TPath,\n      TFullPath,\n      TRouteLoaderData,\n      TLoaderData,\n      TActionPayload,\n      TActionResponse,\n      TParentSearchSchema,\n      TSearchSchema,\n      TFullSearchSchema,\n      TParentParams,\n      TParams,\n      TAllParams,\n      TNewChildren\n    >\n  >\n  createChildren: IsAny<\n    TId,\n    any,\n    <TNewChildren extends any>(\n      cb: (\n        createChildRoute: CreateRouteConfigFn<\n          false,\n          TId,\n          TFullPath,\n          TLoaderData,\n          TFullSearchSchema,\n          TAllParams\n        >,\n      ) => TNewChildren extends AnyRouteConfig[]\n        ? TNewChildren\n        : { error: 'Invalid route detected'; route: TNewChildren },\n    ) => RouteConfig<\n      TId,\n      TRouteId,\n      TPath,\n      TFullPath,\n      TRouteLoaderData,\n      TLoaderData,\n      TActionPayload,\n      TActionResponse,\n      TParentSearchSchema,\n      TSearchSchema,\n      TFullSearchSchema,\n      TParentParams,\n      TParams,\n      TAllParams,\n      TNewChildren\n    >\n  >\n  createRoute: CreateRouteConfigFn<\n    false,\n    TId,\n    TFullPath,\n    TLoaderData,\n    TFullSearchSchema,\n    TAllParams\n  >\n}\n\ntype CreateRouteConfigFn<\n  TIsRoot extends boolean = false,\n  TParentId extends string = string,\n  TParentPath extends string = string,\n  TParentAllLoaderData extends AnyLoaderData = {},\n  TParentSearchSchema extends AnySearchSchema = {},\n  TParentParams extends AnyPathParams = {},\n> = <\n  TRouteId extends string,\n  TPath extends string,\n  TRouteLoaderData extends AnyLoaderData,\n  TActionPayload,\n  TActionResponse,\n  TSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n    ParsePathParams<TPath>,\n    string\n  >,\n  TAllParams extends AnyPathParams extends TParams\n    ? Record<ParsePathParams<TPath>, string>\n    : NoInfer<TParams> = AnyPathParams extends TParams\n    ? Record<ParsePathParams<TPath>, string>\n    : NoInfer<TParams>,\n  TKnownChildren extends RouteConfig[] = RouteConfig[],\n  TResolvedId extends string = string extends TRouteId\n    ? string extends TPath\n      ? string\n      : TPath\n    : TRouteId,\n>(\n  options?: TIsRoot extends true\n    ? Omit<\n        RouteOptions<\n          TRouteId,\n          TPath,\n          TRouteLoaderData,\n          Expand<TParentAllLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n          TActionPayload,\n          TActionResponse,\n          TParentSearchSchema,\n          TSearchSchema,\n          Expand<TParentSearchSchema & TSearchSchema>,\n          TParentParams,\n          TParams,\n          Expand<TParentParams & TAllParams>\n        >,\n        'path'\n      > & { path?: never }\n    : RouteOptions<\n        TRouteId,\n        TPath,\n        TRouteLoaderData,\n        Expand<TParentAllLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n        TActionPayload,\n        TActionResponse,\n        TParentSearchSchema,\n        TSearchSchema,\n        Expand<TParentSearchSchema & TSearchSchema>,\n        TParentParams,\n        TParams,\n        Expand<TParentParams & TAllParams>\n      >,\n  children?: TKnownChildren,\n  isRoot?: boolean,\n  parentId?: string,\n  parentPath?: string,\n) => RouteConfig<\n  RoutePrefix<TParentId, TResolvedId>,\n  TResolvedId,\n  TPath,\n  string extends TPath ? '' : RoutePath<RoutePrefix<TParentPath, TPath>>,\n  TRouteLoaderData,\n  Expand<TParentAllLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n  TActionPayload,\n  TActionResponse,\n  TParentSearchSchema,\n  TSearchSchema,\n  Expand<TParentSearchSchema & TSearchSchema>,\n  TParentParams,\n  TParams,\n  Expand<TParentParams & TAllParams>,\n  TKnownChildren\n>\n\ntype RoutePath<T extends string> = T extends RootRouteId\n  ? '/'\n  : TrimPathRight<`${T}`>\n\ntype RoutePrefix<\n  TPrefix extends string,\n  TId extends string,\n> = string extends TId\n  ? RootRouteId\n  : TId extends string\n  ? `${TPrefix}/${TId}` extends '/'\n    ? '/'\n    : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TId>}`>}`\n  : never\n\nexport interface AnyRouteConfig\n  extends RouteConfig<\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any\n  > {}\n\nexport interface AnyRouteConfigWithChildren<TChildren>\n  extends RouteConfig<\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    TChildren\n  > {}\n\ntype TrimPath<T extends string> = '' extends T\n  ? ''\n  : TrimPathRight<TrimPathLeft<T>>\n\ntype TrimPathLeft<T extends string> = T extends `${RootRouteId}/${infer U}`\n  ? TrimPathLeft<U>\n  : T extends `/${infer U}`\n  ? TrimPathLeft<U>\n  : T\ntype TrimPathRight<T extends string> = T extends '/'\n  ? '/'\n  : T extends `${infer U}/`\n  ? TrimPathRight<U>\n  : T\n\nexport const createRouteConfig: CreateRouteConfigFn<true> = (\n  options = {} as any,\n  children,\n  isRoot = true,\n  parentId,\n  parentPath,\n) => {\n  if (isRoot) {\n    ;(options as any).path = rootRouteId\n  }\n\n  // Strip the root from parentIds\n  if (parentId === rootRouteId) {\n    parentId = ''\n  }\n\n  let path: undefined | string = isRoot ? rootRouteId : options.path\n\n  // If the path is anything other than an index path, trim it up\n  if (path && path !== '/') {\n    path = trimPath(path)\n  }\n\n  const routeId = path || (options as { id?: string }).id\n\n  let id = joinPaths([parentId, routeId])\n\n  if (path === rootRouteId) {\n    path = '/'\n  }\n\n  if (id !== rootRouteId) {\n    id = joinPaths(['/', id])\n  }\n\n  const fullPath =\n    id === rootRouteId ? '/' : trimPathRight(joinPaths([parentPath, path]))\n\n  return {\n    id: id as any,\n    routeId: routeId as any,\n    path: path as any,\n    fullPath: fullPath as any,\n    options: options as any,\n    children,\n    createChildren: (cb: any) =>\n      createRouteConfig(\n        options,\n        cb((childOptions: any) =>\n          createRouteConfig(childOptions, undefined, false, id, fullPath),\n        ),\n        false,\n        parentId,\n        parentPath,\n      ),\n    addChildren: (children: any) =>\n      createRouteConfig(options, children, false, parentId, parentPath),\n    createRoute: (childOptions: any) =>\n      createRouteConfig(childOptions, undefined, false, id, fullPath) as any,\n  }\n}\n"],"names":["rootRouteId","createRouteConfig","options","children","isRoot","parentId","parentPath","path","trimPath","routeId","id","joinPaths","fullPath","trimPathRight","createChildren","cb","childOptions","undefined","addChildren","createRoute"],"mappings":";;;;;;;;;;;;;;;;AAcO,MAAMA,WAAW,GAAG,WAApB;AAoaMC,MAAAA,iBAA4C,GAAG,SAA/CA,iBAA+C,CAC1DC,OAD0D,EAE1DC,QAF0D,EAG1DC,MAH0D,EAI1DC,QAJ0D,EAK1DC,UAL0D,EAMvD;AAAA,EAAA,IALHJ,OAKG,KAAA,KAAA,CAAA,EAAA;AALHA,IAAAA,OAKG,GALO,EAKP,CAAA;AAAA,GAAA;;AAAA,EAAA,IAHHE,MAGG,KAAA,KAAA,CAAA,EAAA;AAHHA,IAAAA,MAGG,GAHM,IAGN,CAAA;AAAA,GAAA;;AACH,EAAA,IAAIA,MAAJ,EAAY;IACRF,OAAD,CAAiBK,IAAjB,GAAwBP,WAAxB,CAAA;AACF,GAHE;;;EAMH,IAAIK,QAAQ,KAAKL,WAAjB,EAA8B;AAC5BK,IAAAA,QAAQ,GAAG,EAAX,CAAA;AACD,GAAA;;EAED,IAAIE,MAAwB,GAAGH,MAAM,GAAGJ,WAAH,GAAiBE,OAAO,CAACK,IAA9D,CAVG;;AAaH,EAAA,IAAIA,MAAI,IAAIA,MAAI,KAAK,GAArB,EAA0B;AACxBA,IAAAA,MAAI,GAAGC,aAAQ,CAACD,MAAD,CAAf,CAAA;AACD,GAAA;;AAED,EAAA,MAAME,OAAO,GAAGF,MAAI,IAAKL,OAAD,CAA6BQ,EAArD,CAAA;EAEA,IAAIA,EAAE,GAAGC,cAAS,CAAC,CAACN,QAAD,EAAWI,OAAX,CAAD,CAAlB,CAAA;;EAEA,IAAIF,MAAI,KAAKP,WAAb,EAA0B;AACxBO,IAAAA,MAAI,GAAG,GAAP,CAAA;AACD,GAAA;;EAED,IAAIG,EAAE,KAAKV,WAAX,EAAwB;IACtBU,EAAE,GAAGC,cAAS,CAAC,CAAC,GAAD,EAAMD,EAAN,CAAD,CAAd,CAAA;AACD,GAAA;;AAED,EAAA,MAAME,QAAQ,GACZF,EAAE,KAAKV,WAAP,GAAqB,GAArB,GAA2Ba,kBAAa,CAACF,cAAS,CAAC,CAACL,UAAD,EAAaC,MAAb,CAAD,CAAV,CAD1C,CAAA;EAGA,OAAO;AACLG,IAAAA,EAAE,EAAEA,EADC;AAELD,IAAAA,OAAO,EAAEA,OAFJ;AAGLF,IAAAA,IAAI,EAAEA,MAHD;AAILK,IAAAA,QAAQ,EAAEA,QAJL;AAKLV,IAAAA,OAAO,EAAEA,OALJ;IAMLC,QANK;AAOLW,IAAAA,cAAc,EAAGC,EAAD,IACdd,iBAAiB,CACfC,OADe,EAEfa,EAAE,CAAEC,YAAD,IACDf,iBAAiB,CAACe,YAAD,EAAeC,SAAf,EAA0B,KAA1B,EAAiCP,EAAjC,EAAqCE,QAArC,CADjB,CAFa,EAKf,KALe,EAMfP,QANe,EAOfC,UAPe,CARd;AAiBLY,IAAAA,WAAW,EAAGf,QAAD,IACXF,iBAAiB,CAACC,OAAD,EAAUC,QAAV,EAAoB,KAApB,EAA2BE,QAA3B,EAAqCC,UAArC,CAlBd;AAmBLa,IAAAA,WAAW,EAAGH,YAAD,IACXf,iBAAiB,CAACe,YAAD,EAAeC,SAAf,EAA0B,KAA1B,EAAiCP,EAAjC,EAAqCE,QAArC,CAAA;GApBrB,CAAA;AAsBD;;;;;"}
+{"version":3,"file":"routeConfig.js","sources":["../../../../../src/routeConfig.ts"],"sourcesContent":["import { GetFrameworkGeneric } from './frameworks'\nimport { ParsePathParams } from './link'\nimport { joinPaths, trimPath, trimPathRight } from './path'\nimport { RouteInfo } from './routeInfo'\nimport { RouteMatch } from './routeMatch'\nimport {\n  DeepAwaited,\n  Expand,\n  IsAny,\n  NoInfer,\n  PickUnsafe,\n  Values,\n} from './utils'\n\nexport const rootRouteId = '__root__' as const\nexport type RootRouteId = typeof rootRouteId\n\nexport type AnyLoaderData = {}\nexport type AnyPathParams = {}\nexport type AnySearchSchema = {}\nexport interface RouteMeta {}\n\n// The parse type here allows a zod schema to be passed directly to the validator\nexport type SearchSchemaValidator<TReturn, TParentSchema> =\n  | SearchSchemaValidatorObj<TReturn, TParentSchema>\n  | SearchSchemaValidatorFn<TReturn, TParentSchema>\n\nexport type SearchSchemaValidatorObj<TReturn, TParentSchema> = {\n  parse?: SearchSchemaValidatorFn<TReturn, TParentSchema>\n}\n\nexport type SearchSchemaValidatorFn<TReturn, TParentSchema> = (\n  searchObj: Record<string, unknown>,\n) => {} extends TParentSchema\n  ? TReturn\n  : keyof TReturn extends keyof TParentSchema\n  ? {\n      error: 'Top level search params cannot be redefined by child routes!'\n      keys: keyof TReturn & keyof TParentSchema\n    }\n  : TReturn\n\nexport type DefinedPathParamWarning =\n  'Path params cannot be redefined by child routes!'\n\nexport type ParentParams<TParentParams> = AnyPathParams extends TParentParams\n  ? {}\n  : {\n      [Key in keyof TParentParams]?: DefinedPathParamWarning\n    }\n\nexport type LoaderFn<\n  TRouteLoaderData extends AnyLoaderData = {},\n  TFullSearchSchema extends AnySearchSchema = {},\n  TAllParams extends AnyPathParams = {},\n> = (\n  loaderContext: LoaderContext<TFullSearchSchema, TAllParams>,\n) => Promise<TRouteLoaderData>\n\nexport interface LoaderContext<\n  TFullSearchSchema extends AnySearchSchema = {},\n  TAllParams extends AnyPathParams = {},\n> {\n  params: TAllParams\n  search: TFullSearchSchema\n  signal?: AbortSignal\n  // parentLoaderPromise?: Promise<TParentRouteLoaderData>\n}\n\nexport type ActionFn<TActionPayload = unknown, TActionResponse = unknown> = (\n  submission: TActionPayload,\n) => TActionResponse | Promise<TActionResponse>\n\nexport type UnloaderFn<TPath extends string> = (\n  routeMatch: RouteMatch<any, RouteInfo<string, TPath>>,\n) => void\n\nexport type RouteOptions<\n  TRouteId extends string = string,\n  TPath extends string = string,\n  TParentRouteLoaderData extends AnyLoaderData = {},\n  TRouteLoaderData extends AnyLoaderData = {},\n  TLoaderData extends AnyLoaderData = {},\n  TActionPayload = unknown,\n  TActionResponse = unknown,\n  TParentSearchSchema extends {} = {},\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = TSearchSchema,\n  TParentParams extends AnyPathParams = {},\n  TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n    ParsePathParams<TPath>,\n    string\n  >,\n  TAllParams extends AnyPathParams = {},\n> = (\n  | {\n      // The path to match (relative to the nearest parent `Route` component or root basepath)\n      path: TPath\n    }\n  | {\n      id: TRouteId\n    }\n) & {\n  // If true, this route will be matched as case-sensitive\n  caseSensitive?: boolean\n  validateSearch?: SearchSchemaValidator<TSearchSchema, TParentSearchSchema>\n  // Filter functions that can manipulate search params *before* they are passed to links and navigate\n  // calls that match this route.\n  preSearchFilters?: SearchFilter<TFullSearchSchema>[]\n  // Filter functions that can manipulate search params *after* they are passed to links and navigate\n  // calls that match this route.\n  postSearchFilters?: SearchFilter<TFullSearchSchema>[]\n  // The content to be rendered when the route is matched. If no component is provided, defaults to `<Outlet />`\n  component?: GetFrameworkGeneric<'Component'> // , NoInfer<TParentLoaderData>>\n  // The content to be rendered when the route encounters an error\n  errorComponent?: GetFrameworkGeneric<'Component'> // , NoInfer<TParentLoaderData>>\n  // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render\n  pendingComponent?: GetFrameworkGeneric<'Component'> //, NoInfer<TParentLoaderData>>\n  // An asynchronous function responsible for preparing or fetching data for the route before it is rendered\n  loader?: LoaderFn<TRouteLoaderData, TFullSearchSchema, TAllParams>\n  // The max age to consider loader data fresh (not-stale) for this route in milliseconds from the time of fetch\n  // Defaults to 0. Only stale loader data is refetched.\n  loaderMaxAge?: number\n  // The max age to cache the loader data for this route in milliseconds from the time of route inactivity\n  // before it is garbage collected.\n  loaderGcMaxAge?: number\n  // An asynchronous function made available to the route for performing asynchronous or mutative actions that\n  // might invalidate the route's data.\n  action?: ActionFn<TActionPayload, TActionResponse>\n  // This function is called\n  // when moving from an inactive state to an active one. Likewise, when moving from\n  // an active to an inactive state, the return function (if provided) is called.\n  onMatch?: (matchContext: {\n    params: TAllParams\n    search: TFullSearchSchema\n  }) =>\n    | void\n    | undefined\n    | ((match: { params: TAllParams; search: TFullSearchSchema }) => void)\n  // This function is called when the route remains active from one transition to the next.\n  onTransition?: (match: {\n    params: TAllParams\n    search: TFullSearchSchema\n  }) => void\n  // An object of whatever you want! This object is accessible anywhere matches are.\n  meta?: RouteMeta // TODO: Make this nested and mergeable\n} & (\n    | {\n        parseParams?: never\n        stringifyParams?: never\n      }\n    | {\n        // Parse params optionally receives path params as strings and returns them in a parsed format (like a number or boolean)\n        parseParams: (\n          rawParams: IsAny<TPath, any, Record<ParsePathParams<TPath>, string>>,\n        ) => TParams\n        stringifyParams: (\n          params: TParams,\n        ) => Record<ParsePathParams<TPath>, string>\n      }\n  ) &\n  (PickUnsafe<TParentParams, ParsePathParams<TPath>> extends never // Detect if an existing path param is being redefined\n    ? {}\n    : 'Cannot redefined path params in child routes!')\n\nexport type SearchFilter<T, U = T> = (prev: T) => U\n\nexport interface RouteConfig<\n  TId extends string = string,\n  TRouteId extends string = string,\n  TPath extends string = string,\n  TFullPath extends string = string,\n  TParentRouteLoaderData extends AnyLoaderData = AnyLoaderData,\n  TRouteLoaderData extends AnyLoaderData = AnyLoaderData,\n  TLoaderData extends AnyLoaderData = AnyLoaderData,\n  TActionPayload = unknown,\n  TActionResponse = unknown,\n  TParentSearchSchema extends {} = {},\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = {},\n  TParentParams extends AnyPathParams = {},\n  TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n    ParsePathParams<TPath>,\n    string\n  >,\n  TAllParams extends AnyPathParams = {},\n  TKnownChildren = unknown,\n> {\n  id: TId\n  routeId: TRouteId\n  path: NoInfer<TPath>\n  fullPath: TFullPath\n  options: RouteOptions<\n    TRouteId,\n    TPath,\n    TParentRouteLoaderData,\n    TRouteLoaderData,\n    TLoaderData,\n    TActionPayload,\n    TActionResponse,\n    TParentSearchSchema,\n    TSearchSchema,\n    TFullSearchSchema,\n    TParentParams,\n    TParams,\n    TAllParams\n  >\n  children?: TKnownChildren\n  addChildren: IsAny<\n    TId,\n    any,\n    <TNewChildren extends any>(\n      children: TNewChildren extends AnyRouteConfig[]\n        ? TNewChildren\n        : { error: 'Invalid route detected'; route: TNewChildren },\n    ) => RouteConfig<\n      TId,\n      TRouteId,\n      TPath,\n      TFullPath,\n      TParentRouteLoaderData,\n      TRouteLoaderData,\n      TLoaderData,\n      TActionPayload,\n      TActionResponse,\n      TParentSearchSchema,\n      TSearchSchema,\n      TFullSearchSchema,\n      TParentParams,\n      TParams,\n      TAllParams,\n      TNewChildren\n    >\n  >\n  createChildren: IsAny<\n    TId,\n    any,\n    <TNewChildren extends any>(\n      cb: (\n        createChildRoute: CreateRouteConfigFn<\n          false,\n          TId,\n          TFullPath,\n          TRouteLoaderData,\n          TLoaderData,\n          TFullSearchSchema,\n          TAllParams\n        >,\n      ) => TNewChildren extends AnyRouteConfig[]\n        ? TNewChildren\n        : { error: 'Invalid route detected'; route: TNewChildren },\n    ) => RouteConfig<\n      TId,\n      TRouteId,\n      TPath,\n      TFullPath,\n      TParentRouteLoaderData,\n      TRouteLoaderData,\n      TLoaderData,\n      TActionPayload,\n      TActionResponse,\n      TParentSearchSchema,\n      TSearchSchema,\n      TFullSearchSchema,\n      TParentParams,\n      TParams,\n      TAllParams,\n      TNewChildren\n    >\n  >\n  createRoute: CreateRouteConfigFn<\n    false,\n    TId,\n    TFullPath,\n    TRouteLoaderData,\n    TLoaderData,\n    TFullSearchSchema,\n    TAllParams\n  >\n}\n\ntype CreateRouteConfigFn<\n  TIsRoot extends boolean = false,\n  TParentId extends string = string,\n  TParentPath extends string = string,\n  TParentRouteLoaderData extends AnyLoaderData = {},\n  TParentLoaderData extends AnyLoaderData = {},\n  TParentSearchSchema extends AnySearchSchema = {},\n  TParentParams extends AnyPathParams = {},\n> = <\n  TRouteId extends string,\n  TPath extends string,\n  TRouteLoaderData extends AnyLoaderData,\n  TActionPayload,\n  TActionResponse,\n  TSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n    ParsePathParams<TPath>,\n    string\n  >,\n  TAllParams extends AnyPathParams extends TParams\n    ? Record<ParsePathParams<TPath>, string>\n    : NoInfer<TParams> = AnyPathParams extends TParams\n    ? Record<ParsePathParams<TPath>, string>\n    : NoInfer<TParams>,\n  TKnownChildren extends RouteConfig[] = RouteConfig[],\n  TResolvedId extends string = string extends TRouteId\n    ? string extends TPath\n      ? string\n      : TPath\n    : TRouteId,\n>(\n  options?: TIsRoot extends true\n    ? Omit<\n        RouteOptions<\n          TRouteId,\n          TPath,\n          TParentRouteLoaderData,\n          TRouteLoaderData,\n          Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n          TActionPayload,\n          TActionResponse,\n          TParentSearchSchema,\n          TSearchSchema,\n          Expand<TParentSearchSchema & TSearchSchema>,\n          TParentParams,\n          TParams,\n          Expand<TParentParams & TAllParams>\n        >,\n        'path'\n      > & { path?: never }\n    : RouteOptions<\n        TRouteId,\n        TPath,\n        TParentRouteLoaderData,\n        TRouteLoaderData,\n        Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n        TActionPayload,\n        TActionResponse,\n        TParentSearchSchema,\n        TSearchSchema,\n        Expand<TParentSearchSchema & TSearchSchema>,\n        TParentParams,\n        TParams,\n        Expand<TParentParams & TAllParams>\n      >,\n  children?: TKnownChildren,\n  isRoot?: boolean,\n  parentId?: string,\n  parentPath?: string,\n) => RouteConfig<\n  RoutePrefix<TParentId, TResolvedId>,\n  TResolvedId,\n  TPath,\n  string extends TPath ? '' : RoutePath<RoutePrefix<TParentPath, TPath>>,\n  TParentRouteLoaderData,\n  TRouteLoaderData,\n  Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n  TActionPayload,\n  TActionResponse,\n  TParentSearchSchema,\n  TSearchSchema,\n  Expand<TParentSearchSchema & TSearchSchema>,\n  TParentParams,\n  TParams,\n  Expand<TParentParams & TAllParams>,\n  TKnownChildren\n>\n\ntype RoutePath<T extends string> = T extends RootRouteId\n  ? '/'\n  : TrimPathRight<`${T}`>\n\ntype RoutePrefix<\n  TPrefix extends string,\n  TId extends string,\n> = string extends TId\n  ? RootRouteId\n  : TId extends string\n  ? `${TPrefix}/${TId}` extends '/'\n    ? '/'\n    : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TId>}`>}`\n  : never\n\nexport interface AnyRouteConfig\n  extends RouteConfig<\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any\n  > {}\n\nexport interface AnyRouteConfigWithChildren<TChildren>\n  extends RouteConfig<\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    TChildren\n  > {}\n\ntype TrimPath<T extends string> = '' extends T\n  ? ''\n  : TrimPathRight<TrimPathLeft<T>>\n\ntype TrimPathLeft<T extends string> = T extends `${RootRouteId}/${infer U}`\n  ? TrimPathLeft<U>\n  : T extends `/${infer U}`\n  ? TrimPathLeft<U>\n  : T\ntype TrimPathRight<T extends string> = T extends '/'\n  ? '/'\n  : T extends `${infer U}/`\n  ? TrimPathRight<U>\n  : T\n\nexport const createRouteConfig: CreateRouteConfigFn<true> = (\n  options = {} as any,\n  children,\n  isRoot = true,\n  parentId,\n  parentPath,\n) => {\n  if (isRoot) {\n    ;(options as any).path = rootRouteId\n  }\n\n  // Strip the root from parentIds\n  if (parentId === rootRouteId) {\n    parentId = ''\n  }\n\n  let path: undefined | string = isRoot ? rootRouteId : options.path\n\n  // If the path is anything other than an index path, trim it up\n  if (path && path !== '/') {\n    path = trimPath(path)\n  }\n\n  const routeId = path || (options as { id?: string }).id\n\n  let id = joinPaths([parentId, routeId])\n\n  if (path === rootRouteId) {\n    path = '/'\n  }\n\n  if (id !== rootRouteId) {\n    id = joinPaths(['/', id])\n  }\n\n  const fullPath =\n    id === rootRouteId ? '/' : trimPathRight(joinPaths([parentPath, path]))\n\n  return {\n    id: id as any,\n    routeId: routeId as any,\n    path: path as any,\n    fullPath: fullPath as any,\n    options: options as any,\n    children,\n    createChildren: (cb: any) =>\n      createRouteConfig(\n        options,\n        cb((childOptions: any) =>\n          createRouteConfig(childOptions, undefined, false, id, fullPath),\n        ),\n        false,\n        parentId,\n        parentPath,\n      ),\n    addChildren: (children: any) =>\n      createRouteConfig(options, children, false, parentId, parentPath),\n    createRoute: (childOptions: any) =>\n      createRouteConfig(childOptions, undefined, false, id, fullPath) as any,\n  }\n}\n"],"names":["rootRouteId","createRouteConfig","options","children","isRoot","parentId","parentPath","path","trimPath","routeId","id","joinPaths","fullPath","trimPathRight","createChildren","cb","childOptions","undefined","addChildren","createRoute"],"mappings":";;;;;;;;;;;;;;;;AAcO,MAAMA,WAAW,GAAG,WAApB;AAyaMC,MAAAA,iBAA4C,GAAG,SAA/CA,iBAA+C,CAC1DC,OAD0D,EAE1DC,QAF0D,EAG1DC,MAH0D,EAI1DC,QAJ0D,EAK1DC,UAL0D,EAMvD;AAAA,EAAA,IALHJ,OAKG,KAAA,KAAA,CAAA,EAAA;AALHA,IAAAA,OAKG,GALO,EAKP,CAAA;AAAA,GAAA;;AAAA,EAAA,IAHHE,MAGG,KAAA,KAAA,CAAA,EAAA;AAHHA,IAAAA,MAGG,GAHM,IAGN,CAAA;AAAA,GAAA;;AACH,EAAA,IAAIA,MAAJ,EAAY;IACRF,OAAD,CAAiBK,IAAjB,GAAwBP,WAAxB,CAAA;AACF,GAHE;;;EAMH,IAAIK,QAAQ,KAAKL,WAAjB,EAA8B;AAC5BK,IAAAA,QAAQ,GAAG,EAAX,CAAA;AACD,GAAA;;EAED,IAAIE,MAAwB,GAAGH,MAAM,GAAGJ,WAAH,GAAiBE,OAAO,CAACK,IAA9D,CAVG;;AAaH,EAAA,IAAIA,MAAI,IAAIA,MAAI,KAAK,GAArB,EAA0B;AACxBA,IAAAA,MAAI,GAAGC,aAAQ,CAACD,MAAD,CAAf,CAAA;AACD,GAAA;;AAED,EAAA,MAAME,OAAO,GAAGF,MAAI,IAAKL,OAAD,CAA6BQ,EAArD,CAAA;EAEA,IAAIA,EAAE,GAAGC,cAAS,CAAC,CAACN,QAAD,EAAWI,OAAX,CAAD,CAAlB,CAAA;;EAEA,IAAIF,MAAI,KAAKP,WAAb,EAA0B;AACxBO,IAAAA,MAAI,GAAG,GAAP,CAAA;AACD,GAAA;;EAED,IAAIG,EAAE,KAAKV,WAAX,EAAwB;IACtBU,EAAE,GAAGC,cAAS,CAAC,CAAC,GAAD,EAAMD,EAAN,CAAD,CAAd,CAAA;AACD,GAAA;;AAED,EAAA,MAAME,QAAQ,GACZF,EAAE,KAAKV,WAAP,GAAqB,GAArB,GAA2Ba,kBAAa,CAACF,cAAS,CAAC,CAACL,UAAD,EAAaC,MAAb,CAAD,CAAV,CAD1C,CAAA;EAGA,OAAO;AACLG,IAAAA,EAAE,EAAEA,EADC;AAELD,IAAAA,OAAO,EAAEA,OAFJ;AAGLF,IAAAA,IAAI,EAAEA,MAHD;AAILK,IAAAA,QAAQ,EAAEA,QAJL;AAKLV,IAAAA,OAAO,EAAEA,OALJ;IAMLC,QANK;AAOLW,IAAAA,cAAc,EAAGC,EAAD,IACdd,iBAAiB,CACfC,OADe,EAEfa,EAAE,CAAEC,YAAD,IACDf,iBAAiB,CAACe,YAAD,EAAeC,SAAf,EAA0B,KAA1B,EAAiCP,EAAjC,EAAqCE,QAArC,CADjB,CAFa,EAKf,KALe,EAMfP,QANe,EAOfC,UAPe,CARd;AAiBLY,IAAAA,WAAW,EAAGf,QAAD,IACXF,iBAAiB,CAACC,OAAD,EAAUC,QAAV,EAAoB,KAApB,EAA2BE,QAA3B,EAAqCC,UAArC,CAlBd;AAmBLa,IAAAA,WAAW,EAAGH,YAAD,IACXf,iBAAiB,CAACe,YAAD,EAAeC,SAAf,EAA0B,KAA1B,EAAiCP,EAAjC,EAAqCE,QAArC,CAAA;GApBrB,CAAA;AAsBD;;;;;"}

package/build/cjs/packages/router-core/src/routeMatch.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var utils = require('./utils.js');
 
-const elementTypes = ['element', 'errorElement', 'catchElement', 'pendingElement'];
+const componentTypes = ['component', 'errorComponent', 'pendingComponent'];
 function createRouteMatch(router, route, opts) {
   const routeMatch = _rollupPluginBabelHelpers["extends"]({}, route, opts, {
     router,
@@ -25,10 +25,10 @@ function createRouteMatch(router, route, opts) {
     status: 'idle',
     routeLoaderData: {},
     loaderData: {},
-    isPending: false,
     isFetching: false,
     isInvalid: false,
     invalidAt: Infinity,
+    // pendingActions: [],
     getIsInvalid: () => {
       const now = Date.now();
       return routeMatch.isInvalid || routeMatch.invalidAt < now;
@@ -42,43 +42,6 @@ function createRouteMatch(router, route, opts) {
 
         routeMatch.router.notify();
       },
-      startPending: () => {
-        var _routeMatch$options$p, _routeMatch$options$p2;
-
-        const pendingMs = (_routeMatch$options$p = routeMatch.options.pendingMs) != null ? _routeMatch$options$p : router.options.defaultPendingMs;
-        const pendingMinMs = (_routeMatch$options$p2 = routeMatch.options.pendingMinMs) != null ? _routeMatch$options$p2 : router.options.defaultPendingMinMs;
-
-        if (routeMatch.__.pendingTimeout || routeMatch.status !== 'loading' || typeof pendingMs === 'undefined') {
-          return;
-        }
-
-        routeMatch.__.pendingTimeout = setTimeout(() => {
-          routeMatch.isPending = true;
-
-          routeMatch.__.resolve();
-
-          if (typeof pendingMinMs !== 'undefined') {
-            routeMatch.__.pendingMinPromise = new Promise(r => routeMatch.__.pendingMinTimeout = setTimeout(r, pendingMinMs));
-          }
-        }, pendingMs);
-      },
-      cancelPending: () => {
-        routeMatch.isPending = false;
-        clearTimeout(routeMatch.__.pendingTimeout);
-        clearTimeout(routeMatch.__.pendingMinTimeout);
-        delete routeMatch.__.pendingMinPromise;
-      },
-      // setParentMatch: (parentMatch?: RouteMatch) => {
-      //   routeMatch.parentMatch = parentMatch
-      // },
-      // addChildMatch: (childMatch: RouteMatch) => {
-      //   if (
-      //     routeMatch.childMatches.find((d) => d.matchId === childMatch.matchId)
-      //   ) {
-      //     return
-      //   }
-      //   routeMatch.childMatches.push(childMatch)
-      // },
       validate: () => {
         var _routeMatch$parentMat, _routeMatch$parentMat2;
 
@@ -86,9 +49,11 @@ function createRouteMatch(router, route, opts) {
         const parentSearch = (_routeMatch$parentMat = (_routeMatch$parentMat2 = routeMatch.parentMatch) == null ? void 0 : _routeMatch$parentMat2.search) != null ? _routeMatch$parentMat : router.location.search;
 
         try {
+          var _validator;
+
           const prevSearch = routeMatch.routeSearch;
           const validator = typeof routeMatch.options.validateSearch === 'object' ? routeMatch.options.validateSearch.parse : routeMatch.options.validateSearch;
-          let nextSearch = utils.replaceEqualDeep(prevSearch, validator == null ? void 0 : validator(parentSearch)); // Invalidate route matches when search param stability changes
+          let nextSearch = utils.replaceEqualDeep(prevSearch, (_validator = validator == null ? void 0 : validator(parentSearch)) != null ? _validator : {}); // Invalidate route matches when search param stability changes
 
           if (prevSearch !== nextSearch) {
             routeMatch.isInvalid = true;
@@ -96,6 +61,13 @@ function createRouteMatch(router, route, opts) {
 
           routeMatch.routeSearch = nextSearch;
           routeMatch.search = utils.replaceEqualDeep(parentSearch, _rollupPluginBabelHelpers["extends"]({}, parentSearch, nextSearch));
+          componentTypes.map(async type => {
+            const component = routeMatch.options[type];
+
+            if (typeof routeMatch.__[type] !== 'function') {
+              routeMatch.__[type] = component;
+            }
+          });
         } catch (err) {
           console.error(err);
           const error = new Error('Invalid search params found', {
@@ -113,14 +85,16 @@ function createRouteMatch(router, route, opts) {
       var _routeMatch$__$abortC;
 
       (_routeMatch$__$abortC = routeMatch.__.abortController) == null ? void 0 : _routeMatch$__$abortC.abort();
-
-      routeMatch.__.cancelPending();
     },
     invalidate: () => {
       routeMatch.isInvalid = true;
     },
     hasLoaders: () => {
-      return !!(route.options.loader || elementTypes.some(d => typeof route.options[d] === 'function'));
+      return !!(route.options.loader || componentTypes.some(d => {
+        var _route$options$d;
+
+        return (_route$options$d = route.options[d]) == null ? void 0 : _route$options$d.preload;
+      }));
     },
     load: async loaderOpts => {
       const now = Date.now();
@@ -141,17 +115,25 @@ function createRouteMatch(router, route, opts) {
 
       if (routeMatch.status === 'success' && routeMatch.getIsInvalid() || routeMatch.status === 'error' || routeMatch.status === 'idle') {
         const maxAge = loaderOpts != null && loaderOpts.preload ? loaderOpts == null ? void 0 : loaderOpts.maxAge : undefined;
-        routeMatch.fetch({
+        await routeMatch.fetch({
           maxAge
         });
       }
     },
     fetch: async opts => {
-      const id = '' + Date.now() + Math.random();
-      routeMatch.__.latestId = id; // If the match was in an error state, set it
+      const loadId = '' + Date.now() + Math.random();
+      routeMatch.__.latestId = loadId;
+
+      const checkLatest = async () => {
+        if (loadId !== routeMatch.__.latestId) {
+          // warning(true, 'Data loader is out of date!')
+          return new Promise(() => {});
+        }
+      }; // If the match was in an error state, set it
       // to a loading state again. Otherwise, keep it
       // as loading or resolved
 
+
       if (routeMatch.status === 'idle') {
         routeMatch.status = 'loading';
       } // We started loading the route, so it's no longer invalid
@@ -164,94 +146,66 @@ function createRouteMatch(router, route, opts) {
         routeMatch.isFetching = true;
         routeMatch.__.resolve = resolve;
 
-        const loaderPromise = (async () => {
-          // Load the elements and data in parallel
-          routeMatch.__.elementsPromise = (async () => {
-            // then run all element and data loaders in parallel
-            // For each element type, potentially load it asynchronously
-            await Promise.all(elementTypes.map(async type => {
-              const routeElement = routeMatch.options[type];
-
-              if (routeMatch.__[type]) {
-                return;
-              }
-
-              routeMatch.__[type] = await router.options.createElement(routeElement);
-            }));
-          })();
-
-          routeMatch.__.dataPromise = Promise.resolve().then(async () => {
-            try {
-              var _ref, _ref2, _opts$maxAge;
-
-              if (routeMatch.options.loader) {
-                const data = await routeMatch.options.loader({
-                  params: routeMatch.params,
-                  search: routeMatch.routeSearch,
-                  signal: routeMatch.__.abortController.signal
-                });
-
-                if (id !== routeMatch.__.latestId) {
-                  return routeMatch.__.loaderPromise;
-                }
-
-                routeMatch.routeLoaderData = utils.replaceEqualDeep(routeMatch.routeLoaderData, data);
-              }
-
-              routeMatch.error = undefined;
-              routeMatch.status = 'success';
-              routeMatch.updatedAt = Date.now();
-              routeMatch.invalidAt = routeMatch.updatedAt + ((_ref = (_ref2 = (_opts$maxAge = opts == null ? void 0 : opts.maxAge) != null ? _opts$maxAge : routeMatch.options.loaderMaxAge) != null ? _ref2 : router.options.defaultLoaderMaxAge) != null ? _ref : 0);
-            } catch (err) {
-              if (id !== routeMatch.__.latestId) {
-                return routeMatch.__.loaderPromise;
-              }
-
-              if (process.env.NODE_ENV !== 'production') {
-                console.error(err);
-              }
-
-              routeMatch.error = err;
-              routeMatch.status = 'error';
-              routeMatch.updatedAt = Date.now();
-            }
-          });
+        routeMatch.__.componentsPromise = (async () => {
+          // then run all component and data loaders in parallel
+          // For each component type, potentially load it asynchronously
+          await Promise.all(componentTypes.map(async type => {
+            var _routeMatch$__$type;
 
-          try {
-            await Promise.all([routeMatch.__.elementsPromise, routeMatch.__.dataPromise]);
+            const component = routeMatch.options[type];
 
-            if (id !== routeMatch.__.latestId) {
-              return routeMatch.__.loaderPromise;
+            if ((_routeMatch$__$type = routeMatch.__[type]) != null && _routeMatch$__$type.preload) {
+              routeMatch.__[type] = await router.options.loadComponent(component);
             }
+          }));
+        })();
 
-            if (routeMatch.__.pendingMinPromise) {
-              await routeMatch.__.pendingMinPromise;
-              delete routeMatch.__.pendingMinPromise;
-            }
-          } finally {
-            if (id !== routeMatch.__.latestId) {
-              return routeMatch.__.loaderPromise;
+        routeMatch.__.dataPromise = Promise.resolve().then(async () => {
+          try {
+            var _ref, _ref2, _opts$maxAge;
+
+            if (routeMatch.options.loader) {
+              const data = await router.loadMatchData(routeMatch);
+              await checkLatest();
+              routeMatch.routeLoaderData = utils.replaceEqualDeep(routeMatch.routeLoaderData, data);
             }
 
-            routeMatch.__.cancelPending();
+            routeMatch.error = undefined;
+            routeMatch.status = 'success';
+            routeMatch.updatedAt = Date.now();
+            routeMatch.invalidAt = routeMatch.updatedAt + ((_ref = (_ref2 = (_opts$maxAge = opts == null ? void 0 : opts.maxAge) != null ? _opts$maxAge : routeMatch.options.loaderMaxAge) != null ? _ref2 : router.options.defaultLoaderMaxAge) != null ? _ref : 0);
+            return routeMatch.routeLoaderData;
+          } catch (err) {
+            await checkLatest();
 
-            routeMatch.isPending = false;
-            routeMatch.isFetching = false;
+            if (process.env.NODE_ENV !== 'production') {
+              console.error(err);
+            }
 
-            routeMatch.__.notify();
+            routeMatch.error = err;
+            routeMatch.status = 'error';
+            routeMatch.updatedAt = Date.now();
+            throw err;
           }
-        })();
+        });
 
-        routeMatch.__.loaderPromise = loaderPromise;
-        await loaderPromise;
+        const after = async () => {
+          await checkLatest();
+          routeMatch.isFetching = false;
+          delete routeMatch.__.loadPromise;
 
-        if (id !== routeMatch.__.latestId) {
-          return routeMatch.__.loaderPromise;
-        }
+          routeMatch.__.notify();
+        };
 
-        delete routeMatch.__.loaderPromise;
+        try {
+          await Promise.all([routeMatch.__.componentsPromise, routeMatch.__.dataPromise.catch(() => {})]);
+          after();
+        } catch (_unused) {
+          after();
+        }
       });
-      return await routeMatch.__.loadPromise;
+      await routeMatch.__.loadPromise;
+      await checkLatest();
     }
   });