@smile-cdr/fhirts 2.0.7 → 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

@@ -94,18 +94,57 @@ If you try writing this out you will see that the variable `resource` inside the
 - The above utlity classes include common functionalities used by front end applications using FHIR. 
 - All utilities functions are static right now, so, no need for instantiating classes. **Note: This is subject to change in future**
 
+### `v2.1.0`
+#### BundleUtils usage
+```js
+import { BundleUtils } from '@smile-cdr/fhirts';
+ 
+const bundleUtils = new BundleUtils();
+// returns arrayof Claim resources from Bundle.entry 
+const claimsList = bundleUtils.getResourcesFromBundle(Bundle.entry, 'Claim');
+// returns a single resource with ID 123 from Bundle.entry
+const resource = bundleUtils.getResourceFromBundle(Bundle.entry, '123'); 
+```
+
+#### ResourceUtils usage
+```js
+import { ResourceUtils } from '@smile-cdr/fhirts';
+const resourceUtils = new ResourceUtils();
+// returns deserialized Patient resource
+const deserializedPatientResource = resourceUtils.deserializeResource(jsonPatientPayload, new Patient()); 
+
+// returns Patient.gender
+const patientGender = resourceUtils.getResourceProperty(jsonPatientPayload, 'gender'); 
+
+// returns all matching identifiers where Identifier.use = usual
+const identifierFilter = resourceUtils.getIdentifiersByProperty(identifierList,"use","usual"); 
+
+const url = "http://ns.electronichealth.net.au/id/hi/ihi/1.0";
+// returns all matching extensions where Extension.use = "http://ns.electronichealth.net.au/id/hi/ihi/1.0"
+const extensionFilter = resourceUtils.getExtensionsByUrl(extensionList, url); 
+
+// returns all matching codings where Coding.code = "abc"
+const codingFilter = resourceUtils.getCodingsByProperty(codingList,"code","abc"); 
+// returns array of elements found at provided path and returns empty array if no values found 
+const values = resourceUtils.getValuesAtResourcePath(jsonPatientPayload, "Patient.contact.relationship.coding.system");
+// returns array of references found in a resource
+const references = resourceUtils.getAllReferencesFromResource(resourcePayload);
+```
+
+
 
