fix(mutative): upgrade mutative to 0.42.0

unadlib · Feb 6, 2023 · 115da64 · 115da64
1 parent 1819621
commit 115da64
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 34 deletions.
diff --git a/packages/usm-redux/package.json b/packages/usm-redux/package.json
@@ -29,7 +29,7 @@
   "author": "unadlib",
   "license": "MIT",
   "dependencies": {
-    "mutative": "^0.4.1",
+    "mutative": "^0.4.2",
     "redux": "^4.2.0"
   }
 }
diff --git a/packages/usm-redux/src/constant.ts b/packages/usm-redux/src/constant.ts
@@ -4,5 +4,5 @@ export const subscriptionsKey: unique symbol = Symbol('subscriptions');
 export const stateKey: unique symbol = Symbol('state');
 export const bootstrappedKey: unique symbol = Symbol('bootstrapped');
 export const identifierKey: unique symbol = Symbol('identifier');
-export const enableAutoFreezeKey: unique symbol = Symbol('enableAutoFreeze');
+export const strictKey: unique symbol = Symbol('strict');
 export const enablePatchesKey: unique symbol = Symbol('enablePatches');
diff --git a/packages/usm-redux/src/createStore.ts b/packages/usm-redux/src/createStore.ts
@@ -13,7 +13,7 @@ import {
   identifierKey,
   subscriptionsKey,
   usm,
-  enableAutoFreezeKey,
+  strictKey,
   enablePatchesKey,
 } from './constant';
 import { getStagedState } from './utils/index';
@@ -40,7 +40,7 @@ export const createStore = (
       `'createStore' options should be a object with a property 'modules'`
     );
   }
-  const enableAutoFreeze = options.strict ?? __DEV__;
+  const strict = options.strict ?? false;
   const enablePatches = config.enablePatches ?? false;
   const identifiers = new Set<string>();
   const reducers: ReducersMapObject = {};
@@ -109,9 +109,10 @@ export const createStore = (
           },
         });
       }
-      const initState = enableAutoFreeze
+      const initState = strict
         ? create({ ...service[stateKey] }, () => {}, {
-            enableAutoFreeze,
+            strict,
+            enableAutoFreeze: strict,
           })
         : service[stateKey];
 
