@smile-cdr/fhirts 2.2.7 → 2.3.0

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

@@ -11,6 +11,7 @@
  */
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Meta } from './meta';
@@ -22,7 +23,7 @@ import { Uri } from './uri';
 /**
  * Nucleic acids are defined by three distinct elements: the base, sugar and linkage. Individual substance/moiety IDs will be created for each of these elements. The nucleotide sequence will be always entered in the 5’-3’ direction.
  */
-export class SubstanceNucleicAcid { 
+export class SubstanceNucleicAcid extends DomainResource { 
     /**
      * This is a SubstanceNucleicAcid resource
      */

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

@@ -11,6 +11,7 @@
  */
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Meta } from './meta';
@@ -23,7 +24,7 @@ import { Uri } from './uri';
 /**
  * Todo.
  */
-export class SubstancePolymer { 
+export class SubstancePolymer extends DomainResource { 
     /**
      * This is a SubstancePolymer resource
      */

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

@@ -11,6 +11,7 @@
  */
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Meta } from './meta';
@@ -22,7 +23,7 @@ import { Uri } from './uri';
 /**
  * A SubstanceProtein is defined as a single unit of a linear amino acid sequence, or a combination of subunits that are either covalently linked or have a defined invariant stoichiometric relationship. This includes all synthetic, recombinant and purified SubstanceProteins of defined sequence, whether the use is therapeutic or prophylactic. This set of elements will be used to describe albumins, coagulation factors, cytokines, growth factors, peptide/SubstanceProtein hormones, enzymes, toxins, toxoids, recombinant vaccines, and immunomodulators.
  */
-export class SubstanceProtein { 
+export class SubstanceProtein extends DomainResource { 
     /**
      * This is a SubstanceProtein resource
      */

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

@@ -10,6 +10,7 @@
  * Do not edit the class manually.
  */
 import { Code } from './code';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Meta } from './meta';
@@ -24,7 +25,7 @@ import { Uri } from './uri';
 /**
  * Todo.
  */
-export class SubstanceReferenceInformation { 
+export class SubstanceReferenceInformation extends DomainResource { 
     /**
      * This is a SubstanceReferenceInformation resource
      */

package/src/FHIR-R4/classes/substanceSourceMaterial.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';
@@ -25,7 +26,7 @@ import { Uri } from './uri';
 /**
  * Source material shall capture information on the taxonomic and anatomical origins as well as the fraction of a material that can result in or can be modified to form a substance. This set of data elements shall be used to define polymer substances isolated from biological matrices. Taxonomic and anatomical origins shall be described using a controlled vocabulary as required. This information is captured for naturally derived polymers ( . starch) and structurally diverse substances. For Organisms belonging to the Kingdom Plantae the Substance level defines the fresh material of a single species or infraspecies, the Herbal Drug and the Herbal preparation. For Herbal preparations, the fraction information will be captured at the Substance information level and additional information for herbal extracts will be captured at the Specified Substance Group 1 information level. See for further explanation the Substance Class: Structurally Diverse and the herbal annex.
  */
-export class SubstanceSourceMaterial { 
+export class SubstanceSourceMaterial extends DomainResource { 
     /**
      * This is a SubstanceSourceMaterial resource
      */

package/src/FHIR-R4/classes/substanceSpecification.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';
@@ -30,7 +31,7 @@ import { Uri } from './uri';
 /**
  * The detailed description of a substance, typically at a level beyond what is used for prescribing.
  */
-export class SubstanceSpecification { 
+export class SubstanceSpecification extends DomainResource { 
     /**
      * This is a SubstanceSpecification resource
      */

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

@@ -1,8 +1,10 @@
 import { ResourceUtils } from "./ResourceUtils";
 import { Coding, Extension, Identifier, } from "../dataTypes";
+import { CareTeam } from "../../FHIR-R4/classes/careTeam";
 
 const patientPayload = require("./../../test-resources/Patient-R4.json");
 const careTeamPayload = require("./../../test-resources/CareTeam-R4.json");
+const careTeamContainedPayload = require("./../../test-resources/CareTeam-R4-contained.json");
 describe("ResourceUtils", () => {
 
   let resourceUtils = new ResourceUtils();
@@ -247,6 +249,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");
@@ -359,5 +368,15 @@ describe("ResourceUtils", () => {
       expect(actual.length).toEqual(0);
     });
 
+    it("should return array of all references in a resource when references found in contained resource", () => {
+      // setup
+      const input = careTeamContainedPayload as CareTeam;
+      expect(input.contained).toHaveSize(1);
+      // execute
+      const actual = resourceUtils.getAllReferencesFromResource(input.contained[0]);
+      // validate
+      expect(actual.length).toEqual(1);
+    });
   });
+
 });

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;

package/src/test-resources/CareTeam-R4-contained.json

@@ -0,0 +1,81 @@
+{
+    "resourceType": "CareTeam",
+    "id": "example",
+    "text": {
+      "status": "generated",
+      "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">Care Team</div>"
+    },
+    "contained": [
+      {
+        "resourceType": "Observation",
+        "id": "obs1",
+        "basedOn": {
+          "reference": "CarePlan/123"
+        },
+        "status": "registered"
+      }
+    ],
+    "identifier": [
+      {
+        "value": "12345"
+      }
+    ],
+    "status": "active",
+    "category": [
+      {
+        "coding": [
+          {
+            "system": "http://loinc.org",
+            "code": "LA27976-2",
+            "display": "Encounter-focused care team"
+          }
+        ]
+      }
+    ],
+    "name": "Peter James Charlmers Care Plan for Inpatient Encounter",
+    "subject": {
+      "reference": "Patient/example",
+      "display": "Peter James Chalmers"
+    },
+    "encounter": {
+      "reference": "Encounter/example"
+    },
+    "period": {
+      "end": "2013-01-01"
+    },
+    "participant": [
+      {
+        "role": [
+          {
+            "text": "responsiblePerson"
+          }
+        ],
+        "member": {
+          "reference": "Patient/example",
+          "display": "Peter James Chalmers"
+        }
+      },
+      {
+        "role": [
+          {
+            "text": "adviser"
+          }
+        ],
+        "member": {
+          "reference": "#pr1",
+          "display": "Dorothy Dietition"
+        },
+        "onBehalfOf": {
+          "reference": "Organization/f001"
+        },
+        "period": {
+          "end": "2013-01-01"
+        }
+      }
+    ],
+    "managingOrganization": [
+      {
+        "reference": "Organization/f001"
+      }
+    ]
+  }