@tanstack/react-router 1.1.5 → 1.1.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
     "@tanstack/store": "^0.1.3",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "1.1.5"
+    "@tanstack/history": "1.1.7"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/fileRoute.ts

@@ -1,3 +1,4 @@
+import { NoInfer } from '@tanstack/react-store'
 import { ParsePathParams } from './link'
 import {
   AnyRoute,
@@ -15,6 +16,8 @@ import {
   RouteConstraints,
   ResolveFullSearchSchemaInput,
   SearchSchemaInput,
+  LoaderFnContext,
+  RouteLoaderFn,
 } from './route'
 import { Assign, Expand, IsAny } from './utils'
 
@@ -93,7 +96,7 @@ export class FileRoute<
       string,
       any
     > = TSearchSchemaInput extends SearchSchemaInput
-      ? TSearchSchemaInput
+      ? Omit<TSearchSchemaInput, keyof SearchSchemaInput>
       : TSearchSchema,
     TFullSearchSchemaInput extends
       RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchemaInput<
@@ -170,3 +173,26 @@ export class FileRoute<
     return route as any
   }
 }
+
+export function FileRouteLoader<
+  TFilePath extends keyof FileRoutesByPath,
+  TRoute extends FileRoutesByPath[TFilePath]['preLoaderRoute'],
+>(
+  _path: TFilePath,
+): <TLoaderData extends any>(
+  loaderFn: RouteLoaderFn<
+    TRoute['types']['allParams'],
+    TRoute['types']['loaderDeps'],
+    TRoute['types']['allContext'],
+    TRoute['types']['routeContext'],
+    TLoaderData
+  >,
+) => RouteLoaderFn<
+  TRoute['types']['allParams'],
+  TRoute['types']['loaderDeps'],
+  TRoute['types']['allContext'],
+  TRoute['types']['routeContext'],
+  NoInfer<TLoaderData>
+> {
+  return (loaderFn) => loaderFn
+}

package/src/link.tsx

@@ -167,15 +167,23 @@ export type ToSubOptions<
 
 type ParamsReducer<TFrom, TTo> = TTo | ((current: TFrom) => TTo)
 
-type ParamVariant = 'PATH' | 'SEARCH';
+type ParamVariant = 'PATH' | 'SEARCH'
 export type ParamOptions<
   TRouteTree extends AnyRoute,
   TFrom,
   TTo,
   TResolved,
   TParamVariant extends ParamVariant,
-  TFromRouteType extends 'allParams' | 'fullSearchSchema' = TParamVariant extends 'PATH' ? 'allParams' : 'fullSearchSchema',
-  TToRouteType extends 'allParams' | 'fullSearchSchemaInput' = TParamVariant extends 'PATH' ? 'allParams' : 'fullSearchSchemaInput',
+  TFromRouteType extends
+    | 'allParams'
+    | 'fullSearchSchema' = TParamVariant extends 'PATH'
+    ? 'allParams'
+    : 'fullSearchSchema',
+  TToRouteType extends
+    | 'allParams'
+    | 'fullSearchSchemaInput' = TParamVariant extends 'PATH'
+    ? 'allParams'
+    : 'fullSearchSchemaInput',
   TFromParams = Expand<RouteByPath<TRouteTree, TFrom>['types'][TFromRouteType]>,
   TToParams = TTo extends ''
     ? TFromParams

package/src/route.ts

@@ -659,6 +659,39 @@ export class Route<
     return this as any
   }
 
+  updateLoader = <TNewLoaderData extends any = unknown>(options: {
+    loader: RouteLoaderFn<
+      TAllParams,
+      TLoaderDeps,
+      TAllContext,
+      TRouteContext,
+      TNewLoaderData
+    >
+  }) => {
+    Object.assign(this.options, options)
+    return this as unknown as Route<
+      TParentRoute,
+      TPath,
+      TFullPath,
+      TCustomId,
+      TId,
+      TSearchSchemaInput,
+      TSearchSchema,
+      TSearchSchemaUsed,
+      TFullSearchSchemaInput,
+      TFullSearchSchema,
+      TParams,
+      TAllParams,
+      TRouteContext,
+      TAllContext,
+      TRouterContext,
+      TLoaderDeps,
+      TNewLoaderData,
+      TChildren,
+      TRouteTree
+    >
+  }
+
   update = (options: UpdatableRouteOptions<TFullSearchSchema>) => {
     Object.assign(this.options, options)
     return this

package/src/router.ts

@@ -1645,7 +1645,9 @@ export function lazyFn<
   T extends Record<string, (...args: any[]) => any>,
   TKey extends keyof T = 'default',
 >(fn: () => Promise<T>, key?: TKey) {
-  return async (...args: Parameters<T[TKey]>): Promise<ReturnType<T[TKey]>> => {
+  return async (
+    ...args: Parameters<T[TKey]>
+  ): Promise<Awaited<ReturnType<T[TKey]>>> => {
     const imported = await fn()
     return imported[key || 'default'](...args)
   }