@tanstack/router-core 0.0.1-beta.11 → 0.0.1-beta.14

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}\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 content to be rendered when the route is matched. If no component is provided, defaults to `<Outlet />`\n  component?: GetFrameworkGeneric<'Component'> // , NoInfer<TLoaderData>>\n  // The content to be rendered when the route encounters an error\n  errorComponent?: GetFrameworkGeneric<'Component'> // , NoInfer<TLoaderData>>\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<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 component, 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;AA8ZMC,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,7 +25,6 @@ function createRouteMatch(router, route, opts) {
     status: 'idle',
     routeLoaderData: {},
     loaderData: {},
-    isPending: false,
     isFetching: false,
     isInvalid: false,
     invalidAt: Infinity,
@@ -43,32 +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;
-      },
       validate: () => {
         var _routeMatch$parentMat, _routeMatch$parentMat2;
 
@@ -88,11 +61,11 @@ function createRouteMatch(router, route, opts) {
 
           routeMatch.routeSearch = nextSearch;
           routeMatch.search = utils.replaceEqualDeep(parentSearch, _rollupPluginBabelHelpers["extends"]({}, parentSearch, nextSearch));
-          elementTypes.map(async type => {
-            const routeElement = routeMatch.options[type];
+          componentTypes.map(async type => {
+            const component = routeMatch.options[type];
 
             if (typeof routeMatch.__[type] !== 'function') {
-              routeMatch.__[type] = routeElement;
+              routeMatch.__[type] = component;
             }
           });
         } catch (err) {
@@ -112,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();
@@ -163,91 +138,79 @@ function createRouteMatch(router, route, opts) {
         routeMatch.isFetching = true;
         routeMatch.__.resolve = resolve;
 
-        routeMatch.__.loaderDataPromise = (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 (typeof routeMatch.__[type] === 'function') {
-                routeMatch.__[type] = await router.options.createElement(routeElement);
-              }
-            }));
-          })();
+        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;
 
-          routeMatch.__.dataPromise = Promise.resolve().then(async () => {
-            try {
-              var _ref, _ref2, _opts$maxAge;
+            const component = routeMatch.options[type];
 
-              if (routeMatch.options.loader) {
-                const data = await routeMatch.options.loader({
-                  params: routeMatch.params,
-                  search: routeMatch.routeSearch,
-                  signal: routeMatch.__.abortController.signal
-                });
+            if ((_routeMatch$__$type = routeMatch.__[type]) != null && _routeMatch$__$type.preload) {
+              routeMatch.__[type] = await router.options.loadComponent(component);
+            }
+          }));
+        })();
 
-                if (id !== routeMatch.__.latestId) {
-                  return routeMatch.__.loadPromise;
-                }
+        routeMatch.__.dataPromise = Promise.resolve().then(async () => {
+          try {
+            var _ref, _ref2, _opts$maxAge;
 
-                routeMatch.routeLoaderData = utils.replaceEqualDeep(routeMatch.routeLoaderData, data);
-              }
+            if (routeMatch.options.loader) {
+              const data = await routeMatch.options.loader({
+                params: routeMatch.params,
+                search: routeMatch.routeSearch,
+                signal: routeMatch.__.abortController.signal
+              });
 
-              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.__.loadPromise;
               }
 
-              if (process.env.NODE_ENV !== 'production') {
-                console.error(err);
-              }
-
-              routeMatch.error = err;
-              routeMatch.status = 'error';
-              routeMatch.updatedAt = Date.now();
+              routeMatch.routeLoaderData = utils.replaceEqualDeep(routeMatch.routeLoaderData, data);
             }
-          });
-
-          try {
-            await Promise.all([routeMatch.__.elementsPromise, routeMatch.__.dataPromise]);
 
+            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.__.loadPromise;
             }
 
-            if (routeMatch.__.pendingMinPromise) {
-              await routeMatch.__.pendingMinPromise;
-              delete routeMatch.__.pendingMinPromise;
-            }
-          } finally {
-            if (id !== routeMatch.__.latestId) {
-              return routeMatch.__.loadPromise;
+            if (process.env.NODE_ENV !== 'production') {
+              console.error(err);
             }
 
-            routeMatch.__.cancelPending();
+            routeMatch.error = err;
+            routeMatch.status = 'error';
+            routeMatch.updatedAt = Date.now();
+          }
+        });
 
