@smile-cdr/fhirts 2.2.5 → 2.2.6

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.2.6
+
+* Fixed issue with `ResourceUtils.getValuesAtResourcePath` not being able to get an array with values if path exists for a top level element and is an object.
+
+
 ## 2.2.5
 
 * Fixed issue with `ResourceUtils.getValuesAtResourcePath` not being able to get an array with values if path exists for a top level element and is an array.

package/dist/library/ResourceUtils/ResourceUtils.js

@@ -65,14 +65,14 @@ class ResourceUtils {
             const subPaths = pathSections[index];
             resourcePathValue = resourcePathValue ? resourcePathValue[subPaths] : resource[subPaths];
             if (resourcePathValue) {
-                if (this.isPrimitive(resourcePathValue)) {
-                    return [resourcePathValue];
+                if (this.isPrimitive(resourcePathValue) || pathSections.length === 2) {
+                    return Array.isArray(resourcePathValue) ? [...resourcePathValue] : [resourcePathValue];
                 }
                 else if (Array.isArray(resourcePathValue) && resourcePathValue.length > 0) {
                     let resultSet = [];
                     for (let subPathIndex = 0; subPathIndex < resourcePathValue.length; subPathIndex++) {
                         const subPathValue = resourcePathValue[subPathIndex];
-                        if (this.isPrimitive(subPathValue) || pathSections.length === 2) {
+                        if (this.isPrimitive(subPathValue)) {
                             resultSet.push(subPathValue);
                         }
                         else {

package/dist/library/ResourceUtils/ResourceUtils.spec.js

@@ -190,7 +190,26 @@ describe("ResourceUtils", () => {
             expect(pathValues.length).toEqual(1);
             expect(pathValues[0]).toEqual("male");
         });
-        it("should return array with values if path exists for a top level element and is a array", () => {
+        it('should return array with values if path exists for a top level element and is an object', () => {
+            const expected = [
+                {
+                    coding: [
+                        {
+                            system: "http://terminology.hl7.org/CodeSystem/v3-MaritalStatus",
+                            code: "M",
+                            display: "Married"
+                        }
+                    ],
+                    text: "Getrouwd",
+                }
+            ];
+            // execute
+            const actual = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.maritalStatus");
+            // validate
+            expect(actual.length).toEqual(1);
+            expect(actual).toEqual(expected);
+        });
+        it("should return array with values if path exists for a top level element and is an array", () => {
             // setup
             const expected = [
                 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smile-cdr/fhirts",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "Fhir ts/js library for frontend apps",
   "license": "Apache-2.0",
   "main": "dist/index.js",

package/src/library/ResourceUtils/ResourceUtils.spec.ts

@@ -255,7 +255,30 @@ describe("ResourceUtils", () => {
       expect(pathValues[0]).toEqual("male");
     });
 
-    it("should return array with values if path exists for a top level element and is a array", () => {
+    it('should return array with values if path exists for a top level element and is an object', () => {
+      const expected = [
+        {
+          coding: [
+            {
+              system: "http://terminology.hl7.org/CodeSystem/v3-MaritalStatus",
+              code: "M",
+              display: "Married"
+            }
+          ],
+          text: "Getrouwd",
+        }
+      ];
+      // execute
+      const actual = resourceUtils.getValuesAtResourcePath(
+        patientPayload,
+        "Patient.maritalStatus"
+      );
+      // validate
+      expect(actual.length).toEqual(1);
+      expect(actual).toEqual(expected);
+    });
+
+    it("should return array with values if path exists for a top level element and is an array", () => {
       // setup
       const expected = [
         {

package/src/library/ResourceUtils/ResourceUtils.ts

@@ -76,13 +76,13 @@ export class ResourceUtils {
       const subPaths = pathSections[index];
       resourcePathValue = resourcePathValue ? resourcePathValue[subPaths] : resource[subPaths];
       if (resourcePathValue) {
-        if (this.isPrimitive(resourcePathValue)) {
-          return [resourcePathValue];
+        if (this.isPrimitive(resourcePathValue) || pathSections.length === 2) {
+          return Array.isArray(resourcePathValue) ? [...resourcePathValue] : [resourcePathValue];
         } else if (Array.isArray(resourcePathValue) && resourcePathValue.length > 0) {
           let resultSet = [];
           for (let subPathIndex = 0; subPathIndex < resourcePathValue.length; subPathIndex++) {
             const subPathValue = resourcePathValue[subPathIndex];
-            if (this.isPrimitive(subPathValue) || pathSections.length === 2) {
+            if (this.isPrimitive(subPathValue)) {
               resultSet.push(subPathValue);
             }
             else {