Merge d9d4bae into 637d527

komlev · Jan 30, 2018 · fad792b · fad792b
2 parents 637d527 + d9d4bae
commit fad792b
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 5 deletions.
diff --git a/src/rule.js b/src/rule.js
@@ -10,7 +10,10 @@ import {
   isArray,
   isObject,
   isEmpty,
-  forEach
+  forEach,
+  last,
+  slice,
+  cloneDeep
 } from 'lodash/fp'
 import { isExisty } from './assert'
 import { concat, arrayOfArrays, getContextPath } from './utils'
@@ -56,8 +59,20 @@ const defaultEnabler = [() => true],
     return { ...rule, value, test, params, enabled }
   },
   queryPath = (value, context) => (p) => {
-    if (isFunction(p)) return p()
-    return traverse(getContextPath(p, context.indexes), value)
+    if (isFunction(p)) {
+      // clone to prevent anyone from messing with lib internals
+      return p(cloneDeep({
+        current: context.current,
+        indexes: context.indexes
+      }))
+    }
+    const
+      contextPath = getContextPath(p, context.indexes)
+
+    if (last(contextPath) === '@') {
+      return slice(0, contextPath.length - 1, contextPath)
+    }
+    return traverse(contextPath, value)
   },
   queryPaths = (params, value, context) =>
     map(queryPath(value, context), params),
@@ -102,7 +117,7 @@ const defaultEnabler = [() => true],
         resPath =
           (rule.to && getContextPath(rule.to, context.indexes)) || context.goal
       if (!isEnabled(ruleParams, rule.enabled)) return []
-      // eslint-disable-next-line
+      // eslint-disable-next-line one-var
       const errors = map(r => r.value, validateItem([ruleParams, rule.test]))
       if (!isEmpty(errors)) res = set(resPath, errors, res)
       return null

diff --git a/test/rule.spec.js b/test/rule.spec.js
@@ -1,5 +1,5 @@
 import { map, cloneDeep } from 'lodash/fp'
-import { runRule, normalizeRule, run, makeConfig } from '../src/rule'
+import { runRule, normalizeRule, run, makeConfig, getPathTo } from '../src/rule'
 import { config, value } from './rule/test-config'
 
 const runNormalizedRule = (rule, val) => runRule(normalizeRule(rule), val)
@@ -111,4 +111,58 @@ describe('rule', () => {
       team: [undefined, undefined, { customName: ['empty'], name: ['empty'] }]
     })
   })
+
+  it('provides path to the processed value', () => {
+    const
+      successMap2 = {
+        'L.1.1': ['team', '0', 'address', '0'],
+        'L.2.1': ['team', '1', 'address', '0'],
+        'L.2.2': ['team', '1', 'address', '1']
+      },
+      successMap3 = {
+        'L.1.1': ['team', 0, 'address', 0, 'line1'],
+        'L.2.1': ['team', 1, 'address', 0, 'line1'],
+        'L.2.2': ['team', 1, 'address', 1, 'line1']
+      },
+      successMap3b = {
+        'L.1.1': { team: 0, address: 0 },
+        'L.2.1': { team: 1, address: 0 },
+        'L.2.2': { team: 1, address: 1 }
+      },
+      rule = {
+      // -1
+        value: 'team.address.line1',
+        params: [
+          'team.{team}.address.{address}.line1',
+          'team.{team}.address.{address}.@',
+          a => a
+        ],
+        test: [
+          [(v, ...params) => {
+            const [p1, p2, p3] = params
+            expect(successMap2[p1]).toEqual(p2)
+            expect(successMap3[p1]).toEqual(p3.current)
+            expect(successMap3b[p1]).toEqual(p3.indexes)
+            return true
+          }, 'ERR']
+        ]
+      },
+      valForTest = {
+        team: [
+          {
+            address: [
+              { line1: 'L.1.1' }
+            ]
+          },
+          {
+            address: [
+              { line1: 'L.2.1' },
+              { line1: 'L.2.2' }
+            ]
+          }
+        ]
+      }
+
+    runNormalizedRule(rule, valForTest)
+  })
 })