@tanstack/router-core 0.0.1-beta.177 → 0.0.1-beta.179

package/build/cjs/route.js.map

@@ -1 +1 @@
-{"version":3,"file":"route.js","sources":["../../src/route.ts"],"sourcesContent":["import { ParsePathParams } from './link'\nimport {\n  AnyRouter,\n  Router,\n  RouteMatch,\n  RegisteredRouter,\n  AnyRouteMatch,\n} from './router'\nimport { IsAny, NoInfer, PickRequired, UnionToIntersection } from './utils'\nimport invariant from 'tiny-invariant'\nimport { joinPaths, trimPath } from './path'\n\nexport const rootRouteId = '__root__' as const\nexport type RootRouteId = typeof rootRouteId\nexport type AnyPathParams = {}\nexport type AnySearchSchema = {}\nexport type AnyContext = {}\nexport interface RouteMeta {}\nexport interface RouteContext {}\nexport interface RegisterRouteComponent<\n  TLoader = unknown,\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // RouteComponent: unknown // This is registered by the framework\n}\nexport interface RegisterErrorRouteComponent<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // ErrorRouteComponent: unknown // This is registered by the framework\n}\nexport interface RegisterPendingRouteComponent<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // PendingRouteComponent: unknown // This is registered by the framework\n}\nexport interface RegisterRouteProps<\n  TLoader = unknown,\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // RouteProps: unknown // This is registered by the framework\n}\nexport interface RegisterErrorRouteProps<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // ErrorRouteProps: unknown // This is registered by the framework\n}\n\nexport interface RegisterPendingRouteProps<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // PendingRouteProps: unknown // This is registered by the framework\n}\n\nexport type RegisteredRouteComponent<\n  TLoader = unknown,\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterRouteComponent<\n  TLoader,\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  RouteComponent: infer T\n}\n  ? T\n  : () => unknown\n\nexport type RegisteredErrorRouteComponent<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterErrorRouteComponent<\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  ErrorRouteComponent: infer T\n}\n  ? T\n  : () => unknown\n\nexport type RegisteredPendingRouteComponent<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterPendingRouteComponent<\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  PendingRouteComponent: infer T\n}\n  ? T\n  : () => unknown\n\nexport type RegisteredRouteProps<\n  TLoader = unknown,\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterRouteProps<\n  TLoader,\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  RouteProps: infer T\n}\n  ? T\n  : {}\n\nexport type RegisteredErrorRouteProps<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterRouteProps<\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  ErrorRouteProps: infer T\n}\n  ? T\n  : {}\n\nexport type RegisteredPendingRouteProps<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterRouteProps<\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  PendingRouteProps: infer T\n}\n  ? T\n  : {}\n\nexport type PreloadableObj = { preload?: () => Promise<void> }\n\nexport type RoutePathOptions<TCustomId, TPath> =\n  | {\n      path: TPath\n    }\n  | {\n      id: TCustomId\n    }\n\nexport type RoutePathOptionsIntersection<TCustomId, TPath> =\n  UnionToIntersection<RoutePathOptions<TCustomId, TPath>>\n\nexport type MetaOptions = keyof PickRequired<RouteMeta> extends never\n  ? {\n      meta?: RouteMeta\n    }\n  : {\n      meta: RouteMeta\n    }\n\nexport type AnyRouteProps = RegisteredRouteProps<any, any, any, any, any>\n\nexport type RouteOptions<\n  TParentRoute extends AnyRoute = AnyRoute,\n  TCustomId extends string = string,\n  TPath extends string = string,\n  TLoader = unknown,\n  TParentSearchSchema extends AnySearchSchema = {},\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = TSearchSchema,\n  TParams extends AnyPathParams = AnyPathParams,\n  TAllParams extends AnyPathParams = TParams,\n  TParentContext extends AnyContext = AnyContext,\n  TAllParentContext extends AnyContext = AnyContext,\n  TRouteContext extends RouteContext = RouteContext,\n  TAllContext extends AnyContext = AnyContext,\n> = BaseRouteOptions<\n  TParentRoute,\n  TCustomId,\n  TPath,\n  TLoader,\n  TParentSearchSchema,\n  TSearchSchema,\n  TFullSearchSchema,\n  TParams,\n  TAllParams,\n  TParentContext,\n  TAllParentContext,\n  TRouteContext,\n  TAllContext\n> &\n  UpdatableRouteOptions<\n    TLoader,\n    TSearchSchema,\n    TFullSearchSchema,\n    TAllParams,\n    TRouteContext,\n    TAllContext\n  >\n\nexport type ParamsFallback<\n  TPath extends string,\n  TParams,\n> = unknown extends TParams ? Record<ParsePathParams<TPath>, string> : TParams\n\ntype Prefix<T extends string, U extends string> = U extends `${T}${infer _}`\n  ? U\n  : never\n\nexport type BaseRouteOptions<\n  TParentRoute extends AnyRoute = AnyRoute,\n  TCustomId extends string = string,\n  TPath extends string = string,\n  TLoader = unknown,\n  TParentSearchSchema extends AnySearchSchema = {},\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = TSearchSchema,\n  TParams extends AnyPathParams = {},\n  TAllParams = ParamsFallback<TPath, TParams>,\n  TParentContext extends AnyContext = AnyContext,\n  TAllParentContext extends AnyContext = AnyContext,\n  TRouteContext extends RouteContext = RouteContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RoutePathOptions<TCustomId, TPath> & {\n  layoutLimit?: string\n  getParentRoute: () => TParentRoute\n  validateSearch?: SearchSchemaValidator<TSearchSchema>\n  loader?: LoaderFn<\n    TLoader,\n    TSearchSchema,\n    TFullSearchSchema,\n    TAllParams,\n    NoInfer<TRouteContext>,\n    TAllContext\n  >\n} & ([TLoader] extends [never]\n    ? {\n        loader: 'Loaders must return a type other than never. If you are throwing a redirect() and not returning anything, return a redirect() instead.'\n      }\n    : {}) &\n  (\n    | {\n        // Both or none\n        parseParams?: (\n          rawParams: IsAny<TPath, any, Record<ParsePathParams<TPath>, string>>,\n        ) => TParams extends Record<ParsePathParams<TPath>, any>\n          ? TParams\n          : 'parseParams must return an object'\n        stringifyParams?: (\n          params: NoInfer<ParamsFallback<TPath, TParams>>,\n        ) => Record<ParsePathParams<TPath>, string>\n      }\n    | {\n        stringifyParams?: never\n        parseParams?: never\n      }\n  ) &\n  (keyof PickRequired<RouteContext> extends never\n    ? {\n        getContext?: GetContextFn<\n          TParentRoute,\n          TAllParams,\n          TFullSearchSchema,\n          TParentContext,\n          TAllParentContext,\n          TRouteContext\n        >\n      }\n    : {\n        getContext: GetContextFn<\n          TParentRoute,\n          TAllParams,\n          TFullSearchSchema,\n          TParentContext,\n          TAllParentContext,\n          TRouteContext\n        >\n      })\n\ntype GetContextFn<\n  TParentRoute,\n  TAllParams,\n  TFullSearchSchema,\n  TParentContext,\n  TAllParentContext,\n  TRouteContext,\n> = (\n  opts: {\n    params: TAllParams\n    search: TFullSearchSchema\n  } & (TParentRoute extends undefined\n    ? {\n        context?: TAllParentContext\n        parentContext?: TParentContext\n      }\n    : {\n        context: TAllParentContext\n        parentContext: TParentContext\n      }),\n) => TRouteContext\n\nexport type UpdatableRouteOptions<\n  TLoader,\n  TSearchSchema extends AnySearchSchema,\n  TFullSearchSchema extends AnySearchSchema,\n  TAllParams extends AnyPathParams,\n  TRouteContext extends AnyContext,\n  TAllContext extends AnyContext,\n> = MetaOptions & {\n  key?: null | false | GetKeyFn<TFullSearchSchema, TAllParams>\n  // If true, this route will be matched as case-sensitive\n  caseSensitive?: boolean\n  // If true, this route will be forcefully wrapped in a suspense boundary\n  wrapInSuspense?: boolean\n  // The content to be rendered when the route is matched. If no component is provided, defaults to `<Outlet />`\n  component?: RegisteredRouteComponent<\n    TLoader,\n    TFullSearchSchema,\n    TAllParams,\n    TRouteContext,\n    TAllContext\n  >\n  // The content to be rendered when the route encounters an error\n  errorComponent?: RegisteredErrorRouteComponent<\n    TFullSearchSchema,\n    TAllParams,\n    TRouteContext,\n    TAllContext\n  > //\n  // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render\n  pendingComponent?: RegisteredPendingRouteComponent<\n    TFullSearchSchema,\n    TAllParams,\n    TRouteContext,\n    TAllContext\n  >\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  // If set, preload matches of this route will be considered fresh for this many milliseconds.\n  preloadMaxAge?: number\n  // If set, a match of this route will be considered fresh for this many milliseconds.\n  maxAge?: number\n  // If set, a match of this route that becomes inactive (or unused) will be garbage collected after this many milliseconds\n  gcMaxAge?: number\n  // This async function is called before a route is loaded.\n  // If an error is thrown here, the route's loader will not be called.\n  // If thrown during a navigation, the navigation will be cancelled and the error will be passed to the `onError` function.\n  // If thrown during a preload event, the error will be logged to the console.\n  beforeLoad?: (\n    opts: LoaderContext<\n      TSearchSchema,\n      TFullSearchSchema,\n      TAllParams,\n      NoInfer<TRouteContext>,\n      TAllContext\n    >,\n  ) => Promise<void> | void\n  onError?: (err: any) => void\n  // These functions are called as route matches are loaded, stick around and leave the active\n  // matches\n  onEnter?: (match: AnyRouteMatch) => void\n  onTransition?: (match: AnyRouteMatch) => void\n  onLeave?: (match: AnyRouteMatch) => void\n}\n\nexport type ParseParamsOption<TPath extends string, TParams> = ParseParamsFn<\n  TPath,\n  TParams\n>\n\nexport type ParseParamsFn<TPath extends string, TParams> = (\n  rawParams: IsAny<TPath, any, Record<ParsePathParams<TPath>, string>>,\n) => TParams extends Record<ParsePathParams<TPath>, any>\n  ? TParams\n  : 'parseParams must return an object'\n\nexport type ParseParamsObj<TPath extends string, TParams> = {\n  parse?: ParseParamsFn<TPath, TParams>\n}\n\n// The parse type here allows a zod schema to be passed directly to the validator\nexport type SearchSchemaValidator<TReturn> =\n  | SearchSchemaValidatorObj<TReturn>\n  | SearchSchemaValidatorFn<TReturn>\n\nexport type SearchSchemaValidatorObj<TReturn> = {\n  parse?: SearchSchemaValidatorFn<TReturn>\n}\n\nexport type SearchSchemaValidatorFn<TReturn> = (\n  searchObj: Record<string, unknown>,\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  TLoader = unknown,\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = {},\n  TAllParams = {},\n  TContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = (\n  match: LoaderContext<\n    TSearchSchema,\n    TFullSearchSchema,\n    TAllParams,\n    TContext,\n    TAllContext\n  > & {\n    parentMatchPromise?: Promise<void>\n  },\n) => Promise<TLoader> | TLoader\n\nexport type GetKeyFn<\n  TFullSearchSchema extends AnySearchSchema = {},\n  TAllParams = {},\n> = (loaderContext: { params: TAllParams; search: TFullSearchSchema }) => any\n\nexport interface LoaderContext<\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = {},\n  TAllParams = {},\n  TContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  params: TAllParams\n  routeSearch: TSearchSchema\n  search: TFullSearchSchema\n  abortController: AbortController\n  preload: boolean\n  routeContext: TContext\n  context: TAllContext\n}\n\nexport type UnloaderFn<TPath extends string> = (\n  routeMatch: RouteMatch<any, Route>,\n) => void\n\nexport type SearchFilter<T, U = T> = (prev: T) => U\n\nexport type ResolveId<\n  TParentRoute,\n  TCustomId extends string,\n  TPath extends string,\n> = TParentRoute extends { id: infer TParentId extends string }\n  ? RoutePrefix<TParentId, string extends TCustomId ? TPath : TCustomId>\n  : RootRouteId\n\nexport type InferFullSearchSchema<TRoute> = TRoute extends {\n  isRoot: true\n  types: {\n    searchSchema: infer TSearchSchema\n  }\n}\n  ? TSearchSchema\n  : TRoute extends {\n      types: {\n        fullSearchSchema: infer TFullSearchSchema\n      }\n    }\n  ? TFullSearchSchema\n  : {}\n\nexport type ResolveFullSearchSchema<TParentRoute, TSearchSchema> =\n  InferFullSearchSchema<TParentRoute> & TSearchSchema\n\nexport interface AnyRoute\n  extends Route<\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    any\n  > {}\n\nexport type MergeParamsFromParent<T, U> = IsAny<T, U, T & U>\n\nexport type UseLoaderResult<T> = T\n// T extends Record<PropertyKey, infer U>\n//   ? {\n//       [K in keyof T]: UseLoaderResultPromise<T[K]>\n//     }\n//   : UseLoaderResultPromise<T>\n\n// export type UseLoaderResultPromise<T> = T extends Promise<infer U>\n//   ? StreamedPromise<U>\n//   : T\n\nexport type StreamedPromise<T> = {\n  promise: Promise<T>\n  status: 'resolved' | 'pending'\n  data: T\n  resolve: (value: T) => void\n}\n\nexport type RouteConstraints = {\n  TParentRoute: AnyRoute\n  TPath: string\n  TFullPath: string\n  TCustomId: string\n  TId: string\n  TSearchSchema: AnySearchSchema\n  TFullSearchSchema: AnySearchSchema\n  TParams: Record<string, any>\n  TAllParams: Record<string, any>\n  TParentContext: AnyContext\n  TAllParentContext: AnyContext\n  TRouteContext: RouteContext\n  TAllContext: AnyContext\n  TRouterContext: AnyContext\n  TChildren: unknown\n  TRouteTree: AnyRoute\n}\n\nexport class Route<\n  TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute,\n  TPath extends RouteConstraints['TPath'] = '/',\n  TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<\n    TParentRoute,\n    TPath\n  >,\n  TCustomId extends RouteConstraints['TCustomId'] = string,\n  TId extends RouteConstraints['TId'] = ResolveId<\n    TParentRoute,\n    TCustomId,\n    TPath\n  >,\n  TLoader = unknown,\n  TSearchSchema extends RouteConstraints['TSearchSchema'] = {},\n  TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<\n    TParentRoute,\n    TSearchSchema\n  >,\n  TParams extends RouteConstraints['TParams'] = Record<\n    ParsePathParams<TPath>,\n    string\n  >,\n  TAllParams extends RouteConstraints['TAllParams'] = MergeParamsFromParent<\n    TParentRoute['types']['allParams'],\n    TParams\n  >,\n  TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['types']['routeContext'],\n  TAllParentContext extends RouteConstraints['TAllParentContext'] = TParentRoute['types']['context'],\n  TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext,\n  TAllContext extends RouteConstraints['TAllContext'] = MergeParamsFromParent<\n    TParentRoute['types']['context'],\n    TRouteContext\n  >,\n  TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,\n  TChildren extends RouteConstraints['TChildren'] = unknown,\n  TRouteTree extends RouteConstraints['TRouteTree'] = AnyRoute,\n> {\n  types!: {\n    parentRoute: TParentRoute\n    path: TPath\n    to: TrimPathRight<TFullPath>\n    fullPath: TFullPath\n    customId: TCustomId\n    id: TId\n    loader: TLoader\n    searchSchema: TSearchSchema\n    fullSearchSchema: TFullSearchSchema\n    params: TParams\n    allParams: TAllParams\n    parentContext: TParentContext\n    allParentContext: TAllParentContext\n    routeContext: TRouteContext\n    context: TAllContext\n    children: TChildren\n    routeTree: TRouteTree\n    routerContext: TRouterContext\n  }\n  isRoot: TParentRoute extends Route<any> ? true : false\n  options: RouteOptions<\n    TParentRoute,\n    TCustomId,\n    TPath,\n    TLoader,\n    InferFullSearchSchema<TParentRoute>,\n    TSearchSchema,\n    TFullSearchSchema,\n    TParams,\n    TAllParams,\n    TParentContext,\n    TAllParentContext,\n    TRouteContext,\n    TAllContext\n  > &\n    UpdatableRouteOptions<\n      TLoader,\n      TSearchSchema,\n      TFullSearchSchema,\n      TAllParams,\n      TRouteContext,\n      TAllContext\n    >\n\n  // Set up in this.init()\n  parentRoute!: TParentRoute\n  id!: TId\n  // customId!: TCustomId\n  path!: TPath\n  fullPath!: TFullPath\n  to!: TrimPathRight<TFullPath>\n\n  // Optional\n  children?: TChildren\n  originalIndex?: number\n  router?: AnyRouter\n  rank!: number\n\n  constructor(\n    options: RouteOptions<\n      TParentRoute,\n      TCustomId,\n      TPath,\n      TLoader,\n      InferFullSearchSchema<TParentRoute>,\n      TSearchSchema,\n      TFullSearchSchema,\n      TParams,\n      TAllParams,\n      TParentContext,\n      TAllParentContext,\n      TRouteContext,\n      TAllContext\n    > &\n      UpdatableRouteOptions<\n        TLoader,\n        TSearchSchema,\n        TFullSearchSchema,\n        TAllParams,\n        TRouteContext,\n        TAllContext\n      >,\n  ) {\n    this.options = (options as any) || {}\n    this.isRoot = !options?.getParentRoute as any\n    Route.__onInit(this)\n  }\n\n  init = (opts: { originalIndex: number; router: AnyRouter }) => {\n    this.originalIndex = opts.originalIndex\n    this.router = opts.router\n\n    const options = this.options as RouteOptions<\n      TParentRoute,\n      TCustomId,\n      TPath,\n      InferFullSearchSchema<TParentRoute>,\n      TSearchSchema,\n      TParams\n    > &\n      RoutePathOptionsIntersection<TCustomId, TPath>\n\n    const isRoot = !options?.path && !options?.id\n\n    this.parentRoute = this.options?.getParentRoute?.()\n\n    if (isRoot) {\n      this.path = rootRouteId as TPath\n    } else {\n      invariant(\n        this.parentRoute,\n        `Child Route instances must pass a 'getParentRoute: () => ParentRoute' option that returns a Route instance.`,\n      )\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 customId = options?.id || path\n\n    // Strip the parentId prefix from the first level of children\n    let id = isRoot\n      ? rootRouteId\n      : joinPaths([\n          (this.parentRoute.id as any) === rootRouteId\n            ? ''\n            : this.parentRoute.id,\n          customId,\n        ])\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 ? '/' : joinPaths([this.parentRoute.fullPath, path])\n\n    this.path = path as TPath\n    this.id = id as TId\n    // this.customId = customId as TCustomId\n    this.fullPath = fullPath as TFullPath\n    this.to = fullPath as TrimPathRight<TFullPath>\n  }\n\n  addChildren = <TNewChildren extends AnyRoute[]>(\n    children: TNewChildren,\n  ): Route<\n    TParentRoute,\n    TPath,\n    TFullPath,\n    TCustomId,\n    TId,\n    TLoader,\n    TSearchSchema,\n    TFullSearchSchema,\n    TParams,\n    TAllParams,\n    TParentContext,\n    TAllParentContext,\n    TRouteContext,\n    TAllContext,\n    TRouterContext,\n    TNewChildren,\n    TRouteTree\n  > => {\n    this.children = children as any\n    return this as any\n  }\n\n  update = (\n    options: UpdatableRouteOptions<\n      TLoader,\n      TSearchSchema,\n      TFullSearchSchema,\n      TAllParams,\n      TRouteContext,\n      TAllContext\n    >,\n  ) => {\n    Object.assign(this.options, options)\n    return this\n  }\n\n  static __onInit = (route: any) => {\n    // This is a dummy static method that should get\n    // replaced by a framework specific implementation if necessary\n  }\n}\n\nexport type AnyRootRoute = RootRoute<any, any, any, any>\n\nexport class RouterContext<TRouterContext extends {}> {\n  constructor() {}\n\n  createRootRoute = <\n    TLoader = unknown,\n    TSearchSchema extends AnySearchSchema = {},\n    TRouteContext extends RouteContext = RouteContext,\n  >(\n    options?: Omit<\n      RouteOptions<\n        AnyRoute,\n        RootRouteId,\n        '',\n        TLoader,\n        TSearchSchema,\n        TSearchSchema,\n        TSearchSchema,\n        {},\n        {},\n        TRouterContext,\n        TRouterContext,\n        TRouteContext,\n        MergeParamsFromParent<TRouterContext, TRouteContext>\n      >,\n      | 'path'\n      | 'id'\n      | 'getParentRoute'\n      | 'caseSensitive'\n      | 'parseParams'\n      | 'stringifyParams'\n    >,\n  ): RootRoute<TLoader, TSearchSchema, TRouteContext, TRouterContext> => {\n    return new RootRoute(options) as any\n  }\n}\n\nexport class RootRoute<\n  TLoader = unknown,\n  TSearchSchema extends AnySearchSchema = {},\n  TRouteContext extends RouteContext = RouteContext,\n  TRouterContext extends {} = {},\n> extends Route<\n  any,\n  '/',\n  '/',\n  string,\n  RootRouteId,\n  TLoader,\n  TSearchSchema,\n  TSearchSchema,\n  {},\n  {},\n  TRouterContext,\n  TRouterContext,\n  TRouteContext,\n  MergeParamsFromParent<TRouterContext, TRouteContext>,\n  TRouterContext,\n  any,\n  any\n> {\n  constructor(\n    options?: Omit<\n      RouteOptions<\n        AnyRoute,\n        RootRouteId,\n        '',\n        TLoader,\n        TSearchSchema,\n        TSearchSchema,\n        TSearchSchema,\n        {},\n        {},\n        TRouterContext,\n        TRouterContext,\n        TRouteContext,\n        MergeParamsFromParent<TRouterContext, TRouteContext>\n      >,\n      | 'path'\n      | 'id'\n      | 'getParentRoute'\n      | 'caseSensitive'\n      | 'parseParams'\n      | 'stringifyParams'\n    >,\n  ) {\n    super(options as any)\n  }\n}\n\nexport type ResolveFullPath<\n  TParentRoute extends AnyRoute,\n  TPath extends string,\n  TPrefixed = RoutePrefix<TParentRoute['fullPath'], TPath>,\n> = TPrefixed extends RootRouteId ? '/' : TPrefixed\n\ntype RoutePrefix<\n  TPrefix extends string,\n  TPath extends string,\n> = string extends TPath\n  ? RootRouteId\n  : TPath extends string\n  ? TPrefix extends RootRouteId\n    ? TPath extends '/'\n      ? '/'\n      : `/${TrimPath<TPath>}`\n    : `${TPrefix}/${TPath}` extends '/'\n    ? '/'\n    : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TPath>}`>}`\n  : never\n\nexport type TrimPath<T extends string> = '' extends T\n  ? ''\n  : TrimPathRight<TrimPathLeft<T>>\n\nexport type TrimPathLeft<T extends string> =\n  T extends `${RootRouteId}/${infer U}`\n    ? TrimPathLeft<U>\n    : T extends `/${infer U}`\n    ? TrimPathLeft<U>\n    : T\nexport type TrimPathRight<T extends string> = T extends '/'\n  ? '/'\n  : T extends `${infer U}/`\n  ? TrimPathRight<U>\n  : T\n"],"names":["rootRouteId","Route","constructor","options","isRoot","getParentRoute","__onInit","init","opts","originalIndex","router","path","id","parentRoute","invariant","trimPath","customId","joinPaths","fullPath","to","addChildren","children","update","Object","assign","route","RouterContext","createRootRoute","RootRoute"],"mappings":"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"}
+{"version":3,"file":"route.js","sources":["../../src/route.ts"],"sourcesContent":["import { ParsePathParams } from './link'\nimport {\n  AnyRouter,\n  Router,\n  RouteMatch,\n  RegisteredRouter,\n  AnyRouteMatch,\n} from './router'\nimport { IsAny, NoInfer, PickRequired, UnionToIntersection } from './utils'\nimport invariant from 'tiny-invariant'\nimport { joinPaths, trimPath } from './path'\n\nexport const rootRouteId = '__root__' as const\nexport type RootRouteId = typeof rootRouteId\nexport type AnyPathParams = {}\nexport type AnySearchSchema = {}\nexport type AnyContext = {}\nexport interface RouteMeta {}\nexport interface RouteContext {}\nexport interface RegisterRouteComponent<\n  TLoader = unknown,\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // RouteComponent: unknown // This is registered by the framework\n}\nexport interface RegisterErrorRouteComponent<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // ErrorRouteComponent: unknown // This is registered by the framework\n}\nexport interface RegisterPendingRouteComponent<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // PendingRouteComponent: unknown // This is registered by the framework\n}\nexport interface RegisterRouteProps<\n  TLoader = unknown,\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // RouteProps: unknown // This is registered by the framework\n}\nexport interface RegisterErrorRouteProps<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // ErrorRouteProps: unknown // This is registered by the framework\n}\n\nexport interface RegisterPendingRouteProps<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  // PendingRouteProps: unknown // This is registered by the framework\n}\n\nexport type RegisteredRouteComponent<\n  TLoader = unknown,\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterRouteComponent<\n  TLoader,\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  RouteComponent: infer T\n}\n  ? T\n  : () => unknown\n\nexport type RegisteredErrorRouteComponent<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterErrorRouteComponent<\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  ErrorRouteComponent: infer T\n}\n  ? T\n  : () => unknown\n\nexport type RegisteredPendingRouteComponent<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterPendingRouteComponent<\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  PendingRouteComponent: infer T\n}\n  ? T\n  : () => unknown\n\nexport type RegisteredRouteProps<\n  TLoader = unknown,\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterRouteProps<\n  TLoader,\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  RouteProps: infer T\n}\n  ? T\n  : {}\n\nexport type RegisteredErrorRouteProps<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterRouteProps<\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  ErrorRouteProps: infer T\n}\n  ? T\n  : {}\n\nexport type RegisteredPendingRouteProps<\n  TFullSearchSchema extends AnySearchSchema = AnySearchSchema,\n  TAllParams extends AnyPathParams = AnyPathParams,\n  TRouteContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RegisterRouteProps<\n  TFullSearchSchema,\n  TAllParams,\n  TRouteContext,\n  TAllContext\n> extends {\n  PendingRouteProps: infer T\n}\n  ? T\n  : {}\n\nexport type PreloadableObj = { preload?: () => Promise<void> }\n\nexport type RoutePathOptions<TCustomId, TPath> =\n  | {\n      path: TPath\n    }\n  | {\n      id: TCustomId\n    }\n\nexport type RoutePathOptionsIntersection<TCustomId, TPath> =\n  UnionToIntersection<RoutePathOptions<TCustomId, TPath>>\n\nexport type MetaOptions = keyof PickRequired<RouteMeta> extends never\n  ? {\n      meta?: RouteMeta\n    }\n  : {\n      meta: RouteMeta\n    }\n\nexport type AnyRouteProps = RegisteredRouteProps<any, any, any, any, any>\n\nexport type RouteOptions<\n  TParentRoute extends AnyRoute = AnyRoute,\n  TCustomId extends string = string,\n  TPath extends string = string,\n  TLoader = unknown,\n  TParentSearchSchema extends AnySearchSchema = {},\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = TSearchSchema,\n  TParams extends AnyPathParams = AnyPathParams,\n  TAllParams extends AnyPathParams = TParams,\n  TParentContext extends AnyContext = AnyContext,\n  TAllParentContext extends AnyContext = AnyContext,\n  TRouteContext extends RouteContext = RouteContext,\n  TAllContext extends AnyContext = AnyContext,\n> = BaseRouteOptions<\n  TParentRoute,\n  TCustomId,\n  TPath,\n  TLoader,\n  TParentSearchSchema,\n  TSearchSchema,\n  TFullSearchSchema,\n  TParams,\n  TAllParams,\n  TParentContext,\n  TAllParentContext,\n  TRouteContext,\n  TAllContext\n> &\n  UpdatableRouteOptions<\n    TLoader,\n    TSearchSchema,\n    TFullSearchSchema,\n    TAllParams,\n    TRouteContext,\n    TAllContext\n  >\n\nexport type ParamsFallback<\n  TPath extends string,\n  TParams,\n> = unknown extends TParams ? Record<ParsePathParams<TPath>, string> : TParams\n\ntype Prefix<T extends string, U extends string> = U extends `${T}${infer _}`\n  ? U\n  : never\n\nexport type BaseRouteOptions<\n  TParentRoute extends AnyRoute = AnyRoute,\n  TCustomId extends string = string,\n  TPath extends string = string,\n  TLoader = unknown,\n  TParentSearchSchema extends AnySearchSchema = {},\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = TSearchSchema,\n  TParams extends AnyPathParams = {},\n  TAllParams = ParamsFallback<TPath, TParams>,\n  TParentContext extends AnyContext = AnyContext,\n  TAllParentContext extends AnyContext = AnyContext,\n  TRouteContext extends RouteContext = RouteContext,\n  TAllContext extends AnyContext = AnyContext,\n> = RoutePathOptions<TCustomId, TPath> & {\n  getParentRoute: () => TParentRoute\n  validateSearch?: SearchSchemaValidator<TSearchSchema>\n  loader?: LoaderFn<\n    TLoader,\n    TSearchSchema,\n    TFullSearchSchema,\n    TAllParams,\n    NoInfer<TRouteContext>,\n    TAllContext\n  >\n} & (keyof PickRequired<RouteContext> extends never\n    ? // This async function is called before a route is loaded.\n      // If an error is thrown here, the route's loader will not be called.\n      // If thrown during a navigation, the navigation will be cancelled and the error will be passed to the `onError` function.\n      // If thrown during a preload event, the error will be logged to the console.\n      {\n        beforeLoad?: BeforeLoadFn<\n          TParentRoute,\n          TAllParams,\n          TSearchSchema,\n          TFullSearchSchema,\n          TParentContext,\n          TAllParentContext,\n          TRouteContext\n        >\n      }\n    : {\n        beforeLoad: BeforeLoadFn<\n          TParentRoute,\n          TAllParams,\n          TSearchSchema,\n          TFullSearchSchema,\n          TParentContext,\n          TAllParentContext,\n          TRouteContext\n        >\n      }) &\n  ([TLoader] extends [never]\n    ? {\n        loader: 'Loaders must return a type other than never. If you are throwing a redirect() and not returning anything, return a redirect() instead.'\n      }\n    : {}) &\n  (\n    | {\n        // Both or none\n        parseParams?: (\n          rawParams: IsAny<TPath, any, Record<ParsePathParams<TPath>, string>>,\n        ) => TParams extends Record<ParsePathParams<TPath>, any>\n          ? TParams\n          : 'parseParams must return an object'\n        stringifyParams?: (\n          params: NoInfer<ParamsFallback<TPath, TParams>>,\n        ) => Record<ParsePathParams<TPath>, string>\n      }\n    | {\n        stringifyParams?: never\n        parseParams?: never\n      }\n  )\n\ntype BeforeLoadFn<\n  TParentRoute,\n  TAllParams,\n  TSearchSchema,\n  TFullSearchSchema,\n  TParentContext,\n  TAllParentContext,\n  TRouteContext,\n> = (\n  opts: {\n    params: TAllParams\n    routeSearch: TSearchSchema\n    search: TFullSearchSchema\n    abortController: AbortController\n    preload: boolean\n  } & (TParentRoute extends undefined\n    ? {\n        context?: TAllParentContext\n        parentContext?: TParentContext\n      }\n    : {\n        context: TAllParentContext\n        parentContext: TParentContext\n      }),\n) => Promise<TRouteContext> | TRouteContext | void\n\nexport type UpdatableRouteOptions<\n  TLoader,\n  TSearchSchema extends AnySearchSchema,\n  TFullSearchSchema extends AnySearchSchema,\n  TAllParams extends AnyPathParams,\n  TRouteContext extends AnyContext,\n  TAllContext extends AnyContext,\n> = MetaOptions & {\n  key?: null | false | GetKeyFn<TFullSearchSchema, TAllParams>\n  // If true, this route will be matched as case-sensitive\n  caseSensitive?: boolean\n  // If true, this route will be forcefully wrapped in a suspense boundary\n  wrapInSuspense?: boolean\n  // The content to be rendered when the route is matched. If no component is provided, defaults to `<Outlet />`\n  component?: RegisteredRouteComponent<\n    TLoader,\n    TFullSearchSchema,\n    TAllParams,\n    TRouteContext,\n    TAllContext\n  >\n  // The content to be rendered when the route encounters an error\n  errorComponent?: RegisteredErrorRouteComponent<\n    TFullSearchSchema,\n    TAllParams,\n    TRouteContext,\n    TAllContext\n  > //\n  // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render\n  pendingComponent?: RegisteredPendingRouteComponent<\n    TFullSearchSchema,\n    TAllParams,\n    TRouteContext,\n    TAllContext\n  >\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  // If set, preload matches of this route will be considered fresh for this many milliseconds.\n  preloadMaxAge?: number\n  // If set, a match of this route will be considered fresh for this many milliseconds.\n  maxAge?: number\n  // If set, a match of this route that becomes inactive (or unused) will be garbage collected after this many milliseconds\n  gcMaxAge?: number\n  onError?: (err: any) => void\n  // These functions are called as route matches are loaded, stick around and leave the active\n  // matches\n  onEnter?: (match: AnyRouteMatch) => void\n  onTransition?: (match: AnyRouteMatch) => void\n  onLeave?: (match: AnyRouteMatch) => void\n}\n\nexport type ParseParamsOption<TPath extends string, TParams> = ParseParamsFn<\n  TPath,\n  TParams\n>\n\nexport type ParseParamsFn<TPath extends string, TParams> = (\n  rawParams: IsAny<TPath, any, Record<ParsePathParams<TPath>, string>>,\n) => TParams extends Record<ParsePathParams<TPath>, any>\n  ? TParams\n  : 'parseParams must return an object'\n\nexport type ParseParamsObj<TPath extends string, TParams> = {\n  parse?: ParseParamsFn<TPath, TParams>\n}\n\n// The parse type here allows a zod schema to be passed directly to the validator\nexport type SearchSchemaValidator<TReturn> =\n  | SearchSchemaValidatorObj<TReturn>\n  | SearchSchemaValidatorFn<TReturn>\n\nexport type SearchSchemaValidatorObj<TReturn> = {\n  parse?: SearchSchemaValidatorFn<TReturn>\n}\n\nexport type SearchSchemaValidatorFn<TReturn> = (\n  searchObj: Record<string, unknown>,\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  TLoader = unknown,\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = {},\n  TAllParams = {},\n  TContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> = (\n  match: LoaderContext<\n    TSearchSchema,\n    TFullSearchSchema,\n    TAllParams,\n    TContext,\n    TAllContext\n  > & {\n    parentMatchPromise?: Promise<void>\n  },\n) => Promise<TLoader> | TLoader\n\nexport type GetKeyFn<\n  TFullSearchSchema extends AnySearchSchema = {},\n  TAllParams = {},\n> = (loaderContext: { params: TAllParams; search: TFullSearchSchema }) => any\n\nexport interface LoaderContext<\n  TSearchSchema extends AnySearchSchema = {},\n  TFullSearchSchema extends AnySearchSchema = {},\n  TAllParams = {},\n  TContext extends AnyContext = AnyContext,\n  TAllContext extends AnyContext = AnyContext,\n> {\n  params: TAllParams\n  routeSearch: TSearchSchema\n  search: TFullSearchSchema\n  abortController: AbortController\n  preload: boolean\n  routeContext: TContext\n  context: TAllContext\n}\n\nexport type UnloaderFn<TPath extends string> = (\n  routeMatch: RouteMatch<any, Route>,\n) => void\n\nexport type SearchFilter<T, U = T> = (prev: T) => U\n\nexport type ResolveId<\n  TParentRoute,\n  TCustomId extends string,\n  TPath extends string,\n> = TParentRoute extends { id: infer TParentId extends string }\n  ? RoutePrefix<TParentId, string extends TCustomId ? TPath : TCustomId>\n  : RootRouteId\n\nexport type InferFullSearchSchema<TRoute> = TRoute extends {\n  isRoot: true\n  types: {\n    searchSchema: infer TSearchSchema\n  }\n}\n  ? TSearchSchema\n  : TRoute extends {\n      types: {\n        fullSearchSchema: infer TFullSearchSchema\n      }\n    }\n  ? TFullSearchSchema\n  : {}\n\nexport type ResolveFullSearchSchema<TParentRoute, TSearchSchema> =\n  InferFullSearchSchema<TParentRoute> & TSearchSchema\n\nexport interface AnyRoute\n  extends Route<\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    any\n  > {}\n\nexport type MergeParamsFromParent<T, U> = IsAny<T, U, T & U>\n\nexport type UseLoaderResult<T> = T\n// T extends Record<PropertyKey, infer U>\n//   ? {\n//       [K in keyof T]: UseLoaderResultPromise<T[K]>\n//     }\n//   : UseLoaderResultPromise<T>\n\n// export type UseLoaderResultPromise<T> = T extends Promise<infer U>\n//   ? StreamedPromise<U>\n//   : T\n\nexport type StreamedPromise<T> = {\n  promise: Promise<T>\n  status: 'resolved' | 'pending'\n  data: T\n  resolve: (value: T) => void\n}\n\nexport type RouteConstraints = {\n  TParentRoute: AnyRoute\n  TPath: string\n  TFullPath: string\n  TCustomId: string\n  TId: string\n  TSearchSchema: AnySearchSchema\n  TFullSearchSchema: AnySearchSchema\n  TParams: Record<string, any>\n  TAllParams: Record<string, any>\n  TParentContext: AnyContext\n  TAllParentContext: AnyContext\n  TRouteContext: RouteContext\n  TAllContext: AnyContext\n  TRouterContext: AnyContext\n  TChildren: unknown\n  TRouteTree: AnyRoute\n}\n\nexport class Route<\n  TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute,\n  TPath extends RouteConstraints['TPath'] = '/',\n  TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<\n    TParentRoute,\n    TPath\n  >,\n  TCustomId extends RouteConstraints['TCustomId'] = string,\n  TId extends RouteConstraints['TId'] = ResolveId<\n    TParentRoute,\n    TCustomId,\n    TPath\n  >,\n  TLoader = unknown,\n  TSearchSchema extends RouteConstraints['TSearchSchema'] = {},\n  TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<\n    TParentRoute,\n    TSearchSchema\n  >,\n  TParams extends RouteConstraints['TParams'] = Record<\n    ParsePathParams<TPath>,\n    string\n  >,\n  TAllParams extends RouteConstraints['TAllParams'] = MergeParamsFromParent<\n    TParentRoute['types']['allParams'],\n    TParams\n  >,\n  TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['types']['routeContext'],\n  TAllParentContext extends RouteConstraints['TAllParentContext'] = TParentRoute['types']['context'],\n  TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext,\n  TAllContext extends RouteConstraints['TAllContext'] = MergeParamsFromParent<\n    TParentRoute['types']['context'],\n    TRouteContext\n  >,\n  TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,\n  TChildren extends RouteConstraints['TChildren'] = unknown,\n  TRouteTree extends RouteConstraints['TRouteTree'] = AnyRoute,\n> {\n  types!: {\n    parentRoute: TParentRoute\n    path: TPath\n    to: TrimPathRight<TFullPath>\n    fullPath: TFullPath\n    customId: TCustomId\n    id: TId\n    loader: TLoader\n    searchSchema: TSearchSchema\n    fullSearchSchema: TFullSearchSchema\n    params: TParams\n    allParams: TAllParams\n    parentContext: TParentContext\n    allParentContext: TAllParentContext\n    routeContext: TRouteContext\n    context: TAllContext\n    children: TChildren\n    routeTree: TRouteTree\n    routerContext: TRouterContext\n  }\n  isRoot: TParentRoute extends Route<any> ? true : false\n  options: RouteOptions<\n    TParentRoute,\n    TCustomId,\n    TPath,\n    TLoader,\n    InferFullSearchSchema<TParentRoute>,\n    TSearchSchema,\n    TFullSearchSchema,\n    TParams,\n    TAllParams,\n    TParentContext,\n    TAllParentContext,\n    TRouteContext,\n    TAllContext\n  >\n\n  // Set up in this.init()\n  parentRoute!: TParentRoute\n  id!: TId\n  // customId!: TCustomId\n  path!: TPath\n  fullPath!: TFullPath\n  to!: TrimPathRight<TFullPath>\n\n  // Optional\n  children?: TChildren\n  originalIndex?: number\n  router?: AnyRouter\n  rank!: number\n\n  constructor(\n    options: RouteOptions<\n      TParentRoute,\n      TCustomId,\n      TPath,\n      TLoader,\n      InferFullSearchSchema<TParentRoute>,\n      TSearchSchema,\n      TFullSearchSchema,\n      TParams,\n      TAllParams,\n      TParentContext,\n      TAllParentContext,\n      TRouteContext,\n      TAllContext\n    > &\n      UpdatableRouteOptions<\n        TLoader,\n        TSearchSchema,\n        TFullSearchSchema,\n        TAllParams,\n        TRouteContext,\n        TAllContext\n      >,\n  ) {\n    this.options = (options as any) || {}\n    this.isRoot = !options?.getParentRoute as any\n    Route.__onInit(this)\n  }\n\n  init = (opts: { originalIndex: number; router: AnyRouter }) => {\n    this.originalIndex = opts.originalIndex\n    this.router = opts.router\n\n    const options = this.options as RouteOptions<\n      TParentRoute,\n      TCustomId,\n      TPath,\n      InferFullSearchSchema<TParentRoute>,\n      TSearchSchema,\n      TParams\n    > &\n      RoutePathOptionsIntersection<TCustomId, TPath>\n\n    const isRoot = !options?.path && !options?.id\n\n    this.parentRoute = this.options?.getParentRoute?.()\n\n    if (isRoot) {\n      this.path = rootRouteId as TPath\n    } else {\n      invariant(\n        this.parentRoute,\n        `Child Route instances must pass a 'getParentRoute: () => ParentRoute' option that returns a Route instance.`,\n      )\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 customId = options?.id || path\n\n    // Strip the parentId prefix from the first level of children\n    let id = isRoot\n      ? rootRouteId\n      : joinPaths([\n          (this.parentRoute.id as any) === rootRouteId\n            ? ''\n            : this.parentRoute.id,\n          customId,\n        ])\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 ? '/' : joinPaths([this.parentRoute.fullPath, path])\n\n    this.path = path as TPath\n    this.id = id as TId\n    // this.customId = customId as TCustomId\n    this.fullPath = fullPath as TFullPath\n    this.to = fullPath as TrimPathRight<TFullPath>\n  }\n\n  addChildren = <TNewChildren extends AnyRoute[]>(\n    children: TNewChildren,\n  ): Route<\n    TParentRoute,\n    TPath,\n    TFullPath,\n    TCustomId,\n    TId,\n    TLoader,\n    TSearchSchema,\n    TFullSearchSchema,\n    TParams,\n    TAllParams,\n    TParentContext,\n    TAllParentContext,\n    TRouteContext,\n    TAllContext,\n    TRouterContext,\n    TNewChildren,\n    TRouteTree\n  > => {\n    this.children = children as any\n    return this as any\n  }\n\n  update = (\n    options: UpdatableRouteOptions<\n      TLoader,\n      TSearchSchema,\n      TFullSearchSchema,\n      TAllParams,\n      TRouteContext,\n      TAllContext\n    >,\n  ) => {\n    Object.assign(this.options, options)\n    return this\n  }\n\n  static __onInit = (route: any) => {\n    // This is a dummy static method that should get\n    // replaced by a framework specific implementation if necessary\n  }\n}\n\nexport type AnyRootRoute = RootRoute<any, any, any, any>\n\nexport class RouterContext<TRouterContext extends {}> {\n  constructor() {}\n\n  createRootRoute = <\n    TLoader = unknown,\n    TSearchSchema extends AnySearchSchema = {},\n    TRouteContext extends RouteContext = RouteContext,\n  >(\n    options?: Omit<\n      RouteOptions<\n        AnyRoute,\n        RootRouteId,\n        '',\n        TLoader,\n        TSearchSchema,\n        TSearchSchema,\n        TSearchSchema,\n        {},\n        {},\n        TRouterContext,\n        TRouterContext,\n        TRouteContext,\n        MergeParamsFromParent<TRouterContext, TRouteContext>\n      >,\n      | 'path'\n      | 'id'\n      | 'getParentRoute'\n      | 'caseSensitive'\n      | 'parseParams'\n      | 'stringifyParams'\n    >,\n  ): RootRoute<TLoader, TSearchSchema, TRouteContext, TRouterContext> => {\n    return new RootRoute(options) as any\n  }\n}\n\nexport class RootRoute<\n  TLoader = unknown,\n  TSearchSchema extends AnySearchSchema = {},\n  TRouteContext extends RouteContext = RouteContext,\n  TRouterContext extends {} = {},\n> extends Route<\n  any,\n  '/',\n  '/',\n  string,\n  RootRouteId,\n  TLoader,\n  TSearchSchema,\n  TSearchSchema,\n  {},\n  {},\n  TRouterContext,\n  TRouterContext,\n  TRouteContext,\n  MergeParamsFromParent<TRouterContext, TRouteContext>,\n  TRouterContext,\n  any,\n  any\n> {\n  constructor(\n    options?: Omit<\n      RouteOptions<\n        AnyRoute,\n        RootRouteId,\n        '',\n        TLoader,\n        TSearchSchema,\n        TSearchSchema,\n        TSearchSchema,\n        {},\n        {},\n        TRouterContext,\n        TRouterContext,\n        TRouteContext,\n        MergeParamsFromParent<TRouterContext, TRouteContext>\n      >,\n      | 'path'\n      | 'id'\n      | 'getParentRoute'\n      | 'caseSensitive'\n      | 'parseParams'\n      | 'stringifyParams'\n    >,\n  ) {\n    super(options as any)\n  }\n}\n\nexport type ResolveFullPath<\n  TParentRoute extends AnyRoute,\n  TPath extends string,\n  TPrefixed = RoutePrefix<TParentRoute['fullPath'], TPath>,\n> = TPrefixed extends RootRouteId ? '/' : TPrefixed\n\ntype RoutePrefix<\n  TPrefix extends string,\n  TPath extends string,\n> = string extends TPath\n  ? RootRouteId\n  : TPath extends string\n  ? TPrefix extends RootRouteId\n    ? TPath extends '/'\n      ? '/'\n      : `/${TrimPath<TPath>}`\n    : `${TPrefix}/${TPath}` extends '/'\n    ? '/'\n    : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TPath>}`>}`\n  : never\n\nexport type TrimPath<T extends string> = '' extends T\n  ? ''\n  : TrimPathRight<TrimPathLeft<T>>\n\nexport type TrimPathLeft<T extends string> =\n  T extends `${RootRouteId}/${infer U}`\n    ? TrimPathLeft<U>\n    : T extends `/${infer U}`\n    ? TrimPathLeft<U>\n    : T\nexport type TrimPathRight<T extends string> = T extends '/'\n  ? '/'\n  : T extends `${infer U}/`\n  ? TrimPathRight<U>\n  : T\n"],"names":["rootRouteId","Route","constructor","options","isRoot","getParentRoute","__onInit","init","opts","originalIndex","router","path","id","parentRoute","invariant","trimPath","customId","joinPaths","fullPath","to","addChildren","children","update","Object","assign","route","RouterContext","createRootRoute","RootRoute"],"mappings":"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"}

