fix almanac.factValue incorrectly interpretting path

Author: Cache Hamm

package.json

@@ -6,6 +6,7 @@
  "scripts": {
  "test": "mocha && npm run lint --silent",
  "lint": "standard --verbose | snazzy || true",
+ "lint:fix": "standard --fix",
  "prepublish": "npm run compile",
  "compile": "babel --stage 1 -d dist/ src/ && regenerator --no-cache-dir --include-runtime src/generator-runtime.js > dist/generator-runtime.js"
  },

src/almanac.js

@@ -17,7 +17,7 @@ import { UndefinedFactError } from './errors'
 export default class Almanac {
  constructor (factMap, runtimeFacts = {}) {
  this.factMap = new Map(factMap)
- this.factResultsCache = new Map()
+ this.factResultsCache = new Map() // { cacheKey: Promise<factValu> }
 
  for (let factId in runtimeFacts) {
  let fact
@@ -89,15 +89,17 @@ export default class Almanac {
  * @return {Promise} a promise which will resolve with the fact computation.
  */
  async factValue (factId, params = {}, path = '') {
+ let factValue
  let fact = this._getFact(factId)
  let cacheKey = fact.getCacheKey(params)
  let cacheVal = cacheKey && this.factResultsCache.get(cacheKey)
  if (cacheVal) {
- cacheVal.then(val => debug(`almanac::factValue cache hit for fact:${factId} value: ${JSON.stringify(val)}<${typeof val}>`))
- return cacheVal
+ factValue = await cacheVal
+ debug(`almanac::factValue cache hit for fact:${factId} value: ${JSON.stringify(factValue)}<${typeof factValue}>`)
+ } else {
+ verbose(`almanac::factValue cache miss for fact:${factId}; calculating`)
+ factValue = await this._setFactValue(fact, params, fact.calculate(params, this))
  }
- verbose(`almanac::factValue cache miss for fact:${factId}; calculating`)
- let factValue = await this._setFactValue(fact, params, fact.calculate(params, this))
  if (path) {
  if (isPlainObject(factValue) || Array.isArray(factValue)) {
  factValue = selectn(path)(factValue)

test/engine-fact.test.js

@@ -57,9 +57,12 @@ describe('Engine: fact evaluation', () => {
  }
  let successSpy = sinon.spy()
  let failureSpy = sinon.spy()
- function setup (conditions = baseConditions(), engineOptions = {}) {
+ beforeEach(() => {
  successSpy.reset()
  failureSpy.reset()
+ })
+
+ function setup (conditions = baseConditions(), engineOptions = {}) {
  engine = engineFactory([], engineOptions)
  let rule = factories.rule({ conditions, event })
  engine.addRule(rule)
@@ -157,14 +160,40 @@ describe('Engine: fact evaluation', () => {
  expect(successSpy).to.not.have.been.called()
  })
 
- it('emits when complex object paths meet the conditions', async () => {
- let complexCondition = conditions()
- complexCondition.any[0].path = '.address.occupantHistory[0].year'
- complexCondition.any[0].value = 2011
- complexCondition.any[0].operator = 'equal'
- setup(complexCondition)
- await engine.run()
- expect(successSpy).to.have.been.calledWith(event)
+ context('complex paths', () => {
+ it('correctly interprets "path" when dynamic facts return objects', async () => {
+ let complexCondition = conditions()
+ complexCondition.any[0].path = '.address.occupantHistory[0].year'
+ complexCondition.any[0].value = 2011
+ complexCondition.any[0].operator = 'equal'
+ setup(complexCondition)
+ await engine.run()
+ expect(successSpy).to.have.been.calledWith(event)
+ })
+
+ it('correctly interprets "path" with runtime fact objects', async () => {
+ let fact = { x: { y: 1 }, a: 2 }
+ let conditions = {
+ all: [{
+ fact: 'x',
+ path: '.y',
+ operator: 'equal',
+ value: 1
+ }]
+ }
+ let event = {
+ type: 'runtimeEvent'
+ }
+
+ engine = engineFactory([])
+ let rule = factories.rule({ conditions, event })
+ engine.addRule(rule)
+ engine.on('success', successSpy)
+ engine.on('failure', failureSpy)
+ await engine.run(fact)
+ expect(successSpy).to.have.been.calledWith(event)
+ expect(failureSpy).to.not.have.been.calledWith(event)
+ })
  })
 
  it('does not emit when complex object paths fail the condition', async () => {