gdc-common-utils-ts 2.9.14 → 2.9.16

package/dist/utils/observation-component-entry-editor.js

@@ -8,32 +8,46 @@ import { ClinicalResourceEntryEditor } from './clinical-resource-entry-editor.js
  * resource at a time without exposing bundle-internal plumbing.
  */
 export class ObservationComponentEntryEditor extends ClinicalResourceEntryEditor {
-    setCode(code) {
-        const token = typeof code === 'string' ? code.trim() : code.claim;
-        this.setClaim(ObservationClaim.Code, token);
-        if (typeof code !== 'string') {
-            this.setClaim(ObservationClaim.CodeSystem, code.system);
-            this.setClaim(ObservationClaim.CodeValue, code.code);
-            if (code.display) {
-                this.setClaim(ObservationClaim.CodeDisplay, code.display);
-            }
+    setCode(codeOrSystem, codeValue) {
+        if (typeof codeOrSystem !== 'string') {
+            this.setCodingTokenSystemAndCode(ObservationClaim.Code, codeOrSystem.system, codeOrSystem.code);
+            this.setClaim(ObservationClaim.CodeSystem, codeOrSystem.system);
+            this.setClaim(ObservationClaim.CodeValue, codeOrSystem.code);
+            if (codeOrSystem.display)
+                this.setClaim(ObservationClaim.CodeDisplay, codeOrSystem.display);
+            return this;
         }
+        this.setCodingTokenCode(ObservationClaim.Code, codeOrSystem, codeValue);
+        this.setClaim(ObservationClaim.CodeSystem, this.getCodingTokenSystem(ObservationClaim.Code) || '');
+        this.setClaim(ObservationClaim.CodeValue, this.getCodingTokenCode(ObservationClaim.Code) || '');
         return this;
     }
     getCode() {
-        return normalizeOptionalIdentifier(this.getClaim(ObservationClaim.Code));
+        return normalizeOptionalIdentifier(this.getClaim(ObservationClaim.CodeValue))
+            || this.getCodingTokenCode(ObservationClaim.Code);
     }
     setCodeSystem(system) {
+        this.setCodingTokenSystem(ObservationClaim.Code, system);
         return this.setClaim(ObservationClaim.CodeSystem, String(system).trim());
     }
     getCodeSystem() {
         return normalizeOptionalIdentifier(this.getClaim(ObservationClaim.CodeSystem));
     }
     setCodeValue(value) {
+        this.setCodingTokenCode(ObservationClaim.Code, value);
         return this.setClaim(ObservationClaim.CodeValue, String(value).trim());
     }
     getCodeValue() {
-        return normalizeOptionalIdentifier(this.getClaim(ObservationClaim.CodeValue));
+        return this.getCode();
+    }
+    setSystemAndCode(system, code) {
+        this.setCodingTokenSystemAndCode(ObservationClaim.Code, system, code);
+        this.setClaim(ObservationClaim.CodeSystem, String(system || '').trim());
+        this.setClaim(ObservationClaim.CodeValue, String(code || '').trim());
+        return this;
+    }
+    getSystemAndCode() {
+        return this.getCodingTokenSystemAndCode(ObservationClaim.Code);
     }
     setCodeDisplay(display) {
         return this.setClaim(ObservationClaim.CodeDisplay, String(display).trim());
@@ -59,6 +73,13 @@ export class ObservationComponentEntryEditor extends ClinicalResourceEntryEditor
     getCodeTextLocal() {
         return normalizeOptionalIdentifier(this.getClaim(ObservationClaim.CodeText));
     }
+    setValueConcept(valueOrSystem, codeValue) { return this.setCodingTokenCode(ObservationClaim.ValueConcept, valueOrSystem, codeValue); }
+    getValueConcept() { return this.getCodingTokenSystemAndCode(ObservationClaim.ValueConcept); }
+    getValueConceptCode() { return this.getCodingTokenCode(ObservationClaim.ValueConcept); }
+    setValueConceptCodeSystem(system) { return this.setCodingTokenSystem(ObservationClaim.ValueConcept, system); }
+    getValueConceptCodeSystem() { return this.getCodingTokenSystem(ObservationClaim.ValueConcept); }
+    setValueConceptSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(ObservationClaim.ValueConcept, system, code); }
+    getValueConceptSystemAndCode() { return this.getCodingTokenSystemAndCode(ObservationClaim.ValueConcept); }
     /** Compatibility alias for older examples/tests. Prefer `setCodeTextLocal(...)`. */
     setLocalText(text) {
         return this.setCodeTextLocal(text);
@@ -77,13 +98,19 @@ export class ObservationComponentEntryEditor extends ClinicalResourceEntryEditor
         const numeric = Number(raw);
         return Number.isFinite(numeric) ? numeric : undefined;
     }
-    setValueQuantityUnit(unit) {
-        const normalized = typeof unit === 'string' ? unit.trim() : unit.claim;
-        return this.setClaim(ObservationClaim.ValueQuantityUnit, normalized);
+    setValueQuantityUnit(unitOrSystem, codeValue) {
+        return typeof unitOrSystem === 'string'
+            ? this.setCodingTokenCode(ObservationClaim.ValueQuantityUnit, unitOrSystem, codeValue)
+            : this.setCodingTokenSystemAndCode(ObservationClaim.ValueQuantityUnit, unitOrSystem.system, unitOrSystem.code);
     }
     getValueQuantityUnit() {
-        return normalizeOptionalIdentifier(this.getClaim(ObservationClaim.ValueQuantityUnit));
+        return this.getCodingTokenSystemAndCode(ObservationClaim.ValueQuantityUnit);
     }
+    getValueQuantityUnitCode() { return this.getCodingTokenCode(ObservationClaim.ValueQuantityUnit); }
+    setValueQuantityUnitCodeSystem(system) { return this.setCodingTokenSystem(ObservationClaim.ValueQuantityUnit, system); }
+    getValueQuantityUnitCodeSystem() { return this.getCodingTokenSystem(ObservationClaim.ValueQuantityUnit); }
+    setValueQuantityUnitSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(ObservationClaim.ValueQuantityUnit, system, code); }
+    getValueQuantityUnitSystemAndCode() { return this.getCodingTokenSystemAndCode(ObservationClaim.ValueQuantityUnit); }
     setValueString(value) {
         return this.setClaim(ObservationClaim.ValueString, String(value).trim());
     }

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

@@ -6,6 +6,14 @@ import { VitalSignEntryEditor } from './vital-sign-entry-editor.js';
  * accessors in a bundle authoring flow.
  */
 export declare class ObservationEntryEditor extends VitalSignEntryEditor {
+    setMethod(value?: string | null): this;
+    setMethod(codeSystem: string, codeValue: string): this;
+    getMethod(): string | undefined;
+    getMethodCode(): string | undefined;
+    setMethodCodeSystem(system?: string | null): this;
+    getMethodCodeSystem(): string | undefined;
+    setMethodSystemAndCode(system?: string | null, code?: string | null): this;
+    getMethodSystemAndCode(): string | undefined;
     /** Writes the based-on reference. */
     setBasedOn(reference: string): this;
     /** Reads the based-on reference. */

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

@@ -18,6 +18,13 @@ import { registerBundleEntryEditor } from './bundle-editor-registry.js';
  * accessors in a bundle authoring flow.
  */
 export class ObservationEntryEditor extends VitalSignEntryEditor {
+    setMethod(valueOrSystem, codeValue) { return this.setCodingTokenCode(ObservationClaim.Method, valueOrSystem, codeValue); }
+    getMethod() { return this.getCodingTokenSystemAndCode(ObservationClaim.Method); }
+    getMethodCode() { return this.getCodingTokenCode(ObservationClaim.Method); }
+    setMethodCodeSystem(system) { return this.setCodingTokenSystem(ObservationClaim.Method, system); }
+    getMethodCodeSystem() { return this.getCodingTokenSystem(ObservationClaim.Method); }
+    setMethodSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(ObservationClaim.Method, system, code); }
+    getMethodSystemAndCode() { return this.getCodingTokenSystemAndCode(ObservationClaim.Method); }
     /** Writes the based-on reference. */
     setBasedOn(reference) {
         return this.setClaim(ObservationClaim.BasedOn, String(reference).trim());

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

@@ -24,10 +24,15 @@ export declare class ProcedureEntryEditor extends ClinicalResourceEntryEditor {
     setDate(date?: string | null): this;
     /** Reads the procedure date. */
     getDate(): string | undefined;
-    /** Writes the procedure code. */
+    /** Writes the procedure code from `code`, `system|code`, or separate `system, code` arguments. */
     setCode(code?: string | null): this;
-    /** Reads the procedure code. */
+    setCode(codeSystem: string, codeValue: string): this;
+    /** Reads only the procedure 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 code text. */
     setCodeTextLocal(text?: string | null): this;
     /** Reads the local code text. */
@@ -44,10 +49,23 @@ export declare class ProcedureEntryEditor extends ClinicalResourceEntryEditor {
     setLocation(reference?: string | null): this;
     /** Reads the location reference. */
     getLocation(): string | undefined;
-    /** Writes the reason code. */
+    /** Writes the reason code from `code`, `system|code`, or separate `system, code` arguments. */
     setReasonCode(code?: string | null): this;
-    /** Reads the reason code. */
+    setReasonCode(codeSystem: string, codeValue: string): this;
+    /** Reads only the reason code value. */
     getReasonCode(): string | undefined;
+    setReasonCodeSystem(system?: string | null): this;
+    getReasonCodeSystem(): string | undefined;
+    setReasonSystemAndCode(system?: string | null, code?: string | null): this;
+    getReasonSystemAndCode(): string | undefined;
+    setBodySite(code?: string | null): this;
+    setBodySite(codeSystem: string, codeValue: string): this;
+    getBodySite(): string | undefined;
+    getBodySiteCode(): string | undefined;
+    setBodySiteCodeSystem(system?: string | null): this;
+    getBodySiteCodeSystem(): string | undefined;
+    setBodySiteSystemAndCode(system?: string | null, code?: string | null): this;
+    getBodySiteSystemAndCode(): string | undefined;
     /** Writes the note text. */
     setNote(note?: string | null): this;
     /** Reads the note text. */

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

@@ -27,10 +27,13 @@ export class ProcedureEntryEditor extends ClinicalResourceEntryEditor {
     setDate(date) { return this.setScalarClaim(ProcedureClaim.Date, date); }
     /** Reads the procedure date. */
     getDate() { return this.getScalarClaim(ProcedureClaim.Date); }
-    /** Writes the procedure code. */
-    setCode(code) { return this.setScalarClaim(ProcedureClaim.Code, code); }
-    /** Reads the procedure code. */
-    getCode() { return this.getScalarClaim(ProcedureClaim.Code); }
+    setCode(codeOrSystem, codeValue) { return this.setCodingTokenCode(ProcedureClaim.Code, codeOrSystem, codeValue); }
+    /** Reads only the procedure code value. */
+    getCode() { return this.getCodingTokenCode(ProcedureClaim.Code); }
+    setCodeSystem(system) { return this.setCodingTokenSystem(ProcedureClaim.Code, system); }
+    getCodeSystem() { return this.getCodingTokenSystem(ProcedureClaim.Code); }
+    setSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(ProcedureClaim.Code, system, code); }
+    getSystemAndCode() { return this.getCodingTokenSystemAndCode(ProcedureClaim.Code); }
     /** Writes the local code text. */
     setCodeTextLocal(text) { return this.setScalarClaim(ProcedureClaim.CodeText, text); }
     /** Reads the local code text. */
@@ -47,10 +50,20 @@ export class ProcedureEntryEditor extends ClinicalResourceEntryEditor {
     setLocation(reference) { return this.setScalarClaim(ProcedureClaim.Location, reference); }
     /** Reads the location reference. */
     getLocation() { return this.getScalarClaim(ProcedureClaim.Location); }
-    /** Writes the reason code. */
-    setReasonCode(code) { return this.setScalarClaim(ProcedureClaim.ReasonCode, code); }
-    /** Reads the reason code. */
-    getReasonCode() { return this.getScalarClaim(ProcedureClaim.ReasonCode); }
+    setReasonCode(codeOrSystem, codeValue) { return this.setCodingTokenCode(ProcedureClaim.ReasonCode, codeOrSystem, codeValue); }
+    /** Reads only the reason code value. */
+    getReasonCode() { return this.getCodingTokenCode(ProcedureClaim.ReasonCode); }
+    setReasonCodeSystem(system) { return this.setCodingTokenSystem(ProcedureClaim.ReasonCode, system); }
+    getReasonCodeSystem() { return this.getCodingTokenSystem(ProcedureClaim.ReasonCode); }
+    setReasonSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(ProcedureClaim.ReasonCode, system, code); }
+    getReasonSystemAndCode() { return this.getCodingTokenSystemAndCode(ProcedureClaim.ReasonCode); }
+    setBodySite(codeOrSystem, codeValue) { return this.setCodingTokenCode(ProcedureClaim.BodySite, codeOrSystem, codeValue); }
+    getBodySite() { return this.getCodingTokenSystemAndCode(ProcedureClaim.BodySite); }
+    getBodySiteCode() { return this.getCodingTokenCode(ProcedureClaim.BodySite); }
+    setBodySiteCodeSystem(system) { return this.setCodingTokenSystem(ProcedureClaim.BodySite, system); }
+    getBodySiteCodeSystem() { return this.getCodingTokenSystem(ProcedureClaim.BodySite); }
+    setBodySiteSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(ProcedureClaim.BodySite, system, code); }
+    getBodySiteSystemAndCode() { return this.getCodingTokenSystemAndCode(ProcedureClaim.BodySite); }
     /** Writes the note text. */
     setNote(note) { return this.setScalarClaim(ProcedureClaim.Note, note); }
     /** Reads the note text. */

package/dist/utils/related-person-entry-editor.d.ts

@@ -14,7 +14,13 @@ export declare class RelatedPersonEntryEditor extends BundleEntryEditor {
     setSubject(value?: string | null): this;
     getSubject(): string | undefined;
     setRelationship(value?: string | null): this;
+    setRelationship(codeSystem: string, codeValue: string): this;
     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;
     setRoleList(values: readonly string[]): this;
     getRoleList(): string[];
     setName(value?: string | null): this;

package/dist/utils/related-person-entry-editor.js

@@ -66,8 +66,13 @@ export class RelatedPersonEntryEditor extends BundleEntryEditor {
     }
     setSubject(value) { return this.setOptionalText(RelatedPersonClaim.Patient, value); }
     getSubject() { return this.getOptionalText(RelatedPersonClaim.Patient); }
-    setRelationship(value) { return this.setOptionalText(RelatedPersonClaim.Relationship, value); }
-    getRelationship() { return this.getOptionalText(RelatedPersonClaim.Relationship); }
+    setRelationship(valueOrSystem, codeValue) { return this.setCodingTokenCode(RelatedPersonClaim.Relationship, valueOrSystem, codeValue); }
+    getRelationship() { return this.getCodingTokenSystemAndCode(RelatedPersonClaim.Relationship); }
+    getRelationshipCode() { return this.getCodingTokenCode(RelatedPersonClaim.Relationship); }
+    setRelationshipCodeSystem(system) { return this.setCodingTokenSystem(RelatedPersonClaim.Relationship, system); }
+    getRelationshipCodeSystem() { return this.getCodingTokenSystem(RelatedPersonClaim.Relationship); }
+    setRelationshipSystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(RelatedPersonClaim.Relationship, system, code); }
+    getRelationshipSystemAndCode() { return this.getCodingTokenSystemAndCode(RelatedPersonClaim.Relationship); }
     setRoleList(values) { return this.setList(RelatedPersonClaim.Role, values); }
     getRoleList() { return this.getList(RelatedPersonClaim.Role); }
     setName(value) { return this.setOptionalText(RelatedPersonClaim.Name, value); }

package/dist/utils/vital-sign-entry-editor.d.ts

@@ -30,8 +30,14 @@ export declare class VitalSignEntryEditor extends ObservationComponentEntryEdito
     getStatus(): string | undefined;
     /** Sets the observation category, usually one of the shared vital-sign category descriptors. */
     setCategory(category: CodingDescriptor | string): this;
+    setCategory(codeSystem: string, codeValue: string): this;
     /** Returns the observation category token. */
     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 observation date/effective time. */
     setDate(date: string): this;
     /** Returns the observation date/effective time. */

package/dist/utils/vital-sign-entry-editor.js

@@ -67,15 +67,20 @@ export class VitalSignEntryEditor extends ObservationComponentEntryEditor {
     getStatus() {
         return normalizeOptionalIdentifier(this.getClaim(ObservationClaim.Status));
     }
-    /** Sets the observation category, usually one of the shared vital-sign category descriptors. */
-    setCategory(category) {
-        const normalized = typeof category === 'string' ? category.trim() : category.claim;
-        return this.setClaim(ObservationClaim.Category, normalized);
+    setCategory(categoryOrSystem, codeValue) {
+        return typeof categoryOrSystem === 'string'
+            ? this.setCodingTokenCode(ObservationClaim.Category, categoryOrSystem, codeValue)
+            : this.setCodingTokenSystemAndCode(ObservationClaim.Category, categoryOrSystem.system, categoryOrSystem.code);
     }
     /** Returns the observation category token. */
     getCategory() {
-        return normalizeOptionalIdentifier(this.getClaim(ObservationClaim.Category));
+        return this.getCodingTokenSystemAndCode(ObservationClaim.Category);
     }
+    getCategoryCode() { return this.getCodingTokenCode(ObservationClaim.Category); }
+    setCategoryCodeSystem(system) { return this.setCodingTokenSystem(ObservationClaim.Category, system); }
+    getCategoryCodeSystem() { return this.getCodingTokenSystem(ObservationClaim.Category); }
+    setCategorySystemAndCode(system, code) { return this.setCodingTokenSystemAndCode(ObservationClaim.Category, system, code); }
+    getCategorySystemAndCode() { return this.getCodingTokenSystemAndCode(ObservationClaim.Category); }
     /** Sets the observation date/effective time. */
     setDate(date) {
         const normalized = String(date).trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdc-common-utils-ts",
-  "version": "2.9.14",
+  "version": "2.9.16",
   "publishConfig": {
     "access": "public"
   },