refactor(router-core): simplify handleRedirectAndNotFound (#4958)

Minor cleanup of `handleRedirectAndNotFound` in `router-core`. The code
looked like there were 3 possible cases, but `err` is only handled if
it's a redirect or a notFound.

This PR is a no-op, it's just code cleanup without any functional
changes.

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Author: 2 people

packages/router-core/src/router.ts

@@ -2116,54 +2116,50 @@ export class RouterCore<
 
     const handleRedirectAndNotFound = (
       match: AnyRouteMatch | undefined,
-      err: any,
+      err: unknown,
     ) => {
-      if (isRedirect(err) || isNotFound(err)) {
-        if (isRedirect(err)) {
-          if (err.redirectHandled) {
-            if (!err.options.reloadDocument) {
-              throw err
-            }
-          }
-        }
+      if (!isRedirect(err) && !isNotFound(err)) return
 
-        // in case of a redirecting match during preload, the match does not exist
-        if (match) {
-          match._nonReactive.beforeLoadPromise?.resolve()
-          match._nonReactive.loaderPromise?.resolve()
-          match._nonReactive.beforeLoadPromise = undefined
-          match._nonReactive.loaderPromise = undefined
-
-          updateMatch(match.id, (prev) => ({
-            ...prev,
-            status: isRedirect(err)
-              ? 'redirected'
-              : isNotFound(err)
-                ? 'notFound'
-                : 'error',
-            isFetching: false,
-            error: err,
-          }))
+      if (
+        isRedirect(err) &&
+        err.redirectHandled &&
+        !err.options.reloadDocument
+      ) {
+        throw err
+      }
 
-          if (!(err as any).routeId) {
-            ;(err as any).routeId = match.routeId
-          }
+      // in case of a redirecting match during preload, the match does not exist
+      if (match) {
+        match._nonReactive.beforeLoadPromise?.resolve()
+        match._nonReactive.loaderPromise?.resolve()
+        match._nonReactive.beforeLoadPromise = undefined
+        match._nonReactive.loaderPromise = undefined
 
-          match._nonReactive.loadPromise?.resolve()
-        }
+        const status = isRedirect(err) ? 'redirected' : 'notFound'
 
-        if (isRedirect(err)) {
-          rendered = true
-          err.options._fromLocation = location
-          err.redirectHandled = true
-          err = this.resolveRedirect(err)
-          throw err
-        } else if (isNotFound(err)) {
-          this._handleNotFound(matches, err, {
-            updateMatch,
-          })
-          throw err
+        updateMatch(match.id, (prev) => ({
+          ...prev,
+          status,
+          isFetching: false,
+          error: err,
+        }))
+
+        if (isNotFound(err) && !err.routeId) {
+          err.routeId = match.routeId
         }
+
+        match._nonReactive.loadPromise?.resolve()
+      }
+
+      if (isRedirect(err)) {
+        rendered = true
+        err.options._fromLocation = location
+        err.redirectHandled = true
+        err = this.resolveRedirect(err)
+        throw err
+      } else {
+        this._handleNotFound(matches, err, updateMatch)
+        throw err
       }
     }
 
@@ -3056,14 +3052,10 @@ export class RouterCore<
   _handleNotFound = (
     matches: Array<AnyRouteMatch>,
     err: NotFoundError,
-    {
-      updateMatch = this.updateMatch,
-    }: {
-      updateMatch?: (
-        id: string,
-        updater: (match: AnyRouteMatch) => AnyRouteMatch,
-      ) => void
-    } = {},
+    updateMatch: (
+      id: string,
+      updater: (match: AnyRouteMatch) => AnyRouteMatch,
+    ) => void = this.updateMatch,
   ) => {
     // Find the route that should handle the not found error
     // First check if a specific route is requested to show the error
@@ -3109,9 +3101,7 @@ export class RouterCore<
 
     if ((err as any).routerCode === 'BEFORE_LOAD' && routeCursor.parentRoute) {
       err.routeId = routeCursor.parentRoute.id
-      this._handleNotFound(matches, err, {
-        updateMatch,
-      })
+      this._handleNotFound(matches, err, updateMatch)
     }
   }