@smile-cdr/fhirts 2.2.7 → 2.2.8

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.2.8
+
+* Fixed issue with `ResourceUtils.getValuesAtResourcePath` not checking if the root of the path matches the resource type.
+
 ## 2.2.7
 
 * Added `BundleUtils.getResourceByFullUrl` to get a resource by its full url from a bundle.
@@ -8,7 +12,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.d.ts

@@ -39,6 +39,7 @@ export declare class ResourceUtils {
      * @returns array of elements found at the provided path
      */
     getValuesAtResourcePath(resource: any, elementPath: string): any[];
+    private getValuesAtResourcePathInner;
     private isPrimitive;
     /**
      * @param resource resource to pull out references from

package/dist/library/ResourceUtils/ResourceUtils.js

@@ -59,7 +59,12 @@ class ResourceUtils {
      * @returns array of elements found at the provided path
      */
     getValuesAtResourcePath(resource, elementPath) {
-        const pathSections = elementPath.split(".");
+        const pathSections = elementPath.split('.');
+        if (!resource || (resource.resourceType !== pathSections[0]))
+            return [];
+        return this.getValuesAtResourcePathInner(resource, pathSections);
+    }
+    getValuesAtResourcePathInner(resource, pathSections) {
         let resourcePathValue;
         for (let index = 1; index < pathSections.length; index++) {
             const subPaths = pathSections[index];
@@ -76,13 +81,13 @@ class ResourceUtils {
                             resultSet.push(subPathValue);
                         }
                         else {
-                            resultSet.push(...this.getValuesAtResourcePath(subPathValue, pathSections.slice(index).join(".")));
+                            resultSet.push(...this.getValuesAtResourcePathInner(subPathValue, pathSections.slice(index)));
                         }
                     }
                     return resultSet;
                 }
                 else if (typeof (resourcePathValue) === 'object') {
-                    return this.getValuesAtResourcePath(resourcePathValue, pathSections.slice(index).join("."));
+                    return this.getValuesAtResourcePathInner(resourcePathValue, pathSections.slice(index));
                 }
             }
             else {

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

@@ -183,6 +183,12 @@ describe("ResourceUtils", () => {
         });
     });
     describe("#getValuesAtResourcePath()", () => {
+        it("should return empty array if the root of the path path does not match the resource type", () => {
+            // execute
+            const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Practitioner.name.given");
+            // validate
+            expect(pathValues.length).toEqual(0);
+        });
         it("should return array with values if path exists for a top level element", () => {
             // execute
             const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.gender");

package/package.json

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

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

@@ -247,6 +247,13 @@ describe("ResourceUtils", () => {
 
   describe("#getValuesAtResourcePath()", () => {
 
+    it("should return empty array if the root of the path path does not match the resource type", () => {
+      // execute
+      const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Practitioner.name.given");
+      // validate
+      expect(pathValues.length).toEqual(0);
+    });
+
     it("should return array with values if path exists for a top level element", () => {
       // execute
       const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.gender");

package/src/library/ResourceUtils/ResourceUtils.ts

@@ -70,7 +70,12 @@ export class ResourceUtils {
    * @returns array of elements found at the provided path
    */
   getValuesAtResourcePath(resource: any, elementPath: string): any[] {
-    const pathSections = elementPath.split(".");
+    const pathSections = elementPath.split('.');
+    if (!resource || (resource.resourceType !== pathSections[0])) return [];
+    return this.getValuesAtResourcePathInner(resource, pathSections);
+  }
+
+  private getValuesAtResourcePathInner(resource: any, pathSections: string[]): any[] {
     let resourcePathValue;
     for (let index = 1; index < pathSections.length; index++) {
       const subPaths = pathSections[index];
@@ -86,14 +91,12 @@ export class ResourceUtils {
               resultSet.push(subPathValue);
             }
             else {
-              resultSet.push(...this.getValuesAtResourcePath(subPathValue,
-                pathSections.slice(index).join(".")));
+              resultSet.push(...this.getValuesAtResourcePathInner(subPathValue, pathSections.slice(index)));
             }
           }
           return resultSet;
         } else if (typeof (resourcePathValue) === 'object') {
-          return this.getValuesAtResourcePath(resourcePathValue,
-            pathSections.slice(index).join("."));
+          return this.getValuesAtResourcePathInner(resourcePathValue, pathSections.slice(index));
         }
       } else {
         break;