one 1.2.18 → 1.2.19

package/dist/cjs/server/oneServe.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","oneServe_exports","__export","oneServe","module","exports","import_path","require","import_fs_extra","__toESM","import_vxrn","import_serve","import_constants","import_createHandleRequest","import_cleanUrl","import_isRolldown","import_toAbsolute","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","getServerEntry","entry","render","default","apiCJS","build","api","outputFormat","useRolldown","isRolldown","requestHandlers","handleAPI","route","route2","fileName","page","slice","apiFile","join","process","cwd","loadMiddleware","toAbsolute","contextKey","handleLoader","request","url","loaderProps","file","loader","console","warn","json","JSON","stringify","handlePage","_$buildInfo","type","error","Object","keys","_exported_loader","exported","serverJsPath","loaderData","call","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","_err_stack","stack","htmlPath","pathname","cleanPath","html","readFile","headers1","createHonoHandler","raw","endsWith","Reflect","ownKeys","routeKeys","length","staticAssetResponse","serveStaticAssets","runMiddlewares","extname","getURLfromRequestURL","response","LOADER_JS_POSTFIX_UNCACHED","originalUrl","getPathFromLoaderPath","finalUrl","URL","origin","location","forEach","key","header","has","info","compiledManifest","compileManifest","manifest","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","apiRoutes","_step1","urlPath","put","post","delete","patch","urlCleanPath"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","oneServe_exports","__export","oneServe","module","exports","import_fs_extra","__toESM","require","import_path","import_vxrn","import_serve","import_constants","import_createHandleRequest","import_cleanUrl","import_isRolldown","import_toAbsolute","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","getServerEntry","entry","render","default","apiCJS","build","api","outputFormat","useRolldown","isRolldown","requestHandlers","handleAPI","route","route2","fileName","page","slice","apiFile","join","process","cwd","loadMiddleware","toAbsolute","contextKey","handleLoader","request","url","loaderProps","file","loader","console","warn","json","JSON","stringify","handlePage","_$buildInfo","type","error","Object","keys","_exported_loader","exported","serverJsPath","loaderData","call","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","_err_stack","stack","htmlPath","pathname","cleanPath","html","readFile","headers1","createHonoHandler","raw","endsWith","Reflect","ownKeys","routeKeys","length","staticAssetResponse","serveStaticAssets","runMiddlewares","extname","getURLfromRequestURL","response","LOADER_JS_POSTFIX_UNCACHED","originalUrl","getPathFromLoaderPath","finalUrl","URL","origin","cleanedRequest","Request","location","forEach","key","header","has","info","compiledManifest","compileManifest","manifest","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","apiRoutes","_step1","urlPath","put","post","delete","patch","urlCleanPath"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAAA;EAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;IAAAC,KAAA;EAAA,IAAAH,GAAA;AAAA,IAAAI,gBAAA;AAAAC,QAAA,CAAAD,gBAAA;EAAAE,QAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAmC,CAAAK,gBAAA;AAoBnC,IAAAK,eAAsB,GAAAC,OAAS,CAAAC,OAA+B,WAA0B,IAAW;EAAAC,WAAA,GAAAD,OAAA;EAAAE,WAAA,GAAAF,OAAA;EAAAG,YAAA,GAAAH,OAAA;EAAAI,gBAAA,GAAAJ,OAAA;EAAAK,0BAAA,GAAAL,OAAA;EAAAM,eAAA,GAAAN,OAAA;EAAAO,iBAAA,GAAAP,OAAA;EAAAQ,iBAAA,GAAAR,OAAA;AACjG,eAAQL,SAAAc,UAAiB,EAAAC,SAAA,EAAoBC,GAAA;EAU7C,IAAIC,eAAA;IAAAC,qBAAA;IAAAC,iBAAA;IAAA;MAAAC,eAAA;MAAAC,kBAAA;MAAAC;IAAA;IAAA;MAAAC;IAAA;IAAA;MAAAC;IAAA;IAAAC,YAAA,sBAAAC,OAAA;IAAAC,SAAA,IAAAV,eAAA,GAAAH,UAAA,CAAAc,GAAA,cAAAX,eAAA,uBAAAA,eAAA,CAAAU,SAAA;EACF,IAAAA,SAAW;IACT,IAAAE,yBAA0B;MAAAC,iBAAY;MAAAC,cAAA;IACpC;MACE,SAAAC,KAAM,YAAAA,CAAA,EAAkB;UACxB,IAAAC,QAAO,GAAAC,KAAQ,CAAIrC,KAAA;UACrBmB,GAAC,CAAAmB,GAAA,CAAAF,QAAA,CAAAG,MAAA,YAAAC,OAAA;YACD,IAAAC,cAAe,GAAAL,QAAS,CAAAM,WAAgB,CAAAC,OAAS,UAAY,UAASC,KAAA;cACvE,IAAAC,SAAA,GAAAD,KAAA,CAAAE,SAAA;cAIA,OAAAN,OAAA,CAAAO,GAAA,CAAAH,KAAA,CAAAC,SAAA;YACG;YAGA,OAAAL,OAAA,CAAAJ,QAAkB,CAAAK,cAAa,EAAAL,QAEjC,CAAAY,SAAgB;UACjB;QACH,GAAAC,SAAM,GAAAnB,SAAA,CAAAoB,MAAA,CAAAC,QAAA,KAAAd,KAAA,IAAAL,yBAAA,IAAAK,KAAA,GAAAY,SAAA,CAAAG,IAAA,IAAAC,IAAA,GAAArB,yBAAA,OAAAG,KAAA;IACR,CAKM,QAAAmB,GAFQ;MAQZrB,iBAAkB,KAAM,EAAAC,cAAG,GAAAoB,GAAA;IACzB,UAAM;MAIN;QACF,CAAAtB,yBAAA,IAAAiB,SAAA,CAAAM,MAAA,YAAAN,SAAA,CAAAM,MAAA;MAEA,UAAM;QACJ,IAAAtB,iBAAa,EACf,MAAAC,cAAA;MAEA;IACE;EAIA;EACE,KAAAhB,SAAA,EAIF,UAAMsC,KAAO,2CAAwB;EAErC;MAAAC,gBAAO;MAAAC;IAAA,IAAAxC,SAAA;IAAqCyC,aAAK,GAAU;MAC7D,GAAA1C,UAAA;MAEA2C,IAAA,EAAM;IACJ;IAAAC,WAAM,OAAAlD,YAAY,CAAAmD,cAAuB,EAAIH,aAAA;IAAAI,KAAA,gBAAAF,WAAA;IAAAG,MAAA,GAAAD,KAAA,CAAAE,OAAA,CAAAD,MAAA;IAAAE,MAAA,KAAA5C,iBAAA,GAAAL,UAAA,CAAAkD,KAAA,cAAA7C,iBAAA,gBAAAD,qBAAA,GAAAC,iBAAA,CAAA8C,GAAA,cAAA/C,qBAAA,uBAAAA,qBAAA,CAAAgD,YAAA;IAAAC,WAAA,aAAAvD,iBAAA,CAAAwD,UAAA;IAAAC,eAAA;MAE7C,MAAIC,SAAMA,CAAA7B,KAAS;QACjB;YAAI8B,KAAC,EAAAC;UAAA,IAAA/B,KAAA;UAAAgC,QAAA,GAAAN,WAAA,GAAAK,MAAA,CAAAE,IAAA,CAAAC,KAAA;UACH;UACUH,MACR,CAAAE,IAAA,CAAAC,KAAA,IAAAnC,OAAA,MAA6B,OAAAA,OAAY,MAAM,EAAI,IAAiB;UAAAoC,OAAY,OAAAtE,WAAkB,CAAAuE,IAAK,EAAAC,OAAA,CAAAC,GAAA,mBAAAN,QAAA,IAAAV,MAAA;QAAO,oBAAAa,OAAA;MAAA;MAIlH,MAAAI,cAAIA,CAAAR,MAAA;QAEF,aAAM,WAAa3D,iBADI,CAAAoE,UAAO,EAAAT,MAAA,CAAAU,UAAA;MAK9B;MAEA,MAAAC,YAAMA,CAAA1C,KAAW;QAAa;YAC5B2C,OAAM;YAAAb,KAAM,EAAAC,MAAA;YAAAa,GAAA;YAAAC;UAAA,IAAA7C,KAAA;UAAAvC,OAAA,oBAAAW,iBAAA,CAAAoE,UAAA,MAAA3E,WAAA,CAAAuE,IAAA,uBAAAL,MAAA,CAAAe,IAAA;UAAA;YAAAC;UAAA,IAAAtF,OAAA;QAAA,KAAAsF,MACZ,SACAC,OAAA,CAAAC,IAAA,+BAAAlB,MAAA,CAAAe,IAAA;QAAA,IAAAI,IACA,SAAMH,MAAA,CAAAF,WAAqB;QAAA,OAC3B,qCAAAM,IAAA,CAAAC,SAAA,CAAAF,IAAA;MAAA;MACe,MACjBG,UAACA,CAAArD,KAAA;QAED;YAAA8B,KAAO,EAAAC,MAAI;YAAAa,GAAS;YAAAC;UAAU,IAAA7C,KAAA;UAAAsD,WAAA,GAAAzC,gBAAA,CAAAkB,MAAA,CAAAe,IAAA;QAAA,IAAAf,MAC5B,CAAAwB,IAAA;UAAA,IACA,CAAAD,WAAQ,EACV,MAACN,OAAA,CAAAQ,KAAA,mBAAAzB,MAAA,OAAAnB,KAAA,2BAAAgC,GAAA,YAAAb,MAAA,CAAAe,IAAA;AAAA,IAAAW,MACH,CAAAC,IAAA,CAAA7C,gBAAc,EAAAuB,IAAA;AACZ;UAA2D;YAE7D,IAAAuB,gBAAe;cAAAC,QAAA,oBAAAxF,iBAAA,CAAAoE,UAAA,EAAAc,WAAA,CAAAO,YAAA;cAAAC,UAAA,WAAAH,gBAAA,GAAAC,QAAA,CAAAb,MAAA,cAAAY,gBAAA,uBAAAA,gBAAA,CAAAI,IAAA,CAAAH,QAAA,EAAAf,WAAA;cAAAmB,SAAA,GAAAV,WAAA,CAAAW,QAAA;cAAAC,OAAA,OAAAC,OAAA;YAAAD,OAAA,CAAAE,GAAA;YAEb,IAAEC,QAAA,SAAAjD,MAAA;cACJkD,IAAA,EAAAvC,MAAA,CAAAwB,IAAA;cACFO,UAAO;cACLjB,WAAM;cAEF0B,IAAA,EAAA1B,WAAU,EAAA0B,IAAA;cACZN,QAAM,EAAAD,SAAa;cAEnBQ,GAAA,EAAAlB,WAAQ,CAAIkB;YAEd;YACF,WAAAC,QAAA,CAAAJ,QAAA;cACFH,OAAA;cACFQ,MAAA,EAAA3C,MAAA,CAAA4C,UAAA;YAEA,CAAS;UACP,SAAOjE,GAAO;YACR,IAAAkE,UAAA;YACF5B,OAAM,CAAAQ,KAAA,CAAU,mCAAYzB,MAAA,CAAAe,IAAA;AAE5B;AAKE,GAAA8B,UAAA,GAAMlE,GAAA,EAAAmE,KAAA,cAAsBD,UAAM,cAAAA,UAAA,GAAAlE,GAAkB;AACpD;AACE,OAAAkC,GAAA;UAAa;QACX;UACA,IAAAkC,QACA,GAAAhE,QAAA,CAAA8B,GAAA,CAAAmC,QAAA,KAAAjE,QAAA,CAAAwC,WAAA,EAAA0B,SAAA;UAAA,IAAAF,QACA;YAAY,IACdG,IAAA,SAAAvH,eAAA,CAAA2D,OAAA,CAAA6D,QAAA,KAAArH,WAAA,CAAAuE,IAAA,iBAAA0C,QAAA;cAAAK,QAAA,OAAAhB,OAAA;YAEJ,OAAAgB,QAAA,CAAAf,GAAA,mCAAAK,QAAA,CAAAQ,IAAA;cAIAf,OAAI,EAAAiB,QAAA;cACFT,MAAO,EAAA3C,MAAK,CAAA4C,UAAA;YAGd;UAIE;QACE;MAGA;IAA0E;EAG5E,SAAAS,iBAAcA,CAAArD,MAAM;IAAA,uBACbnC,OAAA,EAAAY,IAAA;MACH;QAA2D,IAE7DmC,OAAK,GAAA/C,OAAA,CAAAO,GAAA,CAAAkF,GAAA;QAAA,IACLtD,MAAK,CAAAE,IAAA,CAAAqD,QAAA,mBAAAC,OAAA,CAAAC,OAAA,CAAAzD,MAAA,CAAA0D,SAAA,EAAAC,MAAA;UAAA,IACLC,mBAAK,aAAA7H,WAAA,CAAA8H,iBAAA;YACHhG;UAEJ;UACF,IAAG+F,mBAAA,EAEC,aAAU,IAAA1H,0BAAA,CAAA4H,cAAA,EAAAjE,eAAA,EAAAe,OAAA,EAAAZ,MAAA;YACR,OAAA4D,mBAAsB;UAGxB;QACE;QACA,QAAA9H,WAAA,CAAAiI,OAAS,EAAAnD,OAAQ,CAAAC,GAAS,MAAO,SAAQ,IAAA/E,WAAA,CAAAiI,OAAA,EAAAnD,OAAA,CAAAC,GAAA,cACvC,OAAApC,IAAA;QAAyB,IAAAoC,GAC1B,GACM,IAAA3E,0BAA2B,CAAA8H,oBAAe,EAAApD,OAAA;UAAAqD,QAAA;YAAA,IACnDpD,GAAA,CAAAmC,QAAA,CAAAO,QAAA,CAAAtH,gBAAA,CAAAiI,0BAAA;cAEA,IAAIC,WAAA,GAAa,IAAIhI,eAAO,CAAAiI,qBAAA,EAAAvD,GAAA,CAAAmC,QAAA;gBAAAqB,QAAA,OAAAC,GAAA,CAAAH,WAAA,EAAAtD,GAAA,CAAA0D,MAAA;gBAAAC,cAAA,OAAAC,OAAA,CAAAJ,QAAA,EAAAzD,OAAA;cAC1B,OAAI/D,kBAAA,CAAAgD,eAAA,EAAA2E,cAAA,EAAAH,QAAA,EAAArE,MAAA;YACF;YAOO,QACTA,MAAS,CAAAwB,IAAK;cACZ;gBAAQ,OACN5E,eAAA,CAAAiD,eAAA,EAAAe,OAAA,EACEC,GAAA,EAAAb,MAAQ,CAAI;cAC+C,UAC7D;cAAA,KACF;cAAA,KACF;gBAGF,OAAOlD,gBAAA,CAAA+C,eAAA,EAAAe,OAAA,EAAAC,GAAA,EAAAb,MAAA;YACT;UAEA;QACF,IAAAiE,QAAA;UACF,IAAAlH,UAAc,CAAAkH,QAAA;YACZ,IAAQjH,gBAAM,CAAAiH,QAAA,CAAAtB,MAAA;cAChB,IAAA+B,QAAA,MAAAT,QAAA,CAAA9B,OAAA,CAAAxE,GAAA;cAEO,OAAKsG,QAAA,CAAA9B,OAAA,CAAAwC,OAAA,WAAAtJ,KAAA,EAAAuJ,GAAA;gBACd/G,OAAA,CAAAgH,MAAA,CAAAD,GAAA,EAAAvJ,KAAA;cACF,IAAAwC,OAAA,CAAAJ,QAAA,CAAAiH,QAAA,EAAAT,QAAA,CAAAtB,MAAA;YAEM;YAEN,IAAW1F,YAAS,CAAAU,GAAA,CAAAiD,OAAiB,GAC3B,IAAM;cAeL,OAAS,CAAAqD,QAAA,CAAA9B,OAAiB,CAAA2C,GAAA,sBAAAb,QAAA,CAAA9B,OAAA,CAAA2C,GAAA,qBAAAb,QAAA,CAAA9B,OAAA,CAAAE,GAAA,+BAAA4B,QAAA;YAC3B,SAAMtF,GAAA,EAAS;cAOjBsC,OAAa,CAAA8D,IAAA,8CAAAlH,OAAA,CAAAO,GAAA,CAAAoE,IAAA,wBAAAyB,QAAA,CAAA9B,OAAA,CAAAxE,GAAA,+BAAAgB,GAAA;YAGb;YACA,OAASsF,QAAA;UAIX;UAME,OAAIxF,IAAK;QACb;MAIA,SAAAE,GAAW;QAMTsC,OALI,CAAAQ,KAAM,mCAKe9C,GAAK,CAAAmE,KAAA;MAC5B;MAIF,OAAArE,IAAM;IAAc;EACf;EACmC,IAAAuG,gBAGvB,IAAI,GAAA9I,0BAA2B,CAC1C+I,eAAA,EAAiB1I,SAAI,CAAA2I,QAAQ;IAAAC,0BAAiB;IAAAC,kBAAA;IAAAC,eAAA;EAEpD;IAEE,SAAAC,UADuB,GAAAN,gBAAmB,CAAAO,SAAA,CAAAhH,MAAiB,CAAAC,QAAA,KAAAgH,MAAgB,IAAAL,0BAAqB,IAAAK,MAAA,GAAAF,UAAA,CAAA7G,IAAA,IAAAC,IAAA,GAAAyG,0BAAA;MAAA,IAElGpF,KAAA,GAASyF,MAAK,CAAAnK,KAAA;MACZmB,GAAA,CAAAmB,GAAA,CAAAoC,KAAA,CAAA0F,OAAQ,EAAApC,iBAAM,CAAAtD,KAAA,IAAyBvD,GAAG,CAAAkJ,GAAE,CACrC3F,KAAK,CAAA0F,OAAA,EAAApC,iBAAA,CAAAtD,KAAA,IAAAvD,GAAA,CAAAmJ,IAAA,CAAA5F,KAAA,CAAA0F,OAAA,EAAApC,iBAAA,CAAAtD,KAAA,IAAAvD,GAAA,CAAAoJ,MAAA,CAAA7F,KAAA,CAAA0F,OAAA,EAAApC,iBAAA,CAAAtD,KAAA,IAAAvD,GAAA,CAAAqJ,KAAA,CAAA9F,KAAA,CAAA0F,OAAA,EAAApC,iBAAA,CAAAtD,KAAA,IAAAA,KAAA,CAAA0F,OAAA,KAAA1F,KAAA,CAAA+F,YAAA,KAAAtJ,GAAA,CAAAmB,GAAA,CAAAoC,KAAA,CAAA+F,YAAA,EAAAzC,iBAAA,CAAAtD,KAAA,IAAAvD,GAAA,CAAAkJ,GAAA,CAAA3F,KAAA,CAAA+F,YAAA,EAAAzC,iBAAA,CAAAtD,KAAA,IAAAvD,GAAA,CAAAmJ,IAAA,CAAA5F,KAAA,CAAA+F,YAAA,EAAAzC,iBAAA,CAAAtD,KAAA,IAAAvD,GAAA,CAAAoJ,MAAA,CAAA7F,KAAA,CAAA+F,YAAA,EAAAzC,iBAAA,CAAAtD,KAAA,IAAAvD,GAAA,CAAAqJ,KAAA,CAAA9F,KAAA,CAAA+F,YAAA,EAAAzC,iBAAA,CAAAtD,KAAA;IAAA;EACd,SACFpB,GAAA;IACFyG,kBAAA,OAAAC,eAAA,GAAA1G,GAAA;EAEA,UAAO;IACR;MACH,CAAAwG,0BAAA,IAAAG,UAAA,CAAA1G,MAAA,YAAA0G,UAAA,CAAA1G,MAAA","ignoreList":[]}

