#15 missed validation update

Author: mavarazy

src/utils.js

@@ -1,7 +1,11 @@
 import selectn from "selectn";
 
+export function normRef(ref) {
+  return ref.replace(/\$/g, ".");
+}
+
 export function selectRef(field, formData) {
-  let ref = field.replace(/\$/g, ".");
+  let ref = normRef(field);
   return selectn(ref, formData);
 }
 

src/validation.js

@@ -5,6 +5,7 @@ import {
   toError,
   isRefArray,
   extractRefSchema,
+  normRef,
 } from "./utils";
 import { OR, AND, NOT } from "./constants";
 
@@ -51,6 +52,7 @@ export function predicatesFromRule(rule, schema) {
 export function predicatesFromCondition(condition, schema) {
   return flatMap(Object.keys(condition), ref => {
     let refVal = condition[ref];
+    ref = normRef(ref);
     if (ref === OR || ref === AND) {
       if (Array.isArray(refVal)) {
         return flatMap(refVal, c => predicatesFromCondition(c, schema));
@@ -129,7 +131,7 @@ export function fieldsFromCondition(condition) {
     } else if (ref === NOT) {
       return fieldsFromCondition(refCondition);
     } else {
-      return [ref].concat(fieldsFromPredicates(refCondition));
+      return [normRef(ref)].concat(fieldsFromPredicates(refCondition));
     }
   });
 }

test/issues/15.test.js

@@ -1,4 +1,5 @@
 import Engine from "../../src";
+import { listInvalidFields } from "../../src/validation";
 
 test("support $ single level of nesting", () => {
   let rules = [
@@ -35,3 +36,23 @@ test("support $ double level of nesting", () => {
     expect(events[0]).toEqual({ type: "match" });
   });
 });
+
+test("support $ during validation", () => {
+  let schema = {
+    type: "object",
+    properties: {
+      address: {
+        type: "object",
+        properties: {
+          zip: { type: "number" },
+        },
+      },
+    },
+  };
+  let conditions = [
+    {
+      address$zip: { less: 1000 },
+    },
+  ];
+  expect(listInvalidFields(conditions, schema)).toEqual([]);
+});