refactor: replace modifier from 'public static' to 'protected' for mo…

…delStore
foca-js · Oct 20, 2023 · 7abce13 · 7abce13
1 parent f508839
commit 7abce13
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/src/api/use-isolate.ts b/src/api/use-isolate.ts
@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { DestroyLoadingAction, DESTROY_LOADING } from '../actions/loading';
 import { loadingStore } from '../store/loadingStore';
-import { ModelStore, modelStore } from '../store/modelStore';
+import { modelStore } from '../store/modelStore';
 import { cloneModel } from '../model/cloneModel';
 import { Model } from '../model/types';
 
@@ -141,7 +141,7 @@ const useDevName = (model: Model, count: number, err: Error) => {
 };
 
 const unmountModel = (modelName: string) => {
-  ModelStore.removeReducer.call(modelStore, modelName);
+  modelStore['removeReducer'](modelName);
   loadingStore.dispatch<DestroyLoadingAction>({
     type: DESTROY_LOADING,
     model: modelName,

diff --git a/src/model/defineModel.ts b/src/model/defineModel.ts
@@ -2,7 +2,7 @@ import { parseState, stringifyState } from '../utils/serialize';
 import { deepEqual } from '../utils/deepEqual';
 import { EnhancedAction, enhanceAction } from './enhanceAction';
 import { EnhancedEffect, enhanceEffect } from './enhanceEffect';
-import { ModelStore, modelStore } from '../store/modelStore';
+import { modelStore } from '../store/modelStore';
 import { createReducer } from '../redux/createReducer';
 import { composeGetter, defineGetter } from '../utils/getter';
 import { getMethodCategory } from '../utils/getMethodCategory';
@@ -267,8 +267,7 @@ export const defineModel = <
     });
   }
 
-  ModelStore.appendReducer.call(
-    modelStore,
+  modelStore['appendReducer'](
     uniqueName,
     createReducer({
       name: uniqueName,

diff --git a/src/store/modelStore.ts b/src/store/modelStore.ts
@@ -195,11 +195,7 @@ export class ModelStore extends StoreBasic<Record<string, any>> {
     };
   }
 
-  public static appendReducer(
-    this: ModelStore,
-    key: string,
-    consumer: Reducer,
-  ): void {
+  protected appendReducer(key: string, consumer: Reducer): void {
     const store = this.origin;
     const consumers = this.consumers;
     const exists = store && consumers.hasOwnProperty(key);
@@ -209,7 +205,7 @@ export class ModelStore extends StoreBasic<Record<string, any>> {
     store && !exists && store.replaceReducer(this.reducer);
   }
 
-  public static removeReducer(this: ModelStore, key: string): void {
+  protected removeReducer(key: string): void {
     const store = this.origin;
     const consumers = this.consumers;
 

diff --git a/test/lifecycle.test.ts b/test/lifecycle.test.ts
@@ -1,7 +1,6 @@
 import sleep from 'sleep-promise';
 import { cloneModel, defineModel, memoryStorage, store } from '../src';
 import { PersistSchema } from '../src/persist/PersistItem';
-import { ModelStore } from '../src/store/modelStore';
 
 describe('onInit', () => {
   afterEach(() => {
@@ -215,7 +214,7 @@ describe('onDestroy', () => {
 
     model.update();
     expect(spy).toBeCalledTimes(0);
-    ModelStore.removeReducer.call(store, model.name);
+    store['removeReducer'](model.name);
     expect(spy).toBeCalledTimes(1);
     spy.mockRestore();
   });
@@ -241,7 +240,7 @@ describe('onDestroy', () => {
     model.update();
     expect(destroySpy).toBeCalledTimes(0);
     expect(changeSpy).toBeCalledTimes(1);
-    ModelStore.removeReducer.call(store, model.name);
+    store['removeReducer'](model.name);
     expect(destroySpy).toBeCalledTimes(1);
     expect(changeSpy).toBeCalledTimes(1);
     destroySpy.mockRestore();