one 1.15.10 → 1.16.1

package/dist/cjs/useLoader.cjs

@@ -42,12 +42,12 @@ var import_router = require("./router/router.cjs");
 var import_ssrLoaderData = require("./server/ssrLoaderData.cjs");
 var import_useMatches = require("./useMatches.cjs");
 var import_cleanUrl = require("./utils/cleanUrl.cjs");
-var import_constants = require("./constants.cjs");
+require("./constants.cjs");
 var import_dynamicImport = require("./utils/dynamicImport.cjs");
 var import_weakKey = require("./utils/weakKey.cjs");
 var import_one_server_only = require("./vite/one-server-only.cjs");
 var import_ssrLoaderData2 = require("./server/ssrLoaderData.cjs");
-const LOADER_TIMEOUT = process.env.ONE_LOADER_TIMEOUT_MS ? +process.env.ONE_LOADER_TIMEOUT_MS : 6e4;
+process.env.ONE_LOADER_TIMEOUT_MS && +process.env.ONE_LOADER_TIMEOUT_MS;
 const loaderTimingHistory = [];
 const MAX_TIMING_HISTORY = 50;
 const recordLoaderTiming = process.env.NODE_ENV === "development" ? entry => {
@@ -92,103 +92,103 @@ function subscribe(callback) {
   subscribers.add(callback);
   return () => subscribers.delete(callback);
 }
-function getLoaderState(path, preloadedData2) {
+function getLoaderState(path, preloadedData) {
   if (!loaderState[path]) loaderState[path] = {
-    data: preloadedData2,
+    data: preloadedData,
     error: void 0,
     promise: void 0,
     state: "idle",
-    hasLoadedOnce: !!preloadedData2
+    hasLoadedOnce: !!preloadedData
   };
   return loaderState[path];
 }
-async function refetchLoader(pathname2) {
-  const startTime2 = performance.now();
-  updateState(pathname2, {
+async function refetchLoader(pathname) {
+  const startTime = performance.now();
+  updateState(pathname, {
     state: "loading",
     error: null
   });
   try {
     const cacheBust = `${Date.now()}`;
-    const loaderJSUrl2 = (0, import_cleanUrl.getLoaderPath)(pathname2, true, cacheBust);
-    const moduleLoadStart2 = performance.now();
-    const module2 = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl2)?.catch(() => null);
-    const moduleLoadTime2 = performance.now() - moduleLoadStart2;
+    const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(pathname, true, cacheBust);
+    const moduleLoadStart = performance.now();
+    const module2 = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl)?.catch(() => null);
+    const moduleLoadTime = performance.now() - moduleLoadStart;
     if (!module2?.loader) {
-      updateState(pathname2, {
+      updateState(pathname, {
         data: void 0,
         state: "idle",
         hasLoadedOnce: true
       });
       return;
     }
-    const executionStart2 = performance.now();
-    const result2 = await module2.loader();
-    const executionTime2 = performance.now() - executionStart2;
-    const totalTime2 = performance.now() - startTime2;
-    if (result2?.__oneRedirect) {
+    const executionStart = performance.now();
+    const result = await module2.loader();
+    const executionTime = performance.now() - executionStart;
+    const totalTime = performance.now() - startTime;
+    if (result?.__oneRedirect) {
       recordLoaderTiming?.({
-        path: pathname2,
-        startTime: startTime2,
-        moduleLoadTime: moduleLoadTime2,
-        executionTime: executionTime2,
-        totalTime: totalTime2,
+        path: pathname,
+        startTime,
+        moduleLoadTime,
+        executionTime,
+        totalTime,
         source: "refetch"
       });
-      updateState(pathname2, {
+      updateState(pathname, {
         data: void 0,
         state: "idle",
         hasLoadedOnce: true
       });
-      import_imperative_api.router.replace(result2.__oneRedirect);
+      import_imperative_api.router.replace(result.__oneRedirect);
       return;
     }
-    if (result2?.__oneError === 404) {
+    if (result?.__oneError === 404) {
       recordLoaderTiming?.({
-        path: pathname2,
-        startTime: startTime2,
-        moduleLoadTime: moduleLoadTime2,
-        executionTime: executionTime2,
-        totalTime: totalTime2,
+        path: pathname,
+        startTime,
+        moduleLoadTime,
+        executionTime,
+        totalTime,
         source: "refetch"
       });
-      const notFoundRoute = (0, import_notFoundState.findNearestNotFoundRoute)(pathname2, import_router.routeNode);
+      const notFoundRoute = (0, import_notFoundState.findNearestNotFoundRoute)(pathname, import_router.routeNode);
       (0, import_notFoundState.setNotFoundState)({
-        notFoundPath: result2.__oneNotFoundPath || "/+not-found",
+        notFoundPath: result.__oneNotFoundPath || "/+not-found",
         notFoundRouteNode: notFoundRoute || void 0,
-        originalPath: pathname2
+        originalPath: pathname
       });
       return;
     }
-    updateState(pathname2, {
-      data: result2,
+    updateState(pathname, {
+      data: result,
       state: "idle",
       timestamp: Date.now(),
       hasLoadedOnce: true
     });
     const currentMatches = (0, import_useMatches.getClientMatchesSnapshot)();
     const pageMatch = currentMatches[currentMatches.length - 1];
-    const normalizedPathname = pathname2.replace(/\/$/, "") || "/";
+    const normalizedPathname = pathname.replace(/\/$/, "") || "/";
     const normalizedMatchPathname = (pageMatch?.pathname || "").replace(/\/$/, "") || "/";
-    if (pageMatch && normalizedMatchPathname === normalizedPathname) (0, import_useMatches.updateMatchLoaderData)(pageMatch.routeId, result2);
+    if (pageMatch && normalizedMatchPathname === normalizedPathname) (0, import_useMatches.updateMatchLoaderData)(pageMatch.routeId, result);
     recordLoaderTiming?.({
-      path: pathname2,
-      startTime: startTime2,
-      moduleLoadTime: moduleLoadTime2,
-      executionTime: executionTime2,
-      totalTime: totalTime2,
+      path: pathname,
+      startTime,
+      moduleLoadTime,
+      executionTime,
+      totalTime,
       source: "refetch"
     });
   } catch (err) {
-    const totalTime2 = performance.now() - startTime2;
-    updateState(pathname2, {
+    const totalTime = performance.now() - startTime;
+    updateState(pathname, {
       error: err,
       state: "idle"
     });
     recordLoaderTiming?.({
-      path: pathname2,
-      startTime: startTime2,
-      totalTime: totalTime2,
+      path: pathname,
+      startTime,
+      totalTime,
       error: err instanceof Error ? err.message : String(err),
       source: "refetch"
     });
@@ -196,14 +196,14 @@ async function refetchLoader(pathname2) {
   }
 }
 if (process.env.NODE_ENV === "development" && typeof window !== "undefined") window.__oneRefetchLoader = refetchLoader;
-async function refetchMatchLoader(routeId, currentPath2) {
+async function refetchMatchLoader(routeId, currentPath) {
   const cacheBust = `${Date.now()}`;
-  const loaderJSUrl2 = (0, import_cleanUrl.getLoaderPath)(currentPath2, true, cacheBust);
-  const module2 = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl2)?.catch(() => null);
+  const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, true, cacheBust);
+  const module2 = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl)?.catch(() => null);
   if (!module2?.loader) return;
-  const result2 = await module2.loader();
-  if (result2?.__oneRedirect || result2?.__oneError) return;
-  (0, import_useMatches.updateMatchLoaderData)(routeId, result2);
+  const result = await module2.loader();
+  if (result?.__oneRedirect || result?.__oneError) return;
+  (0, import_useMatches.updateMatchLoaderData)(routeId, result);
 }
 function useLoaderState(loader) {
   const {
@@ -246,12 +246,11 @@ function useLoaderState(loader) {
     };
   }
   const matchRouteId = loader ? (() => {
-    const result2 = loader();
-    return typeof result2 === "string" && result2.startsWith("./") ? result2 : null;
+    const result = loader();
+    return typeof result === "string" && result.startsWith("./") ? result : null;
   })() : null;
   const clientMatches = (0, import_react.useSyncExternalStore)(import_useMatches.subscribeToClientMatches, import_useMatches.getClientMatchesSnapshot, import_useMatches.getClientMatchesSnapshot);
-  const serverContextPath = loaderPropsFromServerContext?.path;
-  const preloadedData = serverContextPath === currentPath ? loaderDataFromServerContext : void 0;
+  const preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0;
   const loaderStateEntry = (0, import_react.useSyncExternalStore)(subscribe, () => getLoaderState(currentPath, preloadedData), () => getLoaderState(currentPath, preloadedData));
   const refetch = (0, import_react.useCallback)(() => refetchLoader(currentPath), [currentPath]);
   if (matchRouteId) {
@@ -303,9 +302,9 @@ function useLoaderState(loader) {
         try {
           const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, true);
           const moduleLoadStart = performance.now();
-          const module = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl)?.catch(() => null);
+          const module2 = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl)?.catch(() => null);
           const moduleLoadTime = performance.now() - moduleLoadStart;
-          if (!module?.loader) {
+          if (!module2?.loader) {
             updateState(currentPath, {
               data: void 0,
               hasLoadedOnce: true,
@@ -314,7 +313,7 @@ function useLoaderState(loader) {
             return;
           }
           const executionStart = performance.now();
-          const result = await module.loader();
+          const result = await module2.loader();
           const executionTime = performance.now() - executionStart;
           const totalTime = performance.now() - startTime;
           if (result?.__oneRedirect) {
@@ -365,7 +364,7 @@ function useLoaderState(loader) {
             source: "initial"
           });
         } catch (err) {
-          const totalTime2 = performance.now() - startTime;
+          const totalTime = performance.now() - startTime;
           updateState(currentPath, {
             error: err,
             promise: void 0
@@ -373,14 +372,13 @@ function useLoaderState(loader) {
           recordLoaderTiming?.({
             path: currentPath,
             startTime,
-            totalTime: totalTime2,
+            totalTime,
             error: err instanceof Error ? err.message : String(err),
             source: "initial"
           });
         }
       };
-      const promise = loadData();
-      loaderStateEntry.promise = promise;
+      loaderStateEntry.promise = loadData();
     }
   }
   if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce) throw loaderStateEntry.error;
@@ -391,11 +389,11 @@ function useLoaderState(loader) {
     state: loaderStateEntry.state
   };
 }
-function useLoader(loader2) {
+function useLoader(loader) {
   const {
-    data: data2
-  } = useLoaderState(loader2);
-  return data2;
+    data
+  } = useLoaderState(loader);
+  return data;
 }
 const results = /* @__PURE__ */new Map();
 const started = /* @__PURE__ */new Map();