one 1.2.17 → 1.2.19

package/dist/esm/useLoader.js

@@ -1,50 +1,123 @@
-import { useEffect, useRef } from "react";
-import { useActiveParams, useParams, usePathname } from "./hooks";
+import { useCallback, useSyncExternalStore } from "react";
+import { useParams, usePathname } from "./hooks";
 import { resolveHref } from "./link/href";
 import { preloadingLoader } from "./router/router";
 import { getLoaderPath } from "./utils/cleanUrl";
 import { dynamicImport } from "./utils/dynamicImport";
 import { weakKey } from "./utils/weakKey";
 import { useServerContext } from "./vite/one-server-only";
-const promises = {}, errors = {}, loadedData = {};
-function useLoader(loader) {
-  const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = useServerContext() || {};
-  if (typeof window > "u")
-    return useAsyncFn(
+const loaderState = {}, subscribers = /* @__PURE__ */ new Set();
+function updateState(path, updates) {
+  loaderState[path] = { ...loaderState[path], ...updates }, subscribers.forEach((callback) => {
+    callback();
+  });
+}
+function subscribe(callback) {
+  return subscribers.add(callback), () => subscribers.delete(callback);
+}
+function getLoaderState(path, preloadedData2) {
+  return loaderState[path] || (loaderState[path] = {
+    data: preloadedData2,
+    error: void 0,
+    promise: void 0,
+    state: "idle",
+    hasLoadedOnce: !!preloadedData2
+  }), loaderState[path];
+}
+async function refetchLoader(pathname2) {
+  updateState(pathname2, {
+    state: "loading",
+    error: null
+  });
+  try {
+    const cacheBust = `${Date.now()}`, loaderJSUrl2 = getLoaderPath(pathname2, !0, cacheBust), result2 = await (await dynamicImport(loaderJSUrl2)).loader();
+    updateState(pathname2, {
+      data: result2,
+      state: "idle",
+      timestamp: Date.now(),
+      hasLoadedOnce: !0
+    });
+  } catch (err) {
+    throw updateState(pathname2, {
+      error: err,
+      state: "idle"
+    }), err;
+  }
+}
+function useLoaderState(loader) {
+  const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = useServerContext() || {}, params = useParams(), pathname = usePathname(), currentPath = resolveHref({ pathname, params }).replace(/index$/, "");
+  if (typeof window > "u" && loader)
+    return { data: useAsyncFn(
       loader,
       loaderPropsFromServerContext || {
-        path: usePathname(),
-        params: useActiveParams()
+        path: pathname,
+        params
       }
-    );
-  const params = useParams(), pathname = usePathname(), currentPath = resolveHref({ pathname, params }).replace(/index$/, "").replace(/\?.*/, ""), preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0, currentData = useRef(preloadedData);
-  if (useEffect(() => {
-    preloadedData && (loadedData[currentPath] = preloadedData);
-  }, [preloadedData]), errors[currentPath])
-    throw errors[currentPath];
-  const loaded = loadedData[currentPath];
-  if (typeof loaded < "u")
-    return loaded;
-  if (!preloadedData) {
-    if (preloadingLoader[currentPath] && (typeof preloadingLoader[currentPath] == "function" && (preloadingLoader[currentPath] = preloadingLoader[currentPath]()), promises[currentPath] = preloadingLoader[currentPath].then((val) => {
-      loadedData[currentPath] = val;
-    }).catch((err) => {
-      console.error("Error loading loader", err), errors[currentPath] = err, delete promises[currentPath], delete preloadingLoader[currentPath];
-    })), !promises[currentPath]) {
-      const getData = async () => {
-        const loaderJSUrl = getLoaderPath(currentPath, !0);
+    ), refetch: async () => {
+    }, state: "idle" };
+  const preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0, loaderStateEntry = useSyncExternalStore(
+    subscribe,
+    () => getLoaderState(currentPath, preloadedData),
+    () => getLoaderState(currentPath, preloadedData)
+  ), refetch = useCallback(() => refetchLoader(currentPath), [currentPath]);
+  if (!loader)
+    return {
+      refetch,
+      state: loaderStateEntry.state
+    };
+  if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader)
+    if (preloadingLoader[currentPath]) {
+      typeof preloadingLoader[currentPath] == "function" && (preloadingLoader[currentPath] = preloadingLoader[currentPath]());
+      const promise2 = preloadingLoader[currentPath].then((val) => {
+        delete preloadingLoader[currentPath], updateState(currentPath, {
+          data: val,
+          hasLoadedOnce: !0,
+          promise: void 0
+        });
+      }).catch((err) => {
+        console.error("Error running loader()", err), delete preloadingLoader[currentPath], updateState(currentPath, {
+          error: err,
+          promise: void 0
+        });
+      });
+      loaderStateEntry.promise = promise2;
+    } else {
+      const loadData = async () => {
         try {
-          const response = await (async () => await dynamicImport(loaderJSUrl))();
-          return loadedData[currentPath] = response.loader(), loadedData[currentPath];
+          const loaderJSUrl = getLoaderPath(currentPath, !0), module = await dynamicImport(loaderJSUrl), result = await module.loader();
+          updateState(currentPath, {
+            data: result,
+            hasLoadedOnce: !0,
+            promise: void 0
+          });
         } catch (err) {
-          return console.error(`Error calling loader: ${err}`), errors[currentPath] = err, delete promises[currentPath], null;
+          updateState(currentPath, {
+            error: err,
+            promise: void 0
+          });
         }
-      };
-      promises[currentPath] = getData();
+      }, promise = loadData();
+      loaderStateEntry.promise = promise;
     }
-    throw promises[currentPath];
-  }
-  return currentData.current;
+  if (loader) {
+    if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce)
+      throw loaderStateEntry.error;
+    if (loaderStateEntry.data === void 0 && loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce)
+      throw loaderStateEntry.promise;
+    return {
+      data: loaderStateEntry.data,
+      refetch,
+      state: loaderStateEntry.state
+    };
+  } else
+    return {
+      refetch,
+      state: loaderStateEntry.state
+    };
+}
+function useLoader(loader2) {
+  const { data: data2 } = useLoaderState(loader2);
+  return data2;
 }
 const results = /* @__PURE__ */ new Map(), started = /* @__PURE__ */ new Map();
 function useAsyncFn(val, props) {
@@ -64,6 +137,8 @@ function useAsyncFn(val, props) {
   return current;
 }
 export {
-  useLoader
+  refetchLoader,
+  useLoader,
+  useLoaderState
 };
 //# sourceMappingURL=useLoader.js.map

package/dist/esm/useLoader.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useLoader.ts"],
-  "mappings": "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",
-  "names": []
+  "mappings": "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",
+  "names": ["preloadedData", "pathname", "loaderJSUrl", "result", "promise", "loader", "data"]
 }