-            routeMatch.isPending = false;
-            routeMatch.isFetching = false;
+        try {
+          await Promise.all([routeMatch.__.componentsPromise, routeMatch.__.dataPromise]);
 
-            routeMatch.__.notify();
+          if (id !== routeMatch.__.latestId) {
+            return routeMatch.__.loadPromise;
+          }
+        } finally {
+          if (id !== routeMatch.__.latestId) {
+            return routeMatch.__.loadPromise;
           }
-        })();
 
-        await routeMatch.__.loaderDataPromise;
+          routeMatch.isFetching = false;
 
-        if (id !== routeMatch.__.latestId) {
-          return routeMatch.__.loadPromise;
+          routeMatch.__.notify();
         }
-
-        delete routeMatch.__.loaderDataPromise;
       });
       await routeMatch.__.loadPromise;
+
+      if (id !== routeMatch.__.latestId) {
+        return routeMatch.__.loadPromise;
+      }
+
       delete routeMatch.__.loadPromise;
     }
   });

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

@@ -1 +1 @@
-{"version":3,"file":"routeMatch.js","sources":["../../../../../src/routeMatch.ts"],"sourcesContent":["import { GetFrameworkGeneric } from './frameworks'\nimport { Route } from './route'\nimport {\n  AnyAllRouteInfo,\n  AnyRouteInfo,\n  DefaultAllRouteInfo,\n  RouteInfo,\n} from './routeInfo'\nimport { ActionState, Router } from './router'\nimport { replaceEqualDeep, Timeout } from './utils'\n\nexport interface RouteMatch<\n  TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n  TRouteInfo extends AnyRouteInfo = RouteInfo,\n> extends Route<TAllRouteInfo, TRouteInfo> {\n  matchId: string\n  pathname: string\n  params: TRouteInfo['params']\n  parentMatch?: RouteMatch\n  childMatches: RouteMatch[]\n  routeSearch: TRouteInfo['searchSchema']\n  search: TRouteInfo['fullSearchSchema']\n  status: 'idle' | 'loading' | 'success' | 'error'\n  updatedAt?: number\n  error?: unknown\n  isInvalid: boolean\n  getIsInvalid: () => boolean\n  loaderData: TRouteInfo['loaderData']\n  routeLoaderData: TRouteInfo['routeLoaderData']\n  isFetching: boolean\n  isPending: boolean\n  invalidAt: number\n  __: {\n    element?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n    errorElement?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n    catchElement?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n    pendingElement?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n    loadPromise?: Promise<void>\n    loaderDataPromise?: Promise<void>\n    elementsPromise?: Promise<void>\n    dataPromise?: Promise<void>\n    pendingTimeout?: Timeout\n    pendingMinTimeout?: Timeout\n    pendingMinPromise?: Promise<void>\n    onExit?:\n      | void\n      | ((matchContext: {\n          params: TRouteInfo['allParams']\n          search: TRouteInfo['fullSearchSchema']\n        }) => void)\n    abortController: AbortController\n    latestId: string\n    // setParentMatch: (parentMatch: RouteMatch) => void\n    // addChildMatch: (childMatch: RouteMatch) => void\n    validate: () => void\n    startPending: () => void\n    cancelPending: () => void\n    notify: () => void\n    resolve: () => void\n  }\n  cancel: () => void\n  load: (\n    loaderOpts?: { withPending?: boolean } & (\n      | { preload: true; maxAge: number; gcMaxAge: number }\n      | { preload?: false; maxAge?: never; gcMaxAge?: never }\n    ),\n  ) => Promise<TRouteInfo['routeLoaderData']>\n  fetch: (opts?: { maxAge?: number }) => Promise<TRouteInfo['routeLoaderData']>\n  invalidate: () => void\n  hasLoaders: () => boolean\n}\n\nconst elementTypes = [\n  'element',\n  'errorElement',\n  'catchElement',\n  'pendingElement',\n] as const\n\nexport function createRouteMatch<\n  TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n  TRouteInfo extends AnyRouteInfo = RouteInfo,\n>(\n  router: Router<any, any>,\n  route: Route<TAllRouteInfo, TRouteInfo>,\n  opts: {\n    matchId: string\n    params: TRouteInfo['allParams']\n    pathname: string\n  },\n): RouteMatch<TAllRouteInfo, TRouteInfo> {\n  const routeMatch: RouteMatch<TAllRouteInfo, TRouteInfo> = {\n    ...route,\n    ...opts,\n    router,\n    routeSearch: {},\n    search: {},\n    childMatches: [],\n    status: 'idle',\n    routeLoaderData: {} as TRouteInfo['routeLoaderData'],\n    loaderData: {} as TRouteInfo['loaderData'],\n    isPending: false,\n    isFetching: false,\n    isInvalid: false,\n    invalidAt: Infinity,\n    // pendingActions: [],\n    getIsInvalid: () => {\n      const now = Date.now()\n      return routeMatch.isInvalid || routeMatch.invalidAt < now\n    },\n    __: {\n      abortController: new AbortController(),\n      latestId: '',\n      resolve: () => {},\n      notify: () => {\n        routeMatch.__.resolve()\n        routeMatch.router.notify()\n      },\n      startPending: () => {\n        const pendingMs =\n          routeMatch.options.pendingMs ?? router.options.defaultPendingMs\n        const pendingMinMs =\n          routeMatch.options.pendingMinMs ?? router.options.defaultPendingMinMs\n\n        if (\n          routeMatch.__.pendingTimeout ||\n          routeMatch.status !== 'loading' ||\n          typeof pendingMs === 'undefined'\n        ) {\n          return\n        }\n\n        routeMatch.__.pendingTimeout = setTimeout(() => {\n          routeMatch.isPending = true\n          routeMatch.__.resolve()\n          if (typeof pendingMinMs !== 'undefined') {\n            routeMatch.__.pendingMinPromise = new Promise(\n              (r) =>\n                (routeMatch.__.pendingMinTimeout = setTimeout(r, pendingMinMs)),\n            )\n          }\n        }, pendingMs)\n      },\n      cancelPending: () => {\n        routeMatch.isPending = false\n        clearTimeout(routeMatch.__.pendingTimeout)\n        clearTimeout(routeMatch.__.pendingMinTimeout)\n        delete routeMatch.__.pendingMinPromise\n      },\n      validate: () => {\n        // Validate the search params and stabilize them\n        const parentSearch =\n          routeMatch.parentMatch?.search ?? router.location.search\n\n        try {\n          const prevSearch = routeMatch.routeSearch\n\n          const validator =\n            typeof routeMatch.options.validateSearch === 'object'\n              ? routeMatch.options.validateSearch.parse\n              : routeMatch.options.validateSearch\n\n          let nextSearch = replaceEqualDeep(\n            prevSearch,\n            validator?.(parentSearch) ?? {},\n          )\n\n          // Invalidate route matches when search param stability changes\n          if (prevSearch !== nextSearch) {\n            routeMatch.isInvalid = true\n          }\n\n          routeMatch.routeSearch = nextSearch\n\n          routeMatch.search = replaceEqualDeep(parentSearch, {\n            ...parentSearch,\n            ...nextSearch,\n          })\n\n          elementTypes.map(async (type) => {\n            const routeElement = routeMatch.options[type]\n\n            if (typeof routeMatch.__[type] !== 'function') {\n              routeMatch.__[type] = routeElement\n            }\n          })\n        } catch (err: any) {\n          console.error(err)\n          const error = new (Error as any)('Invalid search params found', {\n            cause: err,\n          })\n          error.code = 'INVALID_SEARCH_PARAMS'\n          routeMatch.status = 'error'\n          routeMatch.error = error\n          // Do not proceed with loading the route\n          return\n        }\n      },\n    },\n    cancel: () => {\n      routeMatch.__.abortController?.abort()\n      routeMatch.__.cancelPending()\n    },\n    invalidate: () => {\n      routeMatch.isInvalid = true\n    },\n    hasLoaders: () => {\n      return !!(\n        route.options.loader ||\n        elementTypes.some((d) => typeof route.options[d] === 'function')\n      )\n    },\n    load: async (loaderOpts) => {\n      const now = Date.now()\n      const minMaxAge = loaderOpts?.preload\n        ? Math.max(loaderOpts?.maxAge, loaderOpts?.gcMaxAge)\n        : 0\n\n      // If this is a preload, add it to the preload cache\n      if (loaderOpts?.preload && minMaxAge > 0) {\n        // If the match is currently active, don't preload it\n        if (\n          router.state.matches.find((d) => d.matchId === routeMatch.matchId)\n        ) {\n          return\n        }\n\n        router.matchCache[routeMatch.matchId] = {\n          gc: now + loaderOpts.gcMaxAge,\n          match: routeMatch as RouteMatch<any, any>,\n        }\n      }\n\n      // If the match is invalid, errored or idle, trigger it to load\n      if (\n        (routeMatch.status === 'success' && routeMatch.getIsInvalid()) ||\n        routeMatch.status === 'error' ||\n        routeMatch.status === 'idle'\n      ) {\n        const maxAge = loaderOpts?.preload ? loaderOpts?.maxAge : undefined\n\n        await routeMatch.fetch({ maxAge })\n      }\n    },\n    fetch: async (opts) => {\n      const id = '' + Date.now() + Math.random()\n      routeMatch.__.latestId = id\n\n      // If the match was in an error state, set it\n      // to a loading state again. Otherwise, keep it\n      // as loading or resolved\n      if (routeMatch.status === 'idle') {\n        routeMatch.status = 'loading'\n      }\n\n      // We started loading the route, so it's no longer invalid\n      routeMatch.isInvalid = false\n\n      routeMatch.__.loadPromise = new Promise(async (resolve) => {\n        // We are now fetching, even if it's in the background of a\n        // resolved state\n        routeMatch.isFetching = true\n        routeMatch.__.resolve = resolve as () => void\n\n        routeMatch.__.loaderDataPromise = (async () => {\n          // Load the elements and data in parallel\n\n          routeMatch.__.elementsPromise = (async () => {\n            // then run all element and data loaders in parallel\n            // For each element type, potentially load it asynchronously\n\n            await Promise.all(\n              elementTypes.map(async (type) => {\n                const routeElement = routeMatch.options[type]\n\n                if (typeof routeMatch.__[type] === 'function') {\n                  routeMatch.__[type] = await router.options.createElement!(\n                    routeElement,\n                  )\n                }\n              }),\n            )\n          })()\n\n          routeMatch.__.dataPromise = Promise.resolve().then(async () => {\n            try {\n              if (routeMatch.options.loader) {\n                const data = await routeMatch.options.loader({\n                  params: routeMatch.params,\n                  search: routeMatch.routeSearch,\n                  signal: routeMatch.__.abortController.signal,\n                })\n                if (id !== routeMatch.__.latestId) {\n                  return routeMatch.__.loadPromise\n                }\n\n                routeMatch.routeLoaderData = replaceEqualDeep(\n                  routeMatch.routeLoaderData,\n                  data,\n                )\n              }\n\n              routeMatch.error = undefined\n              routeMatch.status = 'success'\n              routeMatch.updatedAt = Date.now()\n              routeMatch.invalidAt =\n                routeMatch.updatedAt +\n                (opts?.maxAge ??\n                  routeMatch.options.loaderMaxAge ??\n                  router.options.defaultLoaderMaxAge ??\n                  0)\n            } catch (err) {\n              if (id !== routeMatch.__.latestId) {\n                return routeMatch.__.loadPromise\n              }\n\n              if (process.env.NODE_ENV !== 'production') {\n                console.error(err)\n              }\n              routeMatch.error = err\n              routeMatch.status = 'error'\n              routeMatch.updatedAt = Date.now()\n            }\n          })\n\n          try {\n            await Promise.all([\n              routeMatch.__.elementsPromise,\n              routeMatch.__.dataPromise,\n            ])\n            if (id !== routeMatch.__.latestId) {\n              return routeMatch.__.loadPromise\n            }\n\n            if (routeMatch.__.pendingMinPromise) {\n              await routeMatch.__.pendingMinPromise\n              delete routeMatch.__.pendingMinPromise\n            }\n          } finally {\n            if (id !== routeMatch.__.latestId) {\n              return routeMatch.__.loadPromise\n            }\n            routeMatch.__.cancelPending()\n            routeMatch.isPending = false\n            routeMatch.isFetching = false\n            routeMatch.__.notify()\n          }\n        })()\n\n        await routeMatch.__.loaderDataPromise\n\n        if (id !== routeMatch.__.latestId) {\n          return routeMatch.__.loadPromise\n        }\n\n        delete routeMatch.__.loaderDataPromise\n      })\n\n      await routeMatch.__.loadPromise\n\n      delete routeMatch.__.loadPromise\n    },\n  }\n\n  if (!routeMatch.hasLoaders()) {\n    routeMatch.status = 'success'\n  }\n\n  return routeMatch\n}\n"],"names":["elementTypes","createRouteMatch","router","route","opts","routeMatch","_extends","routeSearch","search","childMatches","status","routeLoaderData","loaderData","isPending","isFetching","isInvalid","invalidAt","Infinity","getIsInvalid","now","Date","__","abortController","AbortController","latestId","resolve","notify","startPending","pendingMs","options","defaultPendingMs","pendingMinMs","defaultPendingMinMs","pendingTimeout","setTimeout","pendingMinPromise","Promise","r","pendingMinTimeout","cancelPending","clearTimeout","validate","parentSearch","parentMatch","location","prevSearch","validator","validateSearch","parse","nextSearch","replaceEqualDeep","map","type","routeElement","err","console","error","Error","cause","code","cancel","abort","invalidate","hasLoaders","loader","some","d","load","loaderOpts","minMaxAge","preload","Math","max","maxAge","gcMaxAge","state","matches","find","matchId","matchCache","gc","match","undefined","fetch","id","random","loadPromise","loaderDataPromise","elementsPromise","all","createElement","dataPromise","then","data","params","signal","updatedAt","loaderMaxAge","defaultLoaderMaxAge","process","env","NODE_ENV"],"mappings":"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"}
+{"version":3,"file":"routeMatch.js","sources":["../../../../../src/routeMatch.ts"],"sourcesContent":["import { GetFrameworkGeneric } from './frameworks'\nimport { Route } from './route'\nimport {\n  AnyAllRouteInfo,\n  AnyRouteInfo,\n  DefaultAllRouteInfo,\n  RouteInfo,\n} from './routeInfo'\nimport { ActionState, Router } from './router'\nimport { replaceEqualDeep, Timeout } from './utils'\n\nexport interface RouteMatch<\n  TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n  TRouteInfo extends AnyRouteInfo = RouteInfo,\n> extends Route<TAllRouteInfo, TRouteInfo> {\n  matchId: string\n  pathname: string\n  params: TRouteInfo['params']\n  parentMatch?: RouteMatch\n  childMatches: RouteMatch[]\n  routeSearch: TRouteInfo['searchSchema']\n  search: TRouteInfo['fullSearchSchema']\n  status: 'idle' | 'loading' | 'success' | 'error'\n  updatedAt?: number\n  error?: unknown\n  isInvalid: boolean\n  getIsInvalid: () => boolean\n  loaderData: TRouteInfo['loaderData']\n  routeLoaderData: TRouteInfo['routeLoaderData']\n  isFetching: boolean\n  invalidAt: number\n  __: {\n    component?: GetFrameworkGeneric<'Component'> // , TRouteInfo['loaderData']>\n    errorComponent?: GetFrameworkGeneric<'Component'> // , TRouteInfo['loaderData']>\n    pendingComponent?: GetFrameworkGeneric<'Component'> // , TRouteInfo['loaderData']>\n    loadPromise?: Promise<void>\n    componentsPromise?: Promise<void>\n    dataPromise?: Promise<void>\n    onExit?:\n      | void\n      | ((matchContext: {\n          params: TRouteInfo['allParams']\n          search: TRouteInfo['fullSearchSchema']\n        }) => void)\n    abortController: AbortController\n    latestId: string\n    // setParentMatch: (parentMatch: RouteMatch) => void\n    // addChildMatch: (childMatch: RouteMatch) => void\n    validate: () => void\n    notify: () => void\n    resolve: () => void\n  }\n  cancel: () => void\n  load: (\n    loaderOpts?:\n      | { preload: true; maxAge: number; gcMaxAge: number }\n      | { preload?: false; maxAge?: never; gcMaxAge?: never },\n  ) => Promise<TRouteInfo['routeLoaderData']>\n  fetch: (opts?: { maxAge?: number }) => Promise<TRouteInfo['routeLoaderData']>\n  invalidate: () => void\n  hasLoaders: () => boolean\n}\n\nconst componentTypes = [\n  'component',\n  'errorComponent',\n  'pendingComponent',\n] as const\n\nexport function createRouteMatch<\n  TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n  TRouteInfo extends AnyRouteInfo = RouteInfo,\n>(\n  router: Router<any, any>,\n  route: Route<TAllRouteInfo, TRouteInfo>,\n  opts: {\n    matchId: string\n    params: TRouteInfo['allParams']\n    pathname: string\n  },\n): RouteMatch<TAllRouteInfo, TRouteInfo> {\n  const routeMatch: RouteMatch<TAllRouteInfo, TRouteInfo> = {\n    ...route,\n    ...opts,\n    router,\n    routeSearch: {},\n    search: {},\n    childMatches: [],\n    status: 'idle',\n    routeLoaderData: {} as TRouteInfo['routeLoaderData'],\n    loaderData: {} as TRouteInfo['loaderData'],\n    isFetching: false,\n    isInvalid: false,\n    invalidAt: Infinity,\n    // pendingActions: [],\n    getIsInvalid: () => {\n      const now = Date.now()\n      return routeMatch.isInvalid || routeMatch.invalidAt < now\n    },\n    __: {\n      abortController: new AbortController(),\n      latestId: '',\n      resolve: () => {},\n      notify: () => {\n        routeMatch.__.resolve()\n        routeMatch.router.notify()\n      },\n      validate: () => {\n        // Validate the search params and stabilize them\n        const parentSearch =\n          routeMatch.parentMatch?.search ?? router.location.search\n\n        try {\n          const prevSearch = routeMatch.routeSearch\n\n          const validator =\n            typeof routeMatch.options.validateSearch === 'object'\n              ? routeMatch.options.validateSearch.parse\n              : routeMatch.options.validateSearch\n\n          let nextSearch = replaceEqualDeep(\n            prevSearch,\n            validator?.(parentSearch) ?? {},\n          )\n\n          // Invalidate route matches when search param stability changes\n          if (prevSearch !== nextSearch) {\n            routeMatch.isInvalid = true\n          }\n\n          routeMatch.routeSearch = nextSearch\n\n          routeMatch.search = replaceEqualDeep(parentSearch, {\n            ...parentSearch,\n            ...nextSearch,\n          })\n\n          componentTypes.map(async (type) => {\n            const component = routeMatch.options[type]\n\n            if (typeof routeMatch.__[type] !== 'function') {\n              routeMatch.__[type] = component\n            }\n          })\n        } catch (err: any) {\n          console.error(err)\n          const error = new (Error as any)('Invalid search params found', {\n            cause: err,\n          })\n          error.code = 'INVALID_SEARCH_PARAMS'\n          routeMatch.status = 'error'\n          routeMatch.error = error\n          // Do not proceed with loading the route\n          return\n        }\n      },\n    },\n    cancel: () => {\n      routeMatch.__.abortController?.abort()\n    },\n    invalidate: () => {\n      routeMatch.isInvalid = true\n    },\n    hasLoaders: () => {\n      return !!(\n        route.options.loader ||\n        componentTypes.some((d) => route.options[d]?.preload)\n      )\n    },\n    load: async (loaderOpts) => {\n      const now = Date.now()\n      const minMaxAge = loaderOpts?.preload\n        ? Math.max(loaderOpts?.maxAge, loaderOpts?.gcMaxAge)\n        : 0\n\n      // If this is a preload, add it to the preload cache\n      if (loaderOpts?.preload && minMaxAge > 0) {\n        // If the match is currently active, don't preload it\n        if (\n          router.state.matches.find((d) => d.matchId === routeMatch.matchId)\n        ) {\n          return\n        }\n\n        router.matchCache[routeMatch.matchId] = {\n          gc: now + loaderOpts.gcMaxAge,\n          match: routeMatch as RouteMatch<any, any>,\n        }\n      }\n\n      // If the match is invalid, errored or idle, trigger it to load\n      if (\n        (routeMatch.status === 'success' && routeMatch.getIsInvalid()) ||\n        routeMatch.status === 'error' ||\n        routeMatch.status === 'idle'\n      ) {\n        const maxAge = loaderOpts?.preload ? loaderOpts?.maxAge : undefined\n\n        await routeMatch.fetch({ maxAge })\n      }\n    },\n    fetch: async (opts) => {\n      const id = '' + Date.now() + Math.random()\n      routeMatch.__.latestId = id\n\n      // If the match was in an error state, set it\n      // to a loading state again. Otherwise, keep it\n      // as loading or resolved\n      if (routeMatch.status === 'idle') {\n        routeMatch.status = 'loading'\n      }\n\n      // We started loading the route, so it's no longer invalid\n      routeMatch.isInvalid = false\n\n      routeMatch.__.loadPromise = new Promise(async (resolve) => {\n        // We are now fetching, even if it's in the background of a\n        // resolved state\n        routeMatch.isFetching = true\n        routeMatch.__.resolve = resolve as () => void\n\n        routeMatch.__.componentsPromise = (async () => {\n          // then run all component and data loaders in parallel\n          // For each component type, potentially load it asynchronously\n\n          await Promise.all(\n            componentTypes.map(async (type) => {\n              const component = routeMatch.options[type]\n\n              if (routeMatch.__[type]?.preload) {\n                routeMatch.__[type] = await router.options.loadComponent!(\n                  component,\n                )\n              }\n            }),\n          )\n        })()\n\n        routeMatch.__.dataPromise = Promise.resolve().then(async () => {\n          try {\n            if (routeMatch.options.loader) {\n              const data = await routeMatch.options.loader({\n                params: routeMatch.params,\n                search: routeMatch.routeSearch,\n                signal: routeMatch.__.abortController.signal,\n              })\n              if (id !== routeMatch.__.latestId) {\n                return routeMatch.__.loadPromise\n              }\n\n              routeMatch.routeLoaderData = replaceEqualDeep(\n                routeMatch.routeLoaderData,\n                data,\n              )\n            }\n\n            routeMatch.error = undefined\n            routeMatch.status = 'success'\n            routeMatch.updatedAt = Date.now()\n            routeMatch.invalidAt =\n              routeMatch.updatedAt +\n              (opts?.maxAge ??\n                routeMatch.options.loaderMaxAge ??\n                router.options.defaultLoaderMaxAge ??\n                0)\n          } catch (err) {\n            if (id !== routeMatch.__.latestId) {\n              return routeMatch.__.loadPromise\n            }\n\n            if (process.env.NODE_ENV !== 'production') {\n              console.error(err)\n            }\n            routeMatch.error = err\n            routeMatch.status = 'error'\n            routeMatch.updatedAt = Date.now()\n          }\n        })\n\n        try {\n          await Promise.all([\n            routeMatch.__.componentsPromise,\n            routeMatch.__.dataPromise,\n          ])\n          if (id !== routeMatch.__.latestId) {\n            return routeMatch.__.loadPromise\n          }\n        } finally {\n          if (id !== routeMatch.__.latestId) {\n            return routeMatch.__.loadPromise\n          }\n          routeMatch.isFetching = false\n          routeMatch.__.notify()\n        }\n      })\n\n      await routeMatch.__.loadPromise\n\n      if (id !== routeMatch.__.latestId) {\n        return routeMatch.__.loadPromise\n      }\n\n      delete routeMatch.__.loadPromise\n    },\n  }\n\n  if (!routeMatch.hasLoaders()) {\n    routeMatch.status = 'success'\n  }\n\n  return routeMatch\n}\n"],"names":["componentTypes","createRouteMatch","router","route","opts","routeMatch","_extends","routeSearch","search","childMatches","status","routeLoaderData","loaderData","isFetching","isInvalid","invalidAt","Infinity","getIsInvalid","now","Date","__","abortController","AbortController","latestId","resolve","notify","validate","parentSearch","parentMatch","location","prevSearch","validator","options","validateSearch","parse","nextSearch","replaceEqualDeep","map","type","component","err","console","error","Error","cause","code","cancel","abort","invalidate","hasLoaders","loader","some","d","preload","load","loaderOpts","minMaxAge","Math","max","maxAge","gcMaxAge","state","matches","find","matchId","matchCache","gc","match","undefined","fetch","id","random","loadPromise","Promise","componentsPromise","all","loadComponent","dataPromise","then","data","params","signal","updatedAt","loaderMaxAge","defaultLoaderMaxAge","process","env","NODE_ENV"],"mappings":"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"}

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

