@smile-cdr/fhirts 2.1.0 → 2.1.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 2.2.2
+
+* Add `QueryBuilder` for ease of generating queries.
+
+## 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/index.d.ts

@@ -4,4 +4,5 @@ import * as fhirR3 from './FHIR-R3';
 import * as dstu2 from './FHIR-DSTU2';
 import { ResourceUtils } from './library/ResourceUtils/ResourceUtils';
 import { BundleUtils } from './library/BundleUtils/BundleUtils';
-export { fhirR4, fhirR3, IfhirR4, dstu2, ResourceUtils, BundleUtils };
+import { QueryBuilder } from './library/QueryBuilder/QueryBuilder';
+export { fhirR4, fhirR3, IfhirR4, dstu2, ResourceUtils, BundleUtils, QueryBuilder };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BundleUtils = exports.ResourceUtils = exports.dstu2 = exports.IfhirR4 = exports.fhirR3 = exports.fhirR4 = void 0;
+exports.QueryBuilder = 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");
@@ -13,3 +13,5 @@ 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; } });
+const QueryBuilder_1 = require("./library/QueryBuilder/QueryBuilder");
+Object.defineProperty(exports, "QueryBuilder", { enumerable: true, get: function () { return QueryBuilder_1.QueryBuilder; } });

package/dist/library/QueryBuilder/QueryBuilder.d.ts

@@ -0,0 +1,59 @@
+import { SORT_ORDER } from "../constants";
+export declare class QueryBuilder {
+    readonly REV_INCLUDE_KEYWORD = "_revinclude";
+    readonly INCLUDE_KEYWORD = "_include";
+    readonly SORT_KEYWORD = "_sort";
+    readonly WILDCARD_ASTERIK = "*";
+    readonly EQUALS = "=";
+    readonly COLON = ":";
+    readonly QUERY_DELIMETER = "&";
+    readonly COMMA = ",";
+    private baseResource;
+    private singularQueries;
+    private sortQueries;
+    /**
+     * @returns base resource for the query
+     */
+    getBaseResource(): String;
+    /**
+     * @param resourceType Base ResourceType for the query
+     * sets base resource type for the query
+     * i.e. which resource the query will performed for
+     */
+    setBaseResource(resourceType: String): this;
+    /**
+     * @param searchParameter SearchParameter reference to targeted resource
+     */
+    include(searchParameter: String): this;
+    /**
+     * @param resourceType Source ResourceType
+     * @param searchParameter SearchParameter reference from target resource to baseResource
+     */
+    revinclude(resourceType: String, searchParameter: String): this;
+    /**
+     * _include all references in query
+     */
+    includeAll(): this;
+    /**
+     * _revinclude all references in query
+     */
+    revincludeAll(): this;
+    /**
+     * @param searchParameter search parameter for the element to sort on
+     * @param sortOrder ASCENDING or DESCENDING
+     */
+    sort(searchParameter: String, sortOrder: SORT_ORDER): this;
+    /**
+     * Resets queries to it empty state
+     */
+    resetQuery(): this;
+    /**
+     * @returns complete generated query with encoded parameter values
+     */
+    getCompleteUrl(): String;
+    /**
+     * @returns complete generated query with decoded parameter values
+     */
+    getCompleteUrlDecoded(): String;
+    private createSortQuery;
+}

package/dist/library/QueryBuilder/QueryBuilder.js

