ts: fix codegeneration for enum arrays.

ryukzak · ryukzak · commit cb2d5e2554e5 · 2025-11-14T13:56:11.000+01:00
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/CDS_Hooks_RequestGroup_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/CDS_Hooks_RequestGroup_profile.ts
@@ -17,7 +17,7 @@ export interface CDS_Hooks_RequestGroup {
 
     identifier: Identifier[];
     instantiatesUri: string[];
-    priority?: 'routine' | 'urgent' | 'asap' | 'stat';
+    priority?: ('routine' | 'urgent' | 'asap' | 'stat');
     subject?: Reference<'Group' | 'Patient'>;
     authoredOn?: string;
     author?: Reference<'Device' | 'Practitioner' | 'PractitionerRole'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Device_Metric_Observation_Profile_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Device_Metric_Observation_Profile_profile.ts
@@ -19,7 +19,7 @@ export interface Device_Metric_Observation_Profile {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/devicemetricobservation";
 
     identifier?: Identifier[];
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     code: CodeableConcept;
     subject: Reference<'Device' | 'Patient'>;
     encounter?: Reference<'Encounter'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/EHRS_FM_Record_Lifecycle_Event___Audit_Event_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/EHRS_FM_Record_Lifecycle_Event___Audit_Event_profile.ts
@@ -18,7 +18,7 @@ export interface EHRS_FM_Record_Lifecycle_Event___Audit_Event {
 
     type: Coding;
     subtype?: Coding[];
-    action?: 'C' | 'R' | 'U' | 'D' | 'E';
+    action?: ('C' | 'R' | 'U' | 'D' | 'E');
     recorded: string;
     purposeOfEvent?: CodeableConcept[];
     agent: AuditEventAgent[];
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Evidence_Synthesis_Profile_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Evidence_Synthesis_Profile_profile.ts
@@ -19,7 +19,7 @@ export interface Evidence_Synthesis_Profile {
     title?: string;
     shortTitle?: string;
     subtitle?: string;
-    status: 'draft' | 'active' | 'retired' | 'unknown';
+    status: ('draft' | 'active' | 'retired' | 'unknown');
     date?: string;
     publisher?: string;
     contact?: ContactDetail[];
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/PICO_Element_Profile_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/PICO_Element_Profile_profile.ts
@@ -27,7 +27,7 @@ export interface PICO_Element_Profile {
     date?: string;
     description?: string;
     note?: Annotation[];
-    type?: 'dichotomous' | 'continuous' | 'descriptive';
+    type?: ('dichotomous' | 'continuous' | 'descriptive');
     characteristic: EvidenceVariableCharacteristic[];
 }
 
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Shareable_CodeSystem_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Shareable_CodeSystem_profile.ts
@@ -13,7 +13,7 @@ export interface Shareable_CodeSystem {
     url: string;
     version: string;
     name: string;
-    status: 'draft' | 'active' | 'retired' | 'unknown';
+    status: ('draft' | 'active' | 'retired' | 'unknown');
     experimental: boolean;
     publisher: string;
     description: string;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Shareable_ValueSet_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Shareable_ValueSet_profile.ts
@@ -11,7 +11,7 @@ export interface Shareable_ValueSet {
     url: string;
     version: string;
     name: string;
-    status: 'draft' | 'active' | 'retired' | 'unknown';
+    status: ('draft' | 'active' | 'retired' | 'unknown');
     experimental: boolean;
     publisher: string;
     description: string;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_bmi_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_bmi_profile.ts
@@ -14,7 +14,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_bmi {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/bmi";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_bodyheight_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_bodyheight_profile.ts
@@ -14,7 +14,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_bodyheight {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/bodyheight";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_bodytemp_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_bodytemp_profile.ts
@@ -14,7 +14,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_bodytemp {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/bodytemp";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_bodyweight_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_bodyweight_profile.ts
@@ -14,7 +14,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_bodyweight {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/bodyweight";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_bp_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_bp_profile.ts
@@ -14,7 +14,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_bp {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/bp";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_headcircum_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_headcircum_profile.ts
@@ -14,7 +14,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_headcircum {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/headcircum";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_heartrate_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_heartrate_profile.ts
@@ -14,7 +14,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_heartrate {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/heartrate";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_oxygensat_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_oxygensat_profile.ts
@@ -14,7 +14,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_oxygensat {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/oxygensat";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_resprate_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_resprate_profile.ts
@@ -14,7 +14,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_resprate {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/resprate";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_vitalsigns_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_vitalsigns_profile.ts
@@ -13,7 +13,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_vitalsigns {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/vitalsigns";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_vitalspanel_profile.ts b/examples/typescript-r4/fhir-types/hl7-fhir-r4-core/observation_vitalspanel_profile.ts
@@ -13,7 +13,7 @@ import type { Reference } from "../hl7-fhir-r4-core/Reference";
 export interface observation_vitalspanel {
     __profileUrl: "http://hl7.org/fhir/StructureDefinition/vitalspanel";
 
-    status: 'registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown';
+    status: ('registered' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'cancelled' | 'entered-in-error' | 'unknown');
     category: CodeableConcept[];
     code: CodeableConcept;
     subject: Reference<'Patient'>;
diff --git a/src/api/writer-generator/typescript.ts b/src/api/writer-generator/typescript.ts
@@ -291,7 +291,7 @@ export class TypeScript extends Writer {
 
                 let tsType: string;
                 if (field.enum) {
-                    tsType = field.enum.map((e) => `'${e}'`).join(" | ");
+                    tsType = `(${field.enum.map((e) => `'${e}'`).join(" | ")})`;
                 } else if (field.reference && field.reference.length > 0) {
                     const specialization = tsIndex.findLastSpecialization(flatProfile);
                     if (!isSpecializationTypeSchema(specialization))

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export interface PICO_Element_Profile {`
`27`	`27`	`date?: string;`
`28`	`28`	`description?: string;`
`29`	`29`	`note?: Annotation[];`
`30`		`- type?: 'dichotomous' \| 'continuous' \| 'descriptive';`
	`30`	`+ type?: ('dichotomous' \| 'continuous' \| 'descriptive');`
`31`	`31`	`characteristic: EvidenceVariableCharacteristic[];`
`32`	`32`	`}`
`33`	`33`