@smile-cdr/fhirts 2.2.8 → 2.4.0

package/eslint.config.mjs

@@ -0,0 +1,69 @@
+import eslint from '@eslint/js';
+import tseslint from '@typescript-eslint/eslint-plugin';
+import tsparser from '@typescript-eslint/parser';
+import prettier from 'eslint-plugin-prettier';
+
+export default [
+  eslint.configs.recommended,
+  {
+    files: ['src/**/*.ts'],
+    languageOptions: {
+      parser: tsparser,
+      parserOptions: {
+        ecmaVersion: 2020,
+        sourceType: 'module',
+        project: './tsconfig.json',
+      },
+    },
+    plugins: {
+      '@typescript-eslint': tseslint,
+      prettier: prettier,
+    },
+    rules: {
+      // Prettier integration
+      'prettier/prettier': 'error',
+
+      // TypeScript specific rules
+      '@typescript-eslint/no-explicit-any': 'off', // Allow any for now (library uses it extensively)
+      '@typescript-eslint/explicit-module-boundary-types': 'off',
+      '@typescript-eslint/no-unused-vars': ['warn', {
+        argsIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+      }],
+
+      // General rules
+      'no-console': 'warn',
+      'no-debugger': 'error',
+      'prefer-const': 'error',
+      'no-var': 'error',
+      'eqeqeq': ['error', 'always'],
+      'curly': ['error', 'all'],
+      'no-throw-literal': 'error',
+
+      // Disable rules that conflict with TypeScript
+      'no-undef': 'off',
+      'no-unused-vars': 'off',
+    },
+  },
+  {
+    files: ['**/*.spec.ts', '**/*.test.ts'],
+    rules: {
+      '@typescript-eslint/no-unused-vars': 'off',
+      'no-console': 'off',
+    },
+  },
+  {
+    ignores: [
+      'dist/**',
+      'node_modules/**',
+      'coverage/**',
+      '*.js',
+      '*.mjs',
+      'src/FHIR-R4/classes/**',
+      'src/FHIR-R4/interfaces/**',
+      'src/FHIR-R5/**',
+      'src/FHIR-R3.ts',
+      'src/FHIR-DSTU2.ts',
+    ],
+  },
+];

package/package.json

@@ -1,24 +1,38 @@
 {
   "name": "@smile-cdr/fhirts",
-  "version": "2.2.8",
-  "description": "Fhir ts/js library for frontend apps",
+  "version": "2.4.0",
+  "description": "Fhir ts/js library for frontend applications with FHIR types and useful utilities.",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "repository": "git://github.com/smilecdr/FHIR.ts",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/smilecdr/FHIR.ts.git"
+  },
   "scripts": {
     "build": "tsc",
-    "test": "ts-node --project ./tsconfig.json node_modules/jasmine/bin/jasmine --config=spec/support/jasmine.json",
+    "test": "tsx --tsconfig ./tsconfig.json node_modules/jasmine/bin/jasmine --config=spec/support/jasmine.json",
     "coverage": "nyc npm run test",
-    "audit": "better-npm-audit audit"
+    "audit": "better-npm-audit audit",
+    "lint": "eslint \"src/library/**/*.ts\" \"src/index.ts\"",
+    "lint:fix": "eslint \"src/library/**/*.ts\" \"src/index.ts\" --fix",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "format:check": "prettier --check \"src/**/*.ts\""
   },
   "devDependencies": {
     "@types/jasmine": "^4.3.1",
-    "@types/node": "^20.12.12",
+    "@types/node": "^25.2.3",
+    "@typescript-eslint/eslint-plugin": "^8.55.0",
+    "@typescript-eslint/parser": "^8.55.0",
     "better-npm-audit": "^3.7.3",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.5",
     "jasmine": "^4.5.0",
     "nyc": "^15.1.0",
+    "prettier": "^3.8.1",
     "ts-node": "^10.9.1",
-    "typescript": "^4.0.2"
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3"
   }
 }

package/src/FHIR-DSTU2.ts

