@tanstack/router-core 0.0.1-beta.150 → 0.0.1-beta.152

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.150",
+  "version": "0.0.1-beta.152",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -43,7 +43,7 @@
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
     "@gisatcz/cross-package-react-context": "^0.2.0",
-    "@tanstack/react-store": "0.0.1-beta.150"
+    "@tanstack/react-store": "0.0.1-beta.152"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js",

package/src/fileRoute.ts

@@ -1,4 +1,5 @@
-import { Last, ParsePathParams, Split } from './link'
+import { T } from 'vitest/dist/types-198fd1d9'
+import { CleanPath, Last, ParsePathParams, Split } from './link'
 import {
   AnyRoute,
   ResolveFullPath,
@@ -12,6 +13,9 @@ import {
   InferFullSearchSchema,
   UpdatableRouteOptions,
   Route,
+  AnyPathParams,
+  RootRouteId,
+  TrimPathLeft,
 } from './route'
 import { DefaultRoutesInfo } from './routeInfo'
 
@@ -21,36 +25,71 @@ export interface FileRoutesByPath {
   // }
 }
 
-type Test = Last<Split<'/test/:id'>>
+type Replace<
+  S extends string,
+  From extends string,
+  To extends string,
+> = S extends `${infer Start}${From}${infer Rest}`
+  ? `${Start}${To}${Replace<Rest, From, To>}`
+  : S
+
+export type TrimLeft<
+  T extends string,
+  S extends string,
+> = T extends `${S}${infer U}` ? U : T
+
+export type TrimRight<
+  T extends string,
+  S extends string,
+> = T extends `${infer U}${S}` ? U : T
+
+export type Trim<T extends string, S extends string> = TrimLeft<
+  TrimRight<T, S>,
+  S
+>
+
+export type ResolveFilePath<
+  TParentRoute extends AnyRoute,
+  TFilePath extends string,
+> = TParentRoute['id'] extends RootRouteId
+  ? TrimPathLeft<TFilePath>
+  : Replace<
+      TrimPathLeft<TFilePath>,
+      TrimPathLeft<TParentRoute['__types']['customId']>,
+      ''
+    >
+
+export type FileRoutePath<
+  TParentRoute extends AnyRoute,
+  TFilePath extends string,
+> = ResolveFilePath<TParentRoute, TFilePath> extends `_${infer _}`
+  ? string
+  : ResolveFilePath<TParentRoute, TFilePath>
 
 export class FileRoute<
   TFilePath extends keyof FileRoutesByPath,
   TParentRoute extends AnyRoute = FileRoutesByPath[TFilePath]['parentRoute'],
-  TPath extends string = Last<Split<TFilePath>>,
-  TCustomId extends string = TPath extends `_${infer T}` ? T : string,
+  TId extends string = TFilePath,
+  TPath extends string = FileRoutePath<TParentRoute, TFilePath>,
+  TFullPath extends string = ResolveFullPath<TParentRoute, TPath>,
 > {
   constructor(public path: TFilePath) {}
 
   createRoute = <
-    TFullPath extends ResolveFullPath<TParentRoute, TPath> = ResolveFullPath<
-      TParentRoute,
-      TPath
-    >,
-    TId extends ResolveId<TParentRoute, TCustomId, TPath> = ResolveId<
-      TParentRoute,
-      TCustomId,
-      TPath
-    >,
     TLoader = unknown,
     TSearchSchema extends AnySearchSchema = {},
     TFullSearchSchema extends AnySearchSchema = ResolveFullSearchSchema<
       TParentRoute,
       TSearchSchema
     >,
-    TParams extends Record<ParsePathParams<TPath>, any> = Record<
-      ParsePathParams<TPath>,
-      string
-    >,
+    TParams extends ParsePathParams<TPath> extends never
+      ? AnyPathParams
+      : Record<
+          ParsePathParams<TPath>,
+          any
+        > = ParsePathParams<TPath> extends never
+      ? AnyPathParams
+      : Record<ParsePathParams<TPath>, string>,
     TAllParams extends MergeParamsFromParent<
       TParentRoute['__types']['allParams'],
       TParams
@@ -72,13 +111,12 @@ export class FileRoute<
     options: Omit<
       RouteOptions<
         TParentRoute,
-        TCustomId,
-        TPath,
+        string,
+        string,
         TLoader,
         InferFullSearchSchema<TParentRoute>,
         TSearchSchema,
         TFullSearchSchema,
-        TParentRoute['__types']['allParams'],
         TParams,
         TAllParams,
         TParentContext,
@@ -100,7 +138,7 @@ export class FileRoute<
     TParentRoute,
     TPath,
     TFullPath,
-    TCustomId,
+    TFilePath,
     TId,
     TLoader,
     TSearchSchema,

package/src/link.ts

@@ -1,3 +1,4 @@
+import { Trim } from './fileRoute'
 import { AnyRoutesInfo, RouteByPath } from './routeInfo'
 import { ParsedLocation, LocationState, RegisteredRoutesInfo } from './router'
 import { NoInfer, PickRequired, UnionToIntersection, Updater } from './utils'
@@ -19,7 +20,7 @@ export type LinkInfo =
       disabled?: boolean
     }
 
-type CleanPath<T extends string> = T extends `${infer L}//${infer R}`
+export type CleanPath<T extends string> = T extends `${infer L}//${infer R}`
   ? CleanPath<`${CleanPath<L>}/${CleanPath<R>}`>
   : T extends `${infer L}//`
   ? `${CleanPath<L>}/`
@@ -49,11 +50,9 @@ export type Split<S, TIncludeTrailingSlash = true> = S extends unknown
     : never
   : never
 
-export type ParsePathParams<T extends string> = Split<T>[number] extends infer U
-  ? U extends `$${infer V}`
-    ? V
-    : never
-  : never
+export type ParsePathParams<T extends string> = keyof {
+  [K in Trim<Split<T>[number], '_'> as K extends `$${infer L}` ? L : never]: K
+}
 
 export type Join<T, Delimiter extends string = '/'> = T extends []
   ? ''

package/src/route.ts

@@ -135,24 +135,12 @@ export type RouteOptions<
   TParentSearchSchema extends AnySearchSchema = {},
   TSearchSchema extends AnySearchSchema = {},
   TFullSearchSchema extends AnySearchSchema = TSearchSchema,
-  TParentParams extends AnyPathParams = AnyPathParams,
-  TParams extends AnyPathParams = Record<ParsePathParams<TPath>, string>,
+  TParams extends AnyPathParams = AnyPathParams,
   TAllParams extends AnyPathParams = TParams,
   TParentContext extends AnyContext = AnyContext,
-  TAllParentContext extends IsAny<
-    TParentRoute['__types']['allParams'],
-    TParentContext,
-    TParentRoute['__types']['allParams'] & TParentContext
-  > = IsAny<
-    TParentRoute['__types']['allParams'],
-    TParentContext,
-    TParentRoute['__types']['allParams'] & TParentContext
-  >,
+  TAllParentContext extends AnyContext = AnyContext,
   TRouteContext extends RouteContext = RouteContext,
-  TContext extends MergeParamsFromParent<
-    TAllParentContext,
-    TRouteContext
-  > = MergeParamsFromParent<TAllParentContext, TRouteContext>,
+  TContext extends AnyContext = AnyContext,
 > = BaseRouteOptions<
   TParentRoute,
   TCustomId,
@@ -161,7 +149,6 @@ export type RouteOptions<
   TParentSearchSchema,
   TSearchSchema,
   TFullSearchSchema,
-  TParentParams,
   TParams,
   TAllParams,
   TParentContext,
@@ -183,6 +170,14 @@ export type ParamsFallback<
   TParams,
 > = unknown extends TParams ? Record<ParsePathParams<TPath>, string> : TParams
 
+type Prefix<T extends string, U extends string> = U extends `${T}${infer _}`
+  ? U
+  : never
+
+type PrefixOrExact<T extends string, U extends string> = U extends T
+  ? U
+  : Prefix<T, U>
+
 export type BaseRouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
   TCustomId extends string = string,
@@ -191,25 +186,14 @@ export type BaseRouteOptions<
   TParentSearchSchema extends AnySearchSchema = {},
   TSearchSchema extends AnySearchSchema = {},
   TFullSearchSchema extends AnySearchSchema = TSearchSchema,
-  TParentParams extends AnyPathParams = AnyPathParams,
   TParams = unknown,
   TAllParams = ParamsFallback<TPath, TParams>,
   TParentContext extends AnyContext = AnyContext,
-  TAllParentContext extends IsAny<
-    TParentRoute['__types']['allParams'],
-    TParentContext,
-    TParentRoute['__types']['allParams'] & TParentContext
-  > = IsAny<
-    TParentRoute['__types']['allParams'],
-    TParentContext,
-    TParentRoute['__types']['allParams'] & TParentContext
-  >,
+  TAllParentContext extends AnyContext = AnyContext,
   TRouteContext extends RouteContext = RouteContext,
-  TContext extends MergeParamsFromParent<
-    TAllParentContext,
-    TRouteContext
-  > = MergeParamsFromParent<TAllParentContext, TRouteContext>,
+  TContext extends AnyContext = AnyContext,
 > = RoutePathOptions<TCustomId, TPath> & {
+  layoutLimit?: string
   getParentRoute: () => TParentRoute
   validateSearch?: SearchSchemaValidator<TSearchSchema, TParentSearchSchema>
   loader?: LoaderFn<
@@ -555,43 +539,62 @@ export type StreamedPromise<T> = {
   resolve: (value: T) => void
 }
 
+export type RouteConstraints = {
+  TParentRoute: AnyRoute
+  TPath: string
+  TFullPath: string
+  TCustomId: string
+  TId: string
+  TSearchSchema: AnySearchSchema
+  TFullSearchSchema: AnySearchSchema
+  TParams: Record<string, any>
+  TAllParams: Record<string, any>
+  TParentContext: AnyContext
+  TAllParentContext: AnyContext
+  TRouteContext: RouteContext
+  TContext: AnyContext
+  TRouterContext: AnyContext
+  TChildren: unknown
+  TRoutesInfo: DefaultRoutesInfo
+}
+
 export class Route<
-  TParentRoute extends AnyRoute = AnyRoute,
-  TPath extends string = '/',
-  TFullPath extends ResolveFullPath<TParentRoute, TPath> = ResolveFullPath<
+  TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute,
+  TPath extends RouteConstraints['TPath'] = '/',
+  TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<
     TParentRoute,
     TPath
   >,
-  TCustomId extends string = string,
-  TId extends ResolveId<TParentRoute, TCustomId, TPath> = ResolveId<
+  TCustomId extends RouteConstraints['TCustomId'] = string,
+  TId extends RouteConstraints['TId'] = ResolveId<
     TParentRoute,
     TCustomId,
     TPath
   >,
   TLoader = unknown,
-  TSearchSchema extends AnySearchSchema = {},
-  TFullSearchSchema extends AnySearchSchema = ResolveFullSearchSchema<
+  TSearchSchema extends RouteConstraints['TSearchSchema'] = {},
+  TFullSearchSchema extends RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
     TParentRoute,
     TSearchSchema
   >,
-  TParams extends Record<ParsePathParams<TPath>, any> = Record<
+  TParams extends RouteConstraints['TParams'] = Record<
     ParsePathParams<TPath>,
     string
   >,
-  TAllParams extends MergeParamsFromParent<
+  TAllParams extends RouteConstraints['TAllParams'] = MergeParamsFromParent<
     TParentRoute['__types']['allParams'],
     TParams
-  > = MergeParamsFromParent<TParentRoute['__types']['allParams'], TParams>,
-  TParentContext extends TParentRoute['__types']['routeContext'] = TParentRoute['__types']['routeContext'],
-  TAllParentContext extends TParentRoute['__types']['context'] = TParentRoute['__types']['context'],
-  TRouteContext extends RouteContext = RouteContext,
-  TContext extends MergeParamsFromParent<
+  >,
+  TParentContext extends RouteConstraints['TParentContext'] = TParentRoute['__types']['routeContext'],
+  TAllParentContext extends RouteConstraints['TAllParentContext'] = TParentRoute['__types']['context'],
+  TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext,
+  TContext extends RouteConstraints['TContext'] = MergeParamsFromParent<
     TParentRoute['__types']['context'],
     TRouteContext
-  > = MergeParamsFromParent<TParentRoute['__types']['context'], TRouteContext>,
-  TRouterContext extends AnyContext = AnyContext,
-  TChildren extends unknown = unknown,
-  TRoutesInfo extends DefaultRoutesInfo = DefaultRoutesInfo,
+  >,
+  TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,
+  TChildren extends RouteConstraints['TChildren'] = unknown,
+  TRoutesInfo extends RouteConstraints['TRoutesInfo'] = DefaultRoutesInfo,
 > {
   __types!: {
     parentRoute: TParentRoute
@@ -622,7 +625,6 @@ export class Route<
     InferFullSearchSchema<TParentRoute>,
     TSearchSchema,
     TFullSearchSchema,
-    TParentRoute['__types']['allParams'],
     TParams,
     TAllParams,
     TParentContext,
@@ -662,7 +664,6 @@ export class Route<
       InferFullSearchSchema<TParentRoute>,
       TSearchSchema,
       TFullSearchSchema,
-      TParentRoute['__types']['allParams'],
       TParams,
       TAllParams,
       TParentContext,
@@ -694,7 +695,6 @@ export class Route<
       TPath,
       InferFullSearchSchema<TParentRoute>,
       TSearchSchema,
-      TParentRoute['__types']['allParams'],
       TParams
     > &
       RoutePathOptionsIntersection<TCustomId, TPath>
@@ -805,7 +805,7 @@ export class RouterContext<TRouterContext extends {}> {
     TContext extends RouteContext = RouteContext,
   >(
     options?: Omit<
-      RouteOptions<AnyRoute, RootRouteId, '', {}, TSearchSchema, {}, {}>,
+      RouteOptions<AnyRoute, RootRouteId, '', {}, TSearchSchema, {}>,
       | 'path'
       | 'id'
       | 'getParentRoute'
@@ -846,7 +846,7 @@ export class RootRoute<
 > {
   constructor(
     options?: Omit<
-      RouteOptions<AnyRoute, RootRouteId, '', TLoader, TSearchSchema, {}, {}>,
+      RouteOptions<AnyRoute, RootRouteId, '', TLoader, TSearchSchema, {}>,
       | 'path'
       | 'id'
       | 'getParentRoute'
@@ -862,10 +862,7 @@ export class RootRoute<
 export type ResolveFullPath<
   TParentRoute extends AnyRoute,
   TPath extends string,
-  TPrefixed extends RoutePrefix<TParentRoute['fullPath'], TPath> = RoutePrefix<
-    TParentRoute['fullPath'],
-    TPath
-  >,
+  TPrefixed = RoutePrefix<TParentRoute['fullPath'], TPath>,
 > = TPrefixed extends RootRouteId ? '/' : TPrefixed
 
 type RoutePrefix<

package/src/router.ts

@@ -649,10 +649,11 @@ export class Router<
       return false
     })
 
-    let routeCursor = foundRoute || (this.routesById['__root__'] as any)
+    let routeCursor: AnyRoute =
+      foundRoute || (this.routesById['__root__'] as any)
 
     let matchedRoutes: AnyRoute[] = [routeCursor]
-
+    // let includingLayouts = true
     while (routeCursor?.parentRoute) {
       routeCursor = routeCursor.parentRoute
       if (routeCursor) matchedRoutes.unshift(routeCursor)