Skip to content

Commit 33eb4d2

Browse files
author
Iago Sardiña
committed
Add valueResult unconditionally and more testing
1 parent eeafc94 commit 33eb4d2

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

src/rule.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,7 @@ class Rule extends EventEmitter {
231231
.then((evaluationResult) => {
232232
const passes = evaluationResult.result
233233
condition.factResult = evaluationResult.leftHandSideValue
234-
if (typeof condition.value === 'object' && condition.value !== null) {
235-
condition.value.factResult = evaluationResult.rightHandSideValue
236-
}
234+
condition.valueResult = evaluationResult.rightHandSideValue
237235
condition.result = passes
238236
return passes
239237
})

test/acceptance/acceptance.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ describe('Acceptance', () => {
3636
path: '$.values',
3737
value: 2,
3838
factResult: [2],
39+
valueResult: 2,
3940
result: true
4041
},
4142
{
4243
fact: 'low-priority',
4344
operator: 'in',
4445
value: [2],
4546
factResult: 2,
47+
valueResult: [2],
4648
result: true
4749
}
4850
],
@@ -169,7 +171,8 @@ describe('Acceptance', () => {
169171
},
170172
path: '$.values',
171173
result: true,
172-
value: 2
174+
value: 2,
175+
valueResult: 2
173176
},
174177
{
175178
fact: 'low-priority',
@@ -178,6 +181,9 @@ describe('Acceptance', () => {
178181
result: true,
179182
value: [
180183
2
184+
],
185+
valueResult: [
186+
2
181187
]
182188
}
183189
],
@@ -202,6 +208,7 @@ describe('Acceptance', () => {
202208
factResult: [
203209
2
204210
],
211+
valueResult: 2,
205212
operator: 'containsDivisibleValuesOf',
206213
params: {
207214
factParam: 1
@@ -210,7 +217,6 @@ describe('Acceptance', () => {
210217
result: true,
211218
value: {
212219
fact: 'rule-created-fact',
213-
factResult: 2,
214220
path: '$.array'
215221
}
216222
}

types/index.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ interface BooleanConditionResultProperties {
192192

193193
interface ConditionResultProperties extends BooleanConditionResultProperties {
194194
factResult?: unknown
195+
valueResult?: unknown
195196
}
196197

197198
interface ConditionProperties {

0 commit comments

Comments
 (0)