gdc-common-utils-ts 2.8.4 → 2.8.5

package/dist/convert/convert-composition.js

@@ -1,13 +1,41 @@
 // Copyright 2026 Conéctate Soluciones y Aplicaciones SL under the Apache License, Version 2.0.
 // File: src/utils/convert-composition.ts
 import { CompositionClaim } from '../models/interoperable-claims/composition-claims.js';
-import { codingFromValue, codingToValue, referenceListToCsv, referenceToValue } from './convert-shared.js';
+import { codingFromValue, codingToValue, referenceListToCsv, referenceToValue, requireClaim } from './convert-shared.js';
+function splitAlignedCsv(value) {
+    return value === undefined ? [] : value.split(',').map((item) => item.trim());
+}
+function attestersFromClaims(claims) {
+    const partyClaim = claims[CompositionClaim.Attester];
+    const modeClaim = claims[CompositionClaim.AttesterMode];
+    const timeClaim = claims[CompositionClaim.AttesterTime];
+    if (partyClaim === undefined && modeClaim === undefined && timeClaim === undefined)
+        return undefined;
+    const modes = splitAlignedCsv(requireClaim(claims, CompositionClaim.AttesterMode));
+    const parties = splitAlignedCsv(partyClaim);
+    const times = splitAlignedCsv(timeClaim);
+    if (modes.some((mode) => !mode) || parties.length > modes.length || times.length > modes.length) {
+        throw new Error('Composition attester claims must be positionally aligned with non-empty attester modes.');
+    }
+    return modes.map((mode, index) => ({
+        mode,
+        ...(parties[index] ? { party: { reference: parties[index] } } : {}),
+        ...(times[index] ? { time: times[index] } : {}),
+    }));
+}
+function alignedAttesterValue(attesters, select) {
+    if (attesters.length === 0)
+        return undefined;
+    return attesters.map((attester) => select(attester) || '').join(',');
+}
 export function compositionFlatToFhirR4(claims) {
     return {
         resourceType: 'Composition',
         identifier: claims[CompositionClaim.Identifier] ? { value: claims[CompositionClaim.Identifier] } : undefined,
         subject: claims[CompositionClaim.Subject] ? { reference: claims[CompositionClaim.Subject] } : undefined,
         author: claims[CompositionClaim.Author] ? claims[CompositionClaim.Author].split(',').map((reference) => ({ reference: reference.trim() })) : undefined,
+        attester: attestersFromClaims(claims),
+        custodian: claims[CompositionClaim.Custodian] ? { reference: claims[CompositionClaim.Custodian] } : undefined,
         date: claims[CompositionClaim.Date],
         title: claims[CompositionClaim.Title],
         type: claims[CompositionClaim.Type] ? { coding: codingFromValue(claims[CompositionClaim.Type]) } : undefined,
@@ -17,6 +45,9 @@ export function compositionFlatToFhirR4(claims) {
     };
 }
 export function compositionFhirR4ToFlat(resource) {
+    const attesters = Array.isArray(resource.attester)
+        ? resource.attester
+        : [];
     const sectionValues = Array.isArray(resource.section)
         ? resource.section
             .map((item) => codingToValue(item?.code?.coding?.[0]))
@@ -26,6 +57,10 @@ export function compositionFhirR4ToFlat(resource) {
         [CompositionClaim.Subject]: referenceToValue(resource.subject),
         [CompositionClaim.Section]: sectionValues.length ? sectionValues.join(',') : undefined,
         [CompositionClaim.Author]: referenceListToCsv(resource.author),
+        [CompositionClaim.Attester]: alignedAttesterValue(attesters, (attester) => attester.party?.reference),
+        [CompositionClaim.AttesterMode]: alignedAttesterValue(attesters, (attester) => attester.mode),
+        [CompositionClaim.AttesterTime]: alignedAttesterValue(attesters, (attester) => attester.time),
+        [CompositionClaim.Custodian]: referenceToValue(resource.custodian),
         [CompositionClaim.Date]: resource.date,
         [CompositionClaim.Entry]: undefined,
         [CompositionClaim.Type]: codingToValue(resource.type?.coding?.[0]),

package/dist/models/interoperable-claims/composition-claims.d.ts

@@ -2,6 +2,14 @@ export declare const CompositionClaim: {
     readonly Subject: "Composition.subject";
     readonly Section: "Composition.section";
     readonly Author: "Composition.author";
+    /** CSV of Composition.attester.party references, aligned with AttesterMode and AttesterTime. */
+    readonly Attester: "Composition.attester";
+    /** CSV of required R4 Composition.attester.mode values, one per attester. */
+    readonly AttesterMode: "Composition.attester-mode";
+    /** CSV of optional R4 Composition.attester.time values, positionally aligned with AttesterMode. */
+    readonly AttesterTime: "Composition.attester-time";
+    /** Composition.custodian Organization reference. */
+    readonly Custodian: "Composition.custodian";
     readonly Date: "Composition.date";
     readonly Entry: "Composition.entry";
     readonly Type: "Composition.type";

package/dist/models/interoperable-claims/composition-claims.js

@@ -4,6 +4,14 @@ export const CompositionClaim = {
     Subject: 'Composition.subject',
     Section: 'Composition.section',
     Author: 'Composition.author',
+    /** CSV of Composition.attester.party references, aligned with AttesterMode and AttesterTime. */
+    Attester: 'Composition.attester',
+    /** CSV of required R4 Composition.attester.mode values, one per attester. */
+    AttesterMode: 'Composition.attester-mode',
+    /** CSV of optional R4 Composition.attester.time values, positionally aligned with AttesterMode. */
+    AttesterTime: 'Composition.attester-time',
+    /** Composition.custodian Organization reference. */
+    Custodian: 'Composition.custodian',
     Date: 'Composition.date',
     Entry: 'Composition.entry',
     Type: 'Composition.type',

package/package.json

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