@@ -85,10 +85,16 @@ function createRouter(userOptions) {
       return router.routesById[id];
     },
     notify: () => {
-      router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, {
-        isFetching: router.state.status === 'loading' || router.state.matches.some(d => d.isFetching),
-        isPreloading: Object.values(router.matchCache).some(d => d.match.isFetching && !router.state.matches.find(dd => dd.matchId === d.match.matchId))
-      });
+      const isFetching = router.state.status === 'loading' || router.state.matches.some(d => d.isFetching);
+      const isPreloading = Object.values(router.matchCache).some(d => d.match.isFetching && !router.state.matches.find(dd => dd.matchId === d.match.matchId));
+
+      if (router.state.isFetching !== isFetching || router.state.isPreloading !== isPreloading) {
+        router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, {
+          isFetching,
+          isPreloading
+        });
+      }
+
       cascadeLoaderData(router.state.matches);
       router.listeners.forEach(listener => listener(router));
     },
@@ -107,7 +113,7 @@ function createRouter(userOptions) {
         tinyInvariant["default"](dehydratedMatch, 'Oh no! Dehydrated route matches did not match the active state of the router 😬');
         Object.assign(match, dehydratedMatch);
       });
-      router.loadMatches(matches);
+      matches.forEach(match => match.__.validate());
       router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, dehydratedState, {
         matches
       });
