Revert "Revert "Fix #136""

This reverts commit 749fc98

Author: yuriy-sedinkin

CHANGELOG.md

@@ -3,6 +3,10 @@
 This log documents significant changes for each release.  This project follows
 [Semantic Versioning](http://semver.org/).
 
+## [3.14.1] - 2024-05-21
+### Fixed
+- impossibility to use attribute name that starts with a capital letter.
+
 ## [3.14.0] - 2024-05-09
 ### Added
 - supplementary function `weight()` with alternative name `ordinal()`.

package-lock.json

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

package.json

@@ -378,17 +378,16 @@ engine.MemberInvocation = function(ctx, parentData, node ) {
   const model = ctx.model;
 
   if (parentData) {
-    if(util.isCapitalized(key)) {
-      return parentData
-        .filter((x) => x instanceof ResourceNode && x.path === key);
-    } else {
-      return parentData.reduce(function(acc, res) {
-        res = makeResNode(res, null, res.__path__?.path, null,
-          res.__path__?.fhirNodeDataType);
+    return parentData.reduce(function(acc, res) {
+      res = makeResNode(res, null, res.__path__?.path, null,
+        res.__path__?.fhirNodeDataType);
+      if (res.data?.resourceType === key) {
+        acc.push(res);
+      } else {
         util.pushFn(acc, util.makeChildResNodes(res, key, model));
-        return acc;
-      }, []);
-    }
+      }
+      return acc;
+    }, []);
   } else {
     return [];
   }

src/fhirpath.js

@@ -99,9 +99,18 @@ tests:
       model: 'stu3'
       result: ['Green']
 
+    - desc: "Access a custom field starting with a capital letter (1)"
+      expression: CustomField = 'test'
+      result: [true]
+
+    - desc: "Access a custom field starting with a capital letter (2)"
+      expression: Observation.CustomField = 'test'
+      result: [true]
+
 
 subject:
   resourceType: Observation
+  CustomField: "test"
   valueString: "high"
   contained:
     - resourceType: Observation