@smile-cdr/fhirts 2.2.6 → 2.2.8

package/CHANGELOG.md

@@ -1,10 +1,17 @@
 # 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.
+
 ## 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/GETTINGSTARTED.md

@@ -151,6 +151,8 @@ const bundleUtils = new BundleUtils();
 const claimsList = bundleUtils.getResources(Bundle.entry, 'Claim');
 // returns a single resource with ID 123 from Bundle.entry
 const resource = bundleUtils.getResource(Bundle.entry, '123'); 
+// returns a single resource with full url 123 from Bundle.entry
+const resource = bundleUtils.getResourceByFullUrl(Bundle.entry, 'http://server-host/fhir/Patient/123'); 
 ```
 
 #### ResourceUtils

package/dist/library/BundleUtils/BundleUtils.d.ts

@@ -13,4 +13,11 @@ export declare class BundleUtils {
      * @returns single resource
      */
     getResource(bundleEntry: any[], resourceId: string): any;
+    /**
+     *
+     * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+     * @param fullUrl Full Url to filter from bundle entries
+     * @returns single resource
+     */
+    getResourceByFullUrl(bundleEntry: any[], fullUrl: string): any;
 }

package/dist/library/BundleUtils/BundleUtils.js

@@ -20,5 +20,14 @@ class BundleUtils {
     getResource(bundleEntry, resourceId) {
         return (bundleEntry === null || bundleEntry === void 0 ? void 0 : bundleEntry.length) ? bundleEntry.find(x => x['resource']['id'] === resourceId) : null;
     }
+    /**
+     *
+     * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+     * @param fullUrl Full Url to filter from bundle entries
+     * @returns single resource
+     */
+    getResourceByFullUrl(bundleEntry, fullUrl) {
+        return (bundleEntry === null || bundleEntry === void 0 ? void 0 : bundleEntry.length) ? bundleEntry.find(x => x['fullUrl'] === fullUrl) : null;
+    }
 }
 exports.BundleUtils = BundleUtils;

package/dist/library/BundleUtils/BundleUtils.spec.js

@@ -41,7 +41,27 @@ describe("BundleUtils", () => {
             // execute
             const actual = bundleUtils.getResource(inputPayload.entry, "ec0bb1b3-b229-36cf-7e34-3f5fec9d3afe");
             // validate
-            expect(actual).not.toBeNull();
+            expect(actual).not.toBeUndefined();
+        });
+    });
+    describe("#getResourceByFullUrl()", () => {
+        it("should return null if null is passed as bundle entries", () => {
+            // execute
+            const actual = bundleUtils.getResourceByFullUrl(null, "123");
+            // validate
+            expect(actual).toBeNull();
+        });
+        it("should return undefined if fullUrl is not found", () => {
+            // execute
+            const actual = bundleUtils.getResourceByFullUrl(inputPayload.entry, "123");
+            // validate
+            expect(actual).toBeUndefined();
+        });
+        it("should return resource if resource is found", () => {
+            // execute
+            const actual = bundleUtils.getResourceByFullUrl(inputPayload.entry, "urn:uuid:7c52dd91-73f8-83e1-cab2-2ffdd7a34601");
+            // validate
+            expect(actual).not.toBeUndefined();
         });
     });
 });

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.6",
+  "version": "2.2.8",
   "description": "Fhir ts/js library for frontend apps",
   "license": "Apache-2.0",
   "main": "dist/index.js",

package/src/library/BundleUtils/BundleUtils.spec.ts

@@ -59,7 +59,36 @@ describe("BundleUtils", () => {
         "ec0bb1b3-b229-36cf-7e34-3f5fec9d3afe"
       );
       // validate
-      expect(actual).not.toBeNull();
+      expect(actual).not.toBeUndefined();
     });
   });
+
+  describe("#getResourceByFullUrl()", () => {
+    it("should return null if null is passed as bundle entries", () => {
+      // execute
+      const actual = bundleUtils.getResourceByFullUrl(null, "123");
+      // validate
+      expect(actual).toBeNull();
+    });
+
+    it("should return undefined if fullUrl is not found", () => {
+      // execute
+      const actual = bundleUtils.getResourceByFullUrl(
+        inputPayload.entry,
+        "123"
+      );
+      // validate
+      expect(actual).toBeUndefined();
+    });
+
+    it("should return resource if resource is found", () => {
+      // execute
+      const actual = bundleUtils.getResourceByFullUrl(
+        inputPayload.entry,
+        "urn:uuid:7c52dd91-73f8-83e1-cab2-2ffdd7a34601"
+      );
+      // validate
+      expect(actual).not.toBeUndefined();
+    });
+  })
 });

package/src/library/BundleUtils/BundleUtils.ts

@@ -20,6 +20,15 @@ export class BundleUtils {
         return bundleEntry?.length ? bundleEntry.find(x => x['resource']['id'] === resourceId) : null;
     }
 
+    /**
+     *
+     * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+     * @param fullUrl Full Url to filter from bundle entries
+     * @returns single resource
+     */
+    getResourceByFullUrl(bundleEntry: any[], fullUrl: string): any {
+        return bundleEntry?.length ? bundleEntry.find(x => x['fullUrl'] === fullUrl) : null;
+    }
 }
 
 

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;