package/build/cjs/router.js

@@ -28,6 +28,7 @@ var invariant__default = /*#__PURE__*/_interopDefaultLegacy(invariant);
 const componentTypes = ['component', 'errorComponent', 'pendingComponent'];
 const visibilityChangeEvent = 'visibilitychange';
 const focusEvent = 'focus';
+const preloadWarning = 'Error preloading route! ☝️';
 class Router {
   #unsubHistory;
   resetNextScroll = false;
@@ -457,39 +458,14 @@ class Router {
           return parentSearchInfo;
         }
       })();
-      Object.assign(match, {
-        ...searchInfo
-      });
-      const contextInfo = (() => {
-        try {
-          const routeContext = route.options.getContext?.({
-            parentContext: parentMatch?.routeContext ?? {},
-            context: parentMatch?.context ?? this?.options.context ?? {},
-            params: match.params,
-            search: match.search
-          }) || {};
-          const context = {
-            ...(parentMatch?.context ?? this?.options.context),
-            ...routeContext
-          };
-          return {
-            context,
-            routeContext
-          };
-        } catch (err) {
-          route.options.onError?.(err);
-          throw err;
-        }
-      })();
-      Object.assign(match, {
-        ...contextInfo
-      });
+      Object.assign(match, searchInfo);
     });
     return matches;
   };
