@hairy/react-lib 1.17.0 → 1.19.0

package/dist/index.cjs

@@ -350,6 +350,9 @@ function useWhenever(source, cb, options) {
   useWatch(source, () => source && cb(source), options);
 }
 
+// src/storage/defineAsyncStore.ts
+var import_utils8 = require("valtio/utils");
+
 // src/storage/defineStore.ts
 var import_react14 = require("react");
 var import_valtio2 = require("valtio");
@@ -394,8 +397,8 @@ function defineStore(store, options = {}) {
   status.finished = false;
   status.loading = false;
   status.error = null;
-  const $state = options.persist ? proxyWithPersistant(options.persist, state) : (0, import_valtio2.proxy)(state);
   const $status = (0, import_valtio2.proxy)(status);
+  const $state = options.persist ? proxyWithPersistant(options.persist, state) : (0, import_valtio2.proxy)(state);
   const $actions = {};
   const $getters = {};
   setupActions($state, actions, $actions, $status);
@@ -446,10 +449,12 @@ function track(action, status) {
     tracking();
     try {
       const result = action(...args);
-      if (result instanceof Promise)
-        result.then(fulfilled).catch(rejected);
-      else
+      if (result instanceof Promise) {
+        return result.then(fulfilled).catch(rejected);
+      } else {
         fulfilled();
+        return result;
+      }
     } catch (error) {
       rejected(error);
     }
@@ -492,9 +497,16 @@ function setupStatus($actions, $status) {
 function defineAsyncStore(fetch, options = {}) {
   const store = defineStore(
     {
-      state: () => ({ value: options.initial }),
+      state: () => ({
+        value: options.initial,
+        error: void 0,
+        loading: false,
+        finished: false
+      }),
       actions: {
-        fetch,
+        async fetch(...args) {
+          return this.value = await fetch(...args);
+        },
         refresh(value) {
           this.value = value || options.initial;
         }
@@ -502,6 +514,10 @@ function defineAsyncStore(fetch, options = {}) {
     },
     { persist: options.persist }
   );
+  (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);
+  options.immediate && store.fetch();
   return store;
 }
 

package/dist/index.d.ts

@@ -201,16 +201,31 @@ type Store<S, A extends Actions<S>, G extends Getters<S>> = {
 interface AsyncStoreOptions<T extends AnyFn> {
     initial?: ReturnType<T> extends Promise<infer U> ? U : undefined;
     persist?: string;
+    immediate?: boolean;
 }
 declare function defineAsyncStore<T extends AnyFn>(fetch: T, options?: AsyncStoreOptions<T>): Store<{
     value: (ReturnType<T> extends Promise<infer U> ? U : undefined) | undefined;
+    error: Error | null | undefined;
+    loading: boolean;
+    finished: boolean;
 }, {
-    fetch: T;
+    fetch(this: {
+        value: (ReturnType<T> extends Promise<infer U> ? U : undefined) | undefined;
+        error: Error | null | undefined;
+        loading: boolean;
+        finished: boolean;
+    }, ...args: Parameters<T>): Promise<any>;
     refresh(this: {
         value: (ReturnType<T> extends Promise<infer U> ? U : undefined) | undefined;
+        error: Error | null | undefined;
+        loading: boolean;
+        finished: boolean;
     }, value?: (ReturnType<T> extends Promise<infer U_1> ? U_1 : undefined)): void;
 }, Getters<{
     value: (ReturnType<T> extends Promise<infer U> ? U : undefined) | undefined;
+    error: Error | null | undefined;
+    loading: boolean;
+    finished: boolean;
 }>>;
 
 declare function defineStore<S extends object, A extends Actions<S>, G extends Getters<S>>(store: StoreDefine<S, A, G>, options?: StoreOptions): Store<S, A, G>;

package/dist/index.global.js

@@ -470,9 +470,6 @@ var LibReact = (() => {
     useWatch(source, () => source && cb(source), options);
   }
 
-  // src/storage/defineStore.ts
-  var import_react15 = __toESM(require_react(), 1);
-
   // ../../node_modules/.pnpm/proxy-compare@3.0.1/node_modules/proxy-compare/dist/index.js
   var TRACK_MEMO_SYMBOL = Symbol();
   var GET_ORIGINAL_SYMBOL = Symbol();
@@ -908,6 +905,33 @@ var LibReact = (() => {
     const [target, ensureVersion] = proxyState;
     return createSnapshot(target, ensureVersion());
   }
+  function unstable_getInternalStates() {
+    return {
+      proxyStateMap,
+      refSet,
+      snapCache,
+      versionHolder,
+      proxyCache
+    };
+  }
+
+  // ../../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);
+        }
+      },
+      notifyInSync
+    );
+  }
+  var DEVTOOLS = Symbol();
+  var { proxyStateMap: proxyStateMap$1, snapCache: snapCache$1 } = unstable_getInternalStates();
+  var { proxyStateMap: proxyStateMap2, snapCache: snapCache2 } = unstable_getInternalStates();
 
   // ../../node_modules/.pnpm/valtio@2.1.4_@types+react@18.3.18_react@18.3.1/node_modules/valtio/esm/react.mjs
   var import_react14 = __toESM(require_react(), 1);
@@ -966,6 +990,9 @@ var LibReact = (() => {
     return createProxy(currSnapshot, affected, proxyCache2, targetCache);
   }
 
+  // src/storage/defineStore.ts
+  var import_react15 = __toESM(require_react(), 1);
+
   // ../util-core/src/util/json.ts
   function jsonTryParse(text) {
     try {
@@ -1005,8 +1032,8 @@ var LibReact = (() => {
     status.finished = false;
     status.loading = false;
     status.error = null;
-    const $state = options.persist ? proxyWithPersistant(options.persist, state) : proxy(state);
     const $status = proxy(status);
+    const $state = options.persist ? proxyWithPersistant(options.persist, state) : proxy(state);
     const $actions = {};
     const $getters = {};
     setupActions($state, actions, $actions, $status);
@@ -1057,10 +1084,12 @@ var LibReact = (() => {
       tracking();
       try {
         const result = action(...args);
-        if (result instanceof Promise)
-          result.then(fulfilled).catch(rejected);
-        else
+        if (result instanceof Promise) {
+          return result.then(fulfilled).catch(rejected);
+        } else {
           fulfilled();
+          return result;
+        }
       } catch (error) {
         rejected(error);
       }
@@ -1103,9 +1132,16 @@ var LibReact = (() => {
   function defineAsyncStore(fetch, options = {}) {
     const store = defineStore(
       {
-        state: () => ({ value: options.initial }),
+        state: () => ({
+          value: options.initial,
+          error: void 0,
+          loading: false,
+          finished: false
+        }),
         actions: {
-          fetch,
+          async fetch(...args) {
+            return this.value = await fetch(...args);
+          },
           refresh(value) {
             this.value = value || options.initial;
           }
@@ -1113,6 +1149,10 @@ var LibReact = (() => {
       },
       { persist: options.persist }
     );
+    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);
+    options.immediate && store.fetch();
     return store;
   }
 

package/dist/index.js

@@ -290,6 +290,9 @@ function useWhenever(source, cb, options) {
   useWatch(source, () => source && cb(source), options);
 }
 
+// src/storage/defineAsyncStore.ts
+import { subscribeKey } from "valtio/utils";
+
 // src/storage/defineStore.ts
 import { createElement as createElement4 } from "react";
 import { proxy as proxy2, subscribe as subscribe2, useSnapshot } from "valtio";
@@ -334,8 +337,8 @@ function defineStore(store, options = {}) {
   status.finished = false;
   status.loading = false;
   status.error = null;
-  const $state = options.persist ? proxyWithPersistant(options.persist, state) : proxy2(state);
   const $status = proxy2(status);
+  const $state = options.persist ? proxyWithPersistant(options.persist, state) : proxy2(state);
   const $actions = {};
   const $getters = {};
   setupActions($state, actions, $actions, $status);
@@ -386,10 +389,12 @@ function track(action, status) {
     tracking();
     try {
       const result = action(...args);
-      if (result instanceof Promise)
-        result.then(fulfilled).catch(rejected);
-      else
+      if (result instanceof Promise) {
+        return result.then(fulfilled).catch(rejected);
+      } else {
         fulfilled();
+        return result;
+      }
     } catch (error) {
       rejected(error);
     }
@@ -432,9 +437,16 @@ function setupStatus($actions, $status) {
 function defineAsyncStore(fetch, options = {}) {
   const store = defineStore(
     {
-      state: () => ({ value: options.initial }),
+      state: () => ({
+        value: options.initial,
+        error: void 0,
+        loading: false,
+        finished: false
+      }),
       actions: {
-        fetch,
+        async fetch(...args) {
+          return this.value = await fetch(...args);
+        },
         refresh(value) {
           this.value = value || options.initial;
         }
@@ -442,6 +454,10 @@ function defineAsyncStore(fetch, options = {}) {
     },
     { persist: options.persist }
   );
+  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);
+  options.immediate && store.fetch();
   return store;
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hairy/react-lib",
   "type": "module",
-  "version": "1.17.0",
+  "version": "1.19.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.17.0"
+    "@hairy/utils": "1.19.0"
   },
   "scripts": {
     "build": "tsup",