gdc-common-utils-ts 2.9.14 → 2.9.16

package/README.md

@@ -80,6 +80,12 @@ by its attached `Composition.section` graph.
 
 ## Identity Continuity
 
+For every Individual Organization, the initial `Organization.member` is the
+indexed subject itself and uses the HL7 relationship `ONESELF`. The creating
+`Organization.owner` is the controller by default. `ONESELF` describes who the
+subject is; controller authority such as `RESPRSN` describes who may act for
+that subject. Never copy the owner/controller role into the SELF member.
+
 For ICA-backed organization activation, the representative/controller proof is
 intentionally split into two complementary dimensions:
 

package/dist/constants/hl7-roles.d.ts

@@ -72,7 +72,18 @@ export declare const HL7_V3_ROLE_CODE_LEGAL_REPRESENTATIVE: Hl7RoleEntry[];
  * is required.
  */
 export declare const HL7_RELATED_PERSON_FUNCTIONAL_ROLES: readonly Hl7RelatedPersonFunctionalRoleEntry[];
-/** Default role code for animal-care and non-human subjects. */
+/** Default SELF-subject role for the initial Individual Organization member. */
+export declare const HL7_DEFAULT_INDIVIDUAL_MEMBER_ROLE = "ONESELF";
+/**
+ * @deprecated This is the human controller relationship, not the animal
+ * Individual Organization member role. Use
+ * `HL7_DEFAULT_CONTROLLER_RELATIONSHIP_ANIMAL_CARE`.
+ */
 export declare const HL7_DEFAULT_ROLE_ANIMAL_CARE = "RESPRSN";
+/**
+ * Default human controller-to-animal authorization relationship.
+ * This never replaces the animal subject's `ONESELF` member role.
+ */
+export declare const HL7_DEFAULT_CONTROLLER_RELATIONSHIP_ANIMAL_CARE = "RESPRSN";
 /** Default role code for health sector (patient self-represents). */
 export declare const HL7_DEFAULT_ROLE_HEALTH = "ONESELF";

package/dist/constants/hl7-roles.js

@@ -290,7 +290,18 @@ export const HL7_RELATED_PERSON_FUNCTIONAL_ROLES = [
         codingSystem: HL7_CODING_SYSTEM_V3_ROLE_CODE,
     },
 ];
-/** Default role code for animal-care and non-human subjects. */
+/** Default SELF-subject role for the initial Individual Organization member. */
+export const HL7_DEFAULT_INDIVIDUAL_MEMBER_ROLE = 'ONESELF';
+/**
+ * @deprecated This is the human controller relationship, not the animal
+ * Individual Organization member role. Use
+ * `HL7_DEFAULT_CONTROLLER_RELATIONSHIP_ANIMAL_CARE`.
+ */
 export const HL7_DEFAULT_ROLE_ANIMAL_CARE = 'RESPRSN';
+/**
+ * Default human controller-to-animal authorization relationship.
+ * This never replaces the animal subject's `ONESELF` member role.
+ */
+export const HL7_DEFAULT_CONTROLLER_RELATIONSHIP_ANIMAL_CARE = 'RESPRSN';
 /** Default role code for health sector (patient self-represents). */
 export const HL7_DEFAULT_ROLE_HEALTH = 'ONESELF';

package/dist/convert/convert-shared.js

