@smile-cdr/fhirts 2.2.8 → 2.4.0

package/src/FHIR-R4/classes/supplyDelivery.ts

@@ -11,6 +11,7 @@
  */
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -26,7 +27,7 @@ import { Uri } from './uri';
 /**
  * Record of delivery of what is supplied.
  */
-export class SupplyDelivery { 
+export class SupplyDelivery extends DomainResource { 
     /**
      * This is a SupplyDelivery resource
      */

package/src/FHIR-R4/classes/supplyRequest.ts

@@ -12,6 +12,7 @@
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -28,7 +29,7 @@ import { Uri } from './uri';
 /**
  * A record of a request for a medication, substance or device used in the healthcare setting.
  */
-export class SupplyRequest { 
+export class SupplyRequest extends DomainResource { 
     /**
      * This is a SupplyRequest resource
      */

package/src/FHIR-R4/classes/task.ts

@@ -14,6 +14,7 @@ import { Canonical } from './canonical';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -30,7 +31,7 @@ import { Uri } from './uri';
 /**
  * A task to be performed.
  */
-export class Task { 
+export class Task extends DomainResource { 
     /**
      * This is a Task resource
      */

package/src/FHIR-R4/classes/terminologyCapabilities.ts

@@ -13,6 +13,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Markdown } from './markdown';
@@ -32,7 +33,7 @@ import { UsageContext } from './usageContext';
 /**
  * A TerminologyCapabilities resource documents a set of capabilities (behaviors) of a FHIR Terminology Server that may be used as a statement of actual server functionality or a statement of required or desired server implementation.
  */
-export class TerminologyCapabilities { 
+export class TerminologyCapabilities extends DomainResource { 
     /**
      * This is a TerminologyCapabilities resource
      */

package/src/FHIR-R4/classes/testReport.ts

@@ -12,6 +12,7 @@
 import { Code } from './code';
 import { DateTime } from './dateTime';
 import { Decimal } from './decimal';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -28,7 +29,7 @@ import { Uri } from './uri';
 /**
  * A summary of information based on the results of executing a TestScript.
  */
-export class TestReport { 
+export class TestReport extends DomainResource { 
     /**
      * This is a TestReport resource
      */

package/src/FHIR-R4/classes/testScript.ts

@@ -13,6 +13,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -35,7 +36,7 @@ import { UsageContext } from './usageContext';
 /**
  * A structured set of tests against a FHIR server or client implementation to determine compliance against the FHIR specification.
  */
-export class TestScript { 
+export class TestScript extends DomainResource { 
     /**
      * This is a TestScript resource
      */

package/src/FHIR-R4/classes/valueSet.ts

@@ -13,6 +13,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -28,7 +29,7 @@ import { ValueSetExpansion } from './valueSetExpansion';
 /**
  * A ValueSet resource instance specifies a set of codes drawn from one or more code systems, intended for use in a particular context. Value sets link between [[[CodeSystem]]] definitions and their use in [coded elements](terminologies.html).
  */
-export class ValueSet { 
+export class ValueSet extends DomainResource { 
     /**
      * This is a ValueSet resource
      */

package/src/FHIR-R4/classes/verificationResult.ts

@@ -12,6 +12,7 @@
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Meta } from './meta';
@@ -27,7 +28,7 @@ import { VerificationResultValidator } from './verificationResultValidator';
 /**
  * Describes validation requirements, source(s), status and dates for one or more elements.
  */
-export class VerificationResult { 
+export class VerificationResult extends DomainResource { 
     /**
      * This is a VerificationResult resource
      */

package/src/FHIR-R4/classes/visionPrescription.ts

@@ -11,6 +11,7 @@
  */
 import { Code } from './code';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -24,7 +25,7 @@ import { VisionPrescriptionLensSpecification } from './visionPrescriptionLensSpe
 /**
  * An authorization for the provision of glasses and/or contact lenses to a patient.
  */
-export class VisionPrescription { 
+export class VisionPrescription extends DomainResource { 
     /**
      * This is a VisionPrescription resource
      */

package/src/index.ts

@@ -8,4 +8,15 @@ import { BundleUtils } from './library/BundleUtils/BundleUtils';
 import { QueryBuilder } from './library/QueryBuilder/QueryBuilder';
 import { PatchUtils } from './library/PatchUtils/PatchUtils';
 import * as fhirtsConstants from './library/constants';
-export { fhirR5, fhirR4, fhirR3, IfhirR4, dstu2, ResourceUtils, BundleUtils, QueryBuilder, PatchUtils, fhirtsConstants};
+export {
+  fhirR5,
+  fhirR4,
+  fhirR3,
+  IfhirR4,
+  dstu2,
+  ResourceUtils,
+  BundleUtils,
+  QueryBuilder,
+  PatchUtils,
+  fhirtsConstants,
+};

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

@@ -1,94 +1,81 @@
-import { BundleUtils } from "./BundleUtils";
+import { BundleUtils } from './BundleUtils';
 
-const inputPayload = require("./../../test-resources/Bundle-R4.json");
-describe("BundleUtils", () => {
+const inputPayload = require('./../../test-resources/Bundle-R4.json');
+describe('BundleUtils', () => {
+  const bundleUtils = new BundleUtils();
 
-  let bundleUtils = new BundleUtils();
-  
-  describe("#getResources()", () => {
-    it("should return empty array if null is passed as bundle entries", () => {
+  describe('#getResources()', () => {
+    it('should return empty array if null is passed as bundle entries', () => {
       // execute
-      const actual = bundleUtils.getResources(null, "Patient");
+      const actual = bundleUtils.getResources(null, 'Patient');
       // validate
       expect(actual.length).toEqual(0);
     });
 
-    it("should return empty array if invalid resourceType is passed", () => {
+    it('should return empty array if invalid resourceType is passed', () => {
       // execute
-      const actual = bundleUtils.getResources(
-        inputPayload.entry,
-        "patient"
-      );
+      const actual = bundleUtils.getResources(inputPayload.entry, 'patient');
       // validate
       expect(actual.length).toEqual(0);
     });
 
-    it("should return all matches array", () => {
+    it('should return all matches array', () => {
       // execute
-      const actual = bundleUtils.getResources(
-        inputPayload.entry,
-        "Claim"
-      );
+      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", () => {
+  describe('#getResource()', () => {
+    it('should return null if null is passed as bundle entries', () => {
       // execute
-      const actual = bundleUtils.getResource(null, "123");
+      const actual = bundleUtils.getResource(null, '123');
       // validate
       expect(actual).toBeNull();
     });
 
-    it("should return undefined if resourceId is not found", () => {
+    it('should return undefined if resourceId is not found', () => {
       // execute
-      const actual = bundleUtils.getResource(
-        inputPayload.entry,
-        "123"
-      );
+      const actual = bundleUtils.getResource(inputPayload.entry, '123');
       // validate
       expect(actual).toBeUndefined();
     });
 
-    it("should return resource if resource is found", () => {
+    it('should return resource if resource is found', () => {
       // execute
       const actual = bundleUtils.getResource(
         inputPayload.entry,
-        "ec0bb1b3-b229-36cf-7e34-3f5fec9d3afe"
+        'ec0bb1b3-b229-36cf-7e34-3f5fec9d3afe'
       );
       // validate
       expect(actual).not.toBeUndefined();
     });
   });
 
-  describe("#getResourceByFullUrl()", () => {
-    it("should return null if null is passed as bundle entries", () => {
+  describe('#getResourceByFullUrl()', () => {
+    it('should return null if null is passed as bundle entries', () => {
       // execute
-      const actual = bundleUtils.getResourceByFullUrl(null, "123");
+      const actual = bundleUtils.getResourceByFullUrl(null, '123');
       // validate
       expect(actual).toBeNull();
     });
 
-    it("should return undefined if fullUrl is not found", () => {
+    it('should return undefined if fullUrl is not found', () => {
       // execute
-      const actual = bundleUtils.getResourceByFullUrl(
-        inputPayload.entry,
-        "123"
-      );
+      const actual = bundleUtils.getResourceByFullUrl(inputPayload.entry, '123');
       // validate
       expect(actual).toBeUndefined();
     });
 
-    it("should return resource if resource is found", () => {
+    it('should return resource if resource is found', () => {
       // execute
       const actual = bundleUtils.getResourceByFullUrl(
         inputPayload.entry,
-        "urn:uuid:7c52dd91-73f8-83e1-cab2-2ffdd7a34601"
+        'urn:uuid:7c52dd91-73f8-83e1-cab2-2ffdd7a34601'
       );
       // validate
       expect(actual).not.toBeUndefined();
     });
-  })
+  });
 });

package/src/library/BundleUtils/BundleUtils.ts

@@ -1,35 +1,49 @@
 export class BundleUtils {
+  /**
+   * Get resources from bundle entries filtered by resource type
+   *
+   * @template T - The resource type to return (defaults to any for backward compatibility)
+   * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+   * @param resourceTypeToFilter ResourceType to filter from bundle entries
+   * @returns array of resources
+   */
+  getResources<T = any>(bundleEntry: any[] | null, resourceTypeToFilter: string): T[] {
+    return bundleEntry?.length
+      ? bundleEntry
+          .filter((x) => x['resource']['resourceType'] === resourceTypeToFilter)
+          .map((x) => x['resource'])
+      : [];
+  }
 
-    /**
-     * 
-     * @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[] {
-        return bundleEntry?.length ? bundleEntry.filter(x => x['resource']['resourceType'] === resourceTypeToFilter) : [];
+  /**
+   * Get a single resource from bundle entries by resource ID
+   *
+   * @template T - The resource type to return (defaults to any for backward compatibility)
+   * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+   * @param resourceId Resource ID to filter from bundle entries
+   * @returns single resource, undefined if not found, or null if input is null
+   */
+  getResource<T = any>(bundleEntry: any[] | null, resourceId: string): T | null {
+    if (!bundleEntry) {
+      return null;
     }
+    const entry = bundleEntry.find((x) => x['resource']?.['id'] === resourceId);
+    return entry?.['resource'];
+  }
 
-    /**
-     * 
-     * @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 {
-        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;
+  /**
+   * Get a single resource from bundle entries by full URL
+   *
+   * @template T - The resource type to return (defaults to any for backward compatibility)
+   * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+   * @param fullUrl Full Url to filter from bundle entries
+   * @returns single resource if not found, or null if input is null
+   */
+  getResourceByFullUrl<T = any>(bundleEntry: any[] | null, fullUrl: string): T | null {
+    if (!bundleEntry) {
+      return null;
     }
+    const entry = bundleEntry.find((x) => x['fullUrl'] === fullUrl);
+    return entry?.['resource'];
+  }
 }
-
-
-