patch(vest): cleaner omit

ealush · Mar 22, 2022 · 4eaea36 · 4eaea36 · vercel · Mar 22, 2022
1 parent 6c0d43c
commit 4eaea36
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/packages/vest/src/core/test/omitOptionalTests.ts b/packages/vest/src/core/test/omitOptionalTests.ts
@@ -1,3 +1,4 @@
+import hasOwnProperty from 'hasOwnProperty';
 import { isEmpty } from 'isEmpty';
 import isFunction from 'isFunction';
 import * as nestedArray from 'nestedArray';
@@ -18,15 +19,10 @@ export default function omitOptionalTests(): void {
     nestedArray.transform(tests, (testObject: VestTest) => {
       const fieldName = testObject.fieldName;
 
-      if (shouldOmit.hasOwnProperty(fieldName)) {
+      if (hasOwnProperty(shouldOmit, fieldName)) {
         omit(testObject);
       } else {
-        const optionalConfig = optionalFields[fieldName];
-        if (isFunction(optionalConfig)) {
-          shouldOmit[fieldName] = optionalConfig();
-
-          omit(testObject);
-        }
+        runOptionalConfig(testObject);
       }
 
       return testObject;
@@ -38,4 +34,13 @@ export default function omitOptionalTests(): void {
       testObject.omit();
     }
   }
+
+  function runOptionalConfig(testObject: VestTest) {
+    const optionalConfig = optionalFields[testObject.fieldName];
+    if (isFunction(optionalConfig)) {
+      shouldOmit[testObject.fieldName] = optionalConfig();
+
+      omit(testObject);
+    }
+  }
 }