@@ -0,0 +1,112 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryBuilder = void 0;
+const constants_1 = require("../constants");
+class QueryBuilder {
+    constructor() {
+        this.REV_INCLUDE_KEYWORD = "_revinclude";
+        this.INCLUDE_KEYWORD = "_include";
+        this.SORT_KEYWORD = "_sort";
+        this.WILDCARD_ASTERIK = "*";
+        this.EQUALS = "=";
+        this.COLON = ":";
+        this.QUERY_DELIMETER = "&";
+        this.COMMA = ",";
+        this.baseResource = "";
+        this.singularQueries = [];
+        this.sortQueries = [];
+    }
+    /**
+     * @returns base resource for the query
+     */
+    getBaseResource() {
+        return this.baseResource;
+    }
+    /**
+     * @param resourceType Base ResourceType for the query
+     * sets base resource type for the query
+     * i.e. which resource the query will performed for
+     */
+    setBaseResource(resourceType) {
+        this.baseResource = resourceType;
+        return this;
+    }
+    /**
+     * @param searchParameter SearchParameter reference to targeted resource
+     */
+    include(searchParameter) {
+        this.singularQueries.push(this.INCLUDE_KEYWORD + this.EQUALS + encodeURIComponent(this.baseResource + this.COLON + searchParameter));
+        return this;
+    }
+    /**
+     * @param resourceType Source ResourceType
+     * @param searchParameter SearchParameter reference from target resource to baseResource
+     */
+    revinclude(resourceType, searchParameter) {
+        this.singularQueries.push(this.REV_INCLUDE_KEYWORD + this.EQUALS + encodeURIComponent(resourceType + this.COLON + searchParameter));
+        return this;
+    }
+    /**
+     * _include all references in query
+     */
+    includeAll() {
+        this.singularQueries.push(this.INCLUDE_KEYWORD + this.EQUALS + this.WILDCARD_ASTERIK);
+        return this;
+    }
+    /**
+     * _revinclude all references in query
+     */
+    revincludeAll() {
+        this.singularQueries.push(this.REV_INCLUDE_KEYWORD + this.EQUALS + this.WILDCARD_ASTERIK);
+        return this;
+    }
+    /**
+     * @param searchParameter search parameter for the element to sort on
+     * @param sortOrder ASCENDING or DESCENDING
+     */
+    sort(searchParameter, sortOrder) {
+        if (sortOrder === constants_1.SORT_ORDER.ASCENDING) {
+            this.sortQueries.push(searchParameter);
+        }
+        else {
+            this.sortQueries.push("-" + searchParameter);
+        }
+        return this;
+    }
+    /**
+     * Resets queries to it empty state
+     */
+    resetQuery() {
+        this.sortQueries = [];
+        this.singularQueries = [];
+        this.baseResource = "";
+        return this;
+    }
+    /**
+     * @returns complete generated query with encoded parameter values
+     */
+    getCompleteUrl() {
+        let completeUrl = this.baseResource + "?";
+        const singularQueriesLength = this.singularQueries.length;
+        if (singularQueriesLength > 0) {
+            completeUrl += this.singularQueries.join(this.QUERY_DELIMETER);
+        }
+        completeUrl += this.createSortQuery(singularQueriesLength);
+        return completeUrl;
+    }
+    /**
+     * @returns complete generated query with decoded parameter values
+     */
+    getCompleteUrlDecoded() {
+        return decodeURIComponent(this.getCompleteUrl().toString());
+    }
+    createSortQuery(singularQueriesLength) {
+        let sortQuery = "";
+        const sortDelimeter = singularQueriesLength > 0 ? this.QUERY_DELIMETER : "";
+        if (this.sortQueries.length > 0) {
+            sortQuery += sortDelimeter + this.SORT_KEYWORD + this.EQUALS + encodeURIComponent(this.sortQueries.join(this.COMMA));
+        }
+        return sortQuery;
+    }
+}
+exports.QueryBuilder = QueryBuilder;

package/dist/library/QueryBuilder/QueryBuilder.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/library/QueryBuilder/QueryBuilder.spec.js