@@ -14,7 +14,7 @@ export class Id {
   constructor(input?: string) {
     const re = new RegExp('[A-Za-z0-9\\-\\.]{1,64}');
 
-    if (re.test(input)) {
+    if (input && re.test(input)) {
       this.id = input;
     } else {
       throw new RangeError('Not a valid Id string - must match reg exp [A-Za-z0-9\\-\\.]{1,64} Was provided: ' + input);

package/src/FHIR-R3.ts

@@ -35,7 +35,9 @@ export class Code extends FHIRElement {
 
   constructor(input?: string) {
     super();
-    this.setCode(input);
+    if (input) {
+      this.setCode(input);
+    }
   }
 
   private setCode(input: string) {

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

@@ -13,6 +13,7 @@ import { AccountCoverage } from './accountCoverage';
 import { AccountGuarantor } from './accountGuarantor';
 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';
 /**
  * A financial tool for tracking value accrued for a particular purpose.  In the healthcare field, used to track charges for a patient, cost centers, etc.
  */
-export class Account { 
+export class Account extends DomainResource { 
     /**
      * This is a Account resource
      */

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

@@ -17,6 +17,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Dosage } from './dosage';
 import { Duration } from './duration';
 import { Extension } from './extension';
@@ -38,7 +39,7 @@ import { UsageContext } from './usageContext';
 /**
  * This resource allows for the definition of some activity to be performed, independent of a particular patient, practitioner, or other performance context.
  */
-export class ActivityDefinition { 
+export class ActivityDefinition extends DomainResource { 
     /**
      * This is a ActivityDefinition resource
      */

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

@@ -13,6 +13,7 @@ import { AdverseEventSuspectEntity } from './adverseEventSuspectEntity';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -25,7 +26,7 @@ import { Uri } from './uri';
 /**
  * Actual or  potential/avoided event causing unintended physical injury resulting from or contributed to by medical care, a research study or other healthcare setting factors that requires additional monitoring, treatment, or hospitalization, or that results in death.
  */
-export class AdverseEvent { 
+export class AdverseEvent extends DomainResource { 
     /**
      * This is a AdverseEvent resource
      */

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

@@ -15,6 +15,7 @@ import { Annotation } from './annotation';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -29,7 +30,7 @@ import { Uri } from './uri';
 /**
  * Risk of harmful or undesirable, physiological response which is unique to an individual and associated with exposure to a substance.
  */
-export class AllergyIntolerance { 
+export class AllergyIntolerance extends DomainResource { 
     /**
      * This is a AllergyIntolerance resource
      */

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

@@ -13,6 +13,7 @@ import { AppointmentParticipant } from './appointmentParticipant';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -29,7 +30,7 @@ import { Uri } from './uri';
 /**
  * A booking of a healthcare event among patient(s), practitioner(s), related person(s) and/or device(s) for a specific date/time. This may result in one or more Encounter(s).
  */
-export class Appointment { 
+export class Appointment extends DomainResource { 
     /**
      * This is a Appointment resource
      */

package/src/FHIR-R4/classes/appointmentResponse.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';
@@ -24,7 +25,7 @@ import { Uri } from './uri';
 /**
  * A reply to an appointment request for a patient and/or practitioner(s), such as a confirmation or rejection.
  */
-export class AppointmentResponse { 
+export class AppointmentResponse extends DomainResource { 
     /**
      * This is a AppointmentResponse resource
      */

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

@@ -15,6 +15,7 @@ import { AuditEventSource } from './auditEventSource';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { Coding } from './coding';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Instant } from './instant';
@@ -27,7 +28,7 @@ import { Uri } from './uri';
 /**
  * A record of an event made for purposes of maintaining a security log. Typical uses include detection of intrusion attempts and monitoring for inappropriate usage.
  */
-export class AuditEvent { 
+export class AuditEvent extends DomainResource { 
     /**
      * This is a AuditEvent resource
      */

package/src/FHIR-R4/classes/basic.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';
@@ -23,7 +24,7 @@ import { Uri } from './uri';
 /**
  * Basic is used for handling concepts not yet defined in FHIR, narrative-only resources that don't map to an existing resource, and custom resources not appropriate for inclusion in the FHIR specification.
  */
-export class Basic {
+export class Basic extends DomainResource {
     /**
      * This is a Basic resource
      */

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

@@ -15,6 +15,7 @@ import { BiologicallyDerivedProductProcessing } from './biologicallyDerivedProdu
 import { BiologicallyDerivedProductStorage } from './biologicallyDerivedProductStorage';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -27,7 +28,7 @@ import { Uri } from './uri';
 /**
  * A material substance originating from a biological entity intended to be transplanted or infused into another (possibly the same) biological entity.
  */
-export class BiologicallyDerivedProduct { 
+export class BiologicallyDerivedProduct extends DomainResource { 
     /**
      * This is a BiologicallyDerivedProduct resource
      */

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

@@ -12,6 +12,7 @@
 import { Attachment } from './attachment';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -24,7 +25,7 @@ import { Uri } from './uri';
 /**
  * Record details about an anatomical structure.  This resource may be used when a coded concept does not provide the necessary detail needed for the use case.
  */
-export class BodyStructure { 
+export class BodyStructure extends DomainResource { 
     /**
      * This is a BodyStructure resource
      */

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

@@ -19,6 +19,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';
@@ -31,7 +32,7 @@ import { UsageContext } from './usageContext';
 /**
  * A Capability Statement documents a set of capabilities (behaviors) of a FHIR Server for a particular version of FHIR that may be used as a statement of actual server functionality or a statement of required or desired server implementation.
  */
-export class CapabilityStatement { 
+export class CapabilityStatement extends DomainResource { 
     /**
      * This is a CapabilityStatement resource
      */

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

@@ -15,6 +15,7 @@ import { CarePlanActivity } from './carePlanActivity';
 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';
 /**
  * Describes the intention of how one or more practitioners intend to deliver care for a particular patient, group or community for a period of time, possibly limited to care for a specific condition or set of conditions.
  */
-export class CarePlan { 
+export class CarePlan extends DomainResource { 
     /**
      * This is a CarePlan resource
      */

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

@@ -14,6 +14,7 @@ import { CareTeamParticipant } from './careTeamParticipant';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { ContactPoint } from './contactPoint';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -27,7 +28,7 @@ import { Uri } from './uri';
 /**
  * The Care Team includes all the people and organizations who plan to participate in the coordination and delivery of care for a patient.
  */
-export class CareTeam { 
+export class CareTeam extends DomainResource { 
     /**
      * This is a CareTeam resource
      */

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

@@ -13,6 +13,7 @@ import { CatalogEntryRelatedEntry } from './catalogEntryRelatedEntry';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -26,7 +27,7 @@ import { Uri } from './uri';
 /**
  * Catalog entries are wrappers that contextualize items included in a catalog.
  */
-export class CatalogEntry { 
+export class CatalogEntry extends DomainResource { 
     /**
      * This is a CatalogEntry resource
      */

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

@@ -16,6 +16,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
 import { Decimal } from './decimal';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -32,7 +33,7 @@ import { Uri } from './uri';
 /**
  * The resource ChargeItem describes the provision of healthcare provider products for a certain patient, therefore referring not only to the product, but containing in addition details of the provision, like date, time, amounts and participating organizations and persons. Main Usage of the ChargeItem is to enable the billing process and internal cost allocation.
  */
-export class ChargeItem { 
+export class ChargeItem extends DomainResource { 
     /**
      * This is a ChargeItem resource
      */

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

@@ -16,6 +16,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';
@@ -31,7 +32,7 @@ import { UsageContext } from './usageContext';
 /**
  * The ChargeItemDefinition resource provides the properties that apply to the (billing) codes necessary to calculate costs and prices. The properties may differ largely depending on type and realm, therefore this resource gives only a rough structure and requires profiling for each type of billing code system.
  */
-export class ChargeItemDefinition { 
+export class ChargeItemDefinition extends DomainResource { 
     /**
      * This is a ChargeItemDefinition resource
      */

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

@@ -21,6 +21,7 @@ import { ClaimSupportingInfo } from './claimSupportingInfo';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -35,7 +36,7 @@ import { Uri } from './uri';
 /**
  * A provider issued list of professional services and products which have been provided, or are to be provided, to a patient which is sent to an insurer for reimbursement.
  */
-export class Claim { 
+export class Claim extends DomainResource { 
     /**
      * This is a Claim resource
      */

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

@@ -21,6 +21,7 @@ import { ClaimResponseTotal } from './claimResponseTotal';
 import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -34,7 +35,7 @@ import { Uri } from './uri';
 /**
  * This resource provides the adjudication details from the processing of a Claim resource.
  */
-export class ClaimResponse { 
+export class ClaimResponse extends DomainResource { 
     /**
      * This is a ClaimResponse resource
      */

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

@@ -15,6 +15,7 @@ import { ClinicalImpressionInvestigation } from './clinicalImpressionInvestigati
 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 clinical assessment performed to determine what problem(s) may affect the patient and before planning the treatments or management strategies that are best to manage a patient's condition. Assessments are often 1:1 with a clinical consultation / encounter,  but this varies greatly depending on the clinical workflow. This resource is called \"ClinicalImpression\" rather than \"ClinicalAssessment\" to avoid confusion with the recording of assessment tools such as Apgar score.
  */
-export class ClinicalImpression { 
+export class ClinicalImpression extends DomainResource { 
     /**
      * This is a ClinicalImpression resource
      */

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

@@ -17,6 +17,7 @@ import { CodeSystemProperty } from './codeSystemProperty';
 import { CodeableConcept } from './codeableConcept';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -31,7 +32,7 @@ import { UsageContext } from './usageContext';
 /**
  * The CodeSystem resource is used to declare the existence of and describe a code system or code system supplement and its key properties, and optionally define a part or all of its content.
  */
-export class CodeSystem { 
+export class CodeSystem extends DomainResource { 
     /**
      * This is a CodeSystem resource
      */

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

@@ -15,6 +15,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { CommunicationPayload } from './communicationPayload';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -27,7 +28,7 @@ import { Uri } from './uri';
 /**
  * An occurrence of information being transmitted; e.g. an alert that was sent to a responsible provider, a public health agency that was notified about a reportable condition.
  */
-export class Communication { 
+export class Communication extends DomainResource { 
     /**
      * This is a Communication resource
      */

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

@@ -14,6 +14,7 @@ import { Code } from './code';
 import { CodeableConcept } from './codeableConcept';
 import { CommunicationRequestPayload } from './communicationRequestPayload';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -27,7 +28,7 @@ import { Uri } from './uri';
 /**
  * A request to convey information; e.g. the CDS system proposes that an alert be sent to a responsible provider, the CDS system proposes that the public health agency be notified about a reportable condition.
  */
-export class CommunicationRequest { 
+export class CommunicationRequest extends DomainResource { 
     /**
      * This is a CommunicationRequest resource
      */

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

@@ -13,6 +13,7 @@ import { Code } from './code';
 import { CompartmentDefinitionResource } from './compartmentDefinitionResource';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Markdown } from './markdown';
@@ -25,7 +26,7 @@ import { UsageContext } from './usageContext';
 /**
  * A compartment definition that defines how resources are accessed on a server.
  */
-export class CompartmentDefinition { 
+export class CompartmentDefinition extends DomainResource { 
     /**
      * This is a CompartmentDefinition resource
      */

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

@@ -16,6 +16,7 @@ import { CompositionEvent } from './compositionEvent';
 import { CompositionRelatesTo } from './compositionRelatesTo';
 import { CompositionSection } from './compositionSection';
 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 set of healthcare-related information that is assembled together into a single logical package that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. A Composition defines the structure and narrative content necessary for a document. However, a Composition alone does not constitute a document. Rather, the Composition must be the first entry in a Bundle where Bundle.type=document, and any other resources referenced from Composition must be included as subsequent entries in the Bundle (for example Patient, Practitioner, Encounter, etc.).
  */
-export class Composition { 
+export class Composition extends DomainResource { 
     /**
      * This is a Composition resource
      */

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

@@ -14,6 +14,7 @@ import { CodeableConcept } from './codeableConcept';
 import { ConceptMapGroup } from './conceptMapGroup';
 import { ContactDetail } from './contactDetail';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -27,7 +28,7 @@ import { UsageContext } from './usageContext';
 /**
  * A statement of relationships from one set of concepts to one or more other concepts - either concepts in code systems, or data element/data element concepts, or classes in class models.
  */
-export class ConceptMap { 
+export class ConceptMap extends DomainResource { 
     /**
      * This is a ConceptMap resource
      */

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

@@ -16,6 +16,7 @@ import { CodeableConcept } from './codeableConcept';
 import { ConditionEvidence } from './conditionEvidence';
 import { ConditionStage } from './conditionStage';
 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 clinical condition, problem, diagnosis, or other event, situation, issue, or clinical concept that has risen to a level of concern.
  */
-export class Condition { 
+export class Condition extends DomainResource { 
     /**
      * This is a Condition resource
      */

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

@@ -16,6 +16,7 @@ import { ConsentPolicy } from './consentPolicy';
 import { ConsentProvision } from './consentProvision';
 import { ConsentVerification } from './consentVerification';
 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 healthcare consumer’s  choices, which permits or denies identified recipient(s) or recipient role(s) to perform one or more actions within a given policy context, for specific purposes and periods of time.
  */
-export class Consent { 
+export class Consent extends DomainResource { 
     /**
      * This is a Consent resource
      */

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

@@ -19,6 +19,7 @@ import { ContractRule } from './contractRule';
 import { ContractSigner } from './contractSigner';
 import { ContractTerm } from './contractTerm';
 import { DateTime } from './dateTime';
+import { DomainResource } from './domainResource';
 import { Extension } from './extension';
 
 import { Identifier } from './identifier';
@@ -32,7 +33,7 @@ import { Uri } from './uri';
 /**
  * Legally enforceable, formally recorded unilateral or bilateral directive i.e., a policy or agreement.
  */
-export class Contract { 
+export class Contract extends DomainResource { 
     /**
      * This is a Contract resource
      */