Merge pull request #49 in LFOR/fhirpath.js from bugfix/LF-2368/aggreg…

…ates-init-parameters to master

* commit '5131cc6caeccaf7a21331780ee579a74294539ae':
  npm audit fix
  Version info
  unit test the aggregate function with a string init value
  #117 aggregate init function type information

CHANGELOG.md

@@ -3,6 +3,10 @@
 This log documents significant changes for each release.  This project follows
 [Semantic Versioning](http://semver.org/).
 
+## [3.3.1] - 2022-11-22
+### Fixed
+- Aggregate init parameter can be any type, not just an integer.
+
 ## [3.3.0] - 2022-11-21
 ### Added
 - An API method `types` which returns the type of each element in FHIRPath result

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhirpath",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "A FHIRPath engine",
   "main": "src/fhirpath.js",
   "dependencies": {

src/fhirpath.js

@@ -78,7 +78,7 @@ engine.invocationTable = {
   where:        {fn: filtering.whereMacro, arity: {1: ["Expr"]}},
   extension:    {fn: filtering.extension, arity: {1: ["String"]}},
   select:       {fn: filtering.selectMacro, arity: {1: ["Expr"]}},
-  aggregate:    {fn: aggregate.aggregateMacro, arity: {1: ["Expr"], 2: ["Expr", "Integer"]}},
+  aggregate:    {fn: aggregate.aggregateMacro, arity: {1: ["Expr"], 2: ["Expr", "Any"]}},
   sum:          {fn: aggregate.sumFn},
   min:          {fn: aggregate.minFn},
   max:          {fn: aggregate.maxFn},

test/cases/7_aggregate.yaml

@@ -17,6 +17,10 @@ tests:
         expression: 10 + (1|2|3).aggregate($total + $this*$index, 4) = 22
         result:
           - true
+      - desc: 'aggregate() function with string initial value'
+        expression: ('a'|'b'|'c').aggregate($total & '-' & $this, 'concat')
+        result:
+          - 'concat-a-b-c'
     - 'group: Extension functions':
       - desc: 'sum() function calculates the sum of input collection'
         expression: (1|2|3|4|5|6|7|8|9).sum() = 45