Merge branch 'bugfix/LF-3223/fix-userInvocationTable-for-toString' in…

…to 'master'

Fix bug with toString when userInvocationTable passed

See merge request lfor/fhirpath.js!24

CHANGELOG.md

@@ -3,6 +3,10 @@
 This log documents significant changes for each release.  This project follows
 [Semantic Versioning](http://semver.org/).
 
+## [3.16.2] - 2025-01-16
+### Fixed
+- Bug with toString when userInvocationTable passed.
+
 ## [3.16.1] - 2025-01-09
 ### Fixed
 - Read environment variables only when they are used in an expression, avoiding

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhirpath",
-  "version": "3.16.1",
+  "version": "3.16.2",
   "description": "A FHIRPath engine",
   "main": "src/fhirpath.js",
   "types": "src/fhirpath.d.ts",

src/fhirpath.js

@@ -506,7 +506,10 @@ function makeParam(ctx, parentData, type, param) {
 }
 
 function doInvoke(ctx, fnName, data, rawParams){
-  var invoc = ctx.userInvocationTable?.[fnName]
+  var invoc =
+    ctx.userInvocationTable
+    && Object.prototype.hasOwnProperty.call(ctx.userInvocationTable, fnName)
+    && ctx.userInvocationTable?.[fnName]
     || engine.invocationTable[fnName]
     || data.length === 1 && data[0]?.invocationTable[fnName];
   var res;

test/user-invocation-table.test.js

@@ -75,6 +75,23 @@ describe('concept', () => {
     expr = "next.concept().select($this | $this.next.concept()).display";
     retrieved = fhirpath.evaluate(concepts.a, expr, null, null, options);
     expect(retrieved).toEqual(["B", "C"]);
+  });
+});
+
+describe("toString", () => {
+  it("Works when userInvocationTable passed without overriding toString", () => {
+    const options = {
+      userInvocationTable: {},
+    };
+
+    let result = fhirpath.evaluate(
+      { index: 0 },
+      "index.toString()",
+      null,
+      null,
+      options
+    );
 
+    expect(result).toEqual(["0"]);
   });
 });