@smile-cdr/fhirts 1.4.8 → 1.4.9

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.4.9
+
+### Updates (R3)
+
+* Made a generic `Resource` type which is a union of all other resources to allow type narrowing when working with Bundles and Contained Resources. For example:
+```
+const res = bundle.entry[0].resource
+// res -> fhirR3.Resource
+if(res.resourceType === 'Organization'){
+  // TypeScript will infer the type of Organization automatically
+  // res -> fhirR3.Organization
+```
+
 ## 1.4.8
 
 ### Updates (R4)

package/dist/FHIR-R3.d.ts

@@ -11,7 +11,7 @@ export declare class DomainResource {
     extension: Extension[];
     modifierExtension: Extension[];
 }
-export declare class Resource extends DomainResource {
+export declare class BaseResource extends DomainResource {
     resourceType: string;
     id: string;
     meta: Meta;
@@ -493,7 +493,8 @@ export declare class Udi extends BackboneElement {
     issuer: string;
     entryType: string;
 }
-export declare class QuestionnaireResponse extends Resource {
+export declare class QuestionnaireResponse extends BaseResource {
+    resourceType: "QuestionnaireResponse";
     identifier: Identifier;
     basedOn: Reference[];
     parent: Reference[];
@@ -506,7 +507,8 @@ export declare class QuestionnaireResponse extends Resource {
     item: QuestionnaireResponseItem[];
     subject: Reference;
 }
-export declare class Questionnaire extends Resource {
+export declare class Questionnaire extends BaseResource {
+    resourceType: "Questionnaire";
     url: string;
     identifier: Identifier[];
     version: string;
@@ -529,7 +531,8 @@ export declare class Questionnaire extends Resource {
     subjectType: Code[];
     item: Item[];
 }
-export declare class Patient extends Resource {
+export declare class Patient extends BaseResource {
+    resourceType: "Patient";
     identifier: Identifier[];
     active: boolean;
     name: HumanName[];
@@ -544,7 +547,8 @@ export declare class Patient extends Resource {
     managingOrganization: Reference;
     link: Link[];
 }
-export declare class DocumentReference extends Resource {
+export declare class DocumentReference extends BaseResource {
+    resourceType: "DocumentReference";
     masterIdentifier: Identifier;
     identifier: Identifier[];
     status: string;
@@ -558,7 +562,8 @@ export declare class DocumentReference extends Resource {
     indexed: Date;
     context: Context;
 }
-export declare class Appointment extends Resource {
+export declare class Appointment extends BaseResource {
+    resourceType: "Appointment";
     identifier: Identifier[];
     status: string;
     serviceCategory: CodeableConcept;
@@ -579,7 +584,8 @@ export declare class Appointment extends Resource {
     participant: Participant[];
     requestPeriod: Period[];
 }
-export declare class AppointmentResponse extends Resource {
+export declare class AppointmentResponse extends BaseResource {
+    resourceType: "AppointmentResponse";
     identifier: Identifier[];
     appointment: Reference;
     start: Date;
@@ -589,7 +595,8 @@ export declare class AppointmentResponse extends Resource {
     participantStatus: string;
     comment: string;
 }
-export declare class Organization extends Resource {
+export declare class Organization extends BaseResource {
+    resourceType: "Organization";
     identifier: Identifier[];
     active: boolean;
     status: string;
@@ -603,7 +610,8 @@ export declare class Organization extends Resource {
     contact: Contact[];
     endpoint: Reference[];
 }
-export declare class Location extends Resource {
+export declare class Location extends BaseResource {
+    resourceType: "Location";
     identifier: Identifier[];
     status: string;
     operationalStatus: Coding;
@@ -620,7 +628,8 @@ export declare class Location extends Resource {
     endpoint: Reference[];
     extension: Extension[];
 }
-export declare class Account extends Resource {
+export declare class Account extends BaseResource {
+    resourceType: "Account";
     identifier: Identifier[];
     status: Code;
     type: CodeableConcept;
@@ -639,14 +648,16 @@ export declare class Account extends Resource {
     partOf: Reference;
     endpoint: Reference[];
 }
-export declare class ProcessRequest extends Resource {
+export declare class ProcessRequest extends BaseResource {
+    resourceType: "ProcessRequest";
     identifier: Identifier[];
     status: string;
     created: Date;
     provider: Reference;
     request: Reference;
 }
-export declare class Encounter extends Resource {
+export declare class Encounter extends BaseResource {
+    resourceType: "Encounter";
     identifier: Identifier[];
     status: string;
     episodeOfCare: Reference[];
@@ -659,7 +670,8 @@ export declare class CareTeamParticipant extends BackboneElement {
     onBehalfOf: Reference;
     period: Period;
 }
-export declare class CareTeam extends Resource {
+export declare class CareTeam extends BaseResource {
+    resourceType: "CareTeam";
     identifier: Identifier[];
     status: string;
     category: CodeableConcept[];
@@ -669,7 +681,8 @@ export declare class CareTeam extends Resource {
     participant: CareTeamParticipant[];
     note: Annotation[];
 }
-export declare class EpisodeOfCare extends Resource {
+export declare class EpisodeOfCare extends BaseResource {
+    resourceType: "EpisodeOfCare";
     identifier: Identifier[];
     status: string;
     statusHistory: BackboneElement[];
@@ -683,7 +696,8 @@ export declare class EpisodeOfCare extends Resource {
     team: Reference[];
     account: Reference[];
 }
-export declare class CarePlan extends Resource {
+export declare class CarePlan extends BaseResource {
+    resourceType: "CarePlan";
     identifier: Identifier[];
     definition: Reference[];
     basedOn: Reference[];
@@ -705,7 +719,8 @@ export declare class CarePlan extends Resource {
     activity: Activity[];
     note: Annotation[];
 }
-export declare class Communication extends Resource {
+export declare class Communication extends BaseResource {
+    resourceType: "Communication";
     identifier: Identifier[];
     definition: Reference[];
     basedOn: Reference[];
@@ -727,7 +742,8 @@ export declare class Communication extends Resource {
     payload: Payload[];
     note: Annotation[];
 }
-export declare class Task extends Resource {
+export declare class Task extends BaseResource {
+    resourceType: "Task";
     identifier: Identifier[];
     definitionUri: string;
     definitionReference: Reference;
@@ -758,7 +774,8 @@ export declare class Task extends Resource {
     input: Input[];
     output: Output[];
 }
-export declare class ProcedureRequest extends Resource {
+export declare class ProcedureRequest extends BaseResource {
+    resourceType: "ProcedureRequest";
     identifier: Identifier[];
     status: string;
     intent: string;
@@ -772,7 +789,8 @@ export declare class ProcedureRequest extends Resource {
     performerType: CodeableConcept;
     note: Annotation[];
 }
-export declare class PractitionerRole extends Resource {
+export declare class PractitionerRole extends BaseResource {
+    resourceType: "PractitionerRole";
     identifier: Identifier[];
     active: boolean;
     period: Period;
@@ -788,7 +806,8 @@ export declare class PractitionerRole extends Resource {
     availabilityExceptions: string;
     endpoint: Reference[];
 }
-export declare class Practitioner extends Resource {
+export declare class Practitioner extends BaseResource {
+    resourceType: "Practitioner";
     identifier: Identifier[];
     active: boolean;
     name: HumanName[];
@@ -800,7 +819,8 @@ export declare class Practitioner extends Resource {
     qualification: Qualification[];
     communication: CodeableConcept[];
 }
-export declare class Device extends Resource {
+export declare class Device extends BaseResource {
+    resourceType: "Device";
     identifier: Identifier[];
     udi: Udi;
     status: string;
@@ -819,7 +839,8 @@ export declare class Device extends Resource {
     note: Annotation[];
     safety: CodeableConcept[];
 }
-export declare class Observation extends Resource {
+export declare class Observation extends BaseResource {
+    resourceType: "Observation";
     identifier: Identifier[];
     basedOn: Reference[];
     status: string;
@@ -853,7 +874,8 @@ export declare class Observation extends Resource {
     related: Related[];
     component: Component[];
 }
-export declare class Immunization extends Resource {
+export declare class Immunization extends BaseResource {
+    resourceType: "Immunization";
     identifier: Identifier[];
     status: string;
     notGiven: boolean;
@@ -875,7 +897,8 @@ export declare class Immunization extends Resource {
     reaction: ImmunizationReaction[];
     vaccinationProtocol: VaccinationProtocol[];
 }
-export declare class CommunicationRequest extends Resource {
+export declare class CommunicationRequest extends BaseResource {
+    resourceType: "CommunicationRequest";
     identifier: Identifier[];
     basedOn: Reference[];
     replaces: Reference[];
@@ -898,7 +921,8 @@ export declare class CommunicationRequest extends Resource {
     reasonReference: Reference[];
     note: Annotation[];
 }
-export declare class AuditEvent extends Resource {
+export declare class AuditEvent extends BaseResource {
+    resourceType: "AuditEvent";
     type: Coding;
     subtype: Coding[];
     action: string;
@@ -913,7 +937,8 @@ export declare class AuditEvent extends Resource {
     source: Source;
     entity: Entity[];
 }
-export declare class Bundle extends Resource {
+export declare class Bundle extends BaseResource {
+    resourceType: "Bundle";
     identifier: Identifier;
     type: string;
     timestamp: string;
@@ -922,7 +947,8 @@ export declare class Bundle extends Resource {
     entry: BundleEntry[];
     signature: BundleSignature;
 }
-export declare class HealthcareService extends Resource {
+export declare class HealthcareService extends BaseResource {
+    resourceType: "HealthcareService";
     identifier: Identifier[];
     active: string;
     providedBy: Reference;
@@ -948,7 +974,8 @@ export declare class HealthcareService extends Resource {
     availibilityExceptions: string;
     endpoint: Reference[];
 }
-export declare class Schedule extends Resource {
+export declare class Schedule extends BaseResource {
+    resourceType: "Schedule";
     identifier: Identifier[];
     active: boolean;
     serviceCategory: CodeableConcept;
@@ -958,7 +985,8 @@ export declare class Schedule extends Resource {
     planningHorizon: Period;
     comment: string;
 }
-export declare class Slot extends Resource {
+export declare class Slot extends BaseResource {
+    resourceType: "Slot";
     identifier: Identifier[];
     serviceCategory: CodeableConcept;
     serviceType: CodeableConcept[];
@@ -971,7 +999,8 @@ export declare class Slot extends Resource {
     overbooked: boolean;
     comment: string;
 }
-export declare class ClinicalImpression extends Resource {
+export declare class ClinicalImpression extends BaseResource {
+    resourceType: "ClinicalImpression";
     identifier: Identifier[];
     status: string;
     code: CodeableConcept;
@@ -1002,7 +1031,8 @@ export declare class ClinicalImpressionFinding extends BackboneElement {
     itemCodeableConcept: CodeableConcept;
     itemReference: Reference;
 }
-export declare class AllergyIntolerance extends Resource {
+export declare class AllergyIntolerance extends BaseResource {
+    resourceType: "AllergyIntolerance";
     identifier: Identifier[];
     clinicalStatus: Code;
     verificationStatus: Code;
@@ -1039,4 +1069,5 @@ export declare class Age extends FHIRElement {
     system: string;
     code: Code;
 }
+export declare type Resource = AllergyIntolerance | ClinicalImpression | Schedule | HealthcareService | Bundle | AuditEvent | CommunicationRequest | Immunization | Observation | Device | Practitioner | PractitionerRole | ProcedureRequest | Task | Communication | CarePlan | EpisodeOfCare | CareTeam | Encounter | ProcessRequest | Account | Location | Organization | AppointmentResponse | Appointment | QuestionnaireResponse | Questionnaire | Slot | Patient | DocumentReference;
 export {};

package/dist/FHIR-R3.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Restriction = exports.SampledData = exports.Output = exports.Input = exports.Range = exports.Ratio = exports.Component = exports.Timing = exports.Activity = exports.EncounterParticipant = exports.Participant = exports.ReferenceRange = exports.Context = exports.ContextRelated = exports.Annotation = exports.FHIROption = exports.Answer = exports.EnableWhen = exports.Network = exports.Payload = exports.Identifier = exports.Reference = exports.ContactDetail = exports.ContactPoint = exports.Contact = exports.PatientCommunication = exports.Link = exports.Content = exports.Qualification = exports.Attachment = exports.VaccinationProtocol = exports.ImmunizationReaction = exports.ImmunizationExplaination = exports.PractitionerForImmunization = exports.UsageContext = exports.Quantity = exports.Period = exports.CodeableConcept = exports.Meta = exports.Address = exports.Extension = exports.HumanName = exports.DoseCoding = exports.Coding = exports.Code = exports.Narrative = exports.Resource = exports.DomainResource = exports.BackboneElement = exports.FHIRElement = void 0;
+exports.Restriction = exports.SampledData = exports.Output = exports.Input = exports.Range = exports.Ratio = exports.Component = exports.Timing = exports.Activity = exports.EncounterParticipant = exports.Participant = exports.ReferenceRange = exports.Context = exports.ContextRelated = exports.Annotation = exports.FHIROption = exports.Answer = exports.EnableWhen = exports.Network = exports.Payload = exports.Identifier = exports.Reference = exports.ContactDetail = exports.ContactPoint = exports.Contact = exports.PatientCommunication = exports.Link = exports.Content = exports.Qualification = exports.Attachment = exports.VaccinationProtocol = exports.ImmunizationReaction = exports.ImmunizationExplaination = exports.PractitionerForImmunization = exports.UsageContext = exports.Quantity = exports.Period = exports.CodeableConcept = exports.Meta = exports.Address = exports.Extension = exports.HumanName = exports.DoseCoding = exports.Coding = exports.Code = exports.Narrative = exports.BaseResource = exports.DomainResource = exports.BackboneElement = exports.FHIRElement = void 0;
 exports.ClinicalImpressionFinding = exports.ClinicalImpressionInvestigation = exports.ClinicalImpression = exports.Slot = exports.Schedule = exports.HealthcareService = exports.Bundle = exports.AuditEvent = exports.CommunicationRequest = exports.Immunization = exports.Observation = exports.Device = exports.Practitioner = exports.PractitionerRole = exports.ProcedureRequest = exports.Task = exports.Communication = exports.CarePlan = exports.EpisodeOfCare = exports.CareTeam = exports.CareTeamParticipant = exports.Encounter = exports.ProcessRequest = exports.Account = exports.Location = exports.Organization = exports.AppointmentResponse = exports.Appointment = exports.DocumentReference = exports.Patient = exports.Questionnaire = exports.QuestionnaireResponse = exports.Udi = exports.Entity = exports.EntityDetail = exports.Source = exports.Agent = exports.Item = exports.QuestionnaireResponseItem = exports.Requester = exports.Position = exports.ActivityDetail = exports.BundleEntry = exports.BundleResponse = exports.BundleRequest = exports.Search = exports.BundleSignature = exports.BundleLink = exports.NotAvailable = exports.AvailableTime = void 0;
 exports.Age = exports.AllergyIntoleranceReaction = exports.AllergyIntolerance = void 0;
 /* This is base class from which other elements are derived */
@@ -14,9 +14,9 @@ exports.BackboneElement = BackboneElement;
 class DomainResource {
 }
 exports.DomainResource = DomainResource;
-class Resource extends DomainResource {
+class BaseResource extends DomainResource {
 }
-exports.Resource = Resource;
+exports.BaseResource = BaseResource;
 class Narrative {
 }
 exports.Narrative = Narrative;
@@ -284,94 +284,94 @@ exports.Entity = Entity;
 class Udi extends BackboneElement {
 }
 exports.Udi = Udi;
-class QuestionnaireResponse extends Resource {
+class QuestionnaireResponse extends BaseResource {
 }
 exports.QuestionnaireResponse = QuestionnaireResponse;
-class Questionnaire extends Resource {
+class Questionnaire extends BaseResource {
 }
 exports.Questionnaire = Questionnaire;
-class Patient extends Resource {
+class Patient extends BaseResource {
 }
 exports.Patient = Patient;
-class DocumentReference extends Resource {
+class DocumentReference extends BaseResource {
 }
 exports.DocumentReference = DocumentReference;
-class Appointment extends Resource {
+class Appointment extends BaseResource {
 }
 exports.Appointment = Appointment;
-class AppointmentResponse extends Resource {
+class AppointmentResponse extends BaseResource {
 }
 exports.AppointmentResponse = AppointmentResponse;
-class Organization extends Resource {
+class Organization extends BaseResource {
 }
 exports.Organization = Organization;
-class Location extends Resource {
+class Location extends BaseResource {
 }
 exports.Location = Location;
-class Account extends Resource {
+class Account extends BaseResource {
 }
 exports.Account = Account;
-class ProcessRequest extends Resource {
+class ProcessRequest extends BaseResource {
 }
 exports.ProcessRequest = ProcessRequest;
-class Encounter extends Resource {
+class Encounter extends BaseResource {
 }
 exports.Encounter = Encounter;
 class CareTeamParticipant extends BackboneElement {
 }
 exports.CareTeamParticipant = CareTeamParticipant;
-class CareTeam extends Resource {
+class CareTeam extends BaseResource {
 }
 exports.CareTeam = CareTeam;
-class EpisodeOfCare extends Resource {
+class EpisodeOfCare extends BaseResource {
 }
 exports.EpisodeOfCare = EpisodeOfCare;
-class CarePlan extends Resource {
+class CarePlan extends BaseResource {
 }
 exports.CarePlan = CarePlan;
-class Communication extends Resource {
+class Communication extends BaseResource {
 }
 exports.Communication = Communication;
-class Task extends Resource {
+class Task extends BaseResource {
 }
 exports.Task = Task;
-class ProcedureRequest extends Resource {
+class ProcedureRequest extends BaseResource {
 }
 exports.ProcedureRequest = ProcedureRequest;
-class PractitionerRole extends Resource {
+class PractitionerRole extends BaseResource {
 }
 exports.PractitionerRole = PractitionerRole;
-class Practitioner extends Resource {
+class Practitioner extends BaseResource {
 }
 exports.Practitioner = Practitioner;
-class Device extends Resource {
+class Device extends BaseResource {
 }
 exports.Device = Device;
-class Observation extends Resource {
+class Observation extends BaseResource {
 }
 exports.Observation = Observation;
-class Immunization extends Resource {
+class Immunization extends BaseResource {
 }
 exports.Immunization = Immunization;
-class CommunicationRequest extends Resource {
+class CommunicationRequest extends BaseResource {
 }
 exports.CommunicationRequest = CommunicationRequest;
-class AuditEvent extends Resource {
+class AuditEvent extends BaseResource {
 }
 exports.AuditEvent = AuditEvent;
-class Bundle extends Resource {
+class Bundle extends BaseResource {
 }
 exports.Bundle = Bundle;
-class HealthcareService extends Resource {
+class HealthcareService extends BaseResource {
 }
 exports.HealthcareService = HealthcareService;
-class Schedule extends Resource {
+class Schedule extends BaseResource {
 }
 exports.Schedule = Schedule;
-class Slot extends Resource {
+class Slot extends BaseResource {
 }
 exports.Slot = Slot;
-class ClinicalImpression extends Resource {
+class ClinicalImpression extends BaseResource {
 }
 exports.ClinicalImpression = ClinicalImpression;
 class ClinicalImpressionInvestigation extends BackboneElement {
@@ -380,7 +380,7 @@ exports.ClinicalImpressionInvestigation = ClinicalImpressionInvestigation;
 class ClinicalImpressionFinding extends BackboneElement {
 }
 exports.ClinicalImpressionFinding = ClinicalImpressionFinding;
-class AllergyIntolerance extends Resource {
+class AllergyIntolerance extends BaseResource {
 }
 exports.AllergyIntolerance = AllergyIntolerance;
 class AllergyIntoleranceReaction extends BackboneElement {

package/package.json

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

package/src/FHIR-R3.ts

@@ -16,7 +16,7 @@ export class DomainResource  {
   modifierExtension: Extension[];
 }
 
-export class Resource extends DomainResource {
+export class BaseResource extends DomainResource {
   resourceType: string;
   id: string;
   meta: Meta;
@@ -633,7 +633,8 @@ export class Udi extends BackboneElement {
   entryType: string;
 }
 
-export class QuestionnaireResponse extends Resource {
+export class QuestionnaireResponse extends BaseResource {
+  resourceType: "QuestionnaireResponse";
   identifier: Identifier;
   basedOn: Reference[];
   parent: Reference[];
@@ -647,7 +648,8 @@ export class QuestionnaireResponse extends Resource {
   subject: Reference;
 }
 
-export class Questionnaire extends Resource  {
+export class Questionnaire extends BaseResource {
+  resourceType: "Questionnaire";
   url: string;
   identifier: Identifier[];
   version: string;
@@ -673,7 +675,8 @@ export class Questionnaire extends Resource  {
 }
 
 
-export class Patient extends Resource {
+export class Patient extends BaseResource {
+  resourceType: "Patient";
   identifier: Identifier[];
   active: boolean;
   name: HumanName[];
@@ -689,7 +692,8 @@ export class Patient extends Resource {
   link: Link[];
 }
 
-export class DocumentReference extends Resource {
+export class DocumentReference extends BaseResource {
+  resourceType: "DocumentReference";
   masterIdentifier: Identifier;
   identifier: Identifier[];
   status: string;
@@ -704,7 +708,8 @@ export class DocumentReference extends Resource {
   context: Context;
 }
 
-export class Appointment extends Resource {
+export class Appointment extends BaseResource {
+  resourceType: "Appointment";
   identifier: Identifier[];
   status: string;
   serviceCategory: CodeableConcept;
@@ -726,7 +731,8 @@ export class Appointment extends Resource {
   requestPeriod: Period[];
 }
 
-export class AppointmentResponse extends Resource {
+export class AppointmentResponse extends BaseResource {
+  resourceType: "AppointmentResponse";
   identifier: Identifier[];
   appointment: Reference;
   start: Date;
@@ -738,7 +744,8 @@ export class AppointmentResponse extends Resource {
 }
 
 
-export class Organization extends Resource {
+export class Organization extends BaseResource {
+  resourceType: "Organization";
   identifier: Identifier[];
   active: boolean;
   status: string;
@@ -753,7 +760,8 @@ export class Organization extends Resource {
   endpoint: Reference[];
 }
 
-export class Location extends Resource {
+export class Location extends BaseResource {
+  resourceType: "Location";
   identifier: Identifier[];
   status: string;
   operationalStatus: Coding;
@@ -771,7 +779,8 @@ export class Location extends Resource {
   extension: Extension[];
 }
 
-export class Account extends Resource {
+export class Account extends BaseResource {
+  resourceType: "Account";
   identifier: Identifier[];
   status: Code;
   type: CodeableConcept;
@@ -792,7 +801,8 @@ export class Account extends Resource {
   endpoint: Reference[];
 }
 
-export class ProcessRequest extends Resource {
+export class ProcessRequest extends BaseResource {
+  resourceType: "ProcessRequest";
   identifier: Identifier[];
   status: string;
   created: Date;
@@ -800,7 +810,8 @@ export class ProcessRequest extends Resource {
   request: Reference;
 }
 
-export class Encounter extends Resource {
+export class Encounter extends BaseResource {
+  resourceType: "Encounter";
   identifier: Identifier[];
   status: string;
   episodeOfCare: Reference[];
@@ -815,7 +826,8 @@ export class CareTeamParticipant extends BackboneElement {
   period: Period;
 }
 
-export class CareTeam extends Resource {
+export class CareTeam extends BaseResource {
+  resourceType: "CareTeam";
   identifier: Identifier[];
   status: string;
   category: CodeableConcept[];
@@ -826,7 +838,8 @@ export class CareTeam extends Resource {
   note: Annotation[];
 }
 
-export class EpisodeOfCare extends Resource {
+export class EpisodeOfCare extends BaseResource {
+  resourceType: "EpisodeOfCare";
   identifier: Identifier[];
   status: string;
   statusHistory: BackboneElement[];
@@ -841,7 +854,8 @@ export class EpisodeOfCare extends Resource {
   account: Reference[];
 }
 
-export class CarePlan extends Resource {
+export class CarePlan extends BaseResource {
+  resourceType: "CarePlan";
   identifier: Identifier[];
   definition: Reference[];
   basedOn: Reference[];
@@ -864,7 +878,8 @@ export class CarePlan extends Resource {
   note: Annotation[];
 }
 
-export class Communication extends Resource {
+export class Communication extends BaseResource {
+  resourceType: "Communication";
   identifier: Identifier[];
   definition: Reference[];
   basedOn: Reference[];
@@ -887,7 +902,8 @@ export class Communication extends Resource {
   note: Annotation[];
 }
 
-export class Task extends Resource {
+export class Task extends BaseResource {
+  resourceType: "Task";
   identifier: Identifier[];
   definitionUri: string;
   definitionReference: Reference;
@@ -919,7 +935,8 @@ export class Task extends Resource {
   output: Output[];
 }
 
-export class ProcedureRequest extends Resource {
+export class ProcedureRequest extends BaseResource {
+  resourceType: "ProcedureRequest";
   identifier: Identifier[];
   status: string;
   intent: string;
@@ -935,7 +952,8 @@ export class ProcedureRequest extends Resource {
 }
 
 
-export class PractitionerRole extends Resource {
+export class PractitionerRole extends BaseResource {
+  resourceType: "PractitionerRole";
   identifier: Identifier[];
   active: boolean;
   period: Period;
@@ -952,7 +970,8 @@ export class PractitionerRole extends Resource {
   endpoint: Reference[];
 }
 
-export class Practitioner extends Resource {
+export class Practitioner extends BaseResource {
+  resourceType: "Practitioner";
   identifier: Identifier[];
   active: boolean;
   name: HumanName[];
@@ -965,7 +984,8 @@ export class Practitioner extends Resource {
   communication: CodeableConcept[];
 }
 
-export class Device extends Resource {
+export class Device extends BaseResource {
+  resourceType: "Device";
   identifier: Identifier[];
   udi: Udi;
   status: string;
@@ -985,7 +1005,8 @@ export class Device extends Resource {
   safety: CodeableConcept[];
 }
 
-export class Observation extends Resource {
+export class Observation extends BaseResource {
+  resourceType: "Observation";
   identifier: Identifier[];
   basedOn: Reference[];
   status: string;
@@ -1020,7 +1041,8 @@ export class Observation extends Resource {
   component: Component[];
 }
 
-export class Immunization extends Resource {
+export class Immunization extends BaseResource {
+  resourceType: "Immunization";
   identifier: Identifier[];
   status: string;
   notGiven: boolean;
@@ -1043,7 +1065,8 @@ export class Immunization extends Resource {
   vaccinationProtocol: VaccinationProtocol[];
 }
 
-export class CommunicationRequest extends Resource {
+export class CommunicationRequest extends BaseResource {
+  resourceType: "CommunicationRequest";
   identifier: Identifier[];
   basedOn: Reference[];
   replaces: Reference[];
@@ -1068,7 +1091,8 @@ export class CommunicationRequest extends Resource {
 }
 
 
-export class AuditEvent extends Resource {
+export class AuditEvent extends BaseResource {
+  resourceType: "AuditEvent";
   type: Coding;
   subtype: Coding[];
   action: string;
@@ -1084,7 +1108,8 @@ export class AuditEvent extends Resource {
   entity: Entity[];
 }
 
-export class Bundle extends Resource {
+export class Bundle extends BaseResource {
+  resourceType: "Bundle";
   identifier: Identifier;
   type: string;
   timestamp: string;
@@ -1094,7 +1119,8 @@ export class Bundle extends Resource {
   signature: BundleSignature;
 }
 
-export class HealthcareService extends Resource {
+export class HealthcareService extends BaseResource {
+  resourceType: "HealthcareService";
   identifier: Identifier[];
   active: string;
   providedBy: Reference;
@@ -1121,7 +1147,8 @@ export class HealthcareService extends Resource {
   endpoint: Reference[];
 }
 
-export class Schedule extends Resource {
+export class Schedule extends BaseResource {
+  resourceType: "Schedule";
   identifier: Identifier[];
   active: boolean;
   serviceCategory: CodeableConcept;
@@ -1132,7 +1159,8 @@ export class Schedule extends Resource {
   comment: string;
 }
 
-export class Slot extends Resource {
+export class Slot extends BaseResource {
+  resourceType: "Slot";
   identifier: Identifier[];
   serviceCategory: CodeableConcept;
   serviceType: CodeableConcept[];
@@ -1146,7 +1174,8 @@ export class Slot extends Resource {
   comment: string;
 }
 
-export class ClinicalImpression extends Resource {
+export class ClinicalImpression extends BaseResource {
+  resourceType: "ClinicalImpression";
   identifier: Identifier[];
   status: string;
   code: CodeableConcept;
@@ -1180,7 +1209,8 @@ export class ClinicalImpressionFinding extends BackboneElement {
   itemReference: Reference;
 }
 
-export class AllergyIntolerance extends Resource {
+export class AllergyIntolerance extends BaseResource {
+  resourceType: "AllergyIntolerance";
   identifier: Identifier[];
   clinicalStatus: Code;
   verificationStatus: Code;
@@ -1218,4 +1248,6 @@ export class Age extends FHIRElement {
     unit: string;
     system: string;
     code: Code;
-}
+}
+
+export type Resource = AllergyIntolerance | ClinicalImpression | Schedule | HealthcareService | Bundle | AuditEvent | CommunicationRequest | Immunization | Observation | Device | Practitioner | PractitionerRole | ProcedureRequest | Task | Communication | CarePlan | EpisodeOfCare | CareTeam | Encounter | ProcessRequest | Account | Location | Organization | AppointmentResponse | Appointment | QuestionnaireResponse | Questionnaire | Slot | Patient | DocumentReference;