fhir-data-utils-ts 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.3.2 - 2026-09-23
+
+- Preserve every coding identity from repeatable AllergyIntolerance and
+  MedicationStatement CodeableConcepts instead of retaining only `coding[0]`.
+- Keep the MedicationStatement dose quantity's human `unit` separate from its
+  coded `system|code`, with read compatibility for records written by 0.3.1.
+- Add executable regressions using the exact allergy and medication examples
+  from the HL7 IPS all-sections Bundle.
+
 ## 0.3.1 - 2026-09-21
 
 - Separate canonical claim catalogs from graph builders and move Immunization

package/README.md

@@ -55,6 +55,14 @@ Use `fhir-data-utils-ts/claims`, `/converters`, `/fhir-bundle`,
 `/fhir-search-parameters`, `/clinical-terminology`, `/group-r5` or
 `/research-study-r5` as appropriate.
 
+Repeatable `CodeableConcept.coding[]` identities are serialized in the owning
+token claim as a comma-separated list of complete `system|code` tokens. The
+first `*-display` remains source evidence for compatibility; authoritative
+labels for every coding are resolved from each token at the terminology
+boundary. FHIR `Quantity.unit` remains separate from its coded identity:
+MedicationStatement dosage uses `dose-quantity-unit` for the human unit and
+`dose-quantity` for `system|code`.
+
 ## Observation components
 
 Composite observations use a claims-first resource graph. The primary

package/dist/converters/convert-allergy-intolerance.js

@@ -1,7 +1,7 @@
 // Copyright 2026 Conéctate Soluciones y Aplicaciones SL under the Apache License, Version 2.0.
 // File: src/utils/convert-allergy-intolerance.ts
 import { AllergyIntoleranceClaim } from '../claims/allergy-intolerance-claims.js';
