fix #13

Author: mavarazy

package.json

@@ -42,30 +42,30 @@
     "node": ">=6"
   },
   "dependencies": {
-    "deep-equal": "^1.0.1",
-    "predicate": "^1.0.0",
-    "selectn": "^1.1.2"
+    "deep-equal": "1.0.1",
+    "predicate": "1.2.0",
+    "selectn": "1.1.2"
   },
   "devDependencies": {
     "atob": "^2.0.3",
-    "babel-cli": "^6.24.1",
-    "babel-core": "^6.25.0",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.0",
     "babel-eslint": "^7.2.3",
     "babel-jest": "^20.0.3",
-    "babel-loader": "^7.1.1",
+    "babel-loader": "^7.1.2",
     "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-polyfill": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
-    "babel-register": "^6.24.1",
-    "codemirror": "^5.28.0",
+    "babel-register": "^6.26.0",
+    "codemirror": "^5.29.0",
     "coveralls": "^2.13.1",
     "cross-env": "^5.0.5",
-    "css-loader": "^0.28.4",
-    "eslint": "^4.4.1",
+    "css-loader": "^0.28.7",
+    "eslint": "^4.6.1",
     "eslint-plugin-jest": "^20.0.3",
-    "eslint-plugin-react": "^7.1.0",
+    "eslint-plugin-react": "^7.3.0",
     "eslint-plugin-standard": "^3.0.1",
     "exit-hook": "^1.1.1",
     "express": "^4.15.4",
@@ -75,14 +75,14 @@
     "html": "1.0.0",
     "husky": "^0.14.3",
     "jest": "^20.0.4",
-    "jsdom": "^11.1.0",
-    "lint-staged": "^4.0.3",
-    "prettier": "^1.5.3",
-    "regenerator-runtime": "^0.10.5",
+    "jsdom": "^11.2.0",
+    "lint-staged": "^4.1.0",
+    "prettier": "^1.6.1",
+    "regenerator-runtime": "^0.11.0",
     "rimraf": "^2.6.1",
-    "sinon": "^3.1.0",
+    "sinon": "^3.2.1",
     "style-loader": "^0.18.2",
-    "webpack": "^3.5.1"
+    "webpack": "^3.5.5"
   },
   "directories": {
     "test": "test"

src/validation.js

@@ -80,9 +80,23 @@ export function listAllPredicates(conditions, schema) {
   return allPredicates.filter((v, i, a) => allPredicates.indexOf(v) === i);
 }
 
+const UNSUPPORTED_PREDICATES = [
+  "and",
+  "or",
+  "ternary",
+  "every",
+  "some",
+  "curry",
+  "partial",
+  "complement",
+  "mod",
+];
+
 export function listInvalidPredicates(conditions, schema) {
   let refPredicates = listAllPredicates(conditions, schema);
-  return refPredicates.filter(p => predicate[p] === undefined);
+  return refPredicates.filter(
+    p => UNSUPPORTED_PREDICATES.includes(p) || predicate[p] === undefined
+  );
 }
 
 export function validatePredicates(conditions, schema) {

test/predicate.test.js

@@ -12,10 +12,6 @@ test("work with empty", function() {
   expect(predicate.empty(null)).toBeTruthy();
 });
 
-test("and is not predicate", () => {
-  expect(predicate.and).toBeUndefined();
-});
-
 predicate.range = predicate.curry((val, range) => {
   return (
     predicate.num(val) &&

test/validation.test.js

@@ -181,15 +181,15 @@ test("invalid field NOT or", () => {
     {
       conditions: {
         not: {
-          firstName: "bad",
+          firstName: "or",
         },
       },
       event: { type: "remove" },
     },
   ]);
 
   expect(listInvalidPredicates(invalidFieldNotWithOr, defSchema)).toEqual([
-    "bad",
+    "or",
   ]);
   expect(() => validatePredicates(invalidFieldNotWithOr, defSchema)).toThrow();
 });