@tanstack/router-core 0.0.1-beta.145 → 0.0.1-beta.147

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.145",
+  "version": "0.0.1-beta.147",
   "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.134"
+    "@tanstack/react-store": "0.0.1-beta.147"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js",

package/src/fileRoute.ts

@@ -0,0 +1,122 @@
+import { Last, ParsePathParams, Split } from './link'
+import {
+  AnyRoute,
+  ResolveFullPath,
+  ResolveId,
+  AnySearchSchema,
+  ResolveFullSearchSchema,
+  MergeParamsFromParent,
+  RouteContext,
+  AnyContext,
+  RouteOptions,
+  InferFullSearchSchema,
+  UpdatableRouteOptions,
+  Route,
+} from './route'
+import { DefaultRoutesInfo } from './routeInfo'
+
+export interface FileRoutesByPath {
+  // '/': {
+  //   parentRoute: typeof rootRoute
+  // }
+}
+
+type Test = Last<Split<'/test/:id'>>
+
+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,
+> {
+  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
+    >,
+    TAllParams extends 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<
+      TParentRoute['__types']['context'],
+      TRouteContext
+    > = MergeParamsFromParent<
+      TParentRoute['__types']['context'],
+      TRouteContext
+    >,
+    TRouterContext extends AnyContext = AnyContext,
+    TChildren extends unknown = unknown,
+    TRoutesInfo extends DefaultRoutesInfo = DefaultRoutesInfo,
+  >(
+    options: Omit<
+      RouteOptions<
+        TParentRoute,
+        TCustomId,
+        TPath,
+        TLoader,
+        InferFullSearchSchema<TParentRoute>,
+        TSearchSchema,
+        TFullSearchSchema,
+        TParentRoute['__types']['allParams'],
+        TParams,
+        TAllParams,
+        TParentContext,
+        TAllParentContext,
+        TRouteContext,
+        TContext
+      >,
+      'getParentRoute' | 'path' | 'id'
+    > &
+      UpdatableRouteOptions<
+        TLoader,
+        TSearchSchema,
+        TFullSearchSchema,
+        TAllParams,
+        TRouteContext,
+        TContext
+      >,
+  ): Route<
+    TParentRoute,
+    TPath,
+    TFullPath,
+    TCustomId,
+    TId,
+    TLoader,
+    TSearchSchema,
+    TFullSearchSchema,
+    TParams,
+    TAllParams,
+    TParentContext,
+    TAllParentContext,
+    TRouteContext,
+    TContext,
+    TRouterContext,
+    TChildren,
+    TRoutesInfo
+  > => {
+    const route = new Route(options as any)
+    ;(route as any).isRoot = false
+    return route as any
+  }
+}

package/src/index.ts

@@ -5,6 +5,7 @@ export * from './link'
 export * from './path'
 export * from './qss'
 export * from './route'
+export * from './fileRoute'
 export * from './routeInfo'
 export * from './router'
 export * from './searchParams'

package/src/link.ts

@@ -55,7 +55,7 @@ export type ParsePathParams<T extends string> = Split<T>[number] extends infer U
     : never
   : never
 
-type Join<T, Delimiter extends string = '/'> = T extends []
+export type Join<T, Delimiter extends string = '/'> = T extends []
   ? ''
   : T extends [infer L extends string]
   ? L
@@ -63,6 +63,8 @@ type Join<T, Delimiter extends string = '/'> = T extends []
   ? CleanPath<`${L}${Delimiter}${Join<Tail>}`>
   : never
 
+export type Last<T extends any[]> = T extends [...infer _, infer L] ? L : never
+
 export type RelativeToPathAutoComplete<
   AllPaths extends string,
   TFrom extends string,

package/src/route.ts

@@ -310,8 +310,16 @@ export type UpdatableRouteOptions<
     RouteProps<TLoader, TFullSearchSchema, TAllParams, TRouteContext, TContext>
   >
   // The content to be rendered when the route encounters an error
-  errorComponent?: RegisterRouteErrorComponent<
-    RouteProps<TLoader, TFullSearchSchema, TAllParams, TRouteContext, TContext>
+  errorComponent?: RegisteredRouteErrorComponent<
+    { error: unknown } & Partial<
+      RouteProps<
+        TLoader,
+        TFullSearchSchema,
+        TAllParams,
+        TRouteContext,
+        TContext
+      >
+    >
   > //
   // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render
   pendingComponent?: RegisteredRouteComponent<
@@ -807,7 +815,7 @@ export class RouterContext<TRouterContext extends {}> {
     >,
   ) => {
     return new RootRoute<TLoader, TSearchSchema, TContext, TRouterContext>(
-      options,
+      options as any,
     )
   }
 }
@@ -838,7 +846,7 @@ export class RootRoute<
 > {
   constructor(
     options?: Omit<
-      RouteOptions<AnyRoute, RootRouteId, '', {}, TSearchSchema, {}, {}>,
+      RouteOptions<AnyRoute, RootRouteId, '', TLoader, TSearchSchema, {}, {}>,
       | 'path'
       | 'id'
       | 'getParentRoute'
@@ -890,47 +898,3 @@ export type TrimPathRight<T extends string> = T extends '/'
   : T extends `${infer U}/`
   ? TrimPathRight<U>
   : T
-
-// const rootRoute = new RootRoute({
-//   validateSearch: () => null as unknown as { root?: boolean },
-// })
-
-// const aRoute = new Route({
-//   getParentRoute: () => rootRoute,
-//   path: 'a',
-//   validateSearch: () => null as unknown as { a?: string },
-// })
-
-// const bRoute = new Route({
-//   getParentRoute: () => aRoute,
-//   path: 'b',
-// })
-
-// const rootIsRoot = rootRoute.isRoot
-// //    ^?
-// const aIsRoot = aRoute.isRoot
-// //    ^?
-
-// const rId = rootRoute.id
-// //    ^?
-// const aId = aRoute.id
-// //    ^?
-// const bId = bRoute.id
-// //    ^?
-
-// const rPath = rootRoute.fullPath
-// //    ^?
-// const aPath = aRoute.fullPath
-// //    ^?
-// const bPath = bRoute.fullPath
-// //    ^?
-
-// const rSearch = rootRoute.__types.fullSearchSchema
-// //    ^?
-// const aSearch = aRoute.__types.fullSearchSchema
-// //    ^?
-// const bSearch = bRoute.__types.fullSearchSchema
-// //    ^?
-
-// const config = rootRoute.addChildren([aRoute.addChildren([bRoute])])
-// //    ^?