patch: Remove state history

ealush · Oct 17, 2020 · 65a7468 · 65a7468
1 parent 699b293
commit 65a7468
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 88 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -17,7 +17,7 @@ module.exports = {
   globals: {
     VEST_VERSION: true,
     LIBRARY_NAME: true,
-    ENV_DEVELOPMENT : true
+    ENV_DEVELOPMENT: true,
   },
   ignorePatterns: ['playground'],
   parser: 'babel-eslint',
@@ -34,7 +34,6 @@ module.exports = {
   plugins: ['jest', 'spellcheck'],
 
   rules: {
-    'arrow-body-style': [2, 'as-needed'],
     'import/newline-after-import': 2,
     'import/no-self-import': 2,
     'import/no-useless-path-segments': 2,

diff --git a/packages/vest/src/core/produce/index.js b/packages/vest/src/core/produce/index.js
@@ -49,10 +49,9 @@ const done = (...args) => {
 
   useTestCallbacks(current => {
     if (fieldName) {
-      current.fieldCallbacks[fieldName] = [].concat(
-        ...(current.fieldCallbacks[fieldName] || []),
-        cb
-      );
+      current.fieldCallbacks[fieldName] = (
+        current.fieldCallbacks[fieldName] || []
+      ).concat(cb);
     } else {
       current.doneCallbacks.push(cb);
     }

diff --git a/packages/vest/src/core/state/index.js b/packages/vest/src/core/state/index.js
@@ -15,28 +15,25 @@ export default (function createState() {
       function update(patcher) {
         const { stateRef } = context.use();
         const currentState = stateRef.current();
-        const prevState = stateRef.prev();
 
         stateRef.set(
           key,
-          typeof patcher === 'function'
-            ? patcher(currentState?.[key], prevState?.[key])
-            : patcher
+          typeof patcher === 'function' ? patcher(currentState?.[key]) : patcher
         );
       }
 
       return [stateRef.current()[key], update];
     }
 
-    use[SYMBOL_ADD_TO_STATE] = function (stateKey, ...args) {
+    use[SYMBOL_ADD_TO_STATE] = function (stateKey, args) {
       const { stateRef } = context.use();
       key = stateKey;
 
       if (!Object.prototype.hasOwnProperty.call(stateRef.current(), key)) {
         stateRef.set(
           key,
           typeof initialValue === 'function'
-            ? initialValue(...args)
+            ? initialValue.apply(null, args)
             : initialValue
         );
       }
@@ -46,62 +43,46 @@ export default (function createState() {
   }
 
   function createRef(handlers = {}) {
-    const state = [];
+    let state = {};
+    const registeredHandlers = [];
 
     function current() {
-      return state[0];
-    }
-
-    function prev() {
-      return state[1];
+      return state;
     }
 
     function set(key, value) {
-      state[0] = {
-        ...state[0],
+      state = {
+        ...state,
         [key]: value,
       };
     }
 
     function reset() {
       state.length = 0;
 
-      unshift();
-    }
-
-    function unshift() {
-      context.run({ stateRef }, () => {
-        state.unshift({});
-        for (const key in handlers) {
-          if (!Object.prototype.hasOwnProperty.call(current(), key)) {
-            if (Array.isArray(handlers[key])) {
-              /*
-                state.createRef({
-                  useSuiteId: [useSuiteId, [id, name]],
-                })
-              */
-              handlers[key][0][SYMBOL_ADD_TO_STATE](key, ...handlers[key][1]);
-            } else {
-              /*
-                state.createRef({
-                  useSuiteId,
-                });
-              */
-              handlers[key][SYMBOL_ADD_TO_STATE](key);
-            }
-          }
-        }
-      });
+      state = {};
+      registeredHandlers.forEach(fn => fn());
     }
 
     const stateRef = {
       current,
-      prev,
       reset,
       set,
-      unshift,
     };
 
+    for (const key in handlers) {
+      registeredHandlers.push(
+        Array.isArray(handlers[key])
+          ? context.bind(
+              { stateRef },
+              handlers[key][0][SYMBOL_ADD_TO_STATE],
+              key,
+              handlers[key][1]
+            )
+          : context.bind({ stateRef }, handlers[key][SYMBOL_ADD_TO_STATE], key)
+      );
+    }
+
     context.run({ stateRef }, reset);
 
     return stateRef;

diff --git a/packages/vest/src/core/state/spec.js b/packages/vest/src/core/state/spec.js
@@ -19,51 +19,21 @@ describe('state', () => {
     it('Should initialize state with provided keys', () => {
       expect(stateRef.current()).toEqual(initialState);
     });
-
-    it('Shoult initialize without a previous state', () => {
-      expect(stateRef.prev()).toBeUndefined();
-    });
   });
 
   describe('State reset', () => {
     it.ctx('Should return state to its initial value', () => {
-      stateRef.unshift();
+      stateRef.reset();
 
       useExampleState(() => 'example_2');
 
       expect(stateRef.current()).toEqual({
         ...initialState,
         exampleState: 'example_2',
       });
-      expect(stateRef.prev()).toEqual(initialState);
 
       stateRef.reset();
       expect(stateRef.current()).toEqual(initialState);
-      expect(stateRef.prev()).toBeUndefined();
-    });
-  });
-
-  describe('unshift', () => {
-    it.ctx('Should move current state to `prev`', () => {
-      useExampleState(() => ({ example: true }));
-      const current = stateRef.current();
-
-      stateRef.unshift();
-
-      expect(stateRef.prev()).toBe(current);
-      expect(stateRef.prev()).toEqual({
-        ...initialState,
-        exampleState: { example: true },
-      });
-    });
-
-    it.ctx('Should set `current` to initial value', () => {
-      useExampleState(() => ({ example: true }));
-      const current = stateRef.current();
-
-      stateRef.unshift();
-      expect(stateRef.current()).not.toBe(current);
-      expect(stateRef.current()).toEqual(initialState);
     });
   });
 

diff --git a/packages/vest/src/core/suite/create/index.js b/packages/vest/src/core/suite/create/index.js
@@ -31,11 +31,12 @@ const createSuite = (...args) => {
   });
 
   return Object.defineProperties(
-    context.bind({ stateRef }, (...args) => {
-      stateRef.unshift();
+    context.bind({ stateRef }, function () {
+      const [previousTestObjects = []] = useTestObjects();
+      stateRef.reset();
 
-      tests.apply(null, args);
-      mergeExcludedTests();
+      tests.apply(null, arguments);
+      mergeExcludedTests(previousTestObjects);
 
       return produce();
     }),

diff --git a/packages/vest/src/core/suite/hasRemainingTests/index.js b/packages/vest/src/core/suite/hasRemainingTests/index.js
@@ -7,7 +7,7 @@ import usePending from '../../test/lib/pending/usePending';
  */
 const hasRemainingTests = fieldName => {
   const [{ pending, lagging }] = usePending();
-  const allIncomplete = [...pending, ...lagging];
+  const allIncomplete = pending.concat(lagging);
   if (!allIncomplete.length) {
     return false;
   }

diff --git a/packages/vest/src/core/test/lib/mergeExcludedTests/index.js b/packages/vest/src/core/test/lib/mergeExcludedTests/index.js
@@ -4,9 +4,9 @@ import useTestObjects from '../../useTestObjects';
 /**
  * Merges excluded tests with their prevState values.
  */
-const mergeExcludedTests = () => {
-  useTestObjects((state, prevState) => {
-    if (!prevState) {
+const mergeExcludedTests = prevState => {
+  useTestObjects(state => {
+    if (!Array.isArray(prevState) || !prevState.length) {
       return state;
     }
 

diff --git a/packages/vest/src/lib/cache/index.js b/packages/vest/src/lib/cache/index.js
@@ -19,7 +19,7 @@ const createCache = (maxSize = 10) => {
 
     const result = cacheAction();
 
-    cacheStorage.unshift([[...deps], result]);
+    cacheStorage.unshift([deps.concat(), result]);
 
     if (cacheStorage.length > maxSize) {
       cacheStorage.length = maxSize;