package/dist/cjs/setup.native.js.map

@@ -1 +1,6 @@
-{"version":3,"names":[],"sources":[],"sourcesContent":[],"mappings":"","ignoreList":[]}
+{
+  "version": 3,
+  "sources": [],
+  "mappings": "",
+  "names": []
+}

package/dist/cjs/useLoader.cjs

@@ -20,7 +20,9 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var useLoader_exports = {};
 __export(useLoader_exports, {
-  useLoader: () => useLoader
+  refetchLoader: () => refetchLoader,
+  useLoader: () => useLoader,
+  useLoaderState: () => useLoaderState
 });
 module.exports = __toCommonJS(useLoader_exports);
 var import_react = require("react"),
@@ -31,51 +33,130 @@ var import_react = require("react"),
   import_dynamicImport = require("./utils/dynamicImport.cjs"),
   import_weakKey = require("./utils/weakKey.cjs"),
   import_one_server_only = require("./vite/one-server-only.cjs");
-const promises = {},
-  errors = {},
-  loadedData = {};
-function useLoader(loader) {
-  const {
-    loaderProps: loaderPropsFromServerContext,
-    loaderData: loaderDataFromServerContext
-  } = (0, import_one_server_only.useServerContext)() || {};
-  if (typeof window > "u") return useAsyncFn(loader, loaderPropsFromServerContext || {
-    path: (0, import_hooks.usePathname)(),
-    params: (0, import_hooks.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 = (0, import_hooks.useParams)(),
+  try {
+    const cacheBust = `${Date.now()}`,
+      loaderJSUrl2 = (0, import_cleanUrl.getLoaderPath)(pathname2, !0, cacheBust),
+      result2 = await (await (0, import_dynamicImport.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
+    } = (0, import_one_server_only.useServerContext)() || {},
+    params = (0, import_hooks.useParams)(),
     pathname = (0, import_hooks.usePathname)(),
     currentPath = (0, import_href.resolveHref)({
       pathname,
       params
-    }).replace(/index$/, "").replace(/\?.*/, ""),
-    preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
-    currentData = (0, import_react.useRef)(preloadedData);
-  if ((0, import_react.useEffect)(() => {
-    preloadedData && (loadedData[currentPath] = preloadedData);
-  }, [preloadedData]), errors[currentPath]) throw errors[currentPath];
-  const loaded = loadedData[currentPath];
-  if (typeof loaded < "u") return loaded;
-  if (!preloadedData) {
-    if (import_router.preloadingLoader[currentPath] && (typeof import_router.preloadingLoader[currentPath] == "function" && (import_router.preloadingLoader[currentPath] = import_router.preloadingLoader[currentPath]()), promises[currentPath] = import_router.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 = (0, import_react.useSyncExternalStore)(subscribe, () => getLoaderState(currentPath, preloadedData), () => getLoaderState(currentPath, preloadedData)),
+    refetch = (0, import_react.useCallback)(() => refetchLoader(currentPath), [currentPath]);
+  if (!loader) return {
+    refetch,
+    state: loaderStateEntry.state
+  };
+  if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader) if (import_router.preloadingLoader[currentPath]) {
+    typeof import_router.preloadingLoader[currentPath] == "function" && (import_router.preloadingLoader[currentPath] = import_router.preloadingLoader[currentPath]());
+    const promise2 = import_router.preloadingLoader[currentPath].then(val => {
+      delete import_router.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 import_router.preloadingLoader[currentPath];
-    })), !promises[currentPath]) {
-      const getData = async () => {
-        const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0);
+      console.error("Error running loader()", err), delete import_router.preloadingLoader[currentPath], updateState(currentPath, {
+        error: err,
+        promise: void 0
+      });
+    });
+    loaderStateEntry.promise = promise2;
+  } else {
+    const loadData = async () => {
         try {
-          const response = await (async () => await (0, import_dynamicImport.dynamicImport)(loaderJSUrl))();
-          return loadedData[currentPath] = response.loader(), loadedData[currentPath];
+          const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0),
+            module = await (0, import_dynamicImport.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();

package/dist/cjs/useLoader.js

@@ -14,49 +14,124 @@ var __export = (target, all) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var useLoader_exports = {};
 __export(useLoader_exports, {
-  useLoader: () => useLoader
+  refetchLoader: () => refetchLoader,
+  useLoader: () => useLoader,
+  useLoaderState: () => useLoaderState
 });
 module.exports = __toCommonJS(useLoader_exports);
 var import_react = require("react"), import_hooks = require("./hooks"), import_href = require("./link/href"), import_router = require("./router/router"), import_cleanUrl = require("./utils/cleanUrl"), import_dynamicImport = require("./utils/dynamicImport"), import_weakKey = require("./utils/weakKey"), import_one_server_only = require("./vite/one-server-only");
-const promises = {}, errors = {}, loadedData = {};
-function useLoader(loader) {
-  const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = (0, import_one_server_only.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 = (0, import_cleanUrl.getLoaderPath)(pathname2, !0, cacheBust), result2 = await (await (0, import_dynamicImport.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 } = (0, import_one_server_only.useServerContext)() || {}, params = (0, import_hooks.useParams)(), pathname = (0, import_hooks.usePathname)(), currentPath = (0, import_href.resolveHref)({ pathname, params }).replace(/index$/, "");
+  if (typeof window > "u" && loader)
+    return { data: useAsyncFn(
       loader,
       loaderPropsFromServerContext || {
-        path: (0, import_hooks.usePathname)(),
-        params: (0, import_hooks.useActiveParams)()
+        path: pathname,
+        params
       }
-    );
-  const params = (0, import_hooks.useParams)(), pathname = (0, import_hooks.usePathname)(), currentPath = (0, import_href.resolveHref)({ pathname, params }).replace(/index$/, "").replace(/\?.*/, ""), preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0, currentData = (0, import_react.useRef)(preloadedData);
-  if ((0, import_react.useEffect)(() => {
-    preloadedData && (loadedData[currentPath] = preloadedData);
-  }, [preloadedData]), errors[currentPath])
-    throw errors[currentPath];
-  const loaded = loadedData[currentPath];
-  if (typeof loaded < "u")
-    return loaded;
-  if (!preloadedData) {
-    if (import_router.preloadingLoader[currentPath] && (typeof import_router.preloadingLoader[currentPath] == "function" && (import_router.preloadingLoader[currentPath] = import_router.preloadingLoader[currentPath]()), promises[currentPath] = import_router.preloadingLoader[currentPath].then((val) => {
-      loadedData[currentPath] = val;
-    }).catch((err) => {
-      console.error("Error loading loader", err), errors[currentPath] = err, delete promises[currentPath], delete import_router.preloadingLoader[currentPath];
-    })), !promises[currentPath]) {
-      const getData = async () => {
-        const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0);
+    ), refetch: async () => {
+    }, state: "idle" };
+  const preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0, loaderStateEntry = (0, import_react.useSyncExternalStore)(
+    subscribe,
+    () => getLoaderState(currentPath, preloadedData),
+    () => getLoaderState(currentPath, preloadedData)
+  ), refetch = (0, import_react.useCallback)(() => refetchLoader(currentPath), [currentPath]);
+  if (!loader)
+    return {
+      refetch,
+      state: loaderStateEntry.state
+    };
+  if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader)
+    if (import_router.preloadingLoader[currentPath]) {
+      typeof import_router.preloadingLoader[currentPath] == "function" && (import_router.preloadingLoader[currentPath] = import_router.preloadingLoader[currentPath]());
+      const promise2 = import_router.preloadingLoader[currentPath].then((val) => {
+        delete import_router.preloadingLoader[currentPath], updateState(currentPath, {
+          data: val,
+          hasLoadedOnce: !0,
+          promise: void 0
+        });
+      }).catch((err) => {
+        console.error("Error running loader()", err), delete import_router.preloadingLoader[currentPath], updateState(currentPath, {
+          error: err,
+          promise: void 0
+        });
+      });
+      loaderStateEntry.promise = promise2;
+    } else {
+      const loadData = async () => {
         try {
-          const response = await (async () => await (0, import_dynamicImport.dynamicImport)(loaderJSUrl))();
-          return loadedData[currentPath] = response.loader(), loadedData[currentPath];
+          const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0), module = await (0, import_dynamicImport.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) {

package/dist/cjs/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"]
 }