one 1.15.8 → 1.15.9

package/dist/esm/router/router.native.js

@@ -26,11 +26,7 @@ import { findInterceptRoute, setNavigationType, updateURLWithoutNavigation, stor
 import { setSlotState } from "../views/Navigator.native.js";
 import { clearNotFoundState, findNearestNotFoundRoute, setNotFoundState } from "../notFoundState.native.js";
 function _instanceof(left, right) {
-  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-    return !!right[Symbol.hasInstance](left);
-  } else {
-    return left instanceof right;
-  }
+  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) return !!right[Symbol.hasInstance](left);else return left instanceof right;
 }
 function _type_of(obj) {
   "@swc/helpers - typeof";
@@ -41,11 +37,7 @@ var routeNode = null;
 var rootComponent;
 var protectedRouteRegistry = /* @__PURE__ */new Map();
 function registerProtectedRoutes(contextKey, protectedScreens) {
-  if (protectedScreens.size === 0) {
-    protectedRouteRegistry.delete(contextKey);
-  } else {
-    protectedRouteRegistry.set(contextKey, protectedScreens);
-  }
+  if (protectedScreens.size === 0) protectedRouteRegistry.delete(contextKey);else protectedRouteRegistry.set(contextKey, protectedScreens);
 }
 function unregisterProtectedRoutes(contextKey) {
   protectedRouteRegistry.delete(contextKey);
@@ -60,12 +52,9 @@ function isRouteProtected(href) {
       var [contextKey, protectedScreens] = _step.value;
       var normalizedContextKey = contextKey.replace(/^\/+|\/+$/g, "");
       if (normalizedHref.startsWith(normalizedContextKey)) {
-        var relativePath = normalizedHref.slice(normalizedContextKey.length).replace(/^\//, "");
-        var routeName = relativePath.split("/")[0] || "index";
+        var routeName = normalizedHref.slice(normalizedContextKey.length).replace(/^\//, "").split("/")[0] || "index";
         var normalizedRouteName = routeName.replace(/\/index$/, "");
-        if (protectedScreens.has(routeName) || protectedScreens.has(normalizedRouteName)) {
-          return true;
-        }
+        if (protectedScreens.has(routeName) || protectedScreens.has(normalizedRouteName)) return true;
       }
     }
   } catch (err) {
@@ -73,13 +62,9 @@ function isRouteProtected(href) {
     _iteratorError = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
+      if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
     } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
+      if (_didIteratorError) throw _iteratorError;
     }
   }
   return false;
@@ -121,28 +106,11 @@ function setValidationState(state) {
     _iteratorError = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
+      if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
     } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
+      if (_didIteratorError) throw _iteratorError;
     }
   }
