@hairy/react-lib 1.19.0 → 1.21.0

package/dist/index.cjs

@@ -437,24 +437,21 @@ function track(action, status) {
   let loadings = 0;
   const tracking = () => loadings++ === 0 && (status.loading = true);
   const done = () => !--loadings && (status.loading = false);
-  const fulfilled = () => {
+  const fulfilled = (value) => {
     status.finished = true;
     done();
+    return value;
   };
   const rejected = (error) => {
     status.error = error;
     done();
+    throw error;
   };
   return function(...args) {
     tracking();
     try {
-      const result = action(...args);
-      if (result instanceof Promise) {
-        return result.then(fulfilled).catch(rejected);
-      } else {
-        fulfilled();
-        return result;
-      }
+      const value = action(...args);
+      return value instanceof Promise ? value.then(fulfilled, rejected) : fulfilled(value);
     } catch (error) {
       rejected(error);
     }
@@ -512,11 +509,14 @@ function defineAsyncStore(fetch, options = {}) {
         }
       }
     },
-    { persist: options.persist }
+    { persist: options.persist ? { id: options.persist, pick: ["value"] } : void 0 }
   );
-  (0, import_utils8.subscribeKey)(store.$status, "error", (error) => store.$state.error = error);
-  (0, import_utils8.subscribeKey)(store.$status, "loading", (loading) => store.$state.loading = loading);
-  (0, import_utils8.subscribeKey)(store.$status, "finished", (finished) => store.$state.finished = finished);
+  (0, import_utils8.watch)((get) => {
+    const status = get(store.$status.fetch);
+    store.$state.error = status.error;
+    store.$state.loading = status.loading;
+    store.$state.finished = status.finished;
+  });
   options.immediate && store.fetch();
   return store;
 }

package/dist/index.global.js