-import { codingFromValue, codingToValue, requireDidWeb, requireSubjectIdentifier } from './convert-shared.js';
+import { codingFromValue, codingListFromCsv, codingListToCsv, codingToValue, requireDidWeb, requireSubjectIdentifier, } from './convert-shared.js';
 export function allergyIntoleranceFlatToFhirR4(claims) {
     const patient = claims[AllergyIntoleranceClaim.Subject] ?? claims[AllergyIntoleranceClaim.Patient];
     const recorder = claims[AllergyIntoleranceClaim.Recorder];
@@ -23,9 +23,9 @@ export function allergyIntoleranceFlatToFhirR4(claims) {
         patient: { reference: patient },
         code: claims[AllergyIntoleranceClaim.Code]
             ? {
-                coding: codingFromValue(claims[AllergyIntoleranceClaim.Code])?.map((coding) => ({
+                coding: codingListFromCsv(claims[AllergyIntoleranceClaim.Code])?.map((coding, index) => ({
                     ...coding,
-                    ...(claims[AllergyIntoleranceClaim.CodeDisplay]
+                    ...(index === 0 && claims[AllergyIntoleranceClaim.CodeDisplay]
                         ? { display: claims[AllergyIntoleranceClaim.CodeDisplay] }
                         : {}),
                 })),
@@ -64,7 +64,7 @@ export function allergyIntoleranceFhirR4ToFlat(resource) {
         [AllergyIntoleranceClaim.Identifier]: resource.identifier?.[0]?.value,
         [AllergyIntoleranceClaim.Subject]: subject,
         [AllergyIntoleranceClaim.Patient]: subject,
-        [AllergyIntoleranceClaim.Code]: codingToValue(code?.coding?.[0]) || code?.text,
+        [AllergyIntoleranceClaim.Code]: codingListToCsv(code?.coding) || code?.text,
         [AllergyIntoleranceClaim.CodeText]: code?.text,
         [AllergyIntoleranceClaim.CodeDisplay]: code?.coding?.[0]?.display,
         [AllergyIntoleranceClaim.ClinicalStatus]: resource.clinicalStatus?.coding?.[0]?.code,

package/dist/converters/convert-medication-statement.js

@@ -1,7 +1,18 @@
 // Copyright 2026 Conéctate Soluciones y Aplicaciones SL under the Apache License, Version 2.0.
 // File: src/utils/convert-medication-statement.ts
-import { MedicationStatementClaim } from '../claims/medication-statement-claims.js';
-import { codingFromValue, codingToValue, requireClaim } from './convert-shared.js';
+import { MedicationStatementClaim, MedicationStatementClaimsFhirApiExtended, } from '../claims/medication-statement-claims.js';
+import { codingFromValue, codingListFromCsv, codingListToCsv, codingToValue, requireClaim, } from './convert-shared.js';
+function isCodingToken(value) {
+    return Boolean(value?.includes('|'));
+}
+function conceptCodings(claims) {
+    return codingListFromCsv(claims[MedicationStatementClaim.Code])?.map((coding, index) => ({
+        ...coding,
+        ...(index === 0 && claims[MedicationStatementClaim.CodeDisplay]
+            ? { display: claims[MedicationStatementClaim.CodeDisplay] }
+            : {}),
+    }));
+}
 export function medicationStatementFlatToFhirR4(claims) {
     const subject = requireClaim(claims, MedicationStatementClaim.Subject);
     const status = requireClaim(claims, MedicationStatementClaim.Status);
@@ -24,10 +35,7 @@ export function medicationStatementFlatToFhirR4(claims) {
         id: containedMedicationId,
         identifier: medicationIdentifier ? [{ value: medicationIdentifier }] : undefined,
         code: claims[MedicationStatementClaim.Code] || medicationText ? {
-            coding: codingFromValue(claims[MedicationStatementClaim.Code])?.map((coding) => ({
-                ...coding,
-                ...(claims[MedicationStatementClaim.CodeDisplay] ? { display: claims[MedicationStatementClaim.CodeDisplay] } : {}),
-            })),
+            coding: conceptCodings(claims),
             ...(medicationText ? { text: medicationText } : {}),
         } : undefined,
         batch: medicationSerialNumber || medicationExpirationDate ? {
@@ -40,7 +48,10 @@ export function medicationStatementFlatToFhirR4(claims) {
     const dosagePeriod = claims[MedicationStatementClaim.TimingPeriod];
     const dosagePeriodUnit = claims[MedicationStatementClaim.TimingPeriodUnit];
     const doseValue = claims[MedicationStatementClaim.DoseQuantityValue];
-    const doseUnit = claims[MedicationStatementClaim.DoseQuantityUnit];
+    const storedDoseUnit = claims[MedicationStatementClaim.DoseQuantityUnit];
+    const doseUnitToken = claims[MedicationStatementClaimsFhirApiExtended.DoseQuantity]
+        || (isCodingToken(storedDoseUnit) ? storedDoseUnit : undefined);
+    const doseUnitText = isCodingToken(storedDoseUnit) ? undefined : storedDoseUnit;
     const hasDosage = claims[MedicationStatementClaim.DosageInstruction] || dosageRoute || dosageFrequency || dosagePeriod || doseValue;
     return {
         resourceType: 'MedicationStatement',
@@ -54,10 +65,7 @@ export function medicationStatementFlatToFhirR4(claims) {
         } : undefined,
         medicationCodeableConcept: !medicationReference && !hasContainedMedication && claims[MedicationStatementClaim.Code]
             ? {
-                coding: codingFromValue(claims[MedicationStatementClaim.Code])?.map((coding) => ({
-                    ...coding,
-                    ...(claims[MedicationStatementClaim.CodeDisplay] ? { display: claims[MedicationStatementClaim.CodeDisplay] } : {}),
-                })),
+                coding: conceptCodings(claims),
                 ...(medicationText ? { text: medicationText } : {}),
             }
             : (!medicationReference && !hasContainedMedication && medicationText ? { text: medicationText } : undefined),
@@ -76,8 +84,8 @@ export function medicationStatementFlatToFhirR4(claims) {
                     } } : undefined,
                 doseAndRate: doseValue ? [{ doseQuantity: {
                             value: Number(doseValue),
-                            unit: doseUnit,
-                            ...(codingFromValue(doseUnit)?.[0] || {}),
+                            ...(doseUnitText ? { unit: doseUnitText } : {}),
+                            ...(codingFromValue(doseUnitToken)?.[0] || {}),
                         } }] : undefined,
             }] : undefined,
         note: claims[MedicationStatementClaim.Note] ? [{ text: claims[MedicationStatementClaim.Note] }] : undefined,
@@ -94,7 +102,8 @@ export function medicationStatementFhirR4ToFlat(resource) {
     const containedMedicationText = containedMedicationConcept?.text;
     const batch = containedMedication?.batch;
     const medicationConcept = resource.medicationCodeableConcept;
-    const medicationCode = codingToValue(medicationConcept?.coding?.[0] || containedMedicationConcept?.coding?.[0]);
+    const medicationCodings = medicationConcept?.coding || containedMedicationConcept?.coding;
+    const medicationCode = codingListToCsv(medicationCodings);
     const medicationText = containedMedicationText || medicationConcept?.text || undefined;
     const dosage = resource.dosage?.[0];
     const repeat = dosage?.timing
@@ -119,7 +128,10 @@ export function medicationStatementFhirR4ToFlat(resource) {
         [MedicationStatementClaim.Source]: resource.informationSource?.reference,
         [MedicationStatementClaim.DosageRoute]: codingToValue(routeCoding),
         [MedicationStatementClaim.DoseQuantityValue]: doseQuantity?.value === undefined ? undefined : String(doseQuantity.value),
-        [MedicationStatementClaim.DoseQuantityUnit]: codingToValue(doseQuantity?.system || doseQuantity?.code ? { system: doseQuantity?.system, code: doseQuantity?.code } : undefined) || doseQuantity?.unit,
+        [MedicationStatementClaimsFhirApiExtended.DoseQuantity]: codingToValue(doseQuantity?.system || doseQuantity?.code
+            ? { system: doseQuantity?.system, code: doseQuantity?.code }
+            : undefined),
+        [MedicationStatementClaim.DoseQuantityUnit]: doseQuantity?.unit,
         [MedicationStatementClaim.TimingFrequency]: repeat?.frequency === undefined ? undefined : String(repeat.frequency),
         [MedicationStatementClaim.TimingPeriod]: repeat?.period === undefined ? undefined : String(repeat.period),
         [MedicationStatementClaim.TimingPeriodUnit]: repeat?.periodUnit,

package/dist/converters/convert-shared.d.ts

@@ -6,6 +6,11 @@ export declare function codingFromValue(value?: string): Array<{
     system?: string;
     code: string;
 }> | undefined;
+/** Convert one canonical comma-separated token list into FHIR Coding entries. */
+export declare function codingListFromCsv(value?: string): Array<{
+    system?: string;
+    code: string;
+}> | undefined;
 export declare function codingToValue(coding?: {
     system?: string;
     code?: string;

package/dist/converters/convert-shared.js

@@ -11,6 +11,15 @@ export function codingFromValue(value) {
         return [{ code: system }];
     return system ? [{ system, code }] : [{ code }];
 }
+/** Convert one canonical comma-separated token list into FHIR Coding entries. */
+export function codingListFromCsv(value) {
+    const codings = String(value || '')
+        .split(',')
+        .map((token) => token.trim())
+        .filter(Boolean)
+        .flatMap((token) => codingFromValue(token) ?? []);
+    return codings.length ? codings : undefined;
+}
 export function codingToValue(coding) {
     if (!coding?.code)
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhir-data-utils-ts",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "FHIR-version-neutral flat-claim and SearchParameter data utilities",
   "license": "Apache-2.0",
   "type": "module",