package/dist/esm/useLoader.mjs

@@ -1,56 +1,135 @@
-import { useEffect, useRef } from "react";
-import { useActiveParams, useParams, usePathname } from "./hooks.mjs";
+import { useCallback, useSyncExternalStore } from "react";
+import { useParams, usePathname } from "./hooks.mjs";
 import { resolveHref } from "./link/href.mjs";
 import { preloadingLoader } from "./router/router.mjs";
 import { getLoaderPath } from "./utils/cleanUrl.mjs";
 import { dynamicImport } from "./utils/dynamicImport.mjs";
 import { weakKey } from "./utils/weakKey.mjs";
 import { useServerContext } from "./vite/one-server-only.mjs";
-const promises = {},
-  errors = {},
-  loadedData = {};
-function useLoader(loader) {
-  const {
-    loaderProps: loaderPropsFromServerContext,
-    loaderData: loaderDataFromServerContext
-  } = useServerContext() || {};
-  if (typeof window > "u") return useAsyncFn(loader, loaderPropsFromServerContext || {
-    path: usePathname(),
-    params: useActiveParams()
+const loaderState = {},
+  subscribers = /* @__PURE__ */new Set();
+function updateState(path, updates) {
+  loaderState[path] = {
+    ...loaderState[path],
+    ...updates
+  }, subscribers.forEach(callback => {
+    callback();
+  });
+}
+function subscribe(callback) {
+  return subscribers.add(callback), () => subscribers.delete(callback);
+}
+function getLoaderState(path, preloadedData2) {
+  return loaderState[path] || (loaderState[path] = {
+    data: preloadedData2,
+    error: void 0,
+    promise: void 0,
+    state: "idle",
+    hasLoadedOnce: !!preloadedData2
+  }), loaderState[path];
+}
+async function refetchLoader(pathname2) {
+  updateState(pathname2, {
+    state: "loading",
+    error: null
   });
-  const params = useParams(),
+  try {
+    const cacheBust = `${Date.now()}`,
+      loaderJSUrl2 = getLoaderPath(pathname2, !0, cacheBust),
+      result2 = await (await dynamicImport(loaderJSUrl2)).loader();
+    updateState(pathname2, {
+      data: result2,
+      state: "idle",
+      timestamp: Date.now(),
+      hasLoadedOnce: !0
+    });
+  } catch (err) {
+    throw updateState(pathname2, {
+      error: err,
+      state: "idle"
+    }), err;
+  }
+}
+function useLoaderState(loader) {
+  const {
+      loaderProps: loaderPropsFromServerContext,
+      loaderData: loaderDataFromServerContext
+    } = useServerContext() || {},
+    params = useParams(),
     pathname = usePathname(),
     currentPath = resolveHref({
       pathname,
       params
-    }).replace(/index$/, "").replace(/\?.*/, ""),
-    preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
-    currentData = useRef(preloadedData);
-  if (useEffect(() => {
-    preloadedData && (loadedData[currentPath] = preloadedData);
-  }, [preloadedData]), errors[currentPath]) throw errors[currentPath];
-  const loaded = loadedData[currentPath];
-  if (typeof loaded < "u") return loaded;
-  if (!preloadedData) {
-    if (preloadingLoader[currentPath] && (typeof preloadingLoader[currentPath] == "function" && (preloadingLoader[currentPath] = preloadingLoader[currentPath]()), promises[currentPath] = preloadingLoader[currentPath].then(val => {
-      loadedData[currentPath] = val;
+    }).replace(/index$/, "");
+  if (typeof window > "u" && loader) return {
+    data: useAsyncFn(loader, loaderPropsFromServerContext || {
+      path: pathname,
+      params
+    }),
+    refetch: async () => {},
+    state: "idle"
+  };
+  const preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
+    loaderStateEntry = useSyncExternalStore(subscribe, () => getLoaderState(currentPath, preloadedData), () => getLoaderState(currentPath, preloadedData)),
+    refetch = useCallback(() => refetchLoader(currentPath), [currentPath]);
+  if (!loader) return {
+    refetch,
+    state: loaderStateEntry.state
+  };
+  if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader) if (preloadingLoader[currentPath]) {
+    typeof preloadingLoader[currentPath] == "function" && (preloadingLoader[currentPath] = preloadingLoader[currentPath]());
+    const promise2 = preloadingLoader[currentPath].then(val => {
+      delete preloadingLoader[currentPath], updateState(currentPath, {
+        data: val,
+        hasLoadedOnce: !0,
+        promise: void 0
+      });
     }).catch(err => {
-      console.error("Error loading loader", err), errors[currentPath] = err, delete promises[currentPath], delete preloadingLoader[currentPath];
-    })), !promises[currentPath]) {
-      const getData = async () => {
-        const loaderJSUrl = getLoaderPath(currentPath, !0);
+      console.error("Error running loader()", err), delete preloadingLoader[currentPath], updateState(currentPath, {
+        error: err,
+        promise: void 0
+      });
+    });
+    loaderStateEntry.promise = promise2;
+  } else {
+    const loadData = async () => {
         try {
-          const response = await (async () => await dynamicImport(loaderJSUrl))();
-          return loadedData[currentPath] = response.loader(), loadedData[currentPath];
+          const loaderJSUrl = getLoaderPath(currentPath, !0),
+            module = await dynamicImport(loaderJSUrl),
+            result = await module.loader();
+          updateState(currentPath, {
+            data: result,
+            hasLoadedOnce: !0,
+            promise: void 0
+          });
         } catch (err) {
-          return console.error(`Error calling loader: ${err}`), errors[currentPath] = err, delete promises[currentPath], null;
+          updateState(currentPath, {
+            error: err,
+            promise: void 0
+          });
         }
-      };
-      promises[currentPath] = getData();
-    }
-    throw promises[currentPath];
+      },
+      promise = loadData();
+    loaderStateEntry.promise = promise;
   }
-  return currentData.current;
+  if (loader) {
+    if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce) throw loaderStateEntry.error;
+    if (loaderStateEntry.data === void 0 && loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce) throw loaderStateEntry.promise;
+    return {
+      data: loaderStateEntry.data,
+      refetch,
+      state: loaderStateEntry.state
+    };
+  } else return {
+    refetch,
+    state: loaderStateEntry.state
+  };
+}
+function useLoader(loader2) {
+  const {
+    data: data2
+  } = useLoaderState(loader2);
+  return data2;
 }
 const results = /* @__PURE__ */new Map(),
   started = /* @__PURE__ */new Map();