@@ -916,18 +916,61 @@ var LibReact = (() => {
   }
 
   // ../../node_modules/.pnpm/valtio@2.1.4_@types+react@18.3.18_react@18.3.1/node_modules/valtio/esm/vanilla/utils.mjs
-  function subscribeKey(proxyObject, key, callback, notifyInSync) {
-    let prevValue = proxyObject[key];
-    return subscribe(
-      proxyObject,
-      () => {
-        const nextValue = proxyObject[key];
-        if (!Object.is(prevValue, nextValue)) {
-          callback(prevValue = nextValue);
+  var currentCleanups;
+  function watch(callback, options) {
+    let alive = true;
+    const cleanups = /* @__PURE__ */ new Set();
+    const subscriptions = /* @__PURE__ */ new Map();
+    const cleanup = () => {
+      if (alive) {
+        alive = false;
+        cleanups.forEach((clean) => clean());
+        cleanups.clear();
+        subscriptions.forEach((unsubscribe) => unsubscribe());
+        subscriptions.clear();
+      }
+    };
+    const revalidate = async () => {
+      if (!alive) {
+        return;
+      }
+      cleanups.forEach((clean) => clean());
+      cleanups.clear();
+      const proxiesToSubscribe = /* @__PURE__ */ new Set();
+      const parent = currentCleanups;
+      currentCleanups = cleanups;
+      try {
+        const promiseOrPossibleCleanup = callback((proxyObject) => {
+          proxiesToSubscribe.add(proxyObject);
+          if (alive && !subscriptions.has(proxyObject)) {
+            const unsubscribe = subscribe(proxyObject, revalidate, options == null ? void 0 : options.sync);
+            subscriptions.set(proxyObject, unsubscribe);
+          }
+          return proxyObject;
+        });
+        const couldBeCleanup = promiseOrPossibleCleanup && promiseOrPossibleCleanup instanceof Promise ? await promiseOrPossibleCleanup : promiseOrPossibleCleanup;
+        if (couldBeCleanup) {
+          if (alive) {
+            cleanups.add(couldBeCleanup);
+          } else {
+            cleanup();
+          }
         }
-      },
-      notifyInSync
-    );
+      } finally {
+        currentCleanups = parent;
+      }
+      subscriptions.forEach((unsubscribe, proxyObject) => {
+        if (!proxiesToSubscribe.has(proxyObject)) {
+          subscriptions.delete(proxyObject);
+          unsubscribe();
+        }
+      });
+    };
+    if (currentCleanups) {
+      currentCleanups.add(cleanup);
+    }
+    revalidate();
+    return cleanup;
   }
   var DEVTOOLS = Symbol();
   var { proxyStateMap: proxyStateMap$1, snapCache: snapCache$1 } = unstable_getInternalStates();
@@ -1072,24 +1115,21 @@ var LibReact = (() => {
     let loadings = 0;
     const tracking = () => loadings++ === 0 && (status.loading = true);
     const done = () => !--loadings && (status.loading = false);
-    const fulfilled = () => {
+    const fulfilled = (value) => {
       status.finished = true;
       done();
+      return value;
     };
     const rejected = (error) => {
       status.error = error;
       done();
+      throw error;
     };
     return function(...args) {
       tracking();
       try {
-        const result = action(...args);
-        if (result instanceof Promise) {
-          return result.then(fulfilled).catch(rejected);
-        } else {
-          fulfilled();
-          return result;
-        }
+        const value = action(...args);
+        return value instanceof Promise ? value.then(fulfilled, rejected) : fulfilled(value);
       } catch (error) {
         rejected(error);
       }
@@ -1147,11 +1187,14 @@ var LibReact = (() => {
           }
         }
       },
-      { persist: options.persist }
+      { persist: options.persist ? { id: options.persist, pick: ["value"] } : void 0 }
     );
-    subscribeKey(store.$status, "error", (error) => store.$state.error = error);
-    subscribeKey(store.$status, "loading", (loading) => store.$state.loading = loading);
-    subscribeKey(store.$status, "finished", (finished) => store.$state.finished = finished);
+    watch((get) => {
+      const status = get(store.$status.fetch);
+      store.$state.error = status.error;
+      store.$state.loading = status.loading;
+      store.$state.finished = status.finished;
+    });
     options.immediate && store.fetch();
     return store;
   }

package/dist/index.js

@@ -291,7 +291,7 @@ function useWhenever(source, cb, options) {
 }
 
 // src/storage/defineAsyncStore.ts
-import { subscribeKey } from "valtio/utils";
+import { watch } from "valtio/utils";
 
 // src/storage/defineStore.ts
 import { createElement as createElement4 } from "react";
@@ -377,24 +377,21 @@ function track(action, status) {
   let loadings = 0;
   const tracking = () => loadings++ === 0 && (status.loading = true);
   const done = () => !--loadings && (status.loading = false);
-  const fulfilled = () => {
+  const fulfilled = (value) => {
     status.finished = true;
     done();
+    return value;
   };
   const rejected = (error) => {
     status.error = error;
     done();
+    throw error;
   };
   return function(...args) {
     tracking();
     try {
-      const result = action(...args);
-      if (result instanceof Promise) {
-        return result.then(fulfilled).catch(rejected);
-      } else {
-        fulfilled();
-        return result;
-      }
+      const value = action(...args);
+      return value instanceof Promise ? value.then(fulfilled, rejected) : fulfilled(value);
     } catch (error) {
       rejected(error);
     }
@@ -452,11 +449,14 @@ function defineAsyncStore(fetch, options = {}) {
         }
       }
     },
-    { persist: options.persist }
+    { persist: options.persist ? { id: options.persist, pick: ["value"] } : void 0 }
   );
-  subscribeKey(store.$status, "error", (error) => store.$state.error = error);
-  subscribeKey(store.$status, "loading", (loading) => store.$state.loading = loading);
-  subscribeKey(store.$status, "finished", (finished) => store.$state.finished = finished);
+  watch((get) => {
+    const status = get(store.$status.fetch);
+    store.$state.error = status.error;
+    store.$state.loading = status.loading;
+    store.$state.finished = status.finished;
+  });
   options.immediate && store.fetch();
   return store;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hairy/react-lib",
   "type": "module",
-  "version": "1.19.0",
+  "version": "1.21.0",
   "description": "Library for react",
   "author": "Hairyf <wwu710632@gmail.com>",
   "license": "MIT",
@@ -38,7 +38,7 @@
     "react-dom": "^18.2.0",
     "react-i18next": "^14.1.2",
     "react-use": "^17.6.0",
-    "@hairy/utils": "1.19.0"
+    "@hairy/utils": "1.21.0"
   },
   "scripts": {
     "build": "tsup",