#5

Author: mavarazy

.eslintrc

@@ -1,6 +1,7 @@
 {
   "parser": "babel-eslint",
   "rules": {
+    "max-len": "off",
     "react/jsx-uses-react": 2,
     "react/jsx-uses-vars": 2,
     "react/react-in-jsx-scope": 2,

package.json

@@ -16,14 +16,14 @@
     "tdd": "jest --watchAll",
     "test": "jest --coverage"
   },
+  "prettierOptions": "--jsx-bracket-same-line --trailing-comma es5 --semi",
   "jest": {
     "verbose": true,
     "collectCoverage": true,
     "collectCoverageFrom": [
       "src/**/*.{js,jsx}"
     ]
   },
-  "prettierOptions": "--jsx-bracket-same-line --trailing-comma es5 --semi",
   "lint-staged": {
     "{src,test}/**/*.js": [
       "npm run lint",
@@ -59,30 +59,30 @@
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "babel-register": "^6.24.1",
-    "codemirror": "^5.27.4",
+    "codemirror": "^5.28.0",
     "coveralls": "^2.13.1",
-    "cross-env": "^5.0.1",
+    "cross-env": "^5.0.5",
     "css-loader": "^0.28.4",
-    "eslint": "^4.1.1",
+    "eslint": "^4.4.1",
     "eslint-plugin-jest": "^20.0.3",
     "eslint-plugin-react": "^7.1.0",
     "eslint-plugin-standard": "^3.0.1",
     "exit-hook": "^1.1.1",
-    "express": "^4.15.3",
-    "extract-text-webpack-plugin": "^2.1.2",
+    "express": "^4.15.4",
+    "extract-text-webpack-plugin": "^3.0.0",
     "gh-pages": "^1.0.0",
     "has-flag": "^2.0.0",
     "html": "1.0.0",
     "husky": "^0.14.3",
     "jest": "^20.0.4",
     "jsdom": "^11.1.0",
-    "lint-staged": "^4.0.0",
-    "prettier": "^1.5.2",
+    "lint-staged": "^4.0.3",
+    "prettier": "^1.5.3",
     "regenerator-runtime": "^0.10.5",
     "rimraf": "^2.6.1",
-    "sinon": "^2.3.6",
+    "sinon": "^3.1.0",
     "style-loader": "^0.18.2",
-    "webpack": "^3.0.0"
+    "webpack": "^3.5.1"
   },
   "directories": {
     "test": "test"

src/checkField.js

@@ -1,40 +1,41 @@
 import predicate from "predicate";
 import { isObject } from "./utils";
 
-import { OR, AND, NOT } from "./constants";
+import { AND, NOT, OR } from "./constants";
 
-const parseObjectRule = (rule, fieldVal) => {
-  return Object.keys(rule).every(p => {
-    let subRule = rule[p];
-    if (p === OR || p === AND) {
-      if (Array.isArray(subRule)) {
-        if (p === OR) {
-          return subRule.some(rule => checkField(fieldVal, rule));
+const checkRule = (fieldVal, rule) => {
+  if (isObject(rule)) {
+    return Object.keys(rule).every(p => {
+      let subRule = rule[p];
+      if (p === OR || p === AND) {
+        if (Array.isArray(subRule)) {
+          if (p === OR) {
+            return subRule.some(rule => checkField(fieldVal, rule));
+          } else {
+            return subRule.every(rule => checkField(fieldVal, rule));
+          }
         } else {
-          return subRule.every(rule => checkField(fieldVal, rule));
+          return false;
         }
+      } else if (p === NOT) {
+        return !checkField(fieldVal, subRule);
+      } else if (predicate[p]) {
+        return predicate[p](fieldVal, subRule);
       } else {
         return false;
       }
-    } else if (p === NOT) {
-      return !checkField(fieldVal, subRule);
-    } else if (predicate[p]) {
-      return predicate[p](fieldVal, subRule);
-    } else {
-      return false;
-    }
-  });
+    });
+  } else {
+    return predicate[rule](fieldVal);
+  }
 };
 
 export default function checkField(fieldVal, rule) {
   if (Array.isArray(fieldVal)) {
-    return isObject(rule)
-      ? fieldVal.some(val => checkField(val, rule)) || parseObjectRule(rule)
-      : fieldVal.some(val => checkField(val, rule)) || predicate[rule](fieldVal);
-  } else if (isObject(rule)) {
-    // Complicated rule - like { greater then 10 }
-    return parseObjectRule(rule, fieldVal);
-  } else {
-    return predicate[rule](fieldVal);
+    let hasValidEntry = fieldVal.some(val => checkField(val, rule));
+    if (hasValidEntry) {
+      return true;
+    }
   }
+  return checkRule(fieldVal, rule);
 }