@@ -0,0 +1,135 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const constants_1 = require("../constants");
+const QueryBuilder_1 = require("./QueryBuilder");
+describe("QueryBuilder", () => {
+    let queryBuilder;
+    beforeEach(() => {
+        queryBuilder = new QueryBuilder_1.QueryBuilder();
+    });
+    it('setBaseResource() should set base resource and getBaseResource() should return correct base resource', () => {
+        // setup
+        const expected = "Patient";
+        // execute
+        queryBuilder.setBaseResource(expected);
+        // validate
+        expect(queryBuilder.getBaseResource()).toEqual(expected);
+    });
+    it('include() should make query for _include', () => {
+        // setup
+        const expected = "Patient?_include=Patient%3Aorganization";
+        // execute
+        queryBuilder.setBaseResource("Patient").include("organization");
+        // validate
+        expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+    });
+    it('include() should make query for multiple _include', () => {
+        // setup
+        const expected = "Patient?_include=Patient%3Aorganization&_include=Patient%3Alink";
+        // execute
+        queryBuilder.setBaseResource("Patient")
+            .include("organization")
+            .include("link");
+        // validate
+        expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+    });
+    it('revinclude() should make query for _revinclude', () => {
+        // setup
+        const expected = "MedicationRequest?_revinclude=CarePlan%3Aactivity-reference";
+        // execute
+        queryBuilder.setBaseResource("MedicationRequest")
+            .revinclude("CarePlan", "activity-reference");
+        // validate
+        expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+    });
+    it('revinclude() should make query for multiple _revinclude', () => {
+        // setup
+        const expected = "MedicationRequest?_revinclude=CarePlan%3Aactivity-reference&_revinclude=Observation%3Abased-on";
+        // execute
+        queryBuilder.setBaseResource("MedicationRequest")
+            .revinclude("CarePlan", "activity-reference")
+            .revinclude("Observation", "based-on");
+        // validate
+        expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+    });
+    it('include() and revinclude() should make query for _include & _revinclude', () => {
+        // setup
+        const expected = "MedicationRequest?_revinclude=CarePlan%3Aactivity-reference&_include=MedicationRequest%3Aencounter";
+        // execute
+        queryBuilder.setBaseResource("MedicationRequest")
+            .revinclude("CarePlan", "activity-reference")
+            .include("encounter");
+        // validate
+        expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+    });
+    it('includeAll() should make query for _include all', () => {
+        // setup
+        const expected = "MedicationRequest?_include=*";
+        // execute
+        queryBuilder.setBaseResource("MedicationRequest").includeAll();
+        // validate
+        expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+    });
+    it('revincludeAll() should make query for _revinclude all', () => {
+        // setup
+        const expected = "MedicationRequest?_revinclude=*";
+        // execute
+        queryBuilder.setBaseResource("MedicationRequest").revincludeAll();
+        // validate
+        expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+    });
+    it('includeAll() & revincludeAll() should make query for _include all & _revinclude all', () => {
+        // setup
+        const expected = "MedicationRequest?_revinclude=*&_include=*";
+        // execute
+        queryBuilder.setBaseResource("MedicationRequest")
+            .revincludeAll()
+            .includeAll();
+        // validate
+        expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+    });
+    it('sort() should make query for _sort', () => {
+        // setup
+        const expected = "Observation?_sort=status%2C-date";
+        // execute
+        queryBuilder.setBaseResource("Observation")
+            .sort("status", constants_1.SORT_ORDER.ASCENDING)
+            .sort("date", constants_1.SORT_ORDER.DESCENDING);
+        // validate
+        expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+    });
+    it('sort(), include() and revincludeAll() should make query for _sort, _include & _revinclude', () => {
+        // setup
+        const expected = "Observation?_revinclude=*&_include=Observation%3Abased-on&_sort=status";
+        // execute
+        queryBuilder.setBaseResource("Observation")
+            .revincludeAll()
+            .include("based-on")
+            .sort("status", constants_1.SORT_ORDER.ASCENDING);
+        // validate
+        expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+    });
+    it('resetQuery() should reset query', () => {
+        // setup
+        const expected = "";
+        queryBuilder.setBaseResource("Observation")
+            .revincludeAll()
+            .include("based-on")
+            .sort("status", constants_1.SORT_ORDER.ASCENDING);
+        // execute
+        queryBuilder.resetQuery();
+        // validate
+        expect(queryBuilder.getBaseResource()).toEqual(expected);
+    });
+    it('getCompleteUrlDecoded() should get uri decoded query', () => {
+        // setup
+        const expected = "Observation?_revinclude=*&_include=Observation:based-on&_sort=status";
+        // execute
+        queryBuilder.setBaseResource("Observation")
+            .revincludeAll()
+            .include("based-on")
+            .sort("status", constants_1.SORT_ORDER.ASCENDING);
+        // validate
+        expect(queryBuilder.getCompleteUrlDecoded()).toEqual(expected);
+    });
+});

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/dist/library/constants.d.ts