@@ -69,5 +148,5 @@ function useAsyncFn(val, props) {
   if (current instanceof Promise) throw current;
   return current;
 }
-export { useLoader };
+export { refetchLoader, useLoader, useLoaderState };
 //# sourceMappingURL=useLoader.mjs.map

package/dist/esm/useLoader.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","useActiveParams","useParams","usePathname","resolveHref","preloadingLoader","getLoaderPath","dynamicImport","weakKey","useServerContext","promises","errors","loadedData","useLoader","loader","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","window","useAsyncFn","path","params","pathname","currentPath","replace","preloadedData","currentData","loaded","then","val","catch","err","console","error","getData","loaderJSUrl","response","current","results","Map","started","props","key","JSON","stringify","get","set","next","Promise","final"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useSyncExternalStore","useParams","usePathname","resolveHref","preloadingLoader","getLoaderPath","dynamicImport","weakKey","useServerContext","loaderState","subscribers","Set","updateState","path","updates","forEach","callback","subscribe","add","delete","getLoaderState","preloadedData2","data","error","promise","state","hasLoadedOnce","refetchLoader","pathname2","cacheBust","Date","now","loaderJSUrl2","result2","loader","timestamp","err","useLoaderState","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","params","pathname","currentPath","replace","window","useAsyncFn","refetch","preloadedData","loaderStateEntry","promise2","then","val","catch","console","loadData","loaderJSUrl","module","result","useLoader","loader2","data2","results","Map","started","props","key","JSON","stringify","get","set","next","Promise","final","current"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/useLoader.native.js

