one 1.15.8 → 1.15.9

package/dist/esm/router/router.mjs

@@ -29,11 +29,7 @@ let routeNode = null;
 let rootComponent;
 const 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);
@@ -43,12 +39,9 @@ function isRouteProtected(href) {
   for (const [contextKey, protectedScreens] of protectedRouteRegistry) {
     const normalizedContextKey = contextKey.replace(/^\/+|\/+$/g, "");
     if (normalizedHref.startsWith(normalizedContextKey)) {
-      const relativePath = normalizedHref.slice(normalizedContextKey.length).replace(/^\//, "");
-      const routeName = relativePath.split("/")[0] || "index";
+      const routeName = normalizedHref.slice(normalizedContextKey.length).replace(/^\//, "").split("/")[0] || "index";
       const normalizedRouteName = routeName.replace(/\/index$/, "");
-      if (protectedScreens.has(routeName) || protectedScreens.has(normalizedRouteName)) {
-        return true;
-      }
+      if (protectedScreens.has(routeName) || protectedScreens.has(normalizedRouteName)) return true;
     }
   }
   return false;
@@ -75,22 +68,18 @@ function subscribeToValidationState(subscriber) {
 }
 function setValidationState(state) {
   validationState = state;
-  for (const subscriber of validationStateSubscribers) {
-    subscriber(state);
-  }
-  if (state.status === "error" && state.error) {
-    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()
-      }
-    }));
-  }
+  for (const subscriber of validationStateSubscribers) subscriber(state);
+  if (state.status === "error" && state.error) 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;
@@ -113,18 +102,15 @@ 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) {
     const formatRouteTree = (node, indent = "", isLast = true) => {
-      const prefix = indent + (isLast ? "\u2514\u2500 " : "\u251C\u2500 ");
-      const childIndent = indent + (isLast ? "   " : "\u2502  ");
+      const prefix = indent + (isLast ? "└─ " : "├─ ");
+      const childIndent = indent + (isLast ? "   " : "│  ");
       const dynamicBadge = node.dynamic ? ` [${node.dynamic.map(d => d.name).join(", ")}]` : "";
       const typeBadge = node.type !== "layout" ? ` (${node.type})` : "";
       const slotsBadge = node.slots?.size ? ` {@${Array.from(node.slots.keys()).join(", @")}}` : "";
-      const routeName = node.route || "/";
-      let line = `${prefix}${routeName}${dynamicBadge}${typeBadge}${slotsBadge}`;
+      let line = `${prefix}${node.route || "/"}${dynamicBadge}${typeBadge}${slotsBadge}`;
       const visibleChildren = node.children.filter(child => !child.internal);
       for (let i = 0; i < visibleChildren.length; i++) {
         const child = visibleChildren[i];
@@ -137,15 +123,13 @@ function initialize(context, ref, initialLocation) {
 ${formatRouteTree(routeNode)}`);
     if (routeNode.slots?.size) {
       console.info(`[one] \u{1F4E6} Slots on root layout:`);
-      for (const [slotName, slotConfig] of routeNode.slots) {
-        console.info(`  @${slotName}:`, {
-          defaultRoute: slotConfig.defaultRoute?.route,
-          interceptRoutes: slotConfig.interceptRoutes.map(r => ({
-            route: r.route,
-            intercept: r.intercept
-          }))
-        });
-      }
+      for (const [slotName, slotConfig] of routeNode.slots) console.info(`  @${slotName}:`, {
+        defaultRoute: slotConfig.defaultRoute?.route,
+        interceptRoutes: slotConfig.interceptRoutes.map(r => ({
+          route: r.route,
+          intercept: r.intercept
+        }))
+      });
     }
   }
   navigationRef = ref;
@@ -168,15 +152,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;
@@ -206,20 +188,14 @@ function handleNavigationContainerStateChange(navState) {
     updateState(state, void 0);
     shouldUpdateSubscribers = true;
   }
-  if (shouldUpdateSubscribers) {
-    startTransition(() => {
-      for (const subscriber of rootStateSubscribers) {
-        subscriber(state);
-      }
-    });
-  }
+  if (shouldUpdateSubscribers) startTransition(() => {
+    for (const subscriber of rootStateSubscribers) subscriber(state);
+  });
 }
 function subscribeToNavigationChanges() {
   startTransition(() => {
     updateSnapshot();
-    for (const subscriber of storeSubscribers) {
-      subscriber();
-    }
+    for (const subscriber of storeSubscribers) subscriber();
   });
 }
 function navigate(url, options) {
@@ -229,9 +205,7 @@ 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})` : ""}`);
-  }
+  if (process.env.ONE_DEBUG_ROUTER) console.info(`[one] \u{1F519} dismiss${count ? ` (${count})` : ""}`);
   navigationRef?.dispatch(StackActions.pop(count));
 }
 function replace(url, options) {
@@ -244,41 +218,29 @@ function setParams(params = {}) {
   params);
 }
 function dismissAll() {
-  if (process.env.ONE_DEBUG_ROUTER) {
-    console.info(`[one] \u{1F519} dismissAll`);
-  }
+  if (process.env.ONE_DEBUG_ROUTER) console.info(`[one] \u{1F519} dismissAll`);
   navigationRef?.dispatch(StackActions.popToTop());
 }
 function goBack() {
-  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?.current?.goBack();
 }
 function canGoBack() {
-  if (!navigationRef.isReady()) {
-    return false;
-  }
+  if (!navigationRef.isReady()) return false;
   return navigationRef?.current?.canGoBack() ?? false;
 }
 function canDismiss() {
   let state = rootState;
   while (state) {
-    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.index]?.state;
   }
   return false;
 }
 function getSortedRoutes() {
-  if (!routeNode) {
-    throw new Error("No routes");
-  }
+  if (!routeNode) throw new Error("No routes");
   return routeNode.children.filter(route => !route.internal).sort(sortRoutes);
 }
 function updateState(state, nextStateParam = state) {
@@ -295,15 +257,8 @@ function updateState(state, nextStateParam = state) {
       } : "");
     }
     routeInfo = nextRouteInfo;
-    if (false) {
-      const params = extractParamsFromState(state);
-      const newMatches = buildNativeMatches(state, nextRouteInfo.pathname, params);
-      currentMatches = newMatches;
-      setClientMatches(newMatches);
-    }
   }
   if (process.env.NODE_ENV === "development" && typeof window !== "undefined") {
-    ;
     window.__oneDevtools = {
       routeInfo: nextRouteInfo,
       rootState: state,
@@ -312,11 +267,9 @@ function updateState(state, nextStateParam = state) {
       getLoaderTimingHistory: () => devtoolsRegistry.getLoaderTimingHistory?.() ?? [],
       getPreloadHistory
     };
-    if (true) {
-      window.dispatchEvent(new CustomEvent("one-route-change", {
-        detail: nextRouteInfo
-      }));
-    }
+    window.dispatchEvent(new CustomEvent("one-route-change", {
+      detail: nextRouteInfo
+    }));
   }
 }
 function subscribeToRootState(subscriber) {
@@ -339,9 +292,7 @@ function subscribeToLoadingState(subscriber) {
 }
 function setLoadingState(state) {
   startTransition(() => {
-    for (const listener of loadingStateSubscribers) {
-      listener(state);
-    }
+    for (const listener of loadingStateSubscribers) listener(state);
   });
 }
 let currentSnapshot = null;
@@ -375,19 +326,15 @@ function routeInfoSnapshot() {
   return routeInfo;
 }
 function useOneRouter() {
-  const 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()) {
     const currentState = navigationRef.getRootState();
     if (rootState !== currentState) {
       if (initialState && routeInfo?.pathname) {
-        const nextRouteInfo = getRouteInfo(currentState);
-        if (nextRouteInfo.pathname !== routeInfo.pathname) {
+        if (getRouteInfo(currentState).pathname !== routeInfo.pathname) {
           rootState = currentState;
           return;
         }
@@ -398,18 +345,14 @@ function syncStoreRootState() {
 }
 function useStoreRootState() {
   syncStoreRootState();
-  const state = useSyncExternalStore(subscribeToRootState, rootStateSnapshot, rootStateSnapshot);
-  return useDeferredValue(state);
+  return useDeferredValue(useSyncExternalStore(subscribeToRootState, rootStateSnapshot, rootStateSnapshot));
 }
 function useStoreRouteInfo() {
   syncStoreRootState();
-  const state = useSyncExternalStore(subscribeToRootState, routeInfoSnapshot, routeInfoSnapshot);
-  return state;
+  return useSyncExternalStore(subscribeToRootState, routeInfoSnapshot, routeInfoSnapshot);
 }
 function cleanup() {
-  if (splashScreenAnimationFrame) {
-    cancelAnimationFrame(splashScreenAnimationFrame);
-  }
+  if (splashScreenAnimationFrame) cancelAnimationFrame(splashScreenAnimationFrame);
 }
 const preloadingLoader = {};
 async function doPreloadDev(href) {
@@ -420,21 +363,15 @@ async function doPreloadDev(href) {
       const loaderJSUrl = getLoaderPath(href, true);
       const moduleLoadStart = performance.now();
       const modulePromise = dynamicImport(loaderJSUrl);
-      if (!modulePromise) {
-        return null;
-      }
+      if (!modulePromise) return null;
       const module = await modulePromise.catch(() => null);
       const moduleLoadTime = performance.now() - moduleLoadStart;
-      if (!module?.loader) {
-        return null;
-      }
+      if (!module?.loader) return null;
       const executionStart = performance.now();
       const result = await module.loader();
       const executionTime = performance.now() - executionStart;
       const totalTime = performance.now() - startTime;
-      if (result?.__oneRedirect) {
-        return result;
-      }
+      if (result?.__oneRedirect) return result;
       devtoolsRegistry.recordLoaderTiming?.({
         path: normalizedPath,
         startTime,
@@ -453,9 +390,7 @@ async function doPreloadDev(href) {
         error: err instanceof Error ? err.message : String(err),
         source: "preload"
       });
-      if (process.env.ONE_DEBUG_ROUTER) {
-        console.warn(`[one] dev preload failed for ${href}:`, err);
-      }
+      if (process.env.ONE_DEBUG_ROUTER) console.warn(`[one] dev preload failed for ${href}:`, err);
       return null;
     }
   }
@@ -471,18 +406,13 @@ async function doPreload(href) {
       return null;
     }), dynamicImport(cssPreloadPath)?.catch(() => null) ?? Promise.resolve(null), dynamicImport(loaderPath)?.catch(() => null) ?? Promise.resolve(null), preloadRouteModules(href)]);
     const hasCss = !!cssPreloadModule?.injectCSS;
-    if (hasCss) {
-      cssInjectFunctions[href] = cssPreloadModule.injectCSS;
-    }
-    const hasLoader = !!loader?.loader;
-    if (!hasLoader) {
+    if (hasCss) cssInjectFunctions[href] = cssPreloadModule.injectCSS;
+    if (!!!loader?.loader) {
       recordPreloadComplete(href, false, hasCss);
       return null;
     }
     const result = await loader.loader();
-    if (result?.__oneRedirect) {
-      return result;
-    }
+    if (result?.__oneRedirect) return result;
     recordPreloadComplete(href, true, hasCss);
     return result ?? null;
   } catch (err) {
@@ -511,9 +441,7 @@ function recordPreloadStart(href) {
     hasLoader: false,
     hasCss: false
   });
-  if (preloadHistory.length > MAX_PRELOAD_HISTORY) {
-    preloadHistory.pop();
-  }
+  if (preloadHistory.length > MAX_PRELOAD_HISTORY) preloadHistory.pop();
   dispatchPreloadEvent();
 }
 function recordPreloadComplete(href, hasLoader, hasCss) {
@@ -538,46 +466,33 @@ function recordPreloadError(href, error) {
   dispatchPreloadEvent();
 }
 function dispatchPreloadEvent() {
-  if (true) {
-    window.dispatchEvent(new CustomEvent("one-preload-update"));
-  }
+  window.dispatchEvent(new CustomEvent("one-preload-update"));
 }
 function getPreloadHistory() {
   return preloadHistory;
 }
 function preloadRoute(href, injectCSS = false) {
-  if (true) {
-    if (process.env.NODE_ENV === "development") {
-      const normalizedHref = normalizeLoaderPath(href);
-      if (!preloadingLoader[normalizedHref]) {
-        preloadingLoader[normalizedHref] = doPreloadDev(href).then(data => {
-          preloadedLoaderData[normalizedHref] = data;
-          return data;
-        });
-      }
-      return preloadingLoader[normalizedHref];
-    }
-    if (!preloadingLoader[href]) {
-      preloadingLoader[href] = doPreload(href).then(data => {
-        preloadedLoaderData[href] = data;
-        return data;
-      });
-    }
-    if (injectCSS) {
-      return preloadingLoader[href]?.then(async data => {
-        const inject = cssInjectFunctions[href];
-        if (inject) {
-          await Promise.race([inject(), new Promise(r => setTimeout(r, 800))]);
-        }
-        return data;
-      });
-    }
-    return preloadingLoader[href];
+  if (process.env.NODE_ENV === "development") {
+    const normalizedHref = normalizeLoaderPath(href);
+    if (!preloadingLoader[normalizedHref]) preloadingLoader[normalizedHref] = doPreloadDev(href).then(data => {
+      preloadedLoaderData[normalizedHref] = data;
+      return data;
+    });
+    return preloadingLoader[normalizedHref];
   }
+  if (!preloadingLoader[href]) preloadingLoader[href] = doPreload(href).then(data => {
+    preloadedLoaderData[href] = data;
+    return data;
+  });
+  if (injectCSS) return preloadingLoader[href]?.then(async data => {
+    const inject = cssInjectFunctions[href];
+    if (inject) await Promise.race([inject(), new Promise(r => setTimeout(r, 800))]);
+    return data;
+  });
+  return preloadingLoader[href];
 }
 function normalizeLoaderPath(href) {
-  const 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) {
   const pathname = extractPathnameFromHref(href);
@@ -596,14 +511,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;
@@ -612,12 +523,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;
   const currentLayoutNode = routeNode;
   const currentPath = routeInfo?.pathname || "/";
   const interceptResult = findInterceptRoute(href, currentLayoutNode, currentPath);
@@ -641,13 +548,9 @@ async function linkTo(href, event, options) {
   }
   assertIsReady(navigationRef);
   const 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?");
   const 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();
@@ -659,17 +562,13 @@ async function linkTo(href, event, options) {
       if (segment.startsWith("[...")) {
         segment = segment.slice(4, -1);
         const params2 = routeInfo?.params?.[segment];
-        if (Array.isArray(params2)) {
-          return params2.join("/");
-        }
+        if (Array.isArray(params2)) return params2.join("/");
         return params2?.split(",")?.join("/") ?? "";
       }
       segment = segment.slice(1, -1);
       return routeInfo?.params?.[segment];
     }).filter(Boolean).join("/") ?? "/";
-    if (!routeInfo?.isIndex) {
-      base += "/..";
-    }
+    if (!routeInfo?.isIndex) base += "/..";
     href = resolve(base, href);
   }
   const state = linking.getStateFromPath(href, linking.config);
@@ -681,13 +580,9 @@ async function linkTo(href, event, options) {
   }
   setLoadingState("loading");
   const 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") {
     const inject = cssInjectFunctions[href];
-    if (inject) {
-      inject().catch(() => {});
-    }
+    if (inject) inject().catch(() => {});
   }
   const preloadResult = preloadedLoaderData[normalizedPreloadPath];
   if (preloadResult?.__oneRedirect) {
@@ -725,9 +620,7 @@ async function linkTo(href, event, options) {
       const params2 = extractParamsFromState(state);
       const search = extractSearchFromHref(href);
       const pathname = extractPathnameFromHref(href);
-      if (loadedRoute.validateParams) {
-        runValidateParams(loadedRoute.validateParams, params2);
-      }
+      if (loadedRoute.validateParams) runValidateParams(loadedRoute.validateParams, params2);
       if (loadedRoute.validateRoute) {
         const validationResult = await loadedRoute.validateRoute({
           params: params2,
@@ -763,22 +656,17 @@ async function linkTo(href, event, options) {
           lastValidatedHref: href
         });
         throw error;
-      } else {
-        throw error;
-      }
+      } else throw error;
     }
   }
-  const normalizedPath = normalizeLoaderPath(href);
-  const loaderData = preloadedLoaderData[normalizedPath];
+  const loaderData = preloadedLoaderData[normalizeLoaderPath(href)];
   const params = extractParamsFromState(state);
   const newMatches = buildClientMatches(href, matchingRouteNode, params, loaderData);
   currentMatches = newMatches;
   setClientMatches(newMatches);
   const currentRootState = navigationRef.getRootState();
   const 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;
   startTransition(() => {
     const freshRootState = navigationRef.getRootState();
@@ -799,55 +687,34 @@ async function linkTo(href, event, options) {
         routes: [...existingRoutes, targetRoute],
         index: existingRoutes.length
       });
-    } else {
-      navigationRef.dispatch(action);
-    }
+    } else navigationRef.dispatch(action);
     let warningTm;
     const interval = setInterval(() => {
-      const next = navigationRef.getCurrentRoute();
-      if (current2 !== next) {
-        setTimeout(() => {
-          setLoadingState("loaded");
-        });
-      }
+      if (current2 !== navigationRef.getCurrentRoute()) setTimeout(() => {
+        setLoadingState("loaded");
+      });
       clearTimeout(warningTm);
       clearTimeout(interval);
     }, 16);
-    if (process.env.NODE_ENV === "development") {
-      warningTm = setTimeout(() => {
-        console.warn(`Routing took more than 8 seconds`);
-      }, 1e3);
-    }
+    if (process.env.NODE_ENV === "development") warningTm = setTimeout(() => {
+      console.warn(`Routing took more than 8 seconds`);
+    }, 1e3);
   });
 }
 const hashes = {};
 let 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 (let i = 0; i < a.length; i++) {
-      if (!deepEqual(a[i], b[i])) {
-        return false;
-      }
-    }
+    if (a.length !== b.length) return false;
+    for (let i = 0; i < a.length; i++) if (!deepEqual(a[i], b[i])) return false;
     return true;
   }
   if (typeof a === "object" && typeof b === "object") {
     const keysA = Object.keys(a);
     const keysB = Object.keys(b);
-    if (keysA.length !== keysB.length) {
-      return false;
-    }
-    for (const key of keysA) {
-      if (!deepEqual(a[key], b[key])) {
-        return false;
-      }
-    }
+    if (keysA.length !== keysB.length) return false;
+    for (const key of keysA) if (!deepEqual(a[key], b[key])) return false;
     return true;
   }
   return false;