@@ -9,7 +9,7 @@ export function codingFromValue(value) {
     const [system, code] = value.split('|');
     if (!code)
         return [{ code: system }];
-    return [{ system, code }];
+    return system ? [{ system, code }] : [{ code }];
 }
 export function codingToValue(coding) {
     if (!coding?.code)

package/dist/examples/shared.d.ts

@@ -449,6 +449,8 @@ export declare const EXAMPLE_MEDICATION_PARACETAMOL_NOTE: "Take every 8 hours as
 export declare const EXAMPLE_IMMUNIZATION_IDENTIFIER: "urn:uuid:immunization-example-001";
 export declare const EXAMPLE_IMMUNIZATION_STATUS_COMPLETED: "completed";
 export declare const EXAMPLE_IMMUNIZATION_DATE: "2026-06-10T09:30:00Z";
+export declare const EXAMPLE_IMMUNIZATION_VACCINE_CODE_SYSTEM: "http://hl7.org/fhir/sid/cvx";
+export declare const EXAMPLE_IMMUNIZATION_VACCINE_CODE_VALUE: "207";
 export declare const EXAMPLE_IMMUNIZATION_VACCINE_CODE: "http://hl7.org/fhir/sid/cvx|207";
 export declare const EXAMPLE_IMMUNIZATION_LOCATION_REFERENCE: "Location/location-example-001";
 export declare const EXAMPLE_IMMUNIZATION_MANUFACTURER_REFERENCE: "Organization/manufacturer-example-001";

package/dist/examples/shared.js

@@ -521,7 +521,9 @@ export const EXAMPLE_MEDICATION_PARACETAMOL_NOTE = 'Take every 8 hours as needed
 export const EXAMPLE_IMMUNIZATION_IDENTIFIER = 'urn:uuid:immunization-example-001';
 export const EXAMPLE_IMMUNIZATION_STATUS_COMPLETED = 'completed';
 export const EXAMPLE_IMMUNIZATION_DATE = '2026-06-10T09:30:00Z';
-export const EXAMPLE_IMMUNIZATION_VACCINE_CODE = 'http://hl7.org/fhir/sid/cvx|207';
+export const EXAMPLE_IMMUNIZATION_VACCINE_CODE_SYSTEM = 'http://hl7.org/fhir/sid/cvx';
+export const EXAMPLE_IMMUNIZATION_VACCINE_CODE_VALUE = '207';
+export const EXAMPLE_IMMUNIZATION_VACCINE_CODE = `${EXAMPLE_IMMUNIZATION_VACCINE_CODE_SYSTEM}|${EXAMPLE_IMMUNIZATION_VACCINE_CODE_VALUE}`;
 export const EXAMPLE_IMMUNIZATION_LOCATION_REFERENCE = 'Location/location-example-001';
 export const EXAMPLE_IMMUNIZATION_MANUFACTURER_REFERENCE = 'Organization/manufacturer-example-001';
 export const EXAMPLE_IMMUNIZATION_LOT_NUMBER = 'LOT-2026-001';

package/dist/models/animal-onboarding.d.ts

@@ -49,8 +49,11 @@ export declare function buildNcbiTaxonomyUri(id: NcbiTaxonomyId): string;
  * Projects one controller-authorized animal card request to the existing
  * schema.org individual-organization claim envelope.
  *
- * The indexed subject is always an animal and its human actor is always a
- * responsible controller. Login identity proves only the application session;
+ * The indexed subject is always the first `Organization.member`, with the
+ * HL7 relationship `ONESELF`. The human that creates the envelope remains the
+ * separate `Organization.owner` controller; `RESPRSN` belongs to that
+ * controller authority and must never replace the subject's ONESELF role.
+ * Login identity proves only the application session;
  * GW must still verify the enrollment grant before accepting the request. A
  * card must not be shown as active until the authoritative GW transaction
  * returns success.

package/dist/models/animal-onboarding.js

@@ -1,5 +1,6 @@
 import { ClaimsOrganizationSchemaorg, ClaimsServiceSchemaorg } from '../constants/schemaorg.js';
 import { DataspaceSectors } from '../constants/sectors.js';
+import { HL7_DEFAULT_INDIVIDUAL_MEMBER_ROLE } from '../constants/hl7-roles.js';
 /**
  * @deprecated Animal-card vocabulary is owned by the consuming product SDK.
  * Retained only so consumers of 2.3.x can migrate without a breaking removal.
@@ -42,8 +43,11 @@ export function buildNcbiTaxonomyUri(id) {
  * Projects one controller-authorized animal card request to the existing
  * schema.org individual-organization claim envelope.
  *
- * The indexed subject is always an animal and its human actor is always a
- * responsible controller. Login identity proves only the application session;
+ * The indexed subject is always the first `Organization.member`, with the
+ * HL7 relationship `ONESELF`. The human that creates the envelope remains the
+ * separate `Organization.owner` controller; `RESPRSN` belongs to that
+ * controller authority and must never replace the subject's ONESELF role.
+ * Login identity proves only the application session;
  * GW must still verify the enrollment grant before accepting the request. A
  * card must not be shown as active until the authoritative GW transaction
  * returns success.
@@ -68,7 +72,7 @@ export function buildAnimalOnboardingClaims(input) {
         [ClaimsOrganizationSchemaorg.sameAs]: cardDidWeb,
         [ClaimsOrganizationSchemaorg.memberName]: alternateName,
         [ClaimsOrganizationSchemaorg.memberAdditionalType]: buildNcbiTaxonomyUri(input.ncbiTaxonomyId),
-        [ClaimsOrganizationSchemaorg.memberRole]: 'RESPRSN',
+        [ClaimsOrganizationSchemaorg.memberRole]: HL7_DEFAULT_INDIVIDUAL_MEMBER_ROLE,
         ...(birthDate ? { [ClaimsOrganizationSchemaorg.memberBirthDate]: birthDate } : {}),
         ...(gender ? { [ClaimsOrganizationSchemaorg.memberGender]: gender } : {}),
         [ClaimsOrganizationSchemaorg.ownerEmail]: input.controllerEmail?.trim() || '',

package/dist/utils/allergy-intolerance-entry-editor.d.ts

@@ -16,10 +16,15 @@ export declare class AllergyIntoleranceEntryEditor extends ClinicalResourceEntry
     setSubject(subject?: string | null): this;
     /** Reads the subject/patient reference for the allergy entry. */
     getSubject(): string | undefined;
-    /** Writes the coded allergy substance. */
+    /** Writes the allergy code from `code`, `system|code`, or separate `system, code` arguments. */
     setCode(code?: string | null): this;
-    /** Reads the coded allergy substance. */
+    setCode(codeSystem: string, codeValue: string): this;
+    /** Reads only the allergy code value. */
     getCode(): string | undefined;
+    setCodeSystem(system?: string | null): this;
+    getCodeSystem(): string | undefined;
+    setSystemAndCode(system?: string | null, code?: string | null): this;
+    getSystemAndCode(): string | undefined;
     /** Writes the local-language allergy name projected to FHIR `code.text`. */
     setCodeTextLocal(text?: string | null): this;
     /** Reads the local-language allergy name. */

package/dist/utils/allergy-intolerance-entry-editor.js

@@ -19,10 +19,13 @@ export class AllergyIntoleranceEntryEditor extends ClinicalResourceEntryEditor {
     setSubject(subject) { return this.setSubjectClaims(AllergyIntoleranceClaim.Subject, AllergyIntoleranceClaim.Patient, subject); }
     /** Reads the subject/patient reference for the allergy entry. */
     getSubject() { return this.getSubjectClaims(AllergyIntoleranceClaim.Subject, AllergyIntoleranceClaim.Patient); }
-    /** Writes the coded allergy substance. */
-    setCode(code) { return this.setScalarClaim(AllergyIntoleranceClaim.Code, code); }
-    /** Reads the coded allergy substance. */
-    getCode() { return this.getScalarClaim(AllergyIntoleranceClaim.Code); }
+    setCode(codeOrSystem, codeValue) { return this.setCodingTokenCode(AllergyIntoleranceClaim.Code, codeOrSystem, codeValue); }
+    /** Reads only the allergy code value. */
+    getCode() { return this.getCodingTokenCode(AllergyIntoleranceClaim.Code); }
+    setCodeSystem(system) { return this.setCodingTokenSystem(AllergyIntoleranceClaim.Code, system); }
+    getCodeSystem() { return this.getCodingTokenSystem(AllergyIntoleranceClaim.Code); }
+    setSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(AllergyIntoleranceClaim.Code, system, code); }
+    getSystemAndCode() { return this.getCodingTokenSystemAndCode(AllergyIntoleranceClaim.Code); }
     /** Writes the local-language allergy name projected to FHIR `code.text`. */
     setCodeTextLocal(text) { return this.setScalarClaim(AllergyIntoleranceClaim.CodeText, text); }
     /** Reads the local-language allergy name. */

package/dist/utils/bundle-entry-editor.d.ts

@@ -24,6 +24,18 @@ export declare class BundleEntryEditor {
     protected readonly bundleEditor: BundleEditor;
     protected readonly entryIndex: number;
     constructor(bundleEditor: BundleEditor, entryIndex: number);
+    /** Writes `code`, `system|code`, or separate `system, code` into one canonical token claim. */
+    protected setCodingTokenCode(claimKey: string, codeOrSystem?: string | null, codeValue?: string | null): this;
+    /** Returns only the code portion of one FHIR token claim. */
+    protected getCodingTokenCode(claimKey: string): string | undefined;
+    /** Replaces only the system portion, preserving the current code value. */
+    protected setCodingTokenSystem(claimKey: string, system?: string | null): this;
+    /** Returns only the system portion of one FHIR token claim. */
+    protected getCodingTokenSystem(claimKey: string): string | undefined;
+    /** Writes separate system and code values as one canonical `system|code` token. */
+    protected setCodingTokenSystemAndCode(claimKey: string, system?: string | null, code?: string | null): this;
+    /** Returns one canonical `system|code` token, including the separator for legacy bare codes. */
+    protected getCodingTokenSystemAndCode(claimKey: string): string | undefined;
     /** Stages a FHIR create request for only this batch entry. */
     create(): this;
     /** Stages a FHIR update request for only this batch entry. */

package/dist/utils/bundle-entry-editor.js

@@ -18,6 +18,63 @@ export class BundleEntryEditor {
         this.bundleEditor = bundleEditor;
         this.entryIndex = entryIndex;
     }
+    /** Writes `code`, `system|code`, or separate `system, code` into one canonical token claim. */
+    setCodingTokenCode(claimKey, codeOrSystem, codeValue) {
+        if (codeOrSystem === undefined || codeOrSystem === null) {
+            this.removeClaim(claimKey);
+            return this;
+        }
+        if (codeValue !== undefined && codeValue !== null) {
+            return this.setCodingTokenSystemAndCode(claimKey, codeOrSystem, codeValue);
+        }
+        const incoming = String(codeOrSystem).trim();
+        if (!incoming) {
+            this.removeClaim(claimKey);
+            return this;
+        }
+        const separator = incoming.indexOf('|');
+        if (separator >= 0) {
+            return this.setCodingTokenSystemAndCode(claimKey, incoming.slice(0, separator), incoming.slice(separator + 1));
+        }
+        return this.setClaim(claimKey, `${this.getCodingTokenSystem(claimKey) || ''}|${incoming}`);
+    }
+    /** Returns only the code portion of one FHIR token claim. */
+    getCodingTokenCode(claimKey) {
+        const token = normalizeOptionalIdentifier(this.getClaim(claimKey));
+        if (!token)
+            return undefined;
+        const separator = token.indexOf('|');
+        return normalizeOptionalIdentifier(separator < 0 ? token : token.slice(separator + 1));
+    }
+    /** Replaces only the system portion, preserving the current code value. */
+    setCodingTokenSystem(claimKey, system) {
+        const normalizedSystem = normalizeOptionalIdentifier(system) || '';
+        return this.setClaim(claimKey, `${normalizedSystem}|${this.getCodingTokenCode(claimKey) || ''}`);
+    }
+    /** Returns only the system portion of one FHIR token claim. */
+    getCodingTokenSystem(claimKey) {
+        const token = normalizeOptionalIdentifier(this.getClaim(claimKey));
+        if (!token)
+            return undefined;
+        const separator = token.indexOf('|');
+        return separator < 0 ? undefined : normalizeOptionalIdentifier(token.slice(0, separator));
+    }
+    /** Writes separate system and code values as one canonical `system|code` token. */
+    setCodingTokenSystemAndCode(claimKey, system, code) {
+        const normalizedSystem = normalizeOptionalIdentifier(system) || '';
+        const normalizedCode = normalizeOptionalIdentifier(code) || '';
+        return this.setClaim(claimKey, `${normalizedSystem}|${normalizedCode}`);
+    }
+    /** Returns one canonical `system|code` token, including the separator for legacy bare codes. */
+    getCodingTokenSystemAndCode(claimKey) {
+        const token = normalizeOptionalIdentifier(this.getClaim(claimKey));
+        if (!token)
+            return undefined;
+        const separator = token.indexOf('|');
+        return separator < 0
+            ? `|${token}`
+            : `${token.slice(0, separator).trim()}|${token.slice(separator + 1).trim()}`;
+    }
     /** Stages a FHIR create request for only this batch entry. */
     create() {
         const entry = this.getMutableEntry();

package/dist/utils/care-plan-entry-editor.d.ts

@@ -26,8 +26,14 @@ export declare class CarePlanEntryEditor extends ClinicalResourceEntryEditor {
     getIntent(): string | undefined;
     /** Writes the care-plan category. */
     setCategory(value?: string | null): this;
+    setCategory(codeSystem: string, codeValue: string): this;
     /** Reads the care-plan category. */
     getCategory(): string | undefined;
+    getCategoryCode(): string | undefined;
+    setCategoryCodeSystem(system?: string | null): this;
+    getCategoryCodeSystem(): string | undefined;
+    setCategorySystemAndCode(system?: string | null, code?: string | null): this;
+    getCategorySystemAndCode(): string | undefined;
     /** Writes the linked encounter reference. */
     setEncounter(value?: string | null): this;
     /** Reads the linked encounter reference. */
@@ -40,4 +46,19 @@ export declare class CarePlanEntryEditor extends ClinicalResourceEntryEditor {
     setNote(value?: string | null): this;
     /** Reads the note text. */
     getNote(): string | undefined;
+    setActivityCode(value?: string | null): this;
+    setActivityCode(codeSystem: string, codeValue: string): this;
+    getActivityCode(): string | undefined;
+    setActivityCodeSystem(system?: string | null): this;
+    getActivityCodeSystem(): string | undefined;
+    setActivitySystemAndCode(system?: string | null, code?: string | null): this;
+    getActivitySystemAndCode(): string | undefined;
+    setActivityOutcome(value?: string | null): this;
+    setActivityOutcome(codeSystem: string, codeValue: string): this;
+    getActivityOutcome(): string | undefined;
+    getActivityOutcomeCode(): string | undefined;
+    setActivityOutcomeCodeSystem(system?: string | null): this;
+    getActivityOutcomeCodeSystem(): string | undefined;
+    setActivityOutcomeSystemAndCode(system?: string | null, code?: string | null): this;
+    getActivityOutcomeSystemAndCode(): string | undefined;
 }

package/dist/utils/care-plan-entry-editor.js

@@ -27,10 +27,14 @@ export class CarePlanEntryEditor extends ClinicalResourceEntryEditor {
     setIntent(value) { return this.setScalarClaim(CarePlanClaim.Intent, value); }
     /** Reads the care-plan intent. */
     getIntent() { return this.getScalarClaim(CarePlanClaim.Intent); }
-    /** Writes the care-plan category. */
-    setCategory(value) { return this.setScalarClaim(CarePlanClaim.Category, value); }
+    setCategory(valueOrSystem, codeValue) { return this.setCodingTokenCode(CarePlanClaim.Category, valueOrSystem, codeValue); }
     /** Reads the care-plan category. */
-    getCategory() { return this.getScalarClaim(CarePlanClaim.Category); }
+    getCategory() { return this.getCodingTokenSystemAndCode(CarePlanClaim.Category); }
+    getCategoryCode() { return this.getCodingTokenCode(CarePlanClaim.Category); }
+    setCategoryCodeSystem(system) { return this.setCodingTokenSystem(CarePlanClaim.Category, system); }
+    getCategoryCodeSystem() { return this.getCodingTokenSystem(CarePlanClaim.Category); }
+    setCategorySystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(CarePlanClaim.Category, system, code); }
+    getCategorySystemAndCode() { return this.getCodingTokenSystemAndCode(CarePlanClaim.Category); }
     /** Writes the linked encounter reference. */
     setEncounter(value) { return this.setScalarClaim(CarePlanClaim.Encounter, value); }
     /** Reads the linked encounter reference. */
@@ -43,5 +47,18 @@ export class CarePlanEntryEditor extends ClinicalResourceEntryEditor {
     setNote(value) { return this.setScalarClaim(CarePlanClaim.Note, value); }
     /** Reads the note text. */
     getNote() { return this.getScalarClaim(CarePlanClaim.Note); }
+    setActivityCode(valueOrSystem, codeValue) { return this.setCodingTokenCode(CarePlanClaim.ActivityCode, valueOrSystem, codeValue); }
+    getActivityCode() { return this.getCodingTokenCode(CarePlanClaim.ActivityCode); }
+    setActivityCodeSystem(system) { return this.setCodingTokenSystem(CarePlanClaim.ActivityCode, system); }
+    getActivityCodeSystem() { return this.getCodingTokenSystem(CarePlanClaim.ActivityCode); }
+    setActivitySystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(CarePlanClaim.ActivityCode, system, code); }
+    getActivitySystemAndCode() { return this.getCodingTokenSystemAndCode(CarePlanClaim.ActivityCode); }
+    setActivityOutcome(valueOrSystem, codeValue) { return this.setCodingTokenCode(CarePlanClaim.ActivityOutcome, valueOrSystem, codeValue); }
+    getActivityOutcome() { return this.getCodingTokenSystemAndCode(CarePlanClaim.ActivityOutcome); }
+    getActivityOutcomeCode() { return this.getCodingTokenCode(CarePlanClaim.ActivityOutcome); }
+    setActivityOutcomeCodeSystem(system) { return this.setCodingTokenSystem(CarePlanClaim.ActivityOutcome, system); }
+    getActivityOutcomeCodeSystem() { return this.getCodingTokenSystem(CarePlanClaim.ActivityOutcome); }
+    setActivityOutcomeSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(CarePlanClaim.ActivityOutcome, system, code); }
+    getActivityOutcomeSystemAndCode() { return this.getCodingTokenSystemAndCode(CarePlanClaim.ActivityOutcome); }
 }
 registerBundleEntryEditor(BundleEditableResourceTypes.carePlan, CarePlanEntryEditor);

package/dist/utils/clinical-impression-entry-editor.d.ts

@@ -40,4 +40,11 @@ export declare class ClinicalImpressionEntryEditor extends ClinicalResourceEntry
     setSummary(value?: string | null): this;
     /** Reads the summary text. */
     getSummary(): string | undefined;
+    setPrognosisCode(value?: string | null): this;
+    setPrognosisCode(codeSystem: string, codeValue: string): this;
+    getPrognosisCode(): string | undefined;
+    setPrognosisCodeSystem(system?: string | null): this;
+    getPrognosisCodeSystem(): string | undefined;
+    setPrognosisSystemAndCode(system?: string | null, code?: string | null): this;
+    getPrognosisSystemAndCode(): string | undefined;
 }

package/dist/utils/clinical-impression-entry-editor.js

@@ -43,5 +43,11 @@ export class ClinicalImpressionEntryEditor extends ClinicalResourceEntryEditor {
     setSummary(value) { return this.setScalarClaim(ClinicalImpressionClaim.Summary, value); }
     /** Reads the summary text. */
     getSummary() { return this.getScalarClaim(ClinicalImpressionClaim.Summary); }
+    setPrognosisCode(valueOrSystem, codeValue) { return this.setCodingTokenCode(ClinicalImpressionClaim.PrognosisCode, valueOrSystem, codeValue); }
+    getPrognosisCode() { return this.getCodingTokenCode(ClinicalImpressionClaim.PrognosisCode); }
+    setPrognosisCodeSystem(system) { return this.setCodingTokenSystem(ClinicalImpressionClaim.PrognosisCode, system); }
+    getPrognosisCodeSystem() { return this.getCodingTokenSystem(ClinicalImpressionClaim.PrognosisCode); }
+    setPrognosisSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(ClinicalImpressionClaim.PrognosisCode, system, code); }
+    getPrognosisSystemAndCode() { return this.getCodingTokenSystemAndCode(ClinicalImpressionClaim.PrognosisCode); }
 }
 registerBundleEntryEditor(BundleEditableResourceTypes.clinicalImpression, ClinicalImpressionEntryEditor);