@@ -145,7 +146,7 @@ export const createStore = (
             const stagedState = getStagedState();
             if (stagedState) return stagedState[identifier];
             const currentState = this[storeKey]?.getState()[identifier];
-            if (enableAutoFreeze && !Object.isFrozen(currentState)) {
+            if (strict && !Object.isFrozen(currentState)) {
               return Object.freeze(currentState);
             }
             return currentState;
@@ -159,10 +160,15 @@ export const createStore = (
         enumerable: false,
         value: identifier,
       },
-      [enableAutoFreezeKey]: {
+      [strictKey]: {
         configurable: false,
         enumerable: false,
-        value: enableAutoFreeze,
+        value: strict,
+      },
+      [strictKey]: {
+        configurable: false,
+        enumerable: false,
+        value: strict,
       },
       [enablePatchesKey]: {
         configurable: false,

diff --git a/packages/usm-redux/src/decorators/action.ts b/packages/usm-redux/src/decorators/action.ts
@@ -5,7 +5,7 @@ import {
   storeKey,
   identifierKey,
   usm,
-  enableAutoFreezeKey,
+  strictKey,
   enablePatchesKey,
 } from '../constant';
 import { getStagedState, setStagedState } from '../utils/index';
@@ -33,15 +33,17 @@ export const action = (
           fn.apply(this, args);
         };
         const enablePatches = this[enablePatchesKey];
-        const enableAutoFreeze = this[enableAutoFreezeKey];
+        const strict = this[strictKey];
         if (enablePatches) {
           [state, patches, inversePatches] = create(lastState, recipe, {
             enablePatches: true,
-            enableAutoFreeze,
+            strict,
+            enableAutoFreeze: strict,
           });
         } else {
           state = create(lastState, recipe, {
-            enableAutoFreeze,
+            strict,
+            enableAutoFreeze: strict,
           });
         }
         setStagedState(undefined);

diff --git a/packages/usm-redux/src/interface.ts b/packages/usm-redux/src/interface.ts
@@ -7,7 +7,7 @@ import {
   bootstrappedKey,
   usm,
   identifierKey,
-  enableAutoFreezeKey,
+  strictKey,
   enablePatchesKey,
 } from './constant';
 
@@ -26,7 +26,7 @@ export interface Service<T extends Record<string, any> = Record<string, any>> {
   name?: string;
   readonly [bootstrappedKey]: boolean;
   readonly [identifierKey]: string;
-  readonly [enableAutoFreezeKey]: boolean;
+  readonly [strictKey]: boolean;
   readonly [enablePatchesKey]: boolean;
   readonly [stateKey]: T;
   readonly [storeKey]: Store<T>;

diff --git a/packages/usm/package.json b/packages/usm/package.json
@@ -28,6 +28,6 @@
   "author": "unadlib",
   "license": "MIT",
   "dependencies": {
-    "mutative": "^0.4.1"
+    "mutative": "^0.4.2"
   }
 }
diff --git a/packages/usm/src/constant.ts b/packages/usm/src/constant.ts
@@ -3,7 +3,7 @@ export const storeKey: unique symbol = Symbol('store');
 export const subscriptionsKey: unique symbol = Symbol('subscriptions');
 export const stateKey: unique symbol = Symbol('state');
 export const identifierKey: unique symbol = Symbol('identifier');
-export const enableAutoFreezeKey: unique symbol = Symbol('enableAutoFreeze');
+export const strictKey: unique symbol = Symbol('strict');
 export const enablePatchesKey: unique symbol = Symbol('enablePatches');
 export const changeStateKey: unique symbol = Symbol('changeState');
 export const bootstrappedKey: unique symbol = Symbol('bootstrapped');
diff --git a/packages/usm/src/createStore.ts b/packages/usm/src/createStore.ts
@@ -6,7 +6,7 @@ import {
   storeKey,
   bootstrappedKey,
   subscriptionsKey,
-  enableAutoFreezeKey,
+  strictKey,
   enablePatchesKey,
 } from './constant';
 import {
@@ -29,7 +29,7 @@ export const createStore = (
       `'createStore' options should be a object with a property 'modules'`
     );
   }
-  const enableAutoFreeze = options.strict ?? __DEV__;
+  const strict = options.strict ?? __DEV__;
   const enablePatches = config.enablePatches ?? false;
   let state: Record<string, any> = {};
   const subscriptions: Subscription[] = [];
@@ -120,9 +120,10 @@ export const createStore = (
           },
         });
       }
-      state[identifier] = enableAutoFreeze
+      state[identifier] = strict
         ? create({ ...service[stateKey] }, () => {}, {
-            enableAutoFreeze,
+            strict,
+            enableAutoFreeze: strict,
           })
         : service[stateKey];
       Object.assign(descriptors, {
@@ -134,7 +135,7 @@ export const createStore = (
             if (stagedState) return stagedState[this[identifierKey]];
             const currentState =
               this[storeKey]?.getState()[this[identifierKey]];
-            if (enableAutoFreeze && !Object.isFrozen(currentState)) {
+            if (strict && !Object.isFrozen(currentState)) {
               return Object.freeze(currentState);
             }
             return currentState;
@@ -148,10 +149,10 @@ export const createStore = (
         enumerable: false,
         value: identifier,
       },
-      [enableAutoFreezeKey]: {
+      [strictKey]: {
         configurable: false,
         enumerable: false,
-        value: enableAutoFreeze,
+        value: strict,
       },
       [enablePatchesKey]: {
         configurable: false,

diff --git a/packages/usm/src/decorators/action.ts b/packages/usm/src/decorators/action.ts
@@ -6,7 +6,7 @@ import {
   identifierKey,
   usm,
   enablePatchesKey,
-  enableAutoFreezeKey,
+  strictKey,
 } from '../constant';
 import { getStagedState, setStagedState } from '../utils/index';
 
@@ -31,15 +31,17 @@ export const action = (
           fn.apply(this, args);
         };
         const enablePatches = this[enablePatchesKey];
-        const enableAutoFreeze = this[enableAutoFreezeKey];
+        const strict = this[strictKey];
         if (enablePatches) {
            [state, patches, inversePatches] = create(lastState, recipe, {
             enablePatches: true,
-            enableAutoFreeze,
+            strict,
+            enableAutoFreeze: strict,
           });
         } else {
           state = create(lastState, recipe, {
-            enableAutoFreeze,
+            strict,
+            enableAutoFreeze: strict,
           });
         }
         setStagedState(undefined);

diff --git a/packages/usm/src/interface.ts b/packages/usm/src/interface.ts
@@ -6,7 +6,7 @@ import {
   identifierKey,
   bootstrappedKey,
   usm,
-  enableAutoFreezeKey,
+  strictKey,
   enablePatchesKey,
 } from './constant';
 
@@ -29,7 +29,7 @@ export interface Store<T = Record<string, any>> {
 export interface Service<T extends Record<string, any> = Record<string, any>> {
   name?: string;
   readonly [identifierKey]: string;
-  readonly [enableAutoFreezeKey]: boolean;
+  readonly [strictKey]: boolean;
   readonly [enablePatchesKey]: boolean;
   readonly [bootstrappedKey]: boolean;
   readonly [stateKey]: T;

diff --git a/yarn.lock b/yarn.lock
@@ -5641,10 +5641,10 @@ multimatch@^5.0.0:
     arrify "^2.0.1"
     minimatch "^3.0.4"
 
-mutative@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/mutative/-/mutative-0.4.1.tgz#7e71eb01ec24e5a8b031079588d5455fa16786e7"
-  integrity sha512-V3z99IFyMfmGoEFoYWXgyEzPis3nsqu8SceQFgR2dKm+Rzn8lQBle/VjPF9sEh1xABxgJvCicQ82q0iwdj4E+A==
+mutative@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/mutative/-/mutative-0.4.2.tgz#dacdae80c32f09b380979cfc534c4274f5a46079"
+  integrity sha512-zAWi/R6mShx7Dr6SnT61Z2Wf2TKVbAVGPzoS8vbr/fK5X0e7hD4pglpLSCWNtA0jh3RoS0QsdjJCywbQpwef5g==
 
 [email protected]:
   version "0.0.7"