patch: use enforce rules for internal evaluations

ealush · Nov 14, 2020 · eb43009 · eb43009
1 parent 4059180
commit eb43009
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/packages/__shared/src/passArgs b/packages/__shared/src/passArgs
diff --git a/packages/vest/src/core/produce/collectFailureMessages.js b/packages/vest/src/core/produce/collectFailureMessages.js
@@ -10,7 +10,7 @@ import useTestObjects from 'useTestObjects';
  */
 const collectFailureMessages = (severity, { group, fieldName } = {}) => {
   const [testObjects] = useTestObjects();
-  return testObjects.reduce((collector, testObject) => {
+  const res = testObjects.reduce((collector, testObject) => {
     if (group && testObject.groupName !== group) {
       return collector;
     }
@@ -33,6 +33,12 @@ const collectFailureMessages = (severity, { group, fieldName } = {}) => {
 
     return collector;
   }, {});
+
+  if (fieldName) {
+    return res[fieldName] || [];
+  } else {
+    return res;
+  }
 };
 
 export default collectFailureMessages;
diff --git a/packages/vest/src/core/produce/getFailures.js b/packages/vest/src/core/produce/getFailures.js
@@ -6,11 +6,6 @@ import collectFailureMessages from 'collectFailureMessages';
  * @returns suite or field's errors or warnings.
  */
 export default function getFailures(severityKey, fieldName) {
-  const res = collectFailureMessages(severityKey, { fieldName });
+  return collectFailureMessages(severityKey, { fieldName });
 
-  if (fieldName) {
-    return res[fieldName] || [];
-  } else {
-    return res;
-  }
 }
diff --git a/packages/vest/src/core/produce/getFailuresByGroup.js b/packages/vest/src/core/produce/getFailuresByGroup.js
@@ -16,13 +16,7 @@ const getByGroup = (severityKey, group, fieldName) => {
     );
   }
 
-  const res = collectFailureMessages(severityKey, { group, fieldName });
-
-  if (fieldName) {
-    return res[fieldName] || [];
-  } else {
-    return res;
-  }
+  return collectFailureMessages(severityKey, { group, fieldName });
 };
 
 export default getByGroup;
diff --git a/packages/vest/src/lib/cache.js b/packages/vest/src/lib/cache.js
@@ -1,3 +1,6 @@
+import { isNotNull } from 'isNull';
+import { lengthEquals } from 'lengthEquals';
+
 /**
  * Creates a cache function
  * @param {number} [maxSize] Max cache size
@@ -13,7 +16,7 @@ const createCache = (maxSize = 10) => {
   const cache = (deps, cacheAction) => {
     const cacheHit = cache.get(deps);
 
-    if (cacheHit !== null) {
+    if (isNotNull(cacheHit)) {
       return cacheHit[1];
     }
 
@@ -36,7 +39,7 @@ const createCache = (maxSize = 10) => {
     cacheStorage[
       cacheStorage.findIndex(
         ([cachedDeps]) =>
-          deps.length === cachedDeps.length &&
+          lengthEquals(deps, cachedDeps.length) &&
           deps.every((dep, i) => dep === cachedDeps[i])
       )
     ] || null;