fix(ts-profile): preserve fixed CodeableConcept codings

Add a generic fixed-value merge helper for generated TypeScript profile apply() methods so fixed CodeableConcept codings are applied without dropping compatible caller-provided codings. Skip placeholder-only UNK ValueSet expansions when generating enum constraints.

Bead: codegen-vwd

Author: sussdorff

assets/api/writer-generator/typescript/profile-helpers.ts

@@ -92,6 +92,42 @@ export const applySliceMatch = <T extends object>(input: Partial<T>, match: Part
     return result as T;
 };
 
+const mergeFixedArray = (current: unknown[], fixed: unknown[]): unknown[] => {
+    const result = [...current];
+    for (const fixedItem of fixed) {
+        const existingIndex = result.findIndex((item) => matchesValue(item, fixedItem));
+        if (existingIndex === -1) {
+            result.push(fixedItem);
+        } else {
+            result[existingIndex] = mergeFixedValue(result[existingIndex], fixedItem);
+        }
+    }
+    return result;
+};
+
+const mergeFixedValue = (current: unknown, fixed: unknown): unknown => {
+    if (Array.isArray(current) && Array.isArray(fixed)) {
+        return mergeFixedArray(current, fixed);
+    }
+    if (isRecord(current) && isRecord(fixed)) {
+        const result: Record<string, unknown> = { ...current };
+        for (const [key, fixedValue] of Object.entries(fixed)) {
+            if (key === "__proto__" || key === "constructor" || key === "prototype") {
+                continue;
+            }
+            result[key] = mergeFixedValue(result[key], fixedValue);
+        }
+        return result;
+    }
+    return fixed;
+};
+
+/** Apply a generated fixed/profile value while preserving compatible existing data. */
+export const applyFixedValue = <T extends object>(resource: T, field: string, fixed: unknown): void => {
+    const rec = resource as Record<string, unknown>;
+    rec[field] = mergeFixedValue(rec[field], fixed);
+};
+
 /**
  * Recursively test whether `value` structurally contains everything in
  * `match`.  Arrays are matched with "every match item has a corresponding

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/profiles/Extension_birthPlace.ts

@@ -6,6 +6,7 @@ import type { Address } from "../../hl7-fhir-r4-core/Address";
 import type { Extension } from "../../hl7-fhir-r4-core/Extension";
 
 import {
+    applyFixedValue,
     validateRequired,
     validateExcluded,
     validateFixedValue,
@@ -45,9 +46,7 @@ export class birthPlaceProfile {
 
     static apply (resource: Extension) : birthPlaceProfile {
         resource.url = birthPlaceProfile.canonicalUrl;
-        Object.assign(resource, {
-            url: "http://hl7.org/fhir/StructureDefinition/patient-birthPlace",
-        })
+        applyFixedValue(resource, "url", "http://hl7.org/fhir/StructureDefinition/patient-birthPlace");
         return new birthPlaceProfile(resource);
     }
 

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/profiles/Extension_birthTime.ts

@@ -5,6 +5,7 @@
 import type { Extension } from "../../hl7-fhir-r4-core/Extension";
 
 import {
+    applyFixedValue,
     validateRequired,
     validateExcluded,
     validateFixedValue,
@@ -44,9 +45,7 @@ export class birthTimeProfile {
 
     static apply (resource: Extension) : birthTimeProfile {
         resource.url = birthTimeProfile.canonicalUrl;
-        Object.assign(resource, {
-            url: "http://hl7.org/fhir/StructureDefinition/patient-birthTime",
-        })
+        applyFixedValue(resource, "url", "http://hl7.org/fhir/StructureDefinition/patient-birthTime");
         return new birthTimeProfile(resource);
     }
 

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/profiles/Extension_nationality.ts

@@ -8,6 +8,7 @@ import type { Period } from "../../hl7-fhir-r4-core/Period";
 
 import {
     isRawExtensionInput,
+    applyFixedValue,
     isExtension,
     getExtensionValue,
     pushExtension,
@@ -56,9 +57,7 @@ export class nationalityProfile {
 
     static apply (resource: Extension) : nationalityProfile {
         resource.url = nationalityProfile.canonicalUrl;
-        Object.assign(resource, {
-            url: "http://hl7.org/fhir/StructureDefinition/patient-nationality",
-        })
+        applyFixedValue(resource, "url", "http://hl7.org/fhir/StructureDefinition/patient-nationality");
         return new nationalityProfile(resource);
     }
 

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/profiles/Extension_own_prefix.ts

@@ -5,6 +5,7 @@
 import type { Extension } from "../../hl7-fhir-r4-core/Extension";
 
 import {
+    applyFixedValue,
     validateRequired,
     validateExcluded,
     validateFixedValue,
@@ -44,9 +45,7 @@ export class own_prefixProfile {
 
     static apply (resource: Extension) : own_prefixProfile {
         resource.url = own_prefixProfile.canonicalUrl;
-        Object.assign(resource, {
-            url: "http://hl7.org/fhir/StructureDefinition/humanname-own-prefix",
-        })
+        applyFixedValue(resource, "url", "http://hl7.org/fhir/StructureDefinition/humanname-own-prefix");
         return new own_prefixProfile(resource);
     }
 

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/profiles/Observation_observation_bodyweight.ts

@@ -15,6 +15,7 @@ export type Observation_bodyweight_Category_VSCatSliceFlatAll = Observation_body
 
 import {
     ensureProfile,
+    applyFixedValue,
     applySliceMatch,
     matchesValue,
     setArraySlice,
@@ -70,9 +71,7 @@ export class observation_bodyweightProfile {
 
     static apply (resource: Observation) : observation_bodyweightProfile {
         ensureProfile(resource, observation_bodyweightProfile.canonicalUrl);
-        Object.assign(resource, {
-            code: {"coding":[{"code":"29463-7","system":"http://loinc.org"}]},
-        })
+        applyFixedValue(resource, "code", {"coding":[{"code":"29463-7","system":"http://loinc.org"}]});
         resource.category = ensureSliceDefaults(
             [...(resource.category ?? [])],
             observation_bodyweightProfile.VSCatSliceMatch,

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/profiles/Observation_observation_bp.ts

@@ -21,6 +21,7 @@ export type Observation_bp_Component_DiastolicBPSliceFlatAll = Observation_bp_Co
 
 import {
     ensureProfile,
+    applyFixedValue,
     applySliceMatch,
     matchesValue,
     setArraySlice,
@@ -85,9 +86,7 @@ export class observation_bpProfile {
 
     static apply (resource: Observation) : observation_bpProfile {
         ensureProfile(resource, observation_bpProfile.canonicalUrl);
-        Object.assign(resource, {
-            code: {"coding":[{"code":"85354-9","system":"http://loinc.org"}]},
-        })
+        applyFixedValue(resource, "code", {"coding":[{"code":"85354-9","system":"http://loinc.org"}]});
         resource.category = ensureSliceDefaults(
             [...(resource.category ?? [])],
             observation_bpProfile.VSCatSliceMatch,

examples/typescript-r4/fhir-types/profile-helpers.ts

@@ -92,6 +92,42 @@ export const applySliceMatch = <T extends object>(input: Partial<T>, match: Part
     return result as T;
 };
 
+const mergeFixedArray = (current: unknown[], fixed: unknown[]): unknown[] => {
+    const result = [...current];
+    for (const fixedItem of fixed) {
+        const existingIndex = result.findIndex((item) => matchesValue(item, fixedItem));
+        if (existingIndex === -1) {
+            result.push(fixedItem);
+        } else {
+            result[existingIndex] = mergeFixedValue(result[existingIndex], fixedItem);
+        }
+    }
+    return result;
+};
+
+const mergeFixedValue = (current: unknown, fixed: unknown): unknown => {
+    if (Array.isArray(current) && Array.isArray(fixed)) {
+        return mergeFixedArray(current, fixed);
+    }
+    if (isRecord(current) && isRecord(fixed)) {
+        const result: Record<string, unknown> = { ...current };
+        for (const [key, fixedValue] of Object.entries(fixed)) {
+            if (key === "__proto__" || key === "constructor" || key === "prototype") {
+                continue;
+            }
+            result[key] = mergeFixedValue(result[key], fixedValue);
+        }
+        return result;
+    }
+    return fixed;
+};
+
+/** Apply a generated fixed/profile value while preserving compatible existing data. */
+export const applyFixedValue = <T extends object>(resource: T, field: string, fixed: unknown): void => {
+    const rec = resource as Record<string, unknown>;
+    rec[field] = mergeFixedValue(rec[field], fixed);
+};
+
 /**
  * Recursively test whether `value` structurally contains everything in
  * `match`.  Arrays are matched with "every match item has a corresponding

examples/typescript-r4/profile-bodyweight.test.ts

@@ -182,7 +182,7 @@ describe("factory method equivalence", () => {
         const fromCreate = bodyweightProfile.create(args).toResource();
         const fromCreateResource = bodyweightProfile.createResource(args);
         const fromApply = bodyweightProfile
-            .apply({ resourceType: "Observation", status: "preliminary", code: { text: "Body weight" } })
+            .apply({ resourceType: "Observation", status: "preliminary", code: {} })
             .setStatus("final")
             .setSubject({ reference: "Patient/pt-1" })
             .toResource();

examples/typescript-us-core/fhir-types/hl7-fhir-us-core/profiles/Extension_USCoreEthnicityExtension.ts

@@ -18,6 +18,7 @@ export type USCoreEthnicityExtension_Extension_TextSliceFlatAll = USCoreEthnicit
 
 import {
     isRawExtensionInput,
+    applyFixedValue,
     applySliceMatch,
     matchesValue,
     setArraySlice,
@@ -80,9 +81,7 @@ export class USCoreEthnicityExtensionProfile {
 
     static apply (resource: Extension) : USCoreEthnicityExtensionProfile {
         resource.url = USCoreEthnicityExtensionProfile.canonicalUrl;
-        Object.assign(resource, {
-            url: "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity",
-        })
+        applyFixedValue(resource, "url", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity");
         return new USCoreEthnicityExtensionProfile(resource);
     }