@smile-cdr/fhirts 2.2.4 → 2.2.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # 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.
+
 ## 2.2.4
 
 ### Updates (R3)

package/GETTINGSTARTED.md

@@ -12,8 +12,8 @@
 - [Utilities](#utilities)
    - [PatchUtils](#patchutils)
    - [QueryBuilder](#querybuilder)
-   - [BundleUtils](#bundleutilities)
-   - [ResourceUtils](#resourceutilities)
+   - [BundleUtils](#bundleutils)
+   - [ResourceUtils](#resourceutils)
    - [Bundle Utilities (static BundleUtils)](#bundleutilities)
    - [Resource Utilities (static ResourceUtils)](#resourceutilities)
 
@@ -88,7 +88,7 @@ Read more about resource narrowing here : https://www.typescriptlang.org/docs/ha
 - All of the above mentioned classes are currently in preliminary phase and will be refined in future as per needs.
 - The above utlity classes include common functionalities used by front end applications using FHIR. 
 
-#### PatchUtils 
+#### PatchUtils
 - Published in `v2.2.0`.
 - Example usage demonstrated below.
 ```js
@@ -118,7 +118,7 @@ console.log(patchParameters)
          }
 	   ]
    }
- * 
+ */ 
 ```
 
 #### QueryBuilder
@@ -148,9 +148,9 @@ import { BundleUtils } from '@smile-cdr/fhirts';
  
 const bundleUtils = new BundleUtils();
 // returns arrayof Claim resources from Bundle.entry 
-const claimsList = bundleUtils.getResourcesFromBundle(Bundle.entry, 'Claim');
+const claimsList = bundleUtils.getResources(Bundle.entry, 'Claim');
 // returns a single resource with ID 123 from Bundle.entry
-const resource = bundleUtils.getResourceFromBundle(Bundle.entry, '123'); 
+const resource = bundleUtils.getResource(Bundle.entry, '123'); 
 ```
 
 #### ResourceUtils

package/dist/library/ResourceUtils/ResourceUtils.js

@@ -65,8 +65,8 @@ 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 = [];

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

@@ -190,6 +190,47 @@ 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 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 = [
+                {
+                    use: "usual",
+                    family: "van de Heuvel",
+                    given: ["Pieter", "Peter"],
+                    suffix: ["MSc"],
+                },
+                {
+                    use: "usual",
+                    family: "van de Heuvel",
+                    given: ["Pieter"],
+                    suffix: ["MSc"],
+                },
+            ];
+            // execute
+            const actual = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.name");
+            // validate
+            expect(actual.length).toEqual(2);
+            expect(actual).toEqual(expected);
+        });
         it("should return array with values for a array under object", () => {
             // execute
             const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.name.given");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smile-cdr/fhirts",
-  "version": "2.2.4",
+  "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,6 +255,55 @@ describe("ResourceUtils", () => {
       expect(pathValues[0]).toEqual("male");
     });
 
+    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 = [
+        {
+          use: "usual",
+          family: "van de Heuvel",
+          given: ["Pieter", "Peter"],
+          suffix: ["MSc"],
+        },
+        {
+          use: "usual",
+          family: "van de Heuvel",
+          given: ["Pieter"],
+          suffix: ["MSc"],
+        },
+      ];
+      // execute
+      const actual = resourceUtils.getValuesAtResourcePath(
+        patientPayload,
+        "Patient.name"
+      );
+      // validate
+      expect(actual.length).toEqual(2);
+      expect(actual).toEqual(expected);
+    });
+
     it("should return array with values for a array under object", () => {
       // execute
       const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.name.given");

package/src/library/ResourceUtils/ResourceUtils.ts

@@ -76,15 +76,16 @@ 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)) {
               resultSet.push(subPathValue);
-            } else {
+            }
+            else {
               resultSet.push(...this.getValuesAtResourcePath(subPathValue,
                 pathSections.slice(index).join(".")));
             }