gdc-common-utils-ts 2.9.29 → 2.9.30

package/dist/utils/bundle-document-builder.js

@@ -26,6 +26,22 @@ function splitCsv(value) {
         .map((item) => item.trim())
         .filter(Boolean);
 }
+function buildCompositionSubjectResource(subjectReference) {
+    const typedReference = /^([A-Z][A-Za-z0-9]*)\/([^/]+)$/.exec(subjectReference);
+    if (typedReference) {
+        return {
+            resourceType: typedReference[1],
+            id: typedReference[2],
+        };
+    }
+    if (/^[A-Z][A-Za-z0-9]*\//.test(subjectReference)) {
+        throw new TypeError('bundle_document_subject_reference_invalid');
+    }
+    return {
+        resourceType: ResourceTypesFhirR4.Patient,
+        id: subjectReference,
+    };
+}
 export function getSimpleClaimAttributeName(key) {
     const value = asTrimmedString(key);
     if (!value)
@@ -511,6 +527,9 @@ export function buildBundleDocumentFromClaims(input) {
     const compositionTitle = asTrimmedString(compositionClaims[CompositionClaim.Title]);
     const compositionDate = asTrimmedString(compositionClaims[CompositionClaim.Date]);
     const compositionAuthorList = splitCsv(compositionClaims[CompositionClaim.Author]);
+    const compositionAttesterList = splitCsv(compositionClaims[CompositionClaim.Attester]);
+    const compositionAttesterModeList = splitCsv(compositionClaims[CompositionClaim.AttesterMode]);
+    const compositionAttesterTimeList = String(compositionClaims[CompositionClaim.AttesterTime] || '').split(',');
     const compositionSections = new Map();
     const visibleEntries = [];
     const resourceByReference = new Map();
@@ -590,16 +609,20 @@ export function buildBundleDocumentFromClaims(input) {
                     ...(compositionAuthorList.length > 0 ? {
                         author: compositionAuthorList.map((reference) => ({ reference })),
                     } : {}),
+                    ...(compositionAttesterList.length > 0 ? {
+                        attester: compositionAttesterList.map((reference, index) => ({
+                            party: { reference },
+                            mode: compositionAttesterModeList[index],
+                            ...(compositionAttesterTimeList[index] ? { time: compositionAttesterTimeList[index] } : {}),
+                        })),
+                    } : {}),
                     meta: { claims: compositionClaims },
                     section: Array.from(compositionSections.values()),
                 },
             },
             ...(compositionSubject
                 ? [{
-                        resource: {
-                            resourceType: 'Patient',
-                            id: compositionSubject,
-                        },
+                        resource: buildCompositionSubjectResource(compositionSubject),
                     }]
                 : []),
             ...visibleEntries,

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

@@ -1,8 +1,14 @@
 import type { BundleEntry, BundleJsonApi } from '../models/bundle.js';
 import { AllowedResourceType, BundleType, type BuiltBundleEntry, type BundleOperation, type ResourceTypeEntryEditor } from '../models/bundle-editor-types.js';
+import { type CompositionAttesterMode } from '../models/interoperable-claims/composition-claims.js';
 import { type ValidateBundleDocumentResult } from './bundle-document-builder.js';
 import { buildEmployeePurgeBundle, buildEmployeeSearchBundle } from './employee.js';
 import { BundleEntryEditor } from './bundle-entry-editor.js';
+export type CompositionAttesterInput = Readonly<{
+    reference: string;
+    mode: CompositionAttesterMode;
+    time?: string;
+}>;
 export declare class BundleEditor {
     private bundleOperation;
     private allowedResourceType;
@@ -77,6 +83,10 @@ export declare class BundleEditor {
     setCompositionAuthorList(references: readonly string[]): this;
     /** Returns the normalized `Composition.author` reference list staged for the future document root. */
     getCompositionAuthorList(): string[];
+    /** Replaces the aligned professional/legal attestation metadata for the document Composition. */
+    setCompositionAttesterList(attesters: readonly CompositionAttesterInput[]): this;
+    /** Returns the positionally aligned Composition attesters currently staged for document authoring. */
+    getCompositionAttesterList(): CompositionAttesterInput[];
     /**
      * Opens one new entry and returns a generic entry editor for that slot.
      *

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

@@ -9,7 +9,7 @@
 import { ClaimsPersonSchemaorg } from '../constants/schemaorg.js';
 import { ResourceTypesFhirR4 } from '../constants/fhir-resource-types.js';
 import { BundleEditorValidationIssues, BundleTypes, } from '../models/bundle-editor-types.js';
-import { CompositionClaim } from '../models/interoperable-claims/composition-claims.js';
+import { CompositionAttesterModes, CompositionClaim, } from '../models/interoperable-claims/composition-claims.js';
 import { getClaimValues, setClaimValues } from '../claims/claim-list-helpers.js';
 import { buildBundleDocumentFromClaims } from './bundle-document-builder.js';
 import { buildEmployeeBatchEntry, buildEmployeePurgeBundle, buildEmployeeSearchBundle, EmployeeBundleOperations, EmployeeResourceTypes, } from './employee.js';
@@ -165,6 +165,41 @@ export class BundleEditor {
     getCompositionAuthorList() {
         return this.getCompositionCsvClaimList(CompositionClaim.Author);
     }
+    /** Replaces the aligned professional/legal attestation metadata for the document Composition. */
+    setCompositionAttesterList(attesters) {
+        const normalized = attesters.map((attester) => ({
+            reference: normalizeOptionalIdentifier(attester.reference),
+            mode: normalizeOptionalIdentifier(attester.mode),
+            time: normalizeOptionalIdentifier(attester.time),
+        }));
+        if (normalized.some((attester) => !attester.reference || !attester.mode
+            || !Object.values(CompositionAttesterModes).includes(attester.mode))) {
+            throw new TypeError('bundle_document_attester_invalid');
+        }
+        if (normalized.length === 0) {
+            delete this.compositionClaims[CompositionClaim.Attester];
+            delete this.compositionClaims[CompositionClaim.AttesterMode];
+            delete this.compositionClaims[CompositionClaim.AttesterTime];
+            return this;
+        }
+        this.compositionClaims[CompositionClaim.Attester] = normalized.map(({ reference }) => reference).join(',');
+        this.compositionClaims[CompositionClaim.AttesterMode] = normalized.map(({ mode }) => mode).join(',');
+        this.compositionClaims[CompositionClaim.AttesterTime] = normalized.map(({ time }) => time || '').join(',');
+        return this;
+    }
+    /** Returns the positionally aligned Composition attesters currently staged for document authoring. */
+    getCompositionAttesterList() {
+        const references = String(this.compositionClaims[CompositionClaim.Attester] || '').split(',');
+        const modes = String(this.compositionClaims[CompositionClaim.AttesterMode] || '').split(',');
+        const times = String(this.compositionClaims[CompositionClaim.AttesterTime] || '').split(',');
+        if (references.length === 1 && !references[0])
+            return [];
+        return references.map((reference, index) => ({
+            reference,
+            mode: modes[index],
+            ...(times[index] ? { time: times[index] } : {}),
+        }));
+    }
     /**
      * Opens one new entry and returns a generic entry editor for that slot.
      *

package/package.json

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