@tanstack/router-core 0.0.1-beta.16 → 0.0.1-beta.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/cjs/packages/router-core/src/routeConfig.js.map +1 -1
- package/build/cjs/packages/router-core/src/routeMatch.js +24 -35
- package/build/cjs/packages/router-core/src/routeMatch.js.map +1 -1
- package/build/cjs/packages/router-core/src/router.js +38 -1
- package/build/cjs/packages/router-core/src/router.js.map +1 -1
- package/build/esm/index.js +62 -36
- package/build/esm/index.js.map +1 -1
- package/build/stats-html.html +1 -1
- package/build/stats-react.json +130 -130
- package/build/types/index.d.ts +87 -81
- package/build/umd/index.development.js +62 -36
- package/build/umd/index.development.js.map +1 -1
- package/build/umd/index.production.js +1 -1
- package/build/umd/index.production.js.map +1 -1
- package/package.json +1 -1
- package/src/routeConfig.ts +1 -4
- package/src/routeInfo.ts +2 -2
- package/src/routeMatch.ts +24 -31
- package/src/router.ts +57 -7
|
@@ -1 +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 TParentRouteLoaderData extends AnyLoaderData = {},\n TRouteLoaderData extends AnyLoaderData = {},\n TFullSearchSchema extends AnySearchSchema = {},\n TAllParams extends AnyPathParams = {},\n> = (\n loaderContext: LoaderContext<\n TParentRouteLoaderData,\n TFullSearchSchema,\n TAllParams\n >,\n) => Promise<TRouteLoaderData>\n\nexport interface LoaderContext<\n TParentRouteLoaderData extends AnyLoaderData = {},\n TFullSearchSchema extends AnySearchSchema = {},\n TAllParams extends AnyPathParams = {},\n> {\n params: TAllParams\n search: TFullSearchSchema\n signal?: AbortSignal\n parentLoaderPromise?: Promise<TParentRouteLoaderData>\n}\n\nexport type ActionFn<TActionPayload = unknown, TActionResponse = unknown> = (\n submission: TActionPayload,\n) => TActionResponse | Promise<TActionResponse>\n\nexport type UnloaderFn<TPath extends string> = (\n routeMatch: RouteMatch<any, RouteInfo<string, TPath>>,\n) => void\n\nexport type RouteOptions<\n TRouteId extends string = string,\n TPath extends string = string,\n TParentRouteLoaderData extends AnyLoaderData = {},\n TRouteLoaderData extends AnyLoaderData = {},\n TLoaderData extends AnyLoaderData = {},\n TActionPayload = unknown,\n TActionResponse = unknown,\n TParentSearchSchema extends {} = {},\n TSearchSchema extends AnySearchSchema = {},\n TFullSearchSchema extends AnySearchSchema = TSearchSchema,\n TParentParams extends AnyPathParams = {},\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams = {},\n> = (\n | {\n // The path to match (relative to the nearest parent `Route` component or root basepath)\n path: TPath\n }\n | {\n id: TRouteId\n }\n) & {\n // If true, this route will be matched as case-sensitive\n caseSensitive?: boolean\n validateSearch?: SearchSchemaValidator<TSearchSchema, TParentSearchSchema>\n // Filter functions that can manipulate search params *before* they are passed to links and navigate\n // calls that match this route.\n preSearchFilters?: SearchFilter<TFullSearchSchema>[]\n // Filter functions that can manipulate search params *after* they are passed to links and navigate\n // calls that match this route.\n postSearchFilters?: SearchFilter<TFullSearchSchema>[]\n // The content to be rendered when the route is matched. If no component is provided, defaults to `<Outlet />`\n component?: GetFrameworkGeneric<'Component'> // , NoInfer<TParentLoaderData>>\n // The content to be rendered when the route encounters an error\n errorComponent?: GetFrameworkGeneric<'Component'> // , NoInfer<TParentLoaderData>>\n // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render\n pendingComponent?: GetFrameworkGeneric<'Component'> //, NoInfer<TParentLoaderData>>\n // An asynchronous function responsible for preparing or fetching data for the route before it is rendered\n loader?: LoaderFn<\n TParentRouteLoaderData,\n TRouteLoaderData,\n TFullSearchSchema,\n TAllParams\n >\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 TParentRouteLoaderData extends AnyLoaderData = AnyLoaderData,\n TRouteLoaderData extends AnyLoaderData = AnyLoaderData,\n TLoaderData extends AnyLoaderData = AnyLoaderData,\n TActionPayload = unknown,\n TActionResponse = unknown,\n TParentSearchSchema extends {} = {},\n TSearchSchema extends AnySearchSchema = {},\n TFullSearchSchema extends AnySearchSchema = {},\n TParentParams extends AnyPathParams = {},\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams = {},\n TKnownChildren = unknown,\n> {\n id: TId\n routeId: TRouteId\n path: NoInfer<TPath>\n fullPath: TFullPath\n options: RouteOptions<\n TRouteId,\n TPath,\n TParentRouteLoaderData,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams\n >\n children?: TKnownChildren\n addChildren: IsAny<\n TId,\n any,\n <TNewChildren extends any>(\n children: TNewChildren extends AnyRouteConfig[]\n ? TNewChildren\n : { error: 'Invalid route detected'; route: TNewChildren },\n ) => RouteConfig<\n TId,\n TRouteId,\n TPath,\n TFullPath,\n TParentRouteLoaderData,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams,\n TNewChildren\n >\n >\n createChildren: IsAny<\n TId,\n any,\n <TNewChildren extends any>(\n cb: (\n createChildRoute: CreateRouteConfigFn<\n false,\n TId,\n TFullPath,\n TRouteLoaderData,\n TLoaderData,\n TFullSearchSchema,\n TAllParams\n >,\n ) => TNewChildren extends AnyRouteConfig[]\n ? TNewChildren\n : { error: 'Invalid route detected'; route: TNewChildren },\n ) => RouteConfig<\n TId,\n TRouteId,\n TPath,\n TFullPath,\n TParentRouteLoaderData,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams,\n TNewChildren\n >\n >\n createRoute: CreateRouteConfigFn<\n false,\n TId,\n TFullPath,\n TRouteLoaderData,\n TLoaderData,\n TFullSearchSchema,\n TAllParams\n >\n}\n\ntype CreateRouteConfigFn<\n TIsRoot extends boolean = false,\n TParentId extends string = string,\n TParentPath extends string = string,\n TParentRouteLoaderData extends AnyLoaderData = {},\n TParentLoaderData extends AnyLoaderData = {},\n TParentSearchSchema extends AnySearchSchema = {},\n TParentParams extends AnyPathParams = {},\n> = <\n TRouteId extends string,\n TPath extends string,\n TRouteLoaderData extends AnyLoaderData,\n TActionPayload,\n TActionResponse,\n TSearchSchema extends AnySearchSchema = AnySearchSchema,\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams extends TParams\n ? Record<ParsePathParams<TPath>, string>\n : NoInfer<TParams> = AnyPathParams extends TParams\n ? Record<ParsePathParams<TPath>, string>\n : NoInfer<TParams>,\n TKnownChildren extends RouteConfig[] = RouteConfig[],\n TResolvedId extends string = string extends TRouteId\n ? string extends TPath\n ? string\n : TPath\n : TRouteId,\n>(\n options?: TIsRoot extends true\n ? Omit<\n RouteOptions<\n TRouteId,\n TPath,\n TParentRouteLoaderData,\n TRouteLoaderData,\n Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>\n >,\n 'path'\n > & { path?: never }\n : RouteOptions<\n TRouteId,\n TPath,\n TParentRouteLoaderData,\n TRouteLoaderData,\n Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>\n >,\n children?: TKnownChildren,\n isRoot?: boolean,\n parentId?: string,\n parentPath?: string,\n) => RouteConfig<\n RoutePrefix<TParentId, TResolvedId>,\n TResolvedId,\n TPath,\n string extends TPath ? '' : RoutePath<RoutePrefix<TParentPath, TPath>>,\n TParentRouteLoaderData,\n TRouteLoaderData,\n Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>,\n TKnownChildren\n>\n\ntype RoutePath<T extends string> = T extends RootRouteId\n ? '/'\n : TrimPathRight<`${T}`>\n\ntype RoutePrefix<\n TPrefix extends string,\n TId extends string,\n> = string extends TId\n ? RootRouteId\n : TId extends string\n ? `${TPrefix}/${TId}` extends '/'\n ? '/'\n : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TId>}`>}`\n : never\n\nexport interface AnyRouteConfig\n extends RouteConfig<\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any\n > {}\n\nexport interface AnyRouteConfigWithChildren<TChildren>\n extends RouteConfig<\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n TChildren\n > {}\n\ntype TrimPath<T extends string> = '' extends T\n ? ''\n : TrimPathRight<TrimPathLeft<T>>\n\ntype TrimPathLeft<T extends string> = T extends `${RootRouteId}/${infer U}`\n ? TrimPathLeft<U>\n : T extends `/${infer U}`\n ? TrimPathLeft<U>\n : T\ntype TrimPathRight<T extends string> = T extends '/'\n ? '/'\n : T extends `${infer U}/`\n ? TrimPathRight<U>\n : T\n\nexport const createRouteConfig: CreateRouteConfigFn<true> = (\n options = {} as any,\n children,\n isRoot = true,\n parentId,\n parentPath,\n) => {\n if (isRoot) {\n ;(options as any).path = rootRouteId\n }\n\n // Strip the root from parentIds\n if (parentId === rootRouteId) {\n parentId = ''\n }\n\n let path: undefined | string = isRoot ? rootRouteId : options.path\n\n // If the path is anything other than an index path, trim it up\n if (path && path !== '/') {\n path = trimPath(path)\n }\n\n const routeId = path || (options as { id?: string }).id\n\n let id = joinPaths([parentId, routeId])\n\n if (path === rootRouteId) {\n path = '/'\n }\n\n if (id !== rootRouteId) {\n id = joinPaths(['/', id])\n }\n\n const fullPath =\n id === rootRouteId ? '/' : trimPathRight(joinPaths([parentPath, path]))\n\n return {\n id: id as any,\n routeId: routeId as any,\n path: path as any,\n fullPath: fullPath as any,\n options: options as any,\n children,\n createChildren: (cb: any) =>\n createRouteConfig(\n options,\n cb((childOptions: any) =>\n createRouteConfig(childOptions, undefined, false, id, fullPath),\n ),\n false,\n parentId,\n parentPath,\n ),\n addChildren: (children: any) =>\n createRouteConfig(options, children, false, parentId, parentPath),\n createRoute: (childOptions: any) =>\n createRouteConfig(childOptions, undefined, false, id, fullPath) as any,\n }\n}\n"],"names":["rootRouteId","createRouteConfig","options","children","isRoot","parentId","parentPath","path","trimPath","routeId","id","joinPaths","fullPath","trimPathRight","createChildren","cb","childOptions","undefined","addChildren","createRoute"],"mappings":";;;;;;;;;;;;;;;;AAcO,MAAMA,WAAW,GAAG,WAApB;AAubMC,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;;;;;"}
|
|
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 TParentRouteLoaderData extends AnyLoaderData = {},\n TRouteLoaderData extends AnyLoaderData = {},\n TFullSearchSchema extends AnySearchSchema = {},\n TAllParams extends AnyPathParams = {},\n> = (\n loaderContext: LoaderContext<\n TParentRouteLoaderData,\n TFullSearchSchema,\n TAllParams\n >,\n) => Promise<TRouteLoaderData>\n\nexport interface LoaderContext<\n TParentRouteLoaderData extends AnyLoaderData = {},\n TFullSearchSchema extends AnySearchSchema = {},\n TAllParams extends AnyPathParams = {},\n> {\n params: TAllParams\n search: TFullSearchSchema\n signal?: AbortSignal\n // parentLoaderPromise?: Promise<TParentRouteLoaderData>\n}\n\nexport type ActionFn<TActionPayload = unknown, TActionResponse = unknown> = (\n submission: TActionPayload,\n) => TActionResponse | Promise<TActionResponse>\n\nexport type UnloaderFn<TPath extends string> = (\n routeMatch: RouteMatch<any, RouteInfo<string, TPath>>,\n) => void\n\nexport type RouteOptions<\n TRouteId extends string = string,\n TPath extends string = string,\n TParentRouteLoaderData extends AnyLoaderData = {},\n TRouteLoaderData extends AnyLoaderData = {},\n TLoaderData extends AnyLoaderData = {},\n TActionPayload = unknown,\n TActionResponse = unknown,\n TParentSearchSchema extends {} = {},\n TSearchSchema extends AnySearchSchema = {},\n TFullSearchSchema extends AnySearchSchema = TSearchSchema,\n TParentParams extends AnyPathParams = {},\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams = {},\n> = (\n | {\n // The path to match (relative to the nearest parent `Route` component or root basepath)\n path: TPath\n }\n | {\n id: TRouteId\n }\n) & {\n // If true, this route will be matched as case-sensitive\n caseSensitive?: boolean\n validateSearch?: SearchSchemaValidator<TSearchSchema, TParentSearchSchema>\n // Filter functions that can manipulate search params *before* they are passed to links and navigate\n // calls that match this route.\n preSearchFilters?: SearchFilter<TFullSearchSchema>[]\n // Filter functions that can manipulate search params *after* they are passed to links and navigate\n // calls that match this route.\n postSearchFilters?: SearchFilter<TFullSearchSchema>[]\n // The content to be rendered when the route is matched. If no component is provided, defaults to `<Outlet />`\n component?: GetFrameworkGeneric<'Component'> // , NoInfer<TParentLoaderData>>\n // The content to be rendered when the route encounters an error\n errorComponent?: GetFrameworkGeneric<'Component'> // , NoInfer<TParentLoaderData>>\n // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render\n pendingComponent?: GetFrameworkGeneric<'Component'> //, NoInfer<TParentLoaderData>>\n // An asynchronous function responsible for preparing or fetching data for the route before it is rendered\n loader?: LoaderFn<\n TParentRouteLoaderData,\n TRouteLoaderData,\n TFullSearchSchema,\n TAllParams\n >\n // The max age to consider loader data fresh (not-stale) for this route in milliseconds from the time of fetch\n // Defaults to 0. Only stale loader data is refetched.\n loaderMaxAge?: number\n // The max age to cache the loader data for this route in milliseconds from the time of route inactivity\n // before it is garbage collected.\n loaderGcMaxAge?: number\n // An asynchronous function made available to the route for performing asynchronous or mutative actions that\n // might invalidate the route's data.\n action?: ActionFn<TActionPayload, TActionResponse>\n // This function is called\n // when moving from an inactive state to an active one. Likewise, when moving from\n // an active to an inactive state, the return function (if provided) is called.\n onMatch?: (matchContext: {\n params: TAllParams\n search: TFullSearchSchema\n }) =>\n | void\n | undefined\n | ((match: { params: TAllParams; search: TFullSearchSchema }) => void)\n // This function is called when the route remains active from one transition to the next.\n onTransition?: (match: {\n params: TAllParams\n search: TFullSearchSchema\n }) => void\n // An object of whatever you want! This object is accessible anywhere matches are.\n meta?: RouteMeta // TODO: Make this nested and mergeable\n} & (\n | {\n parseParams?: never\n stringifyParams?: never\n }\n | {\n // Parse params optionally receives path params as strings and returns them in a parsed format (like a number or boolean)\n parseParams: (\n rawParams: IsAny<TPath, any, Record<ParsePathParams<TPath>, string>>,\n ) => TParams\n stringifyParams: (\n params: TParams,\n ) => Record<ParsePathParams<TPath>, string>\n }\n ) &\n (PickUnsafe<TParentParams, ParsePathParams<TPath>> extends never // Detect if an existing path param is being redefined\n ? {}\n : 'Cannot redefined path params in child routes!')\n\nexport type SearchFilter<T, U = T> = (prev: T) => U\n\nexport interface RouteConfig<\n TId extends string = string,\n TRouteId extends string = string,\n TPath extends string = string,\n TFullPath extends string = string,\n TParentRouteLoaderData extends AnyLoaderData = AnyLoaderData,\n TRouteLoaderData extends AnyLoaderData = AnyLoaderData,\n TLoaderData extends AnyLoaderData = AnyLoaderData,\n TActionPayload = unknown,\n TActionResponse = unknown,\n TParentSearchSchema extends {} = {},\n TSearchSchema extends AnySearchSchema = {},\n TFullSearchSchema extends AnySearchSchema = {},\n TParentParams extends AnyPathParams = {},\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams = {},\n TKnownChildren = unknown,\n> {\n id: TId\n routeId: TRouteId\n path: NoInfer<TPath>\n fullPath: TFullPath\n options: RouteOptions<\n TRouteId,\n TPath,\n TParentRouteLoaderData,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams\n >\n children?: TKnownChildren\n addChildren: IsAny<\n TId,\n any,\n <TNewChildren extends any>(\n children: TNewChildren extends AnyRouteConfig[]\n ? TNewChildren\n : { error: 'Invalid route detected'; route: TNewChildren },\n ) => RouteConfig<\n TId,\n TRouteId,\n TPath,\n TFullPath,\n TParentRouteLoaderData,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams,\n TNewChildren\n >\n >\n createChildren: IsAny<\n TId,\n any,\n <TNewChildren extends any>(\n cb: (\n createChildRoute: CreateRouteConfigFn<\n false,\n TId,\n TFullPath,\n TRouteLoaderData,\n TLoaderData,\n TFullSearchSchema,\n TAllParams\n >,\n ) => TNewChildren extends AnyRouteConfig[]\n ? TNewChildren\n : { error: 'Invalid route detected'; route: TNewChildren },\n ) => RouteConfig<\n TId,\n TRouteId,\n TPath,\n TFullPath,\n TParentRouteLoaderData,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams,\n TNewChildren\n >\n >\n createRoute: CreateRouteConfigFn<\n false,\n TId,\n TFullPath,\n TRouteLoaderData,\n TLoaderData,\n TFullSearchSchema,\n TAllParams\n >\n}\n\ntype CreateRouteConfigFn<\n TIsRoot extends boolean = false,\n TParentId extends string = string,\n TParentPath extends string = string,\n TParentRouteLoaderData extends AnyLoaderData = {},\n TParentLoaderData extends AnyLoaderData = {},\n TParentSearchSchema extends AnySearchSchema = {},\n TParentParams extends AnyPathParams = {},\n> = <\n TRouteId extends string,\n TPath extends string,\n TRouteLoaderData extends AnyLoaderData,\n TActionPayload,\n TActionResponse,\n TSearchSchema extends AnySearchSchema = AnySearchSchema,\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams extends TParams\n ? Record<ParsePathParams<TPath>, string>\n : NoInfer<TParams> = AnyPathParams extends TParams\n ? Record<ParsePathParams<TPath>, string>\n : NoInfer<TParams>,\n TKnownChildren extends RouteConfig[] = RouteConfig[],\n TResolvedId extends string = string extends TRouteId\n ? string extends TPath\n ? string\n : TPath\n : TRouteId,\n>(\n options?: TIsRoot extends true\n ? Omit<\n RouteOptions<\n TRouteId,\n TPath,\n TParentRouteLoaderData,\n TRouteLoaderData,\n Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>\n >,\n 'path'\n > & { path?: never }\n : RouteOptions<\n TRouteId,\n TPath,\n TParentRouteLoaderData,\n TRouteLoaderData,\n Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>\n >,\n children?: TKnownChildren,\n isRoot?: boolean,\n parentId?: string,\n parentPath?: string,\n) => RouteConfig<\n RoutePrefix<TParentId, TResolvedId>,\n TResolvedId,\n TPath,\n string extends TPath ? '' : RoutePath<RoutePrefix<TParentPath, TPath>>,\n TParentRouteLoaderData,\n TRouteLoaderData,\n Expand<TParentLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>,\n TKnownChildren\n>\n\ntype RoutePath<T extends string> = T extends RootRouteId\n ? '/'\n : TrimPathRight<`${T}`>\n\ntype RoutePrefix<\n TPrefix extends string,\n TId extends string,\n> = string extends TId\n ? RootRouteId\n : TId extends string\n ? `${TPrefix}/${TId}` extends '/'\n ? '/'\n : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TId>}`>}`\n : never\n\nexport interface AnyRouteConfig\n extends RouteConfig<\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any\n > {}\n\nexport interface AnyRouteConfigWithChildren<TChildren>\n extends RouteConfig<\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n TChildren\n > {}\n\ntype TrimPath<T extends string> = '' extends T\n ? ''\n : TrimPathRight<TrimPathLeft<T>>\n\ntype TrimPathLeft<T extends string> = T extends `${RootRouteId}/${infer U}`\n ? TrimPathLeft<U>\n : T extends `/${infer U}`\n ? TrimPathLeft<U>\n : T\ntype TrimPathRight<T extends string> = T extends '/'\n ? '/'\n : T extends `${infer U}/`\n ? TrimPathRight<U>\n : T\n\nexport const createRouteConfig: CreateRouteConfigFn<true> = (\n options = {} as any,\n children,\n isRoot = true,\n parentId,\n parentPath,\n) => {\n if (isRoot) {\n ;(options as any).path = rootRouteId\n }\n\n // Strip the root from parentIds\n if (parentId === rootRouteId) {\n parentId = ''\n }\n\n let path: undefined | string = isRoot ? rootRouteId : options.path\n\n // If the path is anything other than an index path, trim it up\n if (path && path !== '/') {\n path = trimPath(path)\n }\n\n const routeId = path || (options as { id?: string }).id\n\n let id = joinPaths([parentId, routeId])\n\n if (path === rootRouteId) {\n path = '/'\n }\n\n if (id !== rootRouteId) {\n id = joinPaths(['/', id])\n }\n\n const fullPath =\n id === rootRouteId ? '/' : trimPathRight(joinPaths([parentPath, path]))\n\n return {\n id: id as any,\n routeId: routeId as any,\n path: path as any,\n fullPath: fullPath as any,\n options: options as any,\n children,\n createChildren: (cb: any) =>\n createRouteConfig(\n options,\n cb((childOptions: any) =>\n createRouteConfig(childOptions, undefined, false, id, fullPath),\n ),\n false,\n parentId,\n parentPath,\n ),\n addChildren: (children: any) =>\n createRouteConfig(options, children, false, parentId, parentPath),\n createRoute: (childOptions: any) =>\n createRouteConfig(childOptions, undefined, false, id, fullPath) as any,\n }\n}\n"],"names":["rootRouteId","createRouteConfig","options","children","isRoot","parentId","parentPath","path","trimPath","routeId","id","joinPaths","fullPath","trimPathRight","createChildren","cb","childOptions","undefined","addChildren","createRoute"],"mappings":";;;;;;;;;;;;;;;;AAcO,MAAMA,WAAW,GAAG,WAApB;AAobMC,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;;;;;"}
|
|
@@ -121,11 +121,19 @@ function createRouteMatch(router, route, opts) {
|
|
|
121
121
|
}
|
|
122
122
|
},
|
|
123
123
|
fetch: async opts => {
|
|
124
|
-
const
|
|
125
|
-
routeMatch.__.latestId =
|
|
124
|
+
const loadId = '' + Date.now() + Math.random();
|
|
125
|
+
routeMatch.__.latestId = loadId;
|
|
126
|
+
|
|
127
|
+
const checkLatest = async () => {
|
|
128
|
+
if (loadId !== routeMatch.__.latestId) {
|
|
129
|
+
// warning(true, 'Data loader is out of date!')
|
|
130
|
+
return new Promise(() => {});
|
|
131
|
+
}
|
|
132
|
+
}; // If the match was in an error state, set it
|
|
126
133
|
// to a loading state again. Otherwise, keep it
|
|
127
134
|
// as loading or resolved
|
|
128
135
|
|
|
136
|
+
|
|
129
137
|
if (routeMatch.status === 'idle') {
|
|
130
138
|
routeMatch.status = 'loading';
|
|
131
139
|
} // We started loading the route, so it's no longer invalid
|
|
@@ -157,19 +165,8 @@ function createRouteMatch(router, route, opts) {
|
|
|
157
165
|
var _ref, _ref2, _opts$maxAge;
|
|
158
166
|
|
|
159
167
|
if (routeMatch.options.loader) {
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
const data = await routeMatch.options.loader({
|
|
163
|
-
parentLoaderPromise: (_routeMatch$parentMat3 = routeMatch.parentMatch) == null ? void 0 : _routeMatch$parentMat3.__.dataPromise,
|
|
164
|
-
params: routeMatch.params,
|
|
165
|
-
search: routeMatch.routeSearch,
|
|
166
|
-
signal: routeMatch.__.abortController.signal
|
|
167
|
-
});
|
|
168
|
-
|
|
169
|
-
if (id !== routeMatch.__.latestId) {
|
|
170
|
-
return routeMatch.__.loadPromise;
|
|
171
|
-
}
|
|
172
|
-
|
|
168
|
+
const data = await router.loadMatchData(routeMatch);
|
|
169
|
+
await checkLatest();
|
|
173
170
|
routeMatch.routeLoaderData = utils.replaceEqualDeep(routeMatch.routeLoaderData, data);
|
|
174
171
|
}
|
|
175
172
|
|
|
@@ -179,9 +176,7 @@ function createRouteMatch(router, route, opts) {
|
|
|
179
176
|
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);
|
|
180
177
|
return routeMatch.routeLoaderData;
|
|
181
178
|
} catch (err) {
|
|
182
|
-
|
|
183
|
-
return routeMatch.__.loadPromise;
|
|
184
|
-
}
|
|
179
|
+
await checkLatest();
|
|
185
180
|
|
|
186
181
|
if (process.env.NODE_ENV !== 'production') {
|
|
187
182
|
console.error(err);
|
|
@@ -194,29 +189,23 @@ function createRouteMatch(router, route, opts) {
|
|
|
194
189
|
}
|
|
195
190
|
});
|
|
196
191
|
|
|
197
|
-
|
|
198
|
-
await
|
|
199
|
-
|
|
200
|
-
if (id !== routeMatch.__.latestId) {
|
|
201
|
-
return routeMatch.__.loadPromise;
|
|
202
|
-
}
|
|
203
|
-
} finally {
|
|
204
|
-
if (id !== routeMatch.__.latestId) {
|
|
205
|
-
return routeMatch.__.loadPromise;
|
|
206
|
-
}
|
|
207
|
-
|
|
192
|
+
const after = async () => {
|
|
193
|
+
await checkLatest();
|
|
208
194
|
routeMatch.isFetching = false;
|
|
195
|
+
delete routeMatch.__.loadPromise;
|
|
209
196
|
|
|
210
197
|
routeMatch.__.notify();
|
|
198
|
+
};
|
|
199
|
+
|
|
200
|
+
try {
|
|
201
|
+
await Promise.all([routeMatch.__.componentsPromise, routeMatch.__.dataPromise.catch(() => {})]);
|
|
202
|
+
after();
|
|
203
|
+
} catch (_unused) {
|
|
204
|
+
after();
|
|
211
205
|
}
|
|
212
206
|
});
|
|
213
207
|
await routeMatch.__.loadPromise;
|
|
214
|
-
|
|
215
|
-
if (id !== routeMatch.__.latestId) {
|
|
216
|
-
return routeMatch.__.loadPromise;
|
|
217
|
-
}
|
|
218
|
-
|
|
219
|
-
delete routeMatch.__.loadPromise;
|
|
208
|
+
await checkLatest();
|
|
220
209
|
}
|
|
221
210
|
});
|
|
222
211
|
|
|
@@ -1 +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 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<TRouteInfo['routeLoaderData']>\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 parentMatch?: RouteMatch<any, any>\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 parentLoaderPromise: routeMatch.parentMatch?.__.dataPromise,\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\n return routeMatch.routeLoaderData\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\n routeMatch.error = err\n routeMatch.status = 'error'\n routeMatch.updatedAt = Date.now()\n\n throw err\n }\n })\n\n try {\n await Promise.all([\n routeMatch.__.componentsPromise,\n routeMatch.__.dataPromise.catch(() => {}),\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","parentLoaderPromise","params","signal","updatedAt","loaderMaxAge","defaultLoaderMaxAge","process","env","NODE_ENV","catch"],"mappings":"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"}
|
|
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 { Router } from './router'\nimport { replaceEqualDeep, warning } 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<TRouteInfo['routeLoaderData']>\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 parentMatch?: RouteMatch<any, any>\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 loadId = '' + Date.now() + Math.random()\n routeMatch.__.latestId = loadId\n const checkLatest = async () => {\n if (loadId !== routeMatch.__.latestId) {\n // warning(true, 'Data loader is out of date!')\n return new Promise(() => {})\n }\n }\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 router.loadMatchData(routeMatch)\n await checkLatest()\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\n return routeMatch.routeLoaderData\n } catch (err) {\n await checkLatest()\n\n if (process.env.NODE_ENV !== 'production') {\n console.error(err)\n }\n\n routeMatch.error = err\n routeMatch.status = 'error'\n routeMatch.updatedAt = Date.now()\n\n throw err\n }\n })\n\n const after = async () => {\n await checkLatest()\n routeMatch.isFetching = false\n delete routeMatch.__.loadPromise\n routeMatch.__.notify()\n }\n\n try {\n await Promise.all([\n routeMatch.__.componentsPromise,\n routeMatch.__.dataPromise.catch(() => {}),\n ])\n after()\n } catch {\n after()\n }\n })\n\n await routeMatch.__.loadPromise\n await checkLatest()\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","loadId","random","checkLatest","Promise","loadPromise","componentsPromise","all","loadComponent","dataPromise","then","data","loadMatchData","updatedAt","loaderMaxAge","defaultLoaderMaxAge","process","env","NODE_ENV","after","catch"],"mappings":"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"}
|
|
@@ -56,6 +56,8 @@ function createRouter(userOptions) {
|
|
|
56
56
|
});
|
|
57
57
|
|
|
58
58
|
let router = {
|
|
59
|
+
types: undefined,
|
|
60
|
+
// public api
|
|
59
61
|
history,
|
|
60
62
|
options: originalOptions,
|
|
61
63
|
listeners: [],
|
|
@@ -64,7 +66,6 @@ function createRouter(userOptions) {
|
|
|
64
66
|
routeTree: undefined,
|
|
65
67
|
routesById: {},
|
|
66
68
|
location: undefined,
|
|
67
|
-
allRouteInfo: undefined,
|
|
68
69
|
//
|
|
69
70
|
navigationPromise: Promise.resolve(),
|
|
70
71
|
resolveNavigation: () => {},
|
|
@@ -447,6 +448,11 @@ function createRouter(userOptions) {
|
|
|
447
448
|
match.__.validate();
|
|
448
449
|
|
|
449
450
|
match.load(loaderOpts);
|
|
451
|
+
const search = match.search;
|
|
452
|
+
|
|
453
|
+
if (search.__data && search.__data.matchId !== match.matchId) {
|
|
454
|
+
return;
|
|
455
|
+
}
|
|
450
456
|
|
|
451
457
|
if (match.__.loadPromise) {
|
|
452
458
|
// Wait for the first sign of activity from the match
|
|
@@ -456,6 +462,37 @@ function createRouter(userOptions) {
|
|
|
456
462
|
router.notify();
|
|
457
463
|
await Promise.all(matchPromises);
|
|
458
464
|
},
|
|
465
|
+
loadMatchData: async routeMatch => {
|
|
466
|
+
if (isServer || !router.options.useServerData) {
|
|
467
|
+
var _await$routeMatch$opt;
|
|
468
|
+
|
|
469
|
+
return (_await$routeMatch$opt = await (routeMatch.options.loader == null ? void 0 : routeMatch.options.loader({
|
|
470
|
+
// parentLoaderPromise: routeMatch.parentMatch?.__.dataPromise,
|
|
471
|
+
params: routeMatch.params,
|
|
472
|
+
search: routeMatch.routeSearch,
|
|
473
|
+
signal: routeMatch.__.abortController.signal
|
|
474
|
+
}))) != null ? _await$routeMatch$opt : {};
|
|
475
|
+
} else {
|
|
476
|
+
const next = router.buildNext({
|
|
477
|
+
to: '.',
|
|
478
|
+
search: d => _rollupPluginBabelHelpers["extends"]({}, d != null ? d : {}, {
|
|
479
|
+
__data: {
|
|
480
|
+
matchId: routeMatch.matchId
|
|
481
|
+
}
|
|
482
|
+
})
|
|
483
|
+
});
|
|
484
|
+
const res = await fetch(next.href, {
|
|
485
|
+
method: 'GET' // signal: routeMatch.__.abortController.signal,
|
|
486
|
+
|
|
487
|
+
});
|
|
488
|
+
|
|
489
|
+
if (res.ok) {
|
|
490
|
+
return res.json();
|
|
491
|
+
}
|
|
492
|
+
|
|
493
|
+
throw new Error('Failed to fetch match data');
|
|
494
|
+
}
|
|
495
|
+
},
|
|
459
496
|
invalidateRoute: opts => {
|
|
460
497
|
var _router$state$pending5, _router$state$pending6;
|
|
461
498
|
|