+### `v2.0.0`
 #### BundleUtilities usage
 ```js
-import { BundleUtilities } from '@smilecdr/fhirts';
+import { BundleUtilities } from '@smile-cdr/fhirts';
  
-// returns list of Claim resources from Bundle.entry 
+// returns arrayof Claim resources from Bundle.entry 
 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/index.d.ts

@@ -2,6 +2,6 @@ import * as fhirR4 from './FHIR-R4/classes/models-r4';
 import * as IfhirR4 from './FHIR-R4/interfaces/IModel';
 import * as fhirR3 from './FHIR-R3';
 import * as dstu2 from './FHIR-DSTU2';
-import { ResourceUtilities } from './library/ResourceUtilities/ResourceUtilities';
-import { BundleUtilities } from './library/BundleUtilities/BundleUtilities';
-export { fhirR4, fhirR3, IfhirR4, dstu2, ResourceUtilities, BundleUtilities };
+import { ResourceUtils } from './library/ResourceUtils/ResourceUtils';
+import { BundleUtils } from './library/BundleUtils/BundleUtils';
+export { fhirR4, fhirR3, IfhirR4, dstu2, ResourceUtils, BundleUtils };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BundleUtilities = exports.ResourceUtilities = exports.dstu2 = exports.IfhirR4 = exports.fhirR3 = exports.fhirR4 = void 0;
+exports.BundleUtils = exports.ResourceUtils = exports.dstu2 = exports.IfhirR4 = exports.fhirR3 = exports.fhirR4 = void 0;
 const fhirR4 = require("./FHIR-R4/classes/models-r4");
 exports.fhirR4 = fhirR4;
 const IfhirR4 = require("./FHIR-R4/interfaces/IModel");
@@ -9,7 +9,7 @@ const fhirR3 = require("./FHIR-R3");
 exports.fhirR3 = fhirR3;
 const dstu2 = require("./FHIR-DSTU2");
 exports.dstu2 = dstu2;
-const ResourceUtilities_1 = require("./library/ResourceUtilities/ResourceUtilities");
-Object.defineProperty(exports, "ResourceUtilities", { enumerable: true, get: function () { return ResourceUtilities_1.ResourceUtilities; } });
-const BundleUtilities_1 = require("./library/BundleUtilities/BundleUtilities");
-Object.defineProperty(exports, "BundleUtilities", { enumerable: true, get: function () { return BundleUtilities_1.BundleUtilities; } });
+const ResourceUtils_1 = require("./library/ResourceUtils/ResourceUtils");
+Object.defineProperty(exports, "ResourceUtils", { enumerable: true, get: function () { return ResourceUtils_1.ResourceUtils; } });
+const BundleUtils_1 = require("./library/BundleUtils/BundleUtils");
+Object.defineProperty(exports, "BundleUtils", { enumerable: true, get: function () { return BundleUtils_1.BundleUtils; } });

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

@@ -0,0 +1,16 @@
+export declare class BundleUtils {
+    /**
+     *
+     * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+     * @param resourceTypeToFilter ResourceType to filter from bundle entries
+     * @returns array of resources
+     */
+    getResources(bundleEntry: any[], resourceTypeToFilter: string): any[];
+    /**
+     *
+     * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+     * @param resourceId Resource ID to filter from bundle entries
+     * @returns single resource
+     */
+    getResource(bundleEntry: any[], resourceId: string): any;
+}

package/dist/library/BundleUtils/BundleUtils.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BundleUtils = void 0;
+class BundleUtils {
+    /**
+     *
+     * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+     * @param resourceTypeToFilter ResourceType to filter from bundle entries
+     * @returns array of resources
+     */
+    getResources(bundleEntry, resourceTypeToFilter) {
+        return (bundleEntry === null || bundleEntry === void 0 ? void 0 : bundleEntry.length) ? bundleEntry.filter(x => x['resource']['resourceType'] === resourceTypeToFilter) : [];
+    }
+    /**
+     *
+     * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+     * @param resourceId Resource ID to filter from bundle entries
+     * @returns single resource
+     */
+    getResource(bundleEntry, resourceId) {
+        return (bundleEntry === null || bundleEntry === void 0 ? void 0 : bundleEntry.length) ? bundleEntry.find(x => x['resource']['id'] === resourceId) : null;
+    }
+}
+exports.BundleUtils = BundleUtils;

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

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const BundleUtils_1 = require("./BundleUtils");
+const inputPayload = require("./../../test-resources/Bundle-R4.json");
+describe("BundleUtils", () => {
+    let bundleUtils = new BundleUtils_1.BundleUtils();
+    describe("#getResources()", () => {
+        it("should return empty array if null is passed as bundle entries", () => {
+            // execute
+            const actual = bundleUtils.getResources(null, "Patient");
+            // validate
+            expect(actual.length).toEqual(0);
+        });
+        it("should return empty array if invalid resourceType is passed", () => {
+            // execute
+            const actual = bundleUtils.getResources(inputPayload.entry, "patient");
+            // validate
+            expect(actual.length).toEqual(0);
+        });
+        it("should return all matches array", () => {
+            // execute
+            const actual = bundleUtils.getResources(inputPayload.entry, "Claim");
+            // validate
+            expect(actual.length).toEqual(27);
+        });
+    });
+    describe("#getResource()", () => {
+        it("should return null if null is passed as bundle entries", () => {
+            // execute
+            const actual = bundleUtils.getResource(null, "123");
+            // validate
+            expect(actual).toBeNull();
+        });
+        it("should return undefined if resourceId is not found", () => {
+            // execute
+            const actual = bundleUtils.getResource(inputPayload.entry, "123");
+            // validate
+            expect(actual).toBeUndefined();
+        });
+        it("should return resource if resource is found", () => {
+            // execute
+            const actual = bundleUtils.getResource(inputPayload.entry, "ec0bb1b3-b229-36cf-7e34-3f5fec9d3afe");
+            // validate
+            expect(actual).not.toBeNull();
+        });
+    });
+});

package/dist/library/{ResourceUtilities/ResourceUtilities.d.ts → ResourceUtils/ResourceUtils.d.ts}

@@ -1,4 +1,4 @@
-export declare class ResourceUtility {
+export declare class ResourceUtils {
     /**
      *
      * @param inputJson - valid json
@@ -31,5 +31,17 @@ export declare class ResourceUtility {
      * @returns array of matches
      */
     getCodingsByProperty(codingList: any[], propertyToCompare: string, propertyValue: string | boolean): any[];
+    /**
+     *
+     * @param resource resource for which path needs to be validated
+     * @param elementPath path to validate in resource
+     * @returns array of elements found at the provided path
+     */
+    getValuesAtResourcePath(resource: any, elementPath: string): any[];
+    private isPrimitive;
+    /**
+     * @param resource resource to pull out references from
+     * @returns array of references inside a resource
+     */
+    getAllReferencesFromResource(resource: any): string[];
 }
-export declare const ResourceUtilities: ResourceUtility;

package/dist/library/ResourceUtils/ResourceUtils.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResourceUtils = void 0;
+class ResourceUtils {
+    /**
+     *
+     * @param inputJson - valid json
+     * @param propertyName - top level property for resource
+     * @returns json property if it exists
+     * @limitation currently just supports get for top level property on resource
+     */
+    getResourceProperty(inputJson, propertyName) {
+        let resourcePropertyValue = null;
+        if (inputJson.hasOwnProperty(propertyName)) {
+            resourcePropertyValue = inputJson[propertyName];
+        }
+        return resourcePropertyValue;
+    }
+    /**
+     *
+     * @param identifierList list of identifiers
+     * @param propertyToCompare identifier property to compare
+     * @param propertyValue value we want to compare against
+     * @returns array of matches
+     * @limitations currently does not work with identifier.type, identifier.period & identifier.assigner
+     */
+    getIdentifiersByProperty(identifierList, propertyToCompare, propertyValue) {
+        return (identifierList === null || identifierList === void 0 ? void 0 : identifierList.length)
+            ? identifierList.filter((x) => x[propertyToCompare] === propertyValue)
+            : [];
+    }
+    /**
+     *
+     * @param extensionList list of extensions
+     * @param extensionUrl Extension.url to compare
+     * @returns array of matches
+     */
+    getExtensionsByUrl(extensionList, extensionUrl) {
+        return (extensionList === null || extensionList === void 0 ? void 0 : extensionList.length)
+            ? extensionList.filter((x) => x["url"] === extensionUrl)
+            : [];
+    }
+    /**
+     *
+     * @param codingList list of codings
+     * @param propertyToCompare coding property to compare
+     * @param propertyValue value we want to compare against string or boolean
+     * @returns array of matches
+     */
+    getCodingsByProperty(codingList, propertyToCompare, propertyValue) {
+        return (codingList === null || codingList === void 0 ? void 0 : codingList.length)
+            ? codingList.filter((x) => x[propertyToCompare] === propertyValue)
+            : [];
+    }
+    /**
+     *
+     * @param resource resource for which path needs to be validated
+     * @param elementPath path to validate in resource
+     * @returns array of elements found at the provided path
+     */
+    getValuesAtResourcePath(resource, elementPath) {
+        const pathSections = elementPath.split(".");
+        let resourcePathValue;
+        for (let index = 1; index < pathSections.length; index++) {
+            const subPaths = pathSections[index];
+            resourcePathValue = resourcePathValue ? resourcePathValue[subPaths] : resource[subPaths];
+            if (resourcePathValue) {
+                if (this.isPrimitive(resourcePathValue)) {
+                    return [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 {
+                            resultSet.push(...this.getValuesAtResourcePath(subPathValue, pathSections.slice(index).join(".")));
+                        }
+                    }
+                    return resultSet;
+                }
+                else if (typeof (resourcePathValue) === 'object') {
+                    return this.getValuesAtResourcePath(resourcePathValue, pathSections.slice(index).join("."));
+                }
+            }
+            else {
+                break;
+            }
+        }
+        return [];
+    }
+    isPrimitive(value) {
+        return typeof (value) === "boolean" || typeof (value) === "string";
+    }
+    /**
+     * @param resource resource to pull out references from
+     * @returns array of references inside a resource
+     */
+    getAllReferencesFromResource(resource) {
+        const stringifiedResource = JSON.stringify(resource);
+        const referenceJsonString = '"reference":';
+        let references = [];
+        let cursor = stringifiedResource.indexOf(referenceJsonString, 0);
+        while (cursor > -1) {
+            const referenceStart = stringifiedResource.indexOf(referenceJsonString, cursor) + referenceJsonString.length;
+            const referenceEnd = stringifiedResource.indexOf('"', referenceStart + 1);
+            const reference = stringifiedResource.substring(referenceStart, referenceEnd);
+            // this means the reference ends started reading from start again
+            if (referenceEnd < cursor) {
+                break;
+            }
+            references.push(reference);
+            cursor = referenceEnd;
+        }
+        return references;
+    }
+}
+exports.ResourceUtils = ResourceUtils;

package/dist/library/{ResourceUtilities/ResourceUtilities.spec.js → ResourceUtils/ResourceUtils.spec.js}

@@ -1,26 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ResourceUtilities_1 = require("./ResourceUtilities");
-const inputPayload = require("./../../test-resources/Patient-R4.json");
-describe("ResourceUtilities", () => {
+const ResourceUtils_1 = require("./ResourceUtils");
+const patientPayload = require("./../../test-resources/Patient-R4.json");
+const careTeamPayload = require("./../../test-resources/CareTeam-R4.json");
+describe("ResourceUtils", () => {
+    let resourceUtils = new ResourceUtils_1.ResourceUtils();
     describe("#getResourceProperty()", () => {
-        it('should return property if property exists in valid inputJson', () => {
+        it("should return property if property exists in valid inputJson", () => {
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getResourceProperty(inputPayload, 'deceasedBoolean');
+            const actual = resourceUtils.getResourceProperty(patientPayload, "deceasedBoolean");
             // validate
             expect(actual).toBeFalse();
         });
-        it('should return null if property exists in valid inputJson', () => {
+        it("should return null if property exists in valid inputJson", () => {
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getResourceProperty(inputPayload, 'abcd');
+            const actual = resourceUtils.getResourceProperty(patientPayload, "abcd");
             // validate
             expect(actual).toBeNull();
         });
-        it('should return null if invalid inputJson is passed', () => {
+        it("should return null if invalid inputJson is passed", () => {
             // setup
             const inputPayload = [1, 2];
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getResourceProperty(inputPayload, 'deceasedBoolean');
+            const actual = resourceUtils.getResourceProperty(inputPayload, "deceasedBoolean");
             // validate
             expect(actual).toBeNull();
         });
@@ -42,7 +44,7 @@ describe("ResourceUtilities", () => {
             // setup
             const value = "abc";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getIdentifiersByProperty(null, "abc", value);
+            const actual = resourceUtils.getIdentifiersByProperty(null, "abc", value);
             // validate
             expect(actual.length).toEqual(0);
         });
@@ -50,7 +52,7 @@ describe("ResourceUtilities", () => {
             // setup
             const value = "abc";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getIdentifiersByProperty(identifierList, "abc", value);
+            const actual = resourceUtils.getIdentifiersByProperty(identifierList, "abc", value);
             // validate
             expect(actual.length).toEqual(0);
         });
@@ -58,7 +60,7 @@ describe("ResourceUtilities", () => {
             // setup
             const systemUrl = "http://somesystem.com";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getIdentifiersByProperty(identifierList, "system", systemUrl);
+            const actual = resourceUtils.getIdentifiersByProperty(identifierList, "system", systemUrl);
             // validate
             expect(actual.length).toEqual(0);
         });
@@ -66,7 +68,7 @@ describe("ResourceUtilities", () => {
             // setup
             const value = "abc";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getIdentifiersByProperty(identifierList, "value", value);
+            const actual = resourceUtils.getIdentifiersByProperty(identifierList, "value", value);
             // validate
             expect(actual.length).toEqual(2);
         });
@@ -84,7 +86,7 @@ describe("ResourceUtilities", () => {
         ];
         it("should return empty array if null is passed as extension list", () => {
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getExtensionsByUrl(null, "url");
+            const actual = resourceUtils.getExtensionsByUrl(null, "url");
             // validate
             expect(actual.length).toEqual(0);
         });
@@ -99,7 +101,7 @@ describe("ResourceUtilities", () => {
             ];
             const url = "http://ns.electronichealth.net.au/id/hi/ihi/1.0";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getExtensionsByUrl(extensionListInvalid, url);
+            const actual = resourceUtils.getExtensionsByUrl(extensionListInvalid, url);
             // validate
             expect(actual.length).toEqual(0);
         });
@@ -107,7 +109,7 @@ describe("ResourceUtilities", () => {
             // setup
             const url = "http://somesystem.com";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getExtensionsByUrl(extensionList, url);
+            const actual = resourceUtils.getExtensionsByUrl(extensionList, url);
             // validate
             expect(actual.length).toEqual(0);
         });
@@ -115,7 +117,7 @@ describe("ResourceUtilities", () => {
             // setup
             const url = "http://ns.electronichealth.net.au/id/hi/ihi/1.0";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getExtensionsByUrl(extensionList, url);
+            const actual = resourceUtils.getExtensionsByUrl(extensionList, url);
             // validate
             expect(actual.length).toEqual(1);
         });
@@ -140,7 +142,7 @@ describe("ResourceUtilities", () => {
             // setup
             const value = "abc";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getCodingsByProperty(null, "abc", value);
+            const actual = resourceUtils.getCodingsByProperty(null, "abc", value);
             // validate
             expect(actual.length).toEqual(0);
         });
@@ -148,7 +150,7 @@ describe("ResourceUtilities", () => {
             // setup
             const value = "abc";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getCodingsByProperty(codingList, "abc", value);
+            const actual = resourceUtils.getCodingsByProperty(codingList, "abc", value);
             // validate
             expect(actual.length).toEqual(0);
         });
@@ -156,7 +158,7 @@ describe("ResourceUtilities", () => {
             // setup
             const systemUrl = "http://somesystem.com";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getCodingsByProperty(codingList, "system", systemUrl);
+            const actual = resourceUtils.getCodingsByProperty(codingList, "system", systemUrl);
             // validate
             expect(actual.length).toEqual(0);
         });
@@ -164,7 +166,7 @@ describe("ResourceUtilities", () => {
             // setup
             const value = "abc";
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getCodingsByProperty(codingList, "code", value);
+            const actual = resourceUtils.getCodingsByProperty(codingList, "code", value);
             // validate
             expect(actual.length).toEqual(2);
         });
@@ -172,9 +174,66 @@ describe("ResourceUtilities", () => {
             // setup
             const value = false;
             // execute
-            const actual = ResourceUtilities_1.ResourceUtilities.getCodingsByProperty(codingList, "userSelected", value);
+            const actual = resourceUtils.getCodingsByProperty(codingList, "userSelected", value);
             // validate
             expect(actual.length).toEqual(1);
         });
     });
+    describe("#getValuesAtResourcePath()", () => {
+        it("should return array with values if path exists for a top level element", () => {
+            // execute
+            const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.gender");
+            // validate
+            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");
+            // validate
+            expect(pathValues.length).toEqual(2);
+            expect(pathValues[0]).toEqual("http://terminology.hl7.org/CodeSystem/v2-0131");
+            expect(pathValues[1]).toEqual("http://terminology.hl7.org/CodeSystem/v2-0132");
+        });
+        it("should return array with values if path exists for a deep json element", () => {
+            // execute
+            const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.maritalStatus.coding.system");
+            // validate
+            expect(pathValues.length).toEqual(1);
+            expect(pathValues[0]).toEqual("http://terminology.hl7.org/CodeSystem/v3-MaritalStatus");
+        });
+        it("should return empty array if path does not exist", () => {
+            // execute
+            const pathValues = resourceUtils.getValuesAtResourcePath(patientPayload, "Patient.contact.relationship.coding.abcd");
+            // validate
+            expect(pathValues.length).toEqual(0);
+        });
+    });
+    describe("#getAllResourceReferences()", () => {
+        it("should return array of all references in a resource when references found", () => {
+            // execute
+            const actual = resourceUtils.getAllReferencesFromResource(careTeamPayload);
+            // validate
+            expect(actual.length).toEqual(6);
+        });
+        it("should return empty array if references in a resource not found", () => {
+            // setup
+            const input = {
+                "resourceType": "Patient"
+            };
+            // execute
+            const actual = resourceUtils.getAllReferencesFromResource(input);
+            // validate
+            expect(actual.length).toEqual(0);
+        });
+    });
 });

package/package.json

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

package/src/index.ts

@@ -2,7 +2,7 @@ import * as fhirR4 from './FHIR-R4/classes/models-r4';
 import * as IfhirR4 from './FHIR-R4/interfaces/IModel';
 import * as fhirR3 from './FHIR-R3';
 import * as dstu2 from './FHIR-DSTU2';
-import { ResourceUtilities } from './library/ResourceUtilities/ResourceUtilities';
-import { BundleUtilities } from './library/BundleUtilities/BundleUtilities';
-export { fhirR4, fhirR3, IfhirR4, dstu2, ResourceUtilities, BundleUtilities };
+import { ResourceUtils } from './library/ResourceUtils/ResourceUtils';
+import { BundleUtils } from './library/BundleUtils/BundleUtils';
+export { fhirR4, fhirR3, IfhirR4, dstu2, ResourceUtils, BundleUtils };
 

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

@@ -0,0 +1,65 @@
+import { BundleUtils } from "./BundleUtils";
+
+const inputPayload = require("./../../test-resources/Bundle-R4.json");
+describe("BundleUtils", () => {
+
+  let bundleUtils = new BundleUtils();
+  
+  describe("#getResources()", () => {
+    it("should return empty array if null is passed as bundle entries", () => {
+      // execute
+      const actual = bundleUtils.getResources(null, "Patient");
+      // validate
+      expect(actual.length).toEqual(0);
+    });
+
+    it("should return empty array if invalid resourceType is passed", () => {
+      // execute
+      const actual = bundleUtils.getResources(
+        inputPayload.entry,
+        "patient"
+      );
+      // validate
+      expect(actual.length).toEqual(0);
+    });
+
+    it("should return all matches array", () => {
+      // execute
+      const actual = bundleUtils.getResources(
+        inputPayload.entry,
+        "Claim"
+      );
+      // validate
+      expect(actual.length).toEqual(27);
+    });
+  });
+
+  describe("#getResource()", () => {
+    it("should return null if null is passed as bundle entries", () => {
+      // execute
+      const actual = bundleUtils.getResource(null, "123");
+      // validate
+      expect(actual).toBeNull();
+    });
+
+    it("should return undefined if resourceId is not found", () => {
+      // execute
+      const actual = bundleUtils.getResource(
+        inputPayload.entry,
+        "123"
+      );
+      // validate
+      expect(actual).toBeUndefined();
+    });
+
+    it("should return resource if resource is found", () => {
+      // execute
+      const actual = bundleUtils.getResource(
+        inputPayload.entry,
+        "ec0bb1b3-b229-36cf-7e34-3f5fec9d3afe"
+      );
+      // validate
+      expect(actual).not.toBeNull();
+    });
+  });
+});