Merge pull request #396 from thorin8k/master

Add RightSideComparisonResult as factResult

Author: chris-pardy

src/condition.js

@@ -62,6 +62,9 @@ export default class Condition {
       if (this.factResult !== undefined) {
         props.factResult = this.factResult
       }
+      if (this.valueResult !== undefined) {
+        props.valueResult = this.valueResult
+      }
       if (this.result !== undefined) {
         props.result = this.result
       }

src/rule.js

@@ -231,6 +231,7 @@ class Rule extends EventEmitter {
           .then((evaluationResult) => {
             const passes = evaluationResult.result
             condition.factResult = evaluationResult.leftHandSideValue
+            condition.valueResult = evaluationResult.rightHandSideValue
             condition.result = passes
             return passes
           })

test/acceptance/acceptance.js

@@ -36,13 +36,15 @@ describe('Acceptance', () => {
       path: '$.values',
       value: 2,
       factResult: [2],
+      valueResult: 2,
       result: true
     },
     {
       fact: 'low-priority',
       operator: 'in',
       value: [2],
       factResult: 2,
+      valueResult: [2],
       result: true
     }
     ],
@@ -169,7 +171,8 @@ describe('Acceptance', () => {
             },
             path: '$.values',
             result: true,
-            value: 2
+            value: 2,
+            valueResult: 2
           },
           {
             fact: 'low-priority',
@@ -178,6 +181,9 @@ describe('Acceptance', () => {
             result: true,
             value: [
               2
+            ],
+            valueResult: [
+              2
             ]
           }
         ],
@@ -202,6 +208,7 @@ describe('Acceptance', () => {
             factResult: [
               2
             ],
+            valueResult: 2,
             operator: 'containsDivisibleValuesOf',
             params: {
               factParam: 1

test/engine-event.test.js

@@ -642,7 +642,7 @@ describe('Engine: event', () => {
       await engine.run()
       const ruleResult = successSpy.getCall(0).args[2]
       const expected =
-        '{"conditions":{"priority":1,"any":[{"name":"over 21","operator":"greaterThanInclusive","value":21,"fact":"age","factResult":21,"result":true},{"operator":"equal","value":true,"fact":"qualified","factResult":false,"result":false}]},"event":{"type":"setDrinkingFlag","params":{"canOrderDrinks":true}},"priority":100,"result":true}'
+        '{"conditions":{"priority":1,"any":[{"name":"over 21","operator":"greaterThanInclusive","value":21,"fact":"age","factResult":21,"valueResult":21,"result":true},{"operator":"equal","value":true,"fact":"qualified","factResult":false,"valueResult":true,"result":false}]},"event":{"type":"setDrinkingFlag","params":{"canOrderDrinks":true}},"priority":100,"result":true}'
       expect(JSON.stringify(ruleResult)).to.equal(expected)
     })
   })
@@ -651,7 +651,7 @@ describe('Engine: event', () => {
     beforeEach(() => setupWithConditionReference())
     it('serializes properties', async () => {
       const { results: [ruleResult] } = await engine.run()
-      const expected = '{"conditions":{"priority":1,"any":[{"priority":1,"all":[{"name":"over 21","operator":"greaterThanInclusive","value":21,"fact":"age","factResult":21,"result":true}]}]},"event":{"type":"awesome"},"priority":100,"result":true}'
+      const expected = '{"conditions":{"priority":1,"any":[{"priority":1,"all":[{"name":"over 21","operator":"greaterThanInclusive","value":21,"fact":"age","factResult":21,"valueResult":21,"result":true}]}]},"event":{"type":"awesome"},"priority":100,"result":true}'
       expect(JSON.stringify(ruleResult)).to.equal(expected)
     })
   })
@@ -662,7 +662,7 @@ describe('Engine: event', () => {
       const { results: [ruleResult] } = await engine.run()
       const { conditions: { any: [conditionReference] } } = ruleResult
       expect(conditionReference.result).to.equal(false)
-      const expected = '{"conditions":{"priority":1,"any":[{"name":"nameOfTheUndefinedConditionReference","condition":"conditionThatIsNotDefined"},{"name":"over 21","operator":"greaterThanInclusive","value":21,"fact":"age","factResult":21,"result":true}]},"event":{"type":"awesome"},"priority":100,"result":true}'
+      const expected = '{"conditions":{"priority":1,"any":[{"name":"nameOfTheUndefinedConditionReference","condition":"conditionThatIsNotDefined"},{"name":"over 21","operator":"greaterThanInclusive","value":21,"fact":"age","factResult":21,"valueResult":21,"result":true}]},"event":{"type":"awesome"},"priority":100,"result":true}'
       expect(JSON.stringify(ruleResult)).to.equal(expected)
     })
   })

test/engine-fact-comparison.test.js

@@ -118,4 +118,23 @@ describe('Engine: fact to fact comparison', () => {
       expect(eventSpy.callCount).to.equal(0)
     })
   })
+
+  context('constant facts: checking valueResult and factResult', () => {
+    const constantCondition = {
+      all: [{
+        fact: 'height',
+        operator: 'lessThanInclusive',
+        value: {
+          fact: 'width'
+        }
+      }]
+    }
+    it('result has the correct valueResult and factResult properties', async () => {
+      setup(constantCondition)
+      const result = await engine.run({ height: 1, width: 2 })
+
+      expect(result.results[0].conditions.all[0].factResult).to.equal(1)
+      expect(result.results[0].conditions.all[0].valueResult).to.equal(2)
+    })
+  })
 })

types/index.d.ts

@@ -192,6 +192,7 @@ interface BooleanConditionResultProperties {
 
 interface ConditionResultProperties extends BooleanConditionResultProperties {
   factResult?: unknown
+  valueResult?: unknown
 }
 
 interface ConditionProperties {