@machinemetrics/io-adapter-lib 2.38.0 → 2.38.1

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [2.38.1]
+- Fixed 'amount' argument for count op
+
 ## [2.38.0]
 - Added object-keys and object-values transforms
 

package/lib/transform/risingEdgeCounter.js

@@ -10,13 +10,13 @@ const TransformState = require('./transformState');
  * the counter will be incremented before the output value is emitted.
  */
 class RisingEdgeCounterFilter extends TransformState {
-  constructor({ engine, path, args: { mergeWindow, accum = {}, reset = {} } }) {
+  constructor({ engine, path, args: { mergeWindow, amount = {}, reset = {} } }) {
     super();
 
     this.mergeWindow = mergeWindow || 0;
     this.engine = engine;
-    this.accumExpression = accum.compiledExpression;
-    this.accumSources = engine.expressionService.expressionTriggers(`${path}.accum`);
+    this.accumExpression = amount.compiledExpression;
+    this.accumSources = engine.expressionService.expressionTriggers(`${path}.amount`);
     this.resetExpression = reset.compiledExpression;
     this.resetSources = engine.expressionService.expressionTriggers(`${path}.reset`);
 
@@ -37,12 +37,12 @@ class RisingEdgeCounterFilter extends TransformState {
       defaultAttribute: 'amount',
     });
 
-    let accum = _.get(defn.args, 'amount', defn.args.count);
-    if (!_.isUndefined(accum)) {
+    let amount = _.get(defn.args, 'amount', defn.args.count);
+    if (!_.isUndefined(amount)) {
       try {
-        const expression = accum.toString();
+        const expression = amount.toString();
         const compiledExpression = configUtil.compileExpression(expression, this.op);
-        accum = { expression, compiledExpression };
+        amount = { expression, compiledExpression };
       } catch (err) {
         configUtil.throwConfigError(`Problem evaluating expression: ${err.message}`, this.op);
       }
@@ -64,12 +64,12 @@ class RisingEdgeCounterFilter extends TransformState {
       configUtil.requirePositive(mergeWindow, 'merge-window', this.op);
     }
 
-    defn.args = { accum, reset, mergeWindow };
+    defn.args = { amount, reset, mergeWindow };
   }
 
   static getExpressions(configUtil, body, info) {
     return [
-      ...configUtil.getExpressions(body, { ...info, field: 'accum' }, true),
+      ...configUtil.getExpressions(body, { ...info, field: 'amount' }, true),
       ...configUtil.getExpressions(body, { ...info, field: 'reset' }),
     ];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@machinemetrics/io-adapter-lib",
-  "version": "2.38.0",
+  "version": "2.38.1",
   "description": "Configuration and engine implementation for MachineMetrics AdapterScripts and adapters",
   "main": "index.js",
   "license": "UNLICENSED",

package/test/configFiles/transform/risingEdgeCounter.yml

@@ -34,3 +34,7 @@ variables:
   var7:
     - source: active
     - count: ppc
+  var8:
+    - source: active
+    - count:
+        amount: ppc

package/test/transform/risingEdgeCounter.test.js

@@ -224,4 +224,23 @@ describe('rising-edge-counter full engine config file tests', function () {
       [14, 8], [17, 10], [17, 12], [20, 14],
     ]);
   });
+
+  it('count by expression 3', function () {
+    const engine = new EngineV2(config);
+    const builder = new Builder(config);
+    builder.build(engine);
+
+    const source = testUtils.valueSource();
+    testUtils.attachEngineTransformValidator(engine, engine.variablePool.var8, source);
+
+    source.sendValue('ppc', 7, 0);
+    source.sendValues('active', [[false, 0], [true, 2], [false, 4], [true, 6]]);
+    source.sendValue('ppc', 3, 7);
+    source.sendValues('active', [[false, 8], [true, 10], [false, 12], [true, 14]]);
+
+    engine.validateFilter([
+      [0, 0], [7, 2], [7, 4], [14, 6], [14, 7],
+      [14, 8], [17, 10], [17, 12], [20, 14],
+    ]);
+  });
 });