-  if (false) {
-    window.dispatchEvent(new CustomEvent("one-validation-error", {
-      detail: {
-        error: {
-          message: state.error.message,
-          name: state.error.name,
-          stack: state.error.stack
-        },
-        href: state.lastValidatedHref,
-        timestamp: Date.now()
-      }
-    }));
-  }
 }
 function getValidationState() {
   return validationState;
@@ -165,24 +133,21 @@ function initialize(context, ref, initialLocation) {
   }
   routeNode = cachedRouteNode;
   rootComponent = cachedRootComponent || Fragment;
-  if (!routeNode && process.env.NODE_ENV === "production") {
-    throw new Error("No routes found");
-  }
+  if (!routeNode && process.env.NODE_ENV === "production") throw new Error("No routes found");
   if (process.env.ONE_DEBUG_ROUTER && routeNode) {
     var _routeNode_slots;
     var formatRouteTree = function (node) {
       var indent = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "",
         isLast = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : true;
       var _node_slots;
-      var prefix = indent + (isLast ? "\u2514\u2500 " : "\u251C\u2500 ");
-      var childIndent = indent + (isLast ? "   " : "\u2502  ");
+      var prefix = indent + (isLast ? "└─ " : "├─ ");
+      var childIndent = indent + (isLast ? "   " : "│  ");
       var dynamicBadge = node.dynamic ? ` [${node.dynamic.map(function (d) {
         return d.name;
       }).join(", ")}]` : "";
       var typeBadge = node.type !== "layout" ? ` (${node.type})` : "";
       var slotsBadge = ((_node_slots = node.slots) === null || _node_slots === void 0 ? void 0 : _node_slots.size) ? ` {@${Array.from(node.slots.keys()).join(", @")}}` : "";
-      var routeName = node.route || "/";
-      var line = `${prefix}${routeName}${dynamicBadge}${typeBadge}${slotsBadge}`;
+      var line = `${prefix}${node.route || "/"}${dynamicBadge}${typeBadge}${slotsBadge}`;
       var visibleChildren = node.children.filter(function (child2) {
         return !child2.internal;
       });
@@ -219,13 +184,9 @@ ${formatRouteTree(routeNode)}`);
         _iteratorError = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion && _iterator.return != null) {
-            _iterator.return();
-          }
+          if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
         } finally {
-          if (_didIteratorError) {
-            throw _iteratorError;
-          }
+          if (_didIteratorError) throw _iteratorError;
         }
       }
     }
@@ -251,15 +212,13 @@ function setupLinkingAndRouteInfo(initialLocation) {
   if (initialState) {
     rootState = initialState;
     routeInfo = getRouteInfo(initialState);
-  } else {
-    routeInfo = {
-      unstable_globalHref: "",
-      pathname: "",
-      isIndex: false,
-      params: {},
-      segments: []
-    };
-  }
+  } else routeInfo = {
+    unstable_globalHref: "",
+    pathname: "",
+    isIndex: false,
+    params: {},
+    segments: []
+  };
 }
 function handleNavigationContainerStateChange(navState) {
   if (!navState) return;
@@ -289,32 +248,26 @@ function handleNavigationContainerStateChange(navState) {
     updateState(state, void 0);
     shouldUpdateSubscribers = true;
   }
-  if (shouldUpdateSubscribers) {
-    startTransition(function () {
-      var _iteratorNormalCompletion = true,
-        _didIteratorError = false,
-        _iteratorError = void 0;
+  if (shouldUpdateSubscribers) startTransition(function () {
+    var _iteratorNormalCompletion = true,
+      _didIteratorError = false,
+      _iteratorError = void 0;
+    try {
+      for (var _iterator = rootStateSubscribers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var subscriber = _step.value;
+        subscriber(state);
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
       try {
-        for (var _iterator = rootStateSubscribers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-          var subscriber = _step.value;
-          subscriber(state);
-        }
-      } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
+        if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
       } finally {
-        try {
-          if (!_iteratorNormalCompletion && _iterator.return != null) {
-            _iterator.return();
-          }
-        } finally {
-          if (_didIteratorError) {
-            throw _iteratorError;
-          }
-        }
+        if (_didIteratorError) throw _iteratorError;
       }
-    });
-  }
+    }
+  });
 }
 function subscribeToNavigationChanges() {
   startTransition(function () {
@@ -332,13 +285,9 @@ function subscribeToNavigationChanges() {
       _iteratorError = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
-        }
+        if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
       } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
+        if (_didIteratorError) throw _iteratorError;
       }
     }
   });
@@ -350,10 +299,8 @@ function push(url, options) {
   return linkTo(resolveHref(url), "PUSH", options);
 }
 function dismiss(count) {
-  if (process.env.ONE_DEBUG_ROUTER) {
-    console.info(`[one] \u{1F519} dismiss${count ? ` (${count})` : ""}`);
-  }
-  navigationRef === null || navigationRef === void 0 ? void 0 : navigationRef.dispatch(StackActions.pop(count));
+  if (process.env.ONE_DEBUG_ROUTER) console.info(`[one] \u{1F519} dismiss${count ? ` (${count})` : ""}`);
+  navigationRef === null || navigationRef === void 0 || navigationRef.dispatch(StackActions.pop(count));
 }
 function replace(url, options) {
   return linkTo(resolveHref(url), "REPLACE", options);
@@ -367,45 +314,33 @@ function setParams() {
   params);
 }
 function dismissAll() {
-  if (process.env.ONE_DEBUG_ROUTER) {
-    console.info(`[one] \u{1F519} dismissAll`);
-  }
-  navigationRef === null || navigationRef === void 0 ? void 0 : navigationRef.dispatch(StackActions.popToTop());
+  if (process.env.ONE_DEBUG_ROUTER) console.info(`[one] \u{1F519} dismissAll`);
+  navigationRef === null || navigationRef === void 0 || navigationRef.dispatch(StackActions.popToTop());
 }
 function goBack() {
   var _navigationRef_current;
-  if (process.env.ONE_DEBUG_ROUTER) {
-    console.info(`[one] \u{1F519} goBack`);
-  }
+  if (process.env.ONE_DEBUG_ROUTER) console.info(`[one] \u{1F519} goBack`);
   assertIsReady(navigationRef);
-  navigationRef === null || navigationRef === void 0 ? void 0 : (_navigationRef_current = navigationRef.current) === null || _navigationRef_current === void 0 ? void 0 : _navigationRef_current.goBack();
+  navigationRef === null || navigationRef === void 0 || (_navigationRef_current = navigationRef.current) == null || _navigationRef_current.goBack();
 }
 function canGoBack() {
   var _ref;
   var _navigationRef_current;
-  if (!navigationRef.isReady()) {
-    return false;
-  }
+  if (!navigationRef.isReady()) return false;
   return (_ref = navigationRef === null || navigationRef === void 0 ? void 0 : (_navigationRef_current = navigationRef.current) === null || _navigationRef_current === void 0 ? void 0 : _navigationRef_current.canGoBack()) !== null && _ref !== void 0 ? _ref : false;
 }
 function canDismiss() {
   var state = rootState;
   while (state) {
     var _state_routes_state_index, _state_routes;
-    if (state.type === "stack" && state.routes.length > 1) {
-      return true;
-    }
-    if (state.index === void 0) {
-      return false;
-    }
+    if (state.type === "stack" && state.routes.length > 1) return true;
+    if (state.index === void 0) return false;
     state = (_state_routes = state.routes) === null || _state_routes === void 0 ? void 0 : (_state_routes_state_index = _state_routes[state.index]) === null || _state_routes_state_index === void 0 ? void 0 : _state_routes_state_index.state;
   }
   return false;
 }
 function getSortedRoutes() {
-  if (!routeNode) {
-    throw new Error("No routes");
-  }
+  if (!routeNode) throw new Error("No routes");
   return routeNode.children.filter(function (route) {
     return !route.internal;
   }).sort(sortRoutes);
@@ -425,35 +360,25 @@ function updateState(state) {
       } : "");
     }
     routeInfo = nextRouteInfo;
-    if (true) {
-      var params1 = extractParamsFromState(state);
-      var newMatches = buildNativeMatches(state, nextRouteInfo.pathname, params1);
-      currentMatches = newMatches;
-      setClientMatches(newMatches);
-    }
-  }
-  if (process.env.NODE_ENV === "development" && typeof window !== "undefined") {
-    ;
-    window.__oneDevtools = {
-      routeInfo: nextRouteInfo,
-      rootState: state,
-      routeNode,
-      getRoutes: function () {
-        return (routeNode === null || routeNode === void 0 ? void 0 : routeNode.children) || [];
-      },
-      getLoaderTimingHistory: function () {
-        var _ref;
-        var _devtoolsRegistry_getLoaderTimingHistory;
-        return (_ref = (_devtoolsRegistry_getLoaderTimingHistory = devtoolsRegistry.getLoaderTimingHistory) === null || _devtoolsRegistry_getLoaderTimingHistory === void 0 ? void 0 : _devtoolsRegistry_getLoaderTimingHistory.call(devtoolsRegistry)) !== null && _ref !== void 0 ? _ref : [];
-      },
-      getPreloadHistory
-    };
-    if (false) {
-      window.dispatchEvent(new CustomEvent("one-route-change", {
-        detail: nextRouteInfo
-      }));
-    }
-  }
+    var params1 = extractParamsFromState(state);
+    var newMatches = buildNativeMatches(state, nextRouteInfo.pathname, params1);
+    currentMatches = newMatches;
+    setClientMatches(newMatches);
+  }
+  if (process.env.NODE_ENV === "development" && typeof window !== "undefined") window.__oneDevtools = {
+    routeInfo: nextRouteInfo,
+    rootState: state,
+    routeNode,
+    getRoutes: function () {
+      return (routeNode === null || routeNode === void 0 ? void 0 : routeNode.children) || [];
+    },
+    getLoaderTimingHistory: function () {
+      var _ref;
+      var _devtoolsRegistry_getLoaderTimingHistory;
+      return (_ref = (_devtoolsRegistry_getLoaderTimingHistory = devtoolsRegistry.getLoaderTimingHistory) === null || _devtoolsRegistry_getLoaderTimingHistory === void 0 ? void 0 : _devtoolsRegistry_getLoaderTimingHistory.call(devtoolsRegistry)) !== null && _ref !== void 0 ? _ref : [];
+    },
+    getPreloadHistory
+  };
 }
 function subscribeToRootState(subscriber) {
   rootStateSubscribers.add(subscriber);
@@ -488,13 +413,9 @@ function setLoadingState(state) {
       _iteratorError = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
-        }
+        if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
       } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
+        if (_didIteratorError) throw _iteratorError;
       }
     }
   });
@@ -530,19 +451,15 @@ function routeInfoSnapshot() {
   return routeInfo;
 }
 function useOneRouter() {
-  var state = useSyncExternalStore(subscribeToStore, snapshot, snapshot);
-  return useDeferredValue(state);
+  return useDeferredValue(useSyncExternalStore(subscribeToStore, snapshot, snapshot));
 }
 function syncStoreRootState() {
-  if (!navigationRef) {
-    throw new Error(`No navigationRef, possible duplicate One dep`);
-  }
+  if (!navigationRef) throw new Error(`No navigationRef, possible duplicate One dep`);
   if (navigationRef.isReady()) {
     var currentState = navigationRef.getRootState();
     if (rootState !== currentState) {
       if (initialState && (routeInfo === null || routeInfo === void 0 ? void 0 : routeInfo.pathname)) {
-        var nextRouteInfo = getRouteInfo(currentState);
-        if (nextRouteInfo.pathname !== routeInfo.pathname) {
+        if (getRouteInfo(currentState).pathname !== routeInfo.pathname) {
           rootState = currentState;
           return;
         }
@@ -553,18 +470,14 @@ function syncStoreRootState() {
 }
 function useStoreRootState() {
   syncStoreRootState();
-  var state = useSyncExternalStore(subscribeToRootState, rootStateSnapshot, rootStateSnapshot);
-  return useDeferredValue(state);
+  return useDeferredValue(useSyncExternalStore(subscribeToRootState, rootStateSnapshot, rootStateSnapshot));
 }
 function useStoreRouteInfo() {
   syncStoreRootState();
-  var state = useSyncExternalStore(subscribeToRootState, routeInfoSnapshot, routeInfoSnapshot);
-  return state;
+  return useSyncExternalStore(subscribeToRootState, routeInfoSnapshot, routeInfoSnapshot);
 }
 function cleanup() {
-  if (splashScreenAnimationFrame) {
-    cancelAnimationFrame(splashScreenAnimationFrame);
-  }
+  if (splashScreenAnimationFrame) cancelAnimationFrame(splashScreenAnimationFrame);
 }
 var preloadingLoader = {};
 var preloadedLoaderData = {};
@@ -574,42 +487,10 @@ function getPreloadHistory() {
   return preloadHistory;
 }
 function preloadRoute(href) {
-  var injectCSS = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
-  if (false) {
-    if (process.env.NODE_ENV === "development") {
-      var normalizedHref = normalizeLoaderPath(href);
-      if (!preloadingLoader[normalizedHref]) {
-        preloadingLoader[normalizedHref] = doPreloadDev(href).then(function (data) {
-          preloadedLoaderData[normalizedHref] = data;
-          return data;
-        });
-      }
-      return preloadingLoader[normalizedHref];
-    }
-    if (!preloadingLoader[href]) {
-      preloadingLoader[href] = doPreload(href).then(function (data) {
-        preloadedLoaderData[href] = data;
-        return data;
-      });
-    }
-    if (injectCSS) {
-      var _preloadingLoader_href;
-      return (_preloadingLoader_href = preloadingLoader[href]) === null || _preloadingLoader_href === void 0 ? void 0 : _preloadingLoader_href.then(async function (data) {
-        var inject = cssInjectFunctions[href];
-        if (inject) {
-          await Promise.race([inject(), new Promise(function (r) {
-            return setTimeout(r, 800);
-          })]);
-        }
-        return data;
-      });
-    }
-    return preloadingLoader[href];
-  }
+  arguments.length > 1 && arguments[1] !== void 0 && arguments[1];
 }
 function normalizeLoaderPath(href) {
-  var url = new URL(href, "http://example.com");
-  return url.pathname.replace(/\/index$/, "").replace(/\/$/, "") || "/";
+  return new URL(href, "http://example.com").pathname.replace(/\/index$/, "").replace(/\/$/, "") || "/";
 }
 function buildClientMatches(href, matchingNode, params, loaderData) {
   var pathname = extractPathnameFromHref(href);
@@ -626,8 +507,7 @@ function buildClientMatches(href, matchingNode, params, loaderData) {
   return [...layoutMatches, pageMatch];
 }
 function buildNativeMatches(state, pathname, params) {
-  var allNodes = findAllRouteNodesFromState(state, routeNode);
-  return allNodes.map(function (node) {
+  return findAllRouteNodesFromState(state, routeNode).map(function (node) {
     return {
       routeId: node.contextKey || pathname,
       pathname,
@@ -641,14 +521,10 @@ function initClientMatches(matches) {
   setClientMatches(matches);
 }
 async function linkTo(href, event, options) {
-  if (process.env.ONE_DEBUG_ROUTER) {
-    console.info(`[one] \u{1F517} ${event || "NAVIGATE"} ${href}`);
-  }
+  if (process.env.ONE_DEBUG_ROUTER) console.info(`[one] \u{1F517} ${event || "NAVIGATE"} ${href}`);
   setNavigationType("soft");
   clearNotFoundState();
-  if (href[0] === "#") {
-    return;
-  }
+  if (href[0] === "#") return;
   if (shouldLinkExternally(href)) {
     openExternalURL(href);
     return;
@@ -657,12 +533,8 @@ async function linkTo(href, event, options) {
     window.location.href = href;
     return;
   }
-  if (checkBlocker(href, event === "REPLACE" ? "replace" : "push")) {
-    return;
-  }
-  if (isRouteProtected(href)) {
-    return;
-  }
+  if (checkBlocker(href, event === "REPLACE" ? "replace" : "push")) return;
+  if (isRouteProtected(href)) return;
   var currentLayoutNode = routeNode;
   var currentPath = (routeInfo === null || routeInfo === void 0 ? void 0 : routeInfo.pathname) || "/";
   var interceptResult = findInterceptRoute(href, currentLayoutNode, currentPath);
@@ -686,13 +558,9 @@ async function linkTo(href, event, options) {
   }
   assertIsReady(navigationRef);
   var current = navigationRef.current;
-  if (current == null) {
-    throw new Error("Couldn't find a navigation object. Is your component inside NavigationContainer?");
-  }
+  if (current == null) throw new Error("Couldn't find a navigation object. Is your component inside NavigationContainer?");
   var linking = getLinking();
-  if (!linking) {
-    throw new Error("Attempted to link to route when no routes are present");
-  }
+  if (!linking) throw new Error("Attempted to link to route when no routes are present");
   setLastAction();
   if (href === ".." || href === "../") {
     current.goBack();
@@ -709,17 +577,13 @@ async function linkTo(href, event, options) {
         var _routeInfo_params1, _params_split;
         segment = segment.slice(4, -1);
         var params3 = routeInfo === null || routeInfo === void 0 ? void 0 : (_routeInfo_params1 = routeInfo.params) === null || _routeInfo_params1 === void 0 ? void 0 : _routeInfo_params1[segment];
-        if (Array.isArray(params3)) {
-          return params3.join("/");
-        }
+        if (Array.isArray(params3)) return params3.join("/");
         return (_ref2 = params3 === null || params3 === void 0 ? void 0 : (_params_split = params3.split(",")) === null || _params_split === void 0 ? void 0 : _params_split.join("/")) !== null && _ref2 !== void 0 ? _ref2 : "";
       }
       segment = segment.slice(1, -1);
       return routeInfo === null || routeInfo === void 0 ? void 0 : (_routeInfo_params = routeInfo.params) === null || _routeInfo_params === void 0 ? void 0 : _routeInfo_params[segment];
     }).filter(Boolean).join("/")) !== null && _ref !== void 0 ? _ref : "/";
-    if (!(routeInfo === null || routeInfo === void 0 ? void 0 : routeInfo.isIndex)) {
-      base += "/..";
-    }
+    if (!(routeInfo === null || routeInfo === void 0 ? void 0 : routeInfo.isIndex)) base += "/..";
     href = resolve(base, href);
   }
   var state = linking.getStateFromPath(href, linking.config);
@@ -731,13 +595,9 @@ async function linkTo(href, event, options) {
   }
   setLoadingState("loading");
   var normalizedPreloadPath = normalizeLoaderPath(href);
-  if (!(normalizedPreloadPath in preloadedLoaderData) && !(href in preloadedLoaderData)) {
-    await preloadRoute(href, true);
-  } else if (process.env.NODE_ENV !== "development") {
+  if (!(normalizedPreloadPath in preloadedLoaderData) && !(href in preloadedLoaderData)) await preloadRoute(href, true);else if (process.env.NODE_ENV !== "development") {
     var inject = cssInjectFunctions[href];
-    if (inject) {
-      inject().catch(function () {});
-    }
+    if (inject) inject().catch(function () {});
   }
   var preloadResult = preloadedLoaderData[normalizedPreloadPath];
   if (preloadResult === null || preloadResult === void 0 ? void 0 : preloadResult.__oneRedirect) {
@@ -775,9 +635,7 @@ async function linkTo(href, event, options) {
       var params1 = extractParamsFromState(state);
       var search = extractSearchFromHref(href);
       var pathname = extractPathnameFromHref(href);
-      if (loadedRoute.validateParams) {
-        runValidateParams(loadedRoute.validateParams, params1);
-      }
+      if (loadedRoute.validateParams) runValidateParams(loadedRoute.validateParams, params1);
       if (loadedRoute.validateRoute) {
         var validationResult = await loadedRoute.validateRoute({
           params: params1,
@@ -813,22 +671,17 @@ async function linkTo(href, event, options) {
           lastValidatedHref: href
         });
         throw error;
-      } else {
-        throw error;
-      }
+      } else throw error;
     }
   }
-  var normalizedPath = normalizeLoaderPath(href);
-  var loaderData = preloadedLoaderData[normalizedPath];
+  var loaderData = preloadedLoaderData[normalizeLoaderPath(href)];
   var params2 = extractParamsFromState(state);
   var newMatches = buildClientMatches(href, matchingRouteNode, params2, loaderData);
   currentMatches = newMatches;
   setClientMatches(newMatches);
   var currentRootState = navigationRef.getRootState();
   var hash = href.indexOf("#");
-  if (currentRootState.key && hash > 0) {
-    hashes[currentRootState.key] = href.slice(hash);
-  }
+  if (currentRootState.key && hash > 0) hashes[currentRootState.key] = href.slice(hash);
   nextOptions = options !== null && options !== void 0 ? options : null;
   startTransition(function () {
     var _action_payload, _freshRootState_routes_freshRootState_index;
@@ -852,72 +705,49 @@ async function linkTo(href, event, options) {
         routes: [...existingRoutes, targetRoute],
         index: existingRoutes.length
       });
-    } else {
-      navigationRef.dispatch(action);
-    }
+    } else navigationRef.dispatch(action);
     var warningTm;
     var interval = setInterval(function () {
-      var next = navigationRef.getCurrentRoute();
-      if (current2 !== next) {
-        setTimeout(function () {
-          setLoadingState("loaded");
-        });
-      }
+      if (current2 !== navigationRef.getCurrentRoute()) setTimeout(function () {
+        setLoadingState("loaded");
+      });
       clearTimeout(warningTm);
       clearTimeout(interval);
     }, 16);
-    if (process.env.NODE_ENV === "development") {
-      warningTm = setTimeout(function () {
-        console.warn(`Routing took more than 8 seconds`);
-      }, 1e3);
-    }
+    if (process.env.NODE_ENV === "development") warningTm = setTimeout(function () {
+      console.warn(`Routing took more than 8 seconds`);
+    }, 1e3);
   });
 }
 var hashes = {};
 var nextOptions = null;
 function deepEqual(a, b) {
-  if (a === b) {
-    return true;
-  }
+  if (a === b) return true;
   if (Array.isArray(a) && Array.isArray(b)) {
-    if (a.length !== b.length) {
-      return false;
-    }
-    for (var i = 0; i < a.length; i++) {
-      if (!deepEqual(a[i], b[i])) {
-        return false;
-      }
-    }
+    if (a.length !== b.length) return false;
+    for (var i = 0; i < a.length; i++) if (!deepEqual(a[i], b[i])) return false;
     return true;
   }
   if ((typeof a === "undefined" ? "undefined" : _type_of(a)) === "object" && (typeof b === "undefined" ? "undefined" : _type_of(b)) === "object") {
     var keysA = Object.keys(a);
     var keysB = Object.keys(b);
-    if (keysA.length !== keysB.length) {
-      return false;
-    }
+    if (keysA.length !== keysB.length) return false;
     var _iteratorNormalCompletion = true,
       _didIteratorError = false,
       _iteratorError = void 0;
     try {
       for (var _iterator = keysA[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
         var key = _step.value;
-        if (!deepEqual(a[key], b[key])) {
-          return false;
-        }
+        if (!deepEqual(a[key], b[key])) return false;
       }
     } catch (err) {
       _didIteratorError = true;
       _iteratorError = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
-        }
+        if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
       } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
+        if (_didIteratorError) throw _iteratorError;
       }
     }
     return true;