@@ -0,0 +1,4 @@
+export declare enum SORT_ORDER {
+    ASCENDING = 0,
+    DESCENDING = 1
+}

package/dist/library/constants.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SORT_ORDER = void 0;
+var SORT_ORDER;
+(function (SORT_ORDER) {
+    SORT_ORDER[SORT_ORDER["ASCENDING"] = 0] = "ASCENDING";
+    SORT_ORDER[SORT_ORDER["DESCENDING"] = 1] = "DESCENDING";
+})(SORT_ORDER = exports.SORT_ORDER || (exports.SORT_ORDER = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smile-cdr/fhirts",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Fhir ts/js library for frontend apps",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -14,13 +14,11 @@
   },
   "devDependencies": {
     "@types/jasmine": "^4.3.1",
+    "@types/node": "^20.12.12",
+    "better-npm-audit": "^3.7.3",
     "jasmine": "^4.5.0",
+    "nyc": "^15.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.0.2"
-  },
-  "dependencies": {
-    "@types/node": "^18.11.15",
-    "better-npm-audit": "^3.7.3",
-    "nyc": "^15.1.0"
   }
 }

package/src/index.ts

@@ -4,5 +4,6 @@ import * as fhirR3 from './FHIR-R3';
 import * as dstu2 from './FHIR-DSTU2';
 import { ResourceUtils } from './library/ResourceUtils/ResourceUtils';
 import { BundleUtils } from './library/BundleUtils/BundleUtils';
-export { fhirR4, fhirR3, IfhirR4, dstu2, ResourceUtils, BundleUtils };
+import { QueryBuilder } from './library/QueryBuilder/QueryBuilder';
+export { fhirR4, fhirR3, IfhirR4, dstu2, ResourceUtils, BundleUtils, QueryBuilder };
 

package/src/library/QueryBuilder/QueryBuilder.spec.ts

