@smile-cdr/fhirts 2.1.0 → 2.1.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.1.1
+
+* Fix issue with `BundleUtils.getResourceFromBundle` not being able get the values inside nested array under array of objects.
+
+## 2.1.0
+
+* Remove static classes for `BundleUtilities` & `ResourceUtilities` to non static classes `BundleUtils` & `ResourceUtils.`
+
 ## 2.0.7
 
 ### Updates (R4)

package/GETTINGSTARTED.md

@@ -97,7 +97,7 @@ If you try writing this out you will see that the variable `resource` inside the
 ### `v2.1.0`
 #### BundleUtils usage
 ```js
-import { BundleUtils } from '@smilecdr/fhirts';
+import { BundleUtils } from '@smile-cdr/fhirts';
  
 const bundleUtils = new BundleUtils();
 // returns arrayof Claim resources from Bundle.entry 
@@ -108,7 +108,7 @@ const resource = bundleUtils.getResourceFromBundle(Bundle.entry, '123');
 
 #### ResourceUtils usage
 ```js
-import { ResourceUtils } from '@smilecdr/fhirts';
+import { ResourceUtils } from '@smile-cdr/fhirts';
 const resourceUtils = new ResourceUtils();
 // returns deserialized Patient resource
 const deserializedPatientResource = resourceUtils.deserializeResource(jsonPatientPayload, new Patient()); 
@@ -136,7 +136,7 @@ const references = resourceUtils.getAllReferencesFromResource(resourcePayload);
 ### `v2.0.0`
 #### BundleUtilities usage
 ```js
-import { BundleUtilities } from '@smilecdr/fhirts';
+import { BundleUtilities } from '@smile-cdr/fhirts';
  
 // returns arrayof Claim resources from Bundle.entry 
 const claimsList = BundleUtilities.getResourcesFromBundle(Bundle.entry, 'Claim'); 
@@ -144,7 +144,7 @@ const claimsList = BundleUtilities.getResourcesFromBundle(Bundle.entry, 'Claim')
 
 #### ResourceUtilities usage
 ```js
-import { ResourceUtilities } from '@smilecdr/fhirts';
+import { ResourceUtilities } from '@smile-cdr/fhirts';
 
 // returns deserialized Patient resource
 const deserializedPatientResource = ResourceUtilities.deserializeResource(jsonPatientPayload, new Patient()); 

package/dist/library/ResourceUtils/ResourceUtils.js

@@ -72,7 +72,12 @@ class ResourceUtils {
                     let resultSet = [];
                     for (let subPathIndex = 0; subPathIndex < resourcePathValue.length; subPathIndex++) {
                         const subPathValue = resourcePathValue[subPathIndex];
-                        resultSet.push(...this.getValuesAtResourcePath(subPathValue, pathSections.slice(index).join(".")));
+                        if (this.isPrimitive(subPathValue)) {
+                            resultSet.push(subPathValue);
+                        }
+                        else {
+                            resultSet.push(...this.getValuesAtResourcePath(subPathValue, pathSections.slice(index).join(".")));
+                        }
                     }
                     return resultSet;
                 }

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

@@ -187,6 +187,15 @@ describe("ResourceUtils", () => {
             expect(pathValues.length).toEqual(1);
             expect(pathValues[0]).toEqual("male");
         });
+        it("should return array with values for a array under object", () => {
+            // execute
+            const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.name.given");
+            // validate
+            expect(pathValues.length).toEqual(3);
+            expect(pathValues[0]).toEqual("Pieter");
+            expect(pathValues[1]).toEqual("Peter");
+            expect(pathValues[2]).toEqual("Pieter");
+        });
         it("should return array with values if path exists for a deep array element", () => {
             // execute
             const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.contact.relationship.coding.system");

package/package.json

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

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

@@ -253,6 +253,16 @@ describe("ResourceUtils", () => {
       expect(pathValues[0]).toEqual("male");
     });
 
+    it("should return array with values for a array under object", () => {
+      // execute
+      const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.name.given");
+      // validate
+      expect(pathValues.length).toEqual(3);
+      expect(pathValues[0]).toEqual("Pieter");
+      expect(pathValues[1]).toEqual("Peter");
+      expect(pathValues[2]).toEqual("Pieter");
+    });
+
     it("should return array with values if path exists for a deep array element", () => {
       // execute
       const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.contact.relationship.coding.system");

package/src/library/ResourceUtils/ResourceUtils.ts

@@ -80,8 +80,12 @@ export class ResourceUtils {
            let resultSet = [];
            for (let subPathIndex = 0; subPathIndex < resourcePathValue.length; subPathIndex++) {
               const subPathValue = resourcePathValue[subPathIndex];
-              resultSet.push(...this.getValuesAtResourcePath(subPathValue,
-                 pathSections.slice(index).join(".")));
+              if(this.isPrimitive(subPathValue)) {
+                resultSet.push(subPathValue);
+              } else {
+                resultSet.push(...this.getValuesAtResourcePath(subPathValue,
+                  pathSections.slice(index).join(".")));
+              }
            }
            return resultSet;
         } else if (typeof(resourcePathValue) === 'object') {

package/src/test-resources/Patient-R4.json

@@ -22,7 +22,8 @@
         "use": "usual",
         "family": "van de Heuvel",
         "given": [
-          "Pieter"
+          "Pieter",
+          "Peter"
         ],
         "suffix": [
           "MSc"