@tanstack/react-router 1.132.0-alpha.8 → 1.132.2

package/src/route.tsx

@@ -159,7 +159,7 @@ export class RouteApi<
 }
 
 export class Route<
-    in out TRegister extends Register = Register,
+    in out TRegister = unknown,
     in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute,
     in out TPath extends RouteConstraints['TPath'] = '/',
     in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<
@@ -182,6 +182,8 @@ export class Route<
     in out TChildren = unknown,
     in out TFileRouteTypes = unknown,
     in out TSSR = unknown,
+    in out TServerMiddlewares = unknown,
+    in out THandlers = undefined,
   >
   extends BaseRoute<
     TRegister,
@@ -199,7 +201,9 @@ export class Route<
     TLoaderFn,
     TChildren,
     TFileRouteTypes,
-    TSSR
+    TSSR,
+    TServerMiddlewares,
+    THandlers
   >
   implements
     RouteCore<
@@ -218,7 +222,9 @@ export class Route<
       TLoaderFn,
       TChildren,
       TFileRouteTypes,
-      TSSR
+      TSSR,
+      TServerMiddlewares,
+      THandlers
     >
 {
   /**
@@ -239,7 +245,9 @@ export class Route<
       TRouterContext,
       TRouteContextFn,
       TBeforeLoadFn,
-      TSSR
+      TSSR,
+      TServerMiddlewares,
+      THandlers
     >,
   ) {
     super(options)
@@ -300,7 +308,7 @@ export class Route<
 }
 
 export function createRoute<
-  TRegister extends Register = Register,
+  TRegister = unknown,
   TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute,
   TPath extends RouteConstraints['TPath'] = '/',
   TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<
@@ -321,6 +329,7 @@ export function createRoute<
   TLoaderFn = undefined,
   TChildren = unknown,
   TSSR = unknown,
+  const TServerMiddlewares = unknown,
 >(
   options: RouteOptions<
     TRegister,
@@ -336,7 +345,8 @@ export function createRoute<
     AnyContext,
     TRouteContextFn,
     TBeforeLoadFn,
-    TSSR
+    TSSR,
+    TServerMiddlewares
   >,
 ): Route<
   TRegister,
@@ -353,7 +363,8 @@ export function createRoute<
   TLoaderDeps,
   TLoaderFn,
   TChildren,
-  TSSR
+  TSSR,
+  TServerMiddlewares
 > {
   return new Route<
     TRegister,
@@ -370,8 +381,12 @@ export function createRoute<
     TLoaderDeps,
     TLoaderFn,
     TChildren,
-    TSSR
-  >(options)
+    TSSR,
+    TServerMiddlewares
+  >(
+    // TODO: Help us TypeChris, you're our only hope!
+    options as any,
+  )
 }
 
 export type AnyRootRoute = RootRoute<
@@ -383,18 +398,21 @@ export type AnyRootRoute = RootRoute<
   any,
   any,
   any,
+  any,
+  any,
   any
 >
 
 export function createRootRouteWithContext<TRouterContext extends {}>() {
   return <
-    TRegister extends Register = Register,
+    TRegister = Register,
     TRouteContextFn = AnyContext,
     TBeforeLoadFn = AnyContext,
     TSearchValidator = undefined,
     TLoaderDeps extends Record<string, any> = {},
     TLoaderFn = undefined,
     TSSR = unknown,
+    TServerMiddlewares = unknown,
   >(
     options?: RootRouteOptions<
       TRegister,
@@ -404,7 +422,8 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
       TBeforeLoadFn,
       TLoaderDeps,
       TLoaderFn,
-      TSSR
+      TSSR,
+      TServerMiddlewares
     >,
   ) => {
     return createRootRoute<
@@ -415,7 +434,8 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
       TBeforeLoadFn,
       TLoaderDeps,
       TLoaderFn,
-      TSSR
+      TSSR,
+      TServerMiddlewares
     >(options as any)
   }
 }
@@ -426,7 +446,7 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
 export const rootRouteWithContext = createRootRouteWithContext
 
 export class RootRoute<
-    in out TRegister extends Register = Register,
+    in out TRegister = unknown,
     in out TSearchValidator = undefined,
     in out TRouterContext = {},
     in out TRouteContextFn = AnyContext,
@@ -436,6 +456,8 @@ export class RootRoute<
     in out TChildren = unknown,
     in out TFileRouteTypes = unknown,
     in out TSSR = unknown,
+    in out TServerMiddlewares = unknown,
+    in out THandlers = undefined,
   >
   extends BaseRootRoute<
     TRegister,
@@ -447,7 +469,9 @@ export class RootRoute<
     TLoaderFn,
     TChildren,
     TFileRouteTypes,
-    TSSR
+    TSSR,
+    TServerMiddlewares,
+    THandlers
   >
   implements
     RootRouteCore<
@@ -460,7 +484,9 @@ export class RootRoute<
       TLoaderFn,
       TChildren,
       TFileRouteTypes,
-      TSSR
+      TSSR,
+      TServerMiddlewares,
+      THandlers
     >
 {
   /**
@@ -475,7 +501,9 @@ export class RootRoute<
       TBeforeLoadFn,
       TLoaderDeps,
       TLoaderFn,
-      TSSR
+      TSSR,
+      TServerMiddlewares,
+      THandlers
     >,
   ) {
     super(options)
@@ -536,7 +564,7 @@ export class RootRoute<
 }
 
 export function createRootRoute<
-  TRegister extends Register = Register,
+  TRegister = Register,
   TSearchValidator = undefined,
   TRouterContext = {},
   TRouteContextFn = AnyContext,
@@ -544,6 +572,8 @@ export function createRootRoute<
   TLoaderDeps extends Record<string, any> = {},
   TLoaderFn = undefined,
   TSSR = unknown,
+  const TServerMiddlewares = unknown,
+  THandlers = undefined,
 >(
   options?: RootRouteOptions<
     TRegister,
@@ -553,7 +583,9 @@ export function createRootRoute<
     TBeforeLoadFn,
     TLoaderDeps,
     TLoaderFn,
-    TSSR
+    TSSR,
+    TServerMiddlewares,
+    THandlers
   >,
 ): RootRoute<
   TRegister,
@@ -565,7 +597,9 @@ export function createRootRoute<
   TLoaderFn,
   unknown,
   unknown,
-  TSSR
+  TSSR,
+  TServerMiddlewares,
+  THandlers
 > {
   return new RootRoute<
     TRegister,
@@ -577,7 +611,9 @@ export function createRootRoute<
     TLoaderFn,
     unknown,
     unknown,
-    TSSR
+    TSSR,
+    TServerMiddlewares,
+    THandlers
   >(options)
 }
 
@@ -611,7 +647,7 @@ export type ErrorRouteComponent = AsyncRouteComponent<ErrorComponentProps>
 export type NotFoundRouteComponent = RouteTypes<NotFoundRouteProps>['component']
 
 export class NotFoundRoute<
-  TRegister extends Register,
+  TRegister,
   TParentRoute extends AnyRootRoute,
   TRouterContext = AnyContext,
   TRouteContextFn = AnyContext,
@@ -621,6 +657,7 @@ export class NotFoundRoute<
   TLoaderFn = undefined,
   TChildren = unknown,
   TSSR = unknown,
+  TServerMiddlewares = unknown,
 > extends Route<
   TRegister,
   TParentRoute,
@@ -636,7 +673,8 @@ export class NotFoundRoute<
   TLoaderDeps,
   TLoaderFn,
   TChildren,
-  TSSR
+  TSSR,
+  TServerMiddlewares
 > {
   constructor(
     options: Omit<
@@ -654,7 +692,8 @@ export class NotFoundRoute<
         TRouterContext,
         TRouteContextFn,
         TBeforeLoadFn,
-        TSSR
+        TSSR,
+        TServerMiddlewares
       >,
       | 'caseSensitive'
       | 'parseParams'

package/src/ssr/renderRouterToString.tsx

@@ -13,6 +13,7 @@ export const renderRouterToString = async ({
 }) => {
   try {
     let html = ReactDOMServer.renderToString(children)
+    router.serverSsr!.setRenderFinished()
     const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(
       (htmls) => htmls.join(''),
     )

package/src/typePrimitives.ts

@@ -32,7 +32,7 @@ export type ValidateLinkOptions<
 >
 
 /**
- * @internal
+ * @private
  */
 export type InferStructuralSharing<TOptions> = TOptions extends {
   structuralSharing: infer TStructuralSharing

package/src/useNavigate.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react'
 import { useRouter } from './useRouter'
-import { useActiveLocation } from './useActiveLocation'
 import type {
   AnyRouter,
   FromPathOption,
@@ -17,19 +16,14 @@ export function useNavigate<
 }): UseNavigateResult<TDefaultFrom> {
   const router = useRouter()
 
-  const { getFromPath, activeLocation } = useActiveLocation()
-
   return React.useCallback(
     (options: NavigateOptions) => {
-      const from = getFromPath(options.from ?? _defaultOpts?.from)
-
       return router.navigate({
         ...options,
-        from,
+        from: options.from ?? _defaultOpts?.from,
       })
     },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [_defaultOpts?.from, router, getFromPath, activeLocation],
+    [_defaultOpts?.from, router],
   ) as UseNavigateResult<TDefaultFrom>
 }
 

package/src/useParams.tsx

@@ -83,11 +83,13 @@ export function useParams<
 > {
   return useMatch({
     from: opts.from!,
-    strict: opts.strict,
     shouldThrow: opts.shouldThrow,
     structuralSharing: opts.structuralSharing,
-    select: (match: any) => {
-      return opts.select ? opts.select(match.params) : match.params
+    strict: opts.strict,
+    select: (match) => {
+      const params = opts.strict === false ? match.params : match._strictParams
+
+      return opts.select ? opts.select(params) : params
     },
   }) as any
 }

package/dist/cjs/useActiveLocation.cjs

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const routerCore = require("@tanstack/router-core");
-const React = require("react");
-const useRouter = require("./useRouter.cjs");
-const useMatch = require("./useMatch.cjs");
-const useRouterState = require("./useRouterState.cjs");
-const useActiveLocation = (location) => {
-  const router = useRouter.useRouter();
-  const routerLocation = useRouterState.useRouterState({ select: (state) => state.location });
-  const [activeLocation, setActiveLocation] = React.useState(
-    routerLocation
-  );
-  const [customActiveLocation, setCustomActiveLocation] = React.useState(location);
-  React.useEffect(() => {
-    setActiveLocation(customActiveLocation ?? routerLocation);
-  }, [routerLocation, customActiveLocation]);
-  const matchIndex = useMatch.useMatch({
-    strict: false,
-    select: (match) => match.index
-  });
-  const getFromPath = React.useCallback(
-    (from) => {
-      const activeLocationMatches = router.matchRoutes(activeLocation, {
-        _buildLocation: false
-      });
-      const activeLocationMatch = routerCore.last(activeLocationMatches);
-      return from ?? activeLocationMatch?.fullPath ?? router.state.matches[matchIndex].fullPath;
-    },
-    [activeLocation, matchIndex, router]
-  );
-  return {
-    activeLocation,
-    getFromPath,
-    setActiveLocation: setCustomActiveLocation
-  };
-};
-exports.useActiveLocation = useActiveLocation;
-//# sourceMappingURL=useActiveLocation.cjs.map

package/dist/cjs/useActiveLocation.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveLocation.cjs","sources":["../../src/useActiveLocation.ts"],"sourcesContent":["import { last } from '@tanstack/router-core'\nimport { useCallback, useEffect, useState } from 'react'\nimport { useRouter } from './useRouter'\nimport { useMatch } from './useMatch'\nimport { useRouterState } from './useRouterState'\nimport type { ParsedLocation } from '@tanstack/router-core'\n\nexport type UseActiveLocationResult = {\n  activeLocation: ParsedLocation\n  getFromPath: (from?: string) => string\n  setActiveLocation: (location?: ParsedLocation) => void\n}\n\nexport const useActiveLocation = (\n  location?: ParsedLocation,\n): UseActiveLocationResult => {\n  const router = useRouter()\n  const routerLocation = useRouterState({ select: (state) => state.location })\n  const [activeLocation, setActiveLocation] = useState<ParsedLocation>(\n    location ?? routerLocation,\n  )\n  const [customActiveLocation, setCustomActiveLocation] = useState<\n    ParsedLocation | undefined\n  >(location)\n\n  useEffect(() => {\n    setActiveLocation(customActiveLocation ?? routerLocation)\n  }, [routerLocation, customActiveLocation])\n\n  const matchIndex = useMatch({\n    strict: false,\n    select: (match) => match.index,\n  })\n\n  const getFromPath = useCallback(\n    (from?: string) => {\n      const activeLocationMatches = router.matchRoutes(activeLocation, {\n        _buildLocation: false,\n      })\n\n      const activeLocationMatch = last(activeLocationMatches)\n\n      return (\n        from ??\n        activeLocationMatch?.fullPath ??\n        router.state.matches[matchIndex]!.fullPath\n      )\n    },\n    [activeLocation, matchIndex, router],\n  )\n\n  return {\n    activeLocation,\n    getFromPath,\n    setActiveLocation: setCustomActiveLocation,\n  }\n}\n"],"names":["useRouter","useRouterState","useState","useEffect","useMatch","useCallback","last"],"mappings":";;;;;;;AAaO,MAAM,oBAAoB,CAC/B,aAC4B;AAC5B,QAAM,SAASA,UAAAA,UAAA;AACf,QAAM,iBAAiBC,eAAAA,eAAe,EAAE,QAAQ,CAAC,UAAU,MAAM,UAAU;AAC3E,QAAM,CAAC,gBAAgB,iBAAiB,IAAIC,MAAAA;AAAAA,IAC9B;AAAA,EAAA;AAEd,QAAM,CAAC,sBAAsB,uBAAuB,IAAIA,MAAAA,SAEtD,QAAQ;AAEVC,QAAAA,UAAU,MAAM;AACd,sBAAkB,wBAAwB,cAAc;AAAA,EAC1D,GAAG,CAAC,gBAAgB,oBAAoB,CAAC;AAEzC,QAAM,aAAaC,SAAAA,SAAS;AAAA,IAC1B,QAAQ;AAAA,IACR,QAAQ,CAAC,UAAU,MAAM;AAAA,EAAA,CAC1B;AAED,QAAM,cAAcC,MAAAA;AAAAA,IAClB,CAAC,SAAkB;AACjB,YAAM,wBAAwB,OAAO,YAAY,gBAAgB;AAAA,QAC/D,gBAAgB;AAAA,MAAA,CACjB;AAED,YAAM,sBAAsBC,WAAAA,KAAK,qBAAqB;AAEtD,aACE,QACA,qBAAqB,YACrB,OAAO,MAAM,QAAQ,UAAU,EAAG;AAAA,IAEtC;AAAA,IACA,CAAC,gBAAgB,YAAY,MAAM;AAAA,EAAA;AAGrC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA,mBAAmB;AAAA,EAAA;AAEvB;;"}

package/dist/cjs/useActiveLocation.d.cts

@@ -1,7 +0,0 @@
-import { ParsedLocation } from '@tanstack/router-core';
-export type UseActiveLocationResult = {
-    activeLocation: ParsedLocation;
-    getFromPath: (from?: string) => string;
-    setActiveLocation: (location?: ParsedLocation) => void;
-};
-export declare const useActiveLocation: (location?: ParsedLocation) => UseActiveLocationResult;

package/dist/esm/useActiveLocation.d.ts

@@ -1,7 +0,0 @@
-import { ParsedLocation } from '@tanstack/router-core';
-export type UseActiveLocationResult = {
-    activeLocation: ParsedLocation;
-    getFromPath: (from?: string) => string;
-    setActiveLocation: (location?: ParsedLocation) => void;
-};
-export declare const useActiveLocation: (location?: ParsedLocation) => UseActiveLocationResult;

package/dist/esm/useActiveLocation.js

@@ -1,39 +0,0 @@
-import { last } from "@tanstack/router-core";
-import { useState, useEffect, useCallback } from "react";
-import { useRouter } from "./useRouter.js";
-import { useMatch } from "./useMatch.js";
-import { useRouterState } from "./useRouterState.js";
-const useActiveLocation = (location) => {
-  const router = useRouter();
-  const routerLocation = useRouterState({ select: (state) => state.location });
-  const [activeLocation, setActiveLocation] = useState(
-    routerLocation
-  );
-  const [customActiveLocation, setCustomActiveLocation] = useState(location);
-  useEffect(() => {
-    setActiveLocation(customActiveLocation ?? routerLocation);
-  }, [routerLocation, customActiveLocation]);
-  const matchIndex = useMatch({
-    strict: false,
-    select: (match) => match.index
-  });
-  const getFromPath = useCallback(
-    (from) => {
-      const activeLocationMatches = router.matchRoutes(activeLocation, {
-        _buildLocation: false
-      });
-      const activeLocationMatch = last(activeLocationMatches);
-      return from ?? activeLocationMatch?.fullPath ?? router.state.matches[matchIndex].fullPath;
-    },
-    [activeLocation, matchIndex, router]
-  );
-  return {
-    activeLocation,
-    getFromPath,
-    setActiveLocation: setCustomActiveLocation
-  };
-};
-export {
-  useActiveLocation
-};
-//# sourceMappingURL=useActiveLocation.js.map

package/dist/esm/useActiveLocation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useActiveLocation.js","sources":["../../src/useActiveLocation.ts"],"sourcesContent":["import { last } from '@tanstack/router-core'\nimport { useCallback, useEffect, useState } from 'react'\nimport { useRouter } from './useRouter'\nimport { useMatch } from './useMatch'\nimport { useRouterState } from './useRouterState'\nimport type { ParsedLocation } from '@tanstack/router-core'\n\nexport type UseActiveLocationResult = {\n  activeLocation: ParsedLocation\n  getFromPath: (from?: string) => string\n  setActiveLocation: (location?: ParsedLocation) => void\n}\n\nexport const useActiveLocation = (\n  location?: ParsedLocation,\n): UseActiveLocationResult => {\n  const router = useRouter()\n  const routerLocation = useRouterState({ select: (state) => state.location })\n  const [activeLocation, setActiveLocation] = useState<ParsedLocation>(\n    location ?? routerLocation,\n  )\n  const [customActiveLocation, setCustomActiveLocation] = useState<\n    ParsedLocation | undefined\n  >(location)\n\n  useEffect(() => {\n    setActiveLocation(customActiveLocation ?? routerLocation)\n  }, [routerLocation, customActiveLocation])\n\n  const matchIndex = useMatch({\n    strict: false,\n    select: (match) => match.index,\n  })\n\n  const getFromPath = useCallback(\n    (from?: string) => {\n      const activeLocationMatches = router.matchRoutes(activeLocation, {\n        _buildLocation: false,\n      })\n\n      const activeLocationMatch = last(activeLocationMatches)\n\n      return (\n        from ??\n        activeLocationMatch?.fullPath ??\n        router.state.matches[matchIndex]!.fullPath\n      )\n    },\n    [activeLocation, matchIndex, router],\n  )\n\n  return {\n    activeLocation,\n    getFromPath,\n    setActiveLocation: setCustomActiveLocation,\n  }\n}\n"],"names":[],"mappings":";;;;;AAaO,MAAM,oBAAoB,CAC/B,aAC4B;AAC5B,QAAM,SAAS,UAAA;AACf,QAAM,iBAAiB,eAAe,EAAE,QAAQ,CAAC,UAAU,MAAM,UAAU;AAC3E,QAAM,CAAC,gBAAgB,iBAAiB,IAAI;AAAA,IAC9B;AAAA,EAAA;AAEd,QAAM,CAAC,sBAAsB,uBAAuB,IAAI,SAEtD,QAAQ;AAEV,YAAU,MAAM;AACd,sBAAkB,wBAAwB,cAAc;AAAA,EAC1D,GAAG,CAAC,gBAAgB,oBAAoB,CAAC;AAEzC,QAAM,aAAa,SAAS;AAAA,IAC1B,QAAQ;AAAA,IACR,QAAQ,CAAC,UAAU,MAAM;AAAA,EAAA,CAC1B;AAED,QAAM,cAAc;AAAA,IAClB,CAAC,SAAkB;AACjB,YAAM,wBAAwB,OAAO,YAAY,gBAAgB;AAAA,QAC/D,gBAAgB;AAAA,MAAA,CACjB;AAED,YAAM,sBAAsB,KAAK,qBAAqB;AAEtD,aACE,QACA,qBAAqB,YACrB,OAAO,MAAM,QAAQ,UAAU,EAAG;AAAA,IAEtC;AAAA,IACA,CAAC,gBAAgB,YAAY,MAAM;AAAA,EAAA;AAGrC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA,mBAAmB;AAAA,EAAA;AAEvB;"}

package/src/useActiveLocation.ts

@@ -1,57 +0,0 @@
-import { last } from '@tanstack/router-core'
-import { useCallback, useEffect, useState } from 'react'
-import { useRouter } from './useRouter'
-import { useMatch } from './useMatch'
-import { useRouterState } from './useRouterState'
-import type { ParsedLocation } from '@tanstack/router-core'
-
-export type UseActiveLocationResult = {
-  activeLocation: ParsedLocation
-  getFromPath: (from?: string) => string
-  setActiveLocation: (location?: ParsedLocation) => void
-}
-
-export const useActiveLocation = (
-  location?: ParsedLocation,
-): UseActiveLocationResult => {
-  const router = useRouter()
-  const routerLocation = useRouterState({ select: (state) => state.location })
-  const [activeLocation, setActiveLocation] = useState<ParsedLocation>(
-    location ?? routerLocation,
-  )
-  const [customActiveLocation, setCustomActiveLocation] = useState<
-    ParsedLocation | undefined
-  >(location)
-
-  useEffect(() => {
-    setActiveLocation(customActiveLocation ?? routerLocation)
-  }, [routerLocation, customActiveLocation])
-
-  const matchIndex = useMatch({
-    strict: false,
-    select: (match) => match.index,
-  })
-
-  const getFromPath = useCallback(
-    (from?: string) => {
-      const activeLocationMatches = router.matchRoutes(activeLocation, {
-        _buildLocation: false,
-      })
-
-      const activeLocationMatch = last(activeLocationMatches)
-
-      return (
-        from ??
-        activeLocationMatch?.fullPath ??
-        router.state.matches[matchIndex]!.fullPath
-      )
-    },
-    [activeLocation, matchIndex, router],
-  )
-
-  return {
-    activeLocation,
-    getFromPath,
-    setActiveLocation: setCustomActiveLocation,
-  }
-}