refactor(coaction): refactor act()

unadlib · Dec 20, 2024 · d5d24f4 · d5d24f4
1 parent ba6f4b8
commit d5d24f4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/packages/coaction-mobx/src/index.ts b/packages/coaction-mobx/src/index.ts
@@ -15,7 +15,7 @@ const handleStore = (
   Object.assign(store, {
     subscribe: autorun
   });
-  store.act = runInAction;
+  internal.actMutable = runInAction;
   store.apply = (state = store.getState(), patches) => {
     if (!patches) {
       if (store.isSliceStore) {

diff --git a/packages/core/src/getRawState.ts b/packages/core/src/getRawState.ts
@@ -192,8 +192,8 @@ export const getRawState = <T extends CreateState>(
               done?.(result);
               return result;
             }
-            if (internal.mutableInstance && store.act) {
-              const result = store.act(() => {
+            if (internal.mutableInstance && internal.actMutable) {
+              const result = internal.actMutable(() => {
                 return fn.apply(
                   sliceKey ? store.getState()[sliceKey] : store.getState(),
                   args

diff --git a/packages/core/src/handleState.ts b/packages/core/src/handleState.ts
@@ -47,8 +47,8 @@ export const handleState = <T extends CreateState>(
         store.transport ?? (options as StoreOptions<T>).enablePatches;
       if (!enablePatches) {
         if (internal.mutableInstance) {
-          if (store.act) {
-            store.act(() => {
+          if (internal.actMutable) {
+            internal.actMutable(() => {
               fn.apply(null);
             });
             return [];

diff --git a/packages/core/src/interface.ts b/packages/core/src/interface.ts
@@ -34,7 +34,7 @@ export interface Store<T extends ISlices = ISlices> {
    */
   getState: () => T;
   /**
-   * Subscribe to the state changes.
+   * Subscribe to the state changes, and return the unsubscribe function.
    */
   subscribe: (listener: Listener) => () => void;
   /**
@@ -72,10 +72,6 @@ export interface Store<T extends ISlices = ISlices> {
     patches: Patches;
     inversePatches: Patches;
   };
-  /**
-   * The act is used to run the function in the action.
-   */
-  act?: <T extends () => any>(fn: T) => ReturnType<T>;
   /**
    * The trace is used to trace the action
    */

diff --git a/packages/core/src/internal.ts b/packages/core/src/internal.ts
@@ -2,10 +2,6 @@ import type { Draft, Patches } from 'mutative';
 import type { CreateState, Listener } from './interface';
 
 export interface Internal<T extends CreateState = CreateState> {
-  /**
-   * Get the mutable raw instance via the initial state.
-   */
-  toMutableRaw?: (key: any) => any;
   /**
    * The store module.
    */
@@ -38,4 +34,12 @@ export interface Internal<T extends CreateState = CreateState> {
    * The listeners.
    */
   listeners: Set<Listener>;
+  /**
+   * The act is used to run the function in the action for mutable state.
+   */
+  actMutable?: <T extends () => any>(fn: T) => ReturnType<T>;
+  /**
+   * Get the mutable raw instance via the initial state.
+   */
+  toMutableRaw?: (key: any) => any;
 }