package/dist/utils/condition-entry-editor.d.ts

@@ -12,7 +12,12 @@ export declare class ConditionEntryEditor extends ClinicalResourceEntryEditor {
     setSubject(subject?: string | null): this;
     getSubject(): string | undefined;
     setCode(code?: string | null): this;
+    setCode(codeSystem: string, codeValue: string): this;
     getCode(): string | undefined;
+    setCodeSystem(system?: string | null): this;
+    getCodeSystem(): string | undefined;
+    setSystemAndCode(system?: string | null, code?: string | null): this;
+    getSystemAndCode(): string | undefined;
     /** Writes the local-language condition name projected to FHIR `code.text`. */
     setCodeTextLocal(text?: string | null): this;
     /** Reads the local-language condition name. */
@@ -26,9 +31,21 @@ export declare class ConditionEntryEditor extends ClinicalResourceEntryEditor {
     setVerificationStatus(status?: string | null): this;
     getVerificationStatus(): string | undefined;
     setCategory(category?: string | null): this;
+    setCategory(codeSystem: string, codeValue: string): this;
     getCategory(): string | undefined;
+    getCategoryCode(): string | undefined;
+    setCategoryCodeSystem(system?: string | null): this;
+    getCategoryCodeSystem(): string | undefined;
+    setCategorySystemAndCode(system?: string | null, code?: string | null): this;
+    getCategorySystemAndCode(): string | undefined;
     setSeverity(severity?: string | null): this;
+    setSeverity(codeSystem: string, codeValue: string): this;
     getSeverity(): string | undefined;
+    getSeverityCode(): string | undefined;
+    setSeverityCodeSystem(system?: string | null): this;
+    getSeverityCodeSystem(): string | undefined;
+    setSeveritySystemAndCode(system?: string | null, code?: string | null): this;
+    getSeveritySystemAndCode(): string | undefined;
     setOnsetDateTime(value?: string | null): this;
     getOnsetDateTime(): string | undefined;
     setRecorder(reference?: string | null): this;

package/dist/utils/condition-entry-editor.js

@@ -14,8 +14,16 @@ export class ConditionEntryEditor extends ClinicalResourceEntryEditor {
     ensureIdentifier() { return this.ensureIdentifierValue(ConditionClaim.Identifier); }
     setSubject(subject) { return this.setSubjectClaims(ConditionClaim.Subject, ConditionClaim.Subject, subject); }
     getSubject() { return this.getSubjectClaims(ConditionClaim.Subject, ConditionClaim.Subject); }
-    setCode(code) { return this.setScalarClaim(ConditionClaim.Code, code); }
-    getCode() { return this.getScalarClaim(ConditionClaim.Code); }
+    setCode(codeOrSystem, codeValue) {
+        return this.setCodingTokenCode(ConditionClaim.Code, codeOrSystem, codeValue);
+    }
+    getCode() { return this.getCodingTokenCode(ConditionClaim.Code); }
+    setCodeSystem(system) { return this.setCodingTokenSystem(ConditionClaim.Code, system); }
+    getCodeSystem() { return this.getCodingTokenSystem(ConditionClaim.Code); }
+    setSystemAndCode(system, code) {
+        return this.setCodingTokenSystemAndCode(ConditionClaim.Code, system, code);
+    }
+    getSystemAndCode() { return this.getCodingTokenSystemAndCode(ConditionClaim.Code); }
     /** Writes the local-language condition name projected to FHIR `code.text`. */
     setCodeTextLocal(text) { return this.setScalarClaim(ConditionClaim.CodeText, text); }
     /** Reads the local-language condition name. */
@@ -28,10 +36,20 @@ export class ConditionEntryEditor extends ClinicalResourceEntryEditor {
     getClinicalStatus() { return this.getScalarClaim(ConditionClaim.ClinicalStatus); }
     setVerificationStatus(status) { return this.setScalarClaim(ConditionClaim.VerificationStatus, status); }
     getVerificationStatus() { return this.getScalarClaim(ConditionClaim.VerificationStatus); }
-    setCategory(category) { return this.setScalarClaim(ConditionClaim.Category, category); }
-    getCategory() { return this.getScalarClaim(ConditionClaim.Category); }
-    setSeverity(severity) { return this.setScalarClaim(ConditionClaim.Severity, severity); }
-    getSeverity() { return this.getScalarClaim(ConditionClaim.Severity); }
+    setCategory(categoryOrSystem, codeValue) { return this.setCodingTokenCode(ConditionClaim.Category, categoryOrSystem, codeValue); }
+    getCategory() { return this.getCodingTokenSystemAndCode(ConditionClaim.Category); }
+    getCategoryCode() { return this.getCodingTokenCode(ConditionClaim.Category); }
+    setCategoryCodeSystem(system) { return this.setCodingTokenSystem(ConditionClaim.Category, system); }
+    getCategoryCodeSystem() { return this.getCodingTokenSystem(ConditionClaim.Category); }
+    setCategorySystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(ConditionClaim.Category, system, code); }
+    getCategorySystemAndCode() { return this.getCodingTokenSystemAndCode(ConditionClaim.Category); }
+    setSeverity(severityOrSystem, codeValue) { return this.setCodingTokenCode(ConditionClaim.Severity, severityOrSystem, codeValue); }
+    getSeverity() { return this.getCodingTokenSystemAndCode(ConditionClaim.Severity); }
+    getSeverityCode() { return this.getCodingTokenCode(ConditionClaim.Severity); }
+    setSeverityCodeSystem(system) { return this.setCodingTokenSystem(ConditionClaim.Severity, system); }
+    getSeverityCodeSystem() { return this.getCodingTokenSystem(ConditionClaim.Severity); }
+    setSeveritySystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(ConditionClaim.Severity, system, code); }
+    getSeveritySystemAndCode() { return this.getCodingTokenSystemAndCode(ConditionClaim.Severity); }
     setOnsetDateTime(value) { return this.setScalarClaim(ConditionClaim.OnsetDateTime, value); }
     getOnsetDateTime() { return this.getScalarClaim(ConditionClaim.OnsetDateTime); }
     setRecorder(reference) { return this.setScalarClaim(ConditionClaim.Recorder, reference); }

package/dist/utils/coverage-entry-editor.d.ts

@@ -18,8 +18,14 @@ export declare class CoverageEntryEditor extends ClinicalResourceEntryEditor {
     getStatus(): string | undefined;
     /** Writes the coverage type. */
     setType(value?: string | null): this;
+    setType(codeSystem: string, codeValue: string): this;
     /** Reads the coverage type. */
     getType(): string | undefined;
+    getTypeCode(): string | undefined;
+    setTypeCodeSystem(system?: string | null): this;
+    getTypeCodeSystem(): string | undefined;
+    setTypeSystemAndCode(system?: string | null, code?: string | null): this;
+    getTypeSystemAndCode(): string | undefined;
     /** Writes the policy-holder reference. */
     setPolicyHolder(value?: string | null): this;
     /** Reads the policy-holder reference. */
@@ -34,8 +40,14 @@ export declare class CoverageEntryEditor extends ClinicalResourceEntryEditor {
     getBeneficiary(): string | undefined;
     /** Writes the subscriber relationship. */
     setRelationship(value?: string | null): this;
+    setRelationship(codeSystem: string, codeValue: string): this;
     /** Reads the subscriber relationship. */
     getRelationship(): string | undefined;
+    getRelationshipCode(): string | undefined;
+    setRelationshipCodeSystem(system?: string | null): this;
+    getRelationshipCodeSystem(): string | undefined;
+    setRelationshipSystemAndCode(system?: string | null, code?: string | null): this;
+    getRelationshipSystemAndCode(): string | undefined;
     /** Writes the coverage period start. */
     setPeriodStart(value?: string | null): this;
     /** Reads the coverage period start. */

package/dist/utils/coverage-entry-editor.js

@@ -19,10 +19,14 @@ export class CoverageEntryEditor extends ClinicalResourceEntryEditor {
     setStatus(value) { return this.setScalarClaim(CoverageClaim.Status, value); }
     /** Reads the coverage status. */
     getStatus() { return this.getScalarClaim(CoverageClaim.Status); }
-    /** Writes the coverage type. */
-    setType(value) { return this.setScalarClaim(CoverageClaim.Type, value); }
+    setType(valueOrSystem, codeValue) { return this.setCodingTokenCode(CoverageClaim.Type, valueOrSystem, codeValue); }
     /** Reads the coverage type. */
-    getType() { return this.getScalarClaim(CoverageClaim.Type); }
+    getType() { return this.getCodingTokenSystemAndCode(CoverageClaim.Type); }
+    getTypeCode() { return this.getCodingTokenCode(CoverageClaim.Type); }
+    setTypeCodeSystem(system) { return this.setCodingTokenSystem(CoverageClaim.Type, system); }
+    getTypeCodeSystem() { return this.getCodingTokenSystem(CoverageClaim.Type); }
+    setTypeSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(CoverageClaim.Type, system, code); }
+    getTypeSystemAndCode() { return this.getCodingTokenSystemAndCode(CoverageClaim.Type); }
     /** Writes the policy-holder reference. */
     setPolicyHolder(value) { return this.setScalarClaim(CoverageClaim.PolicyHolder, value); }
     /** Reads the policy-holder reference. */
@@ -35,10 +39,14 @@ export class CoverageEntryEditor extends ClinicalResourceEntryEditor {
     setBeneficiary(value) { return this.setScalarClaim(CoverageClaim.Beneficiary, value); }
     /** Reads the beneficiary reference. */
     getBeneficiary() { return this.getScalarClaim(CoverageClaim.Beneficiary); }
-    /** Writes the subscriber relationship. */
-    setRelationship(value) { return this.setScalarClaim(CoverageClaim.Relationship, value); }
+    setRelationship(valueOrSystem, codeValue) { return this.setCodingTokenCode(CoverageClaim.Relationship, valueOrSystem, codeValue); }
     /** Reads the subscriber relationship. */
-    getRelationship() { return this.getScalarClaim(CoverageClaim.Relationship); }
+    getRelationship() { return this.getCodingTokenSystemAndCode(CoverageClaim.Relationship); }
+    getRelationshipCode() { return this.getCodingTokenCode(CoverageClaim.Relationship); }
+    setRelationshipCodeSystem(system) { return this.setCodingTokenSystem(CoverageClaim.Relationship, system); }
+    getRelationshipCodeSystem() { return this.getCodingTokenSystem(CoverageClaim.Relationship); }
+    setRelationshipSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(CoverageClaim.Relationship, system, code); }
+    getRelationshipSystemAndCode() { return this.getCodingTokenSystemAndCode(CoverageClaim.Relationship); }
     /** Writes the coverage period start. */
     setPeriodStart(value) { return this.setScalarClaim(CoverageClaim.PeriodStart, value); }
     /** Reads the coverage period start. */

package/dist/utils/device-entry-editor.d.ts

@@ -22,8 +22,14 @@ export declare class DeviceEntryEditor extends ClinicalResourceEntryEditor {
     getStatus(): string | undefined;
     /** Writes the device type. */
     setType(value?: string | null): this;
+    setType(codeSystem: string, codeValue: string): this;
     /** Reads the device type. */
     getType(): string | undefined;
+    getTypeCode(): string | undefined;
+    setTypeCodeSystem(system?: string | null): this;
+    getTypeCodeSystem(): string | undefined;
+    setTypeSystemAndCode(system?: string | null, code?: string | null): this;
+    getTypeSystemAndCode(): string | undefined;
     /** Writes the manufacturer reference. */
     setManufacturer(value?: string | null): this;
     /** Reads the manufacturer reference. */

package/dist/utils/device-entry-editor.js

@@ -23,10 +23,14 @@ export class DeviceEntryEditor extends ClinicalResourceEntryEditor {
     setStatus(value) { return this.setScalarClaim(DeviceClaim.Status, value); }
     /** Reads the device status. */
     getStatus() { return this.getScalarClaim(DeviceClaim.Status); }
-    /** Writes the device type. */
-    setType(value) { return this.setScalarClaim(DeviceClaim.Type, value); }
+    setType(valueOrSystem, codeValue) { return this.setCodingTokenCode(DeviceClaim.Type, valueOrSystem, codeValue); }
     /** Reads the device type. */
-    getType() { return this.getScalarClaim(DeviceClaim.Type); }
+    getType() { return this.getCodingTokenSystemAndCode(DeviceClaim.Type); }
+    getTypeCode() { return this.getCodingTokenCode(DeviceClaim.Type); }
+    setTypeCodeSystem(system) { return this.setCodingTokenSystem(DeviceClaim.Type, system); }
+    getTypeCodeSystem() { return this.getCodingTokenSystem(DeviceClaim.Type); }
+    setTypeSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(DeviceClaim.Type, system, code); }
+    getTypeSystemAndCode() { return this.getCodingTokenSystemAndCode(DeviceClaim.Type); }
     /** Writes the manufacturer reference. */
     setManufacturer(value) { return this.setScalarClaim(DeviceClaim.Manufacturer, value); }
     /** Reads the manufacturer reference. */

package/dist/utils/device-use-statement-entry-editor.d.ts

@@ -34,8 +34,13 @@ export declare class DeviceUseStatementEntryEditor extends ClinicalResourceEntry
     getTimingDateTime(): string | undefined;
     /** Writes the reason code. */
     setReasonCode(value?: string | null): this;
+    setReasonCode(codeSystem: string, codeValue: string): this;
     /** Reads the reason code. */
     getReasonCode(): string | undefined;
+    setReasonCodeSystem(system?: string | null): this;
+    getReasonCodeSystem(): string | undefined;
+    setReasonSystemAndCode(system?: string | null, code?: string | null): this;
+    getReasonSystemAndCode(): string | undefined;
     /** Writes the source reference. */
     setSource(value?: string | null): this;
     /** Reads the source reference. */

package/dist/utils/device-use-statement-entry-editor.js

@@ -35,10 +35,13 @@ export class DeviceUseStatementEntryEditor extends ClinicalResourceEntryEditor {
     setTimingDateTime(value) { return this.setScalarClaim(DeviceUseStatementClaim.TimingDateTime, value); }
     /** Reads the timing date/time. */
     getTimingDateTime() { return this.getScalarClaim(DeviceUseStatementClaim.TimingDateTime); }
-    /** Writes the reason code. */
-    setReasonCode(value) { return this.setScalarClaim(DeviceUseStatementClaim.ReasonCode, value); }
+    setReasonCode(valueOrSystem, codeValue) { return this.setCodingTokenCode(DeviceUseStatementClaim.ReasonCode, valueOrSystem, codeValue); }
     /** Reads the reason code. */
-    getReasonCode() { return this.getScalarClaim(DeviceUseStatementClaim.ReasonCode); }
+    getReasonCode() { return this.getCodingTokenCode(DeviceUseStatementClaim.ReasonCode); }
+    setReasonCodeSystem(system) { return this.setCodingTokenSystem(DeviceUseStatementClaim.ReasonCode, system); }
+    getReasonCodeSystem() { return this.getCodingTokenSystem(DeviceUseStatementClaim.ReasonCode); }
+    setReasonSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(DeviceUseStatementClaim.ReasonCode, system, code); }
+    getReasonSystemAndCode() { return this.getCodingTokenSystemAndCode(DeviceUseStatementClaim.ReasonCode); }
     /** Writes the source reference. */
     setSource(value) { return this.setScalarClaim(DeviceUseStatementClaim.Source, value); }
     /** Reads the source reference. */

package/dist/utils/diagnostic-report-entry-editor.d.ts

@@ -33,12 +33,23 @@ export declare class DiagnosticReportEntryEditor extends ClinicalResourceEntryEd
     getDate(): string | undefined;
     /** Sets the report category. */
     setCategory(category?: string | null): this;
+    setCategory(codeSystem: string, codeValue: string): this;
     /** Returns the report category. */
     getCategory(): string | undefined;
+    getCategoryCode(): string | undefined;
+    setCategoryCodeSystem(system?: string | null): this;
+    getCategoryCodeSystem(): string | undefined;
+    setCategorySystemAndCode(system?: string | null, code?: string | null): this;
+    getCategorySystemAndCode(): string | undefined;
     /** Sets the main report code. */
     setCode(code?: string | null): this;
+    setCode(codeSystem: string, codeValue: string): this;
     /** Returns the main report code. */
     getCode(): string | undefined;
+    setCodeSystem(system?: string | null): this;
+    getCodeSystem(): string | undefined;
+    setSystemAndCode(system?: string | null, code?: string | null): this;
+    getSystemAndCode(): string | undefined;
     /** Sets the local-language report name projected to FHIR `code.text`. */
     setCodeTextLocal(text?: string | null): this;
     /** Returns the local-language report name. */