@@ -0,0 +1,149 @@
+import { SORT_ORDER } from "../constants";
+import { QueryBuilder } from "./QueryBuilder";
+
+describe("QueryBuilder", () => {
+
+  let queryBuilder: QueryBuilder;
+
+  beforeEach(() => {
+    queryBuilder = new QueryBuilder();
+  });
+
+  it('setBaseResource() should set base resource and getBaseResource() should return correct base resource', () => {
+    // setup
+    const expected: String = "Patient";
+    // execute
+    queryBuilder.setBaseResource(expected);
+    // validate
+    expect(queryBuilder.getBaseResource()).toEqual(expected);
+  })
+
+  it('include() should make query for _include', () => {
+    // setup
+    const expected: String = "Patient?_include=Patient%3Aorganization"
+    // execute
+    queryBuilder.setBaseResource("Patient").include("organization");
+    // validate
+    expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+  });
+
+  it('include() should make query for multiple _include', () => {
+    // setup
+    const expected: String = "Patient?_include=Patient%3Aorganization&_include=Patient%3Alink"
+    // execute
+    queryBuilder.setBaseResource("Patient")
+                .include("organization")
+                .include("link");
+    // validate
+    expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+  });
+
+  it('revinclude() should make query for _revinclude', () => {
+    // setup
+    const expected: String = "MedicationRequest?_revinclude=CarePlan%3Aactivity-reference"
+    // execute
+    queryBuilder.setBaseResource("MedicationRequest")
+                .revinclude("CarePlan", "activity-reference");
+    // validate
+    expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+  });
+
+  it('revinclude() should make query for multiple _revinclude', () => {
+    // setup
+    const expected: String = "MedicationRequest?_revinclude=CarePlan%3Aactivity-reference&_revinclude=Observation%3Abased-on"
+    // execute
+    queryBuilder.setBaseResource("MedicationRequest")
+                .revinclude("CarePlan", "activity-reference")
+                .revinclude("Observation", "based-on");
+    // validate
+    expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+  });
+
+  it('include() and revinclude() should make query for _include & _revinclude', () => {
+    // setup
+    const expected: String = "MedicationRequest?_revinclude=CarePlan%3Aactivity-reference&_include=MedicationRequest%3Aencounter"
+    // execute
+    queryBuilder.setBaseResource("MedicationRequest")
+                .revinclude("CarePlan", "activity-reference")
+                .include("encounter");
+    // validate
+    expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+  });
+
+  it('includeAll() should make query for _include all', () => {
+    // setup
+    const expected: String = "MedicationRequest?_include=*"
+    // execute
+    queryBuilder.setBaseResource("MedicationRequest").includeAll();
+    // validate
+    expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+  });
+
+  it('revincludeAll() should make query for _revinclude all', () => {
+    // setup
+    const expected: String = "MedicationRequest?_revinclude=*"
+    // execute
+    queryBuilder.setBaseResource("MedicationRequest").revincludeAll();
+    // validate
+    expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+  });
+
+  it('includeAll() & revincludeAll() should make query for _include all & _revinclude all', () => {
+    // setup
+    const expected: String = "MedicationRequest?_revinclude=*&_include=*"
+    // execute
+    queryBuilder.setBaseResource("MedicationRequest")
+                .revincludeAll()
+                .includeAll();
+    // validate
+    expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+  });
+
+  it('sort() should make query for _sort', () => {
+    // setup
+    const expected: String = "Observation?_sort=status%2C-date"
+    // execute
+    queryBuilder.setBaseResource("Observation")
+                .sort("status", SORT_ORDER.ASCENDING)
+                .sort("date", SORT_ORDER.DESCENDING);
+    // validate
+    expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+  });
+
+  it('sort(), include() and revincludeAll() should make query for _sort, _include & _revinclude', () => {
+    // setup
+    const expected: String = "Observation?_revinclude=*&_include=Observation%3Abased-on&_sort=status"
+    // execute
+    queryBuilder.setBaseResource("Observation")
+                .revincludeAll()
+                .include("based-on")
+                .sort("status", SORT_ORDER.ASCENDING);
+    // validate
+    expect(queryBuilder.getCompleteUrl()).toEqual(expected);
+  });
+
+  it('resetQuery() should reset query', () => {
+    // setup
+    const expected: String = ""
+    queryBuilder.setBaseResource("Observation")
+                .revincludeAll()
+                .include("based-on")
+                .sort("status", SORT_ORDER.ASCENDING);
+    // execute
+    queryBuilder.resetQuery();
+    // validate
+    expect(queryBuilder.getBaseResource()).toEqual(expected);
+  });
+
+  it('getCompleteUrlDecoded() should get uri decoded query', () => {
+    // setup
+    const expected: String = "Observation?_revinclude=*&_include=Observation:based-on&_sort=status"
+    // execute
+    queryBuilder.setBaseResource("Observation")
+                .revincludeAll()
+                .include("based-on")
+                .sort("status", SORT_ORDER.ASCENDING);
+    // validate
+    expect(queryBuilder.getCompleteUrlDecoded()).toEqual(expected);
+  });
+});

package/src/library/QueryBuilder/QueryBuilder.ts