@@ -123,8 +129,11 @@ function createRouter(userOptions) {
 
       if (next.href !== router.location.href) {
         router.__.commitLocation(next, true);
-      } // router.load()
+      }
 
+      if (!router.state.matches.length) {
+        router.load();
+      }
 
       const unsub = router.history.listen(event => {
         router.load(router.__.parseLocation(event.location, router.location));
@@ -197,18 +206,26 @@ function createRouter(userOptions) {
       const matches = router.matchRoutes(router.location.pathname, {
         strictParseParams: true
       });
-      router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, {
-        pending: {
+
+      if (typeof document !== 'undefined') {
+        router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, {
+          pending: {
+            matches: matches,
+            location: router.location
+          },
+          status: 'loading'
+        });
+      } else {
+        router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, {
           matches: matches,
-          location: router.location
-        },
-        status: 'loading'
-      });
+          location: router.location,
+          status: 'loading'
+        });
+      }
+
       router.notify(); // Load the matches
 
-      await router.loadMatches(matches, {
-        withPending: true
-      });
+      await router.loadMatches(matches);
 
       if (router.startedLoadingAt !== id) {
         // Ignore side-effects of match loading
@@ -430,14 +447,8 @@ function createRouter(userOptions) {
 
         match.load(loaderOpts);
 
-        if (match.status === 'loading') {
-          // If requested, start the pending timers
-          if (loaderOpts != null && loaderOpts.withPending) match.__.startPending();
-        }
-
         if (match.__.loadPromise) {
           // Wait for the first sign of activity from the match
-          // This might be completion, error, or a pending state
           await match.__.loadPromise;
         }
       });