@@ -1,5 +1,5 @@
-import { useEffect, useRef } from "react";
-import { useActiveParams, useParams, usePathname } from "./hooks.native.js";
+import { useCallback, useSyncExternalStore } from "react";
+import { useParams, usePathname } from "./hooks.native.js";
 import { resolveHref } from "./link/href.native.js";
 import { preloadingLoader } from "./router/router.native.js";
 import { getLoaderPath } from "./utils/cleanUrl.native.js";
@@ -9,70 +9,164 @@ import { useServerContext } from "./vite/one-server-only.native.js";
 function _instanceof(left, right) {
   return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
 }
-var promises = {},
-  errors = {},
-  loadedData = {};
-function useLoader(loader) {
-  var {
-    loaderProps: loaderPropsFromServerContext,
-    loaderData: loaderDataFromServerContext
-  } = useServerContext() || {};
-  if (typeof window > "u") return useAsyncFn(loader, loaderPropsFromServerContext || {
-    path: usePathname(),
-    params: useActiveParams()
+var loaderState = {},
+  subscribers = /* @__PURE__ */new Set();
+function updateState(path, updates) {
+  loaderState[path] = {
+    ...loaderState[path],
+    ...updates
+  }, subscribers.forEach(function (callback) {
+    callback();
+  });
+}
+function subscribe(callback) {
+  return subscribers.add(callback), function () {
+    return subscribers.delete(callback);
+  };
+}
+function getLoaderState(path, preloadedData2) {
+  return loaderState[path] || (loaderState[path] = {
+    data: preloadedData2,
+    error: void 0,
+    promise: void 0,
+    state: "idle",
+    hasLoadedOnce: !!preloadedData2
+  }), loaderState[path];
+}
+async function refetchLoader(pathname2) {
+  updateState(pathname2, {
+    state: "loading",
+    error: null
   });
-  var params = useParams(),
+  try {
+    var cacheBust = `${Date.now()}`,
+      loaderJSUrl2 = getLoaderPath(pathname2, !0, cacheBust),
+      module2 = await dynamicImport(loaderJSUrl2),
+      result2 = await module2.loader();
+    updateState(pathname2, {
+      data: result2,
+      state: "idle",
+      timestamp: Date.now(),
+      hasLoadedOnce: !0
+    });
+  } catch (err) {
+    throw updateState(pathname2, {
+      error: err,
+      state: "idle"
+    }), err;
+  }
+}
+function useLoaderState(loader) {
+  var {
+      loaderProps: loaderPropsFromServerContext,
+      loaderData: loaderDataFromServerContext
+    } = useServerContext() || {},
+    params = useParams(),
     pathname = usePathname(),
     currentPath = resolveHref({
       pathname,
       params
-    }).replace(/index$/, "").replace(/\?.*/, ""),
-    preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
-    currentData = useRef(preloadedData);
-  if (useEffect(function () {
-    preloadedData && (loadedData[currentPath] = preloadedData);
-  },
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  [preloadedData]), errors[currentPath]) throw errors[currentPath];
-  var loaded = loadedData[currentPath];
-  if (typeof loaded < "u") return loaded;
-  if (!preloadedData) {
-    if (preloadingLoader[currentPath] && (typeof preloadingLoader[currentPath] == "function" && (preloadingLoader[currentPath] = preloadingLoader[currentPath]()), promises[currentPath] = preloadingLoader[currentPath].then(function (val) {
-      loadedData[currentPath] = val;
+    }).replace(/index$/, "");
+  if (typeof window > "u" && loader) {
+    var serverData = useAsyncFn(loader, loaderPropsFromServerContext || {
+      path: pathname,
+      params
+    });
+    return {
+      data: serverData,
+      refetch: async function () {},
+      state: "idle"
+    };
+  }
+  var preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
+    loaderStateEntry = useSyncExternalStore(subscribe, function () {
+      return getLoaderState(currentPath, preloadedData);
+    }, function () {
+      return getLoaderState(currentPath, preloadedData);
+    }),
+    refetch = useCallback(function () {
+      return refetchLoader(currentPath);
+    }, [currentPath]);
+  if (!loader) return {
+    refetch,
+    state: loaderStateEntry.state
+  };
+  if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader) if (preloadingLoader[currentPath]) {
+    typeof preloadingLoader[currentPath] == "function" && (preloadingLoader[currentPath] = preloadingLoader[currentPath]());
+    var promise = preloadingLoader[currentPath].then(function (val) {
+      delete preloadingLoader[currentPath], updateState(currentPath, {
+        data: val,
+        hasLoadedOnce: !0,
+        promise: void 0
+      });
     }).catch(function (err) {
-      console.error("Error loading loader", err), errors[currentPath] = err, delete promises[currentPath], delete preloadingLoader[currentPath];
-    })), !promises[currentPath]) {
-      var getData = async function () {
-        var loaderJSUrl = getLoaderPath(currentPath, !0);
+      console.error("Error running loader()", err), delete preloadingLoader[currentPath], updateState(currentPath, {
+        error: err,
+        promise: void 0
+      });
+    });
+    loaderStateEntry.promise = promise;
+  } else {
+    var loadData = async function () {
         try {
-          var response = await async function () {
-            var nativeLoaderJSUrl = `${loaderJSUrl}?platform=ios`;
-            try {
-              var loaderJsCodeResp = await fetch(nativeLoaderJSUrl);
-              if (!loaderJsCodeResp.ok) throw new Error(`Response not ok: ${loaderJsCodeResp.status}`);
-              var loaderJsCode = await loaderJsCodeResp.text(),
-                result = eval(`() => { var exports = {}; ${loaderJsCode}; return exports; }`)();
-              if (typeof result.loader != "function") throw new Error("Loader code isn't exporting a `loader` function");
-              return result;
-            } catch (e) {
-              return console.error(`Error fetching loader from URL: ${nativeLoaderJSUrl}, ${e}`), {
-                loader: function () {
-                  return {};
-                }
-              };
-            }
-            return await dynamicImport(loaderJSUrl);
-          }();
-          return loadedData[currentPath] = response.loader(), loadedData[currentPath];
+          var loaderJSUrl = getLoaderPath(currentPath, !0),
+            nativeLoaderJSUrl = `${loaderJSUrl}?platform=ios`;
+          try {
+            var loaderJsCodeResp = await fetch(nativeLoaderJSUrl);
+            if (!loaderJsCodeResp.ok) throw new Error(`Response not ok: ${loaderJsCodeResp.status}`);
+            var loaderJsCode = await loaderJsCodeResp.text(),
+              result = eval(`() => { var exports = {}; ${loaderJsCode}; return exports; }`)();
+            if (typeof result.loader != "function") throw new Error("Loader code isn't exporting a `loader` function");
+            var data = await result.loader();
+            updateState(currentPath, {
+              data,
+              hasLoadedOnce: !0,
+              promise: void 0
+            });
+            return;
+          } catch (e) {
+            updateState(currentPath, {
+              data: {},
+              promise: void 0
+            });
+            return;
+          }
+          var loaderJSUrl = getLoaderPath(currentPath, !0),
+            module = await dynamicImport(loaderJSUrl),
+            result = await module.loader();
+          updateState(currentPath, {
+            data: result,
+            hasLoadedOnce: !0,
+            promise: void 0
+          });
         } catch (err) {
-          return console.error(`Error calling loader: ${err}`), errors[currentPath] = err, delete promises[currentPath], null;
+          updateState(currentPath, {
+            error: err,
+            promise: void 0
+          });
         }
-      };
-      promises[currentPath] = getData();
-    }
-    throw promises[currentPath];
+      },
+      promise = loadData();
+    loaderStateEntry.promise = promise;
   }
-  return currentData.current;
+  if (loader) {
+    if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce) throw loaderStateEntry.error;
+    if (loaderStateEntry.data === void 0 && loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce) throw loaderStateEntry.promise;
+    return {
+      data: loaderStateEntry.data,
+      refetch,
+      state: loaderStateEntry.state
+    };
+  } else return {
+    refetch,
+    state: loaderStateEntry.state
+  };
+}
+function useLoader(loader2) {
+  var {
+    data: data2
+  } = useLoaderState(loader2);
+  return data2;
 }
 var results = /* @__PURE__ */new Map(),
   started = /* @__PURE__ */new Map();
@@ -91,5 +185,5 @@ function useAsyncFn(val, props) {
   if (_instanceof(current, Promise)) throw current;
   return current;
 }
-export { useLoader };
+export { refetchLoader, useLoader, useLoaderState };
 //# sourceMappingURL=useLoader.native.js.map