-  loadMatches = async (resolvedMatches, opts) => {
+  loadMatches = async (_resolvedMatches, opts) => {
+    const getFreshMatches = () => _resolvedMatches.map(d => this.getRouteMatch(d.id));
     if (!opts?.preload) {
-      resolvedMatches.forEach(match => {
+      getFreshMatches().forEach(match => {
         // Update each match with its latest route data
         this.setRouteMatch(match.id, s => ({
           ...s,
@@ -509,7 +485,8 @@ class Router {
 
     // Check each match middleware to see if the route can be accessed
     try {
-      for (const [index, match] of resolvedMatches.entries()) {
+      for (const [index, match] of getFreshMatches().entries()) {
+        const parentMatch = getFreshMatches()[index - 1];
         const route = this.getRoute(match.routeId);
         const handleError = (err, code) => {
           err.routerCode = code;
@@ -540,10 +517,21 @@ class Router {
         }
         let didError = false;
         try {
-          await route.options.beforeLoad?.({
+          const routeContext = (await route.options.beforeLoad?.({
             ...match,
-            preload: !!opts?.preload
-          });
+            preload: !!opts?.preload,
+            parentContext: parentMatch?.routeContext ?? {},
+            context: parentMatch?.context ?? this?.options.context ?? {}
+          })) ?? {};
+          const context = {
+            ...(parentMatch?.context ?? this?.options.context),
+            ...routeContext
+          };
+          this.setRouteMatch(match.id, s => ({
+            ...s,
+            context,
+            routeContext
+          }));
         } catch (err) {
           handleError(err, 'BEFORE_LOAD');
           didError = true;
@@ -560,7 +548,7 @@ class Router {
       }
       throw err;
     }
-    const validResolvedMatches = resolvedMatches.slice(0, firstBadMatchIndex);
+    const validResolvedMatches = getFreshMatches().slice(0, firstBadMatchIndex);
     const matchPromises = [];
     validResolvedMatches.forEach((match, index) => {
       matchPromises.push((async () => {
@@ -769,14 +757,14 @@ class Router {
       if (preload) {
         this.preloadRoute(nextOpts).catch(err => {
           console.warn(err);
-          console.warn('Error preloading route! ☝️');
+          console.warn(preloadWarning);
         });
       }
     };
     const handleTouchStart = e => {
       this.preloadRoute(nextOpts).catch(err => {
         console.warn(err);
-        console.warn('Error preloading route! ☝️');
+        console.warn(preloadWarning);
       });
     };
     const handleEnter = e => {
@@ -789,7 +777,7 @@ class Router {
           target.preloadTimeout = null;
           this.preloadRoute(nextOpts).catch(err => {
             console.warn(err);
-            console.warn('Error preloading route! ☝️');
+            console.warn(preloadWarning);
           });
         }, preloadDelay);
       }
@@ -816,6 +804,7 @@ class Router {
   dehydrate = () => {
     return {
       state: {
+        matchIds: this.state.matchIds,
         dehydratedMatches: this.state.matches.map(d => utils.pick(d, ['fetchedAt', 'invalid', 'preloadMaxAge', 'maxAge', 'id', 'loaderData', 'status', 'updatedAt']))
       }
     };
@@ -830,11 +819,9 @@ class Router {
     const ctx = _ctx;
     this.dehydratedData = ctx.payload;
     this.options.hydrate?.(ctx.payload);
-    const {
-      dehydratedMatches
-    } = ctx.router.state;
+    const dehydratedState = ctx.router.state;
     let matches = this.matchRoutes(this.state.location.pathname, this.state.location.search).map(match => {
-      const dehydratedMatch = dehydratedMatches.find(d => d.id === match.id);
+      const dehydratedMatch = dehydratedState.dehydratedMatches.find(d => d.id === match.id);
       invariant__default["default"](dehydratedMatch, `Could not find a client-side match for dehydrated match with id: ${match.id}!`);
       if (dehydratedMatch) {
         return {
@@ -847,6 +834,7 @@ class Router {
     this.__store.setState(s => {
       return {
         ...s,
+        matchIds: dehydratedState.matchIds,
         matches,
         matchesById: this.#mergeMatches(s.matchesById, matches)
       };
@@ -863,10 +851,10 @@ class Router {
         const id = `__TSR_DEHYDRATED__${strKey}`;
         const data = typeof getData === 'function' ? await getData() : getData;
         return `<script id='${id}' suppressHydrationWarning>window["__TSR_DEHYDRATED__${escapeJSON(strKey)}"] = ${JSON.stringify(data)}
-        // ;(() => {
-        //   var el = document.getElementById('${id}')
-        //   el.parentElement.removeChild(el)
-        // })()
+        ;(() => {
+          var el = document.getElementById('${id}')
+          el.parentElement.removeChild(el)
+        })()
         </script>`;
       });
       return () => this.hydrateData(key);