@@ -0,0 +1,119 @@
+import { SORT_ORDER } from "../constants";
+
+export class QueryBuilder {
+
+  readonly REV_INCLUDE_KEYWORD = "_revinclude";
+  readonly INCLUDE_KEYWORD = "_include";
+  readonly SORT_KEYWORD = "_sort";
+  readonly WILDCARD_ASTERIK = "*";
+  readonly EQUALS = "=";
+  readonly COLON = ":";
+  readonly QUERY_DELIMETER = "&";
+  readonly COMMA = ",";
+  private baseResource: String = "";
+  private singularQueries: String[] = [];
+  private sortQueries: String[] =  [];
+
+  /**
+   * @returns base resource for the query
+   */
+  getBaseResource(): String {
+    return this.baseResource;
+  }
+
+  /**
+   * @param resourceType Base ResourceType for the query 
+   * sets base resource type for the query
+   * i.e. which resource the query will performed for
+   */
+  setBaseResource(resourceType: String) {
+    this.baseResource = resourceType;
+    return this;
+  }
+
+  /**
+   * @param searchParameter SearchParameter reference to targeted resource
+   */
+  include(searchParameter: String) {
+    this.singularQueries.push(this.INCLUDE_KEYWORD + this.EQUALS + encodeURIComponent(this.baseResource + this.COLON + searchParameter));
+    return this;
+  }
+
+  /**
+   * @param resourceType Source ResourceType 
+   * @param searchParameter SearchParameter reference from target resource to baseResource
+   */
+  revinclude(resourceType: String, searchParameter: String) {
+    this.singularQueries.push(this.REV_INCLUDE_KEYWORD + this.EQUALS +  encodeURIComponent(resourceType + this.COLON + searchParameter));
+    return this;
+  }
+
+  /**
+   * _include all references in query
+   */
+  includeAll() {
+    this.singularQueries.push(this.INCLUDE_KEYWORD + this.EQUALS + this.WILDCARD_ASTERIK);
+    return this;
+  }
+
+  /**
+   * _revinclude all references in query
+   */
+  revincludeAll() {
+    this.singularQueries.push(this.REV_INCLUDE_KEYWORD + this.EQUALS + this.WILDCARD_ASTERIK);
+    return this;
+  }
+
+  /**
+   * @param searchParameter search parameter for the element to sort on
+   * @param sortOrder ASCENDING or DESCENDING
+   */
+  sort(searchParameter: String, sortOrder: SORT_ORDER) {
+    if(sortOrder === SORT_ORDER.ASCENDING) {
+      this.sortQueries.push(searchParameter);
+    } else {
+      this.sortQueries.push("-" + searchParameter);
+    }
+    return this;
+  }
+
+  /**
+   * Resets queries to it empty state
+   */
+  resetQuery() {
+    this.sortQueries = [];
+    this.singularQueries = [];
+    this.baseResource = "";
+    return this;
+  }
+
+  /**
+   * @returns complete generated query with encoded parameter values
+   */
+  getCompleteUrl(): String {
+    let completeUrl = this.baseResource + "?";
+    const singularQueriesLength = this.singularQueries.length;
+    if(singularQueriesLength > 0) {
+      completeUrl +=  this.singularQueries.join(this.QUERY_DELIMETER);
+    }
+    completeUrl += this.createSortQuery(singularQueriesLength);
+    return completeUrl; 
+  }
+
+  /**
+   * @returns complete generated query with decoded parameter values
+   */
+  getCompleteUrlDecoded(): String {
+    return decodeURIComponent(this.getCompleteUrl().toString()); 
+  }
+  
+  private createSortQuery(singularQueriesLength: number): String {
+    let sortQuery = "";
+    const sortDelimeter = singularQueriesLength > 0 ? this.QUERY_DELIMETER : "";
+    if(this.sortQueries.length > 0) {
+      sortQuery += sortDelimeter + this.SORT_KEYWORD + this.EQUALS + encodeURIComponent(this.sortQueries.join(this.COMMA));
+    }
+    return sortQuery;
+  }
+  
+}

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/library/constants.ts

@@ -0,0 +1,4 @@
+export enum SORT_ORDER {
+    ASCENDING,
+    DESCENDING
+}

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

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