babelfhir-ts 1.5.12 → 1.5.14

package/out/src/generator/emitters/client/clientGenerator.js

@@ -416,7 +416,7 @@ function generateBundleParser(clientDir, resourceTypes) {
         const unionType = profiles.map(p => `GeneratedTypes.${p}`).join(' | ');
         return `    case '${baseType}':
       return entries
-        .filter((e): e is BundleEntry<${unionType}> => e.resource?.resourceType === '${baseType}')
+        .filter((e): e is BundleEntry<${unionType}> => (e.resource as { resourceType?: string } | undefined)?.resourceType === '${baseType}')
         .map(e => e.resource!) as T[];`;
     })
         .join("\n");
@@ -463,7 +463,7 @@ export class BundleParser {
   /**
    * Get resources of a specific type
    */
-  getResourcesByType<T extends FhirResource>(resourceType: T['resourceType']): T[] {
+  getResourcesByType<T extends FhirResource>(resourceType: string): T[] {
     const entries = this.getAllEntries();
     switch (resourceType) {
 ${parseByTypeCases}
@@ -475,7 +475,7 @@ ${parseByTypeCases}
   /**
    * Get the first resource of a specific type
    */
-  getFirstResourceByType<T extends FhirResource>(resourceType: T['resourceType']): T | undefined {
+  getFirstResourceByType<T extends FhirResource>(resourceType: string): T | undefined {
     return this.getResourcesByType<T>(resourceType)[0];
   }
 
@@ -498,9 +498,9 @@ ${parseByTypeCases}
   /**
    * Get entries of a specific resource type
    */
-  getEntriesByType<T extends FhirResource>(resourceType: T['resourceType']): BundleEntry<T>[] {
+  getEntriesByType<T extends FhirResource>(resourceType: string): BundleEntry<T>[] {
     return this.getAllEntries().filter(
-      (e): e is BundleEntry<T> => e.resource?.resourceType === resourceType
+      (e): e is BundleEntry<T> => (e.resource as { resourceType?: string } | undefined)?.resourceType === resourceType
     );
   }
 
@@ -539,7 +539,7 @@ ${parseByTypeCases}
     const grouped = new Map<string, FhirResource[]>();
     
     for (const resource of this.getAllResources()) {
-      const type = resource.resourceType;
+      const type = (resource as { resourceType: string }).resourceType;
       if (!grouped.has(type)) {
         grouped.set(type, []);
       }

package/out/src/generator/emitters/interface/processFlatField.js

@@ -451,10 +451,18 @@ export function handleFlatField(args) {
             addTypeImport(fieldType);
         }
     }
+    // Capture primitiveness BEFORE applyBindingConstraint rewrites CodeableConcept
+    // fields into an intersection string like `CodeableConcept & { coding: Array<{
+    // code: X; system: "..." }> }`. That string contains quotes, so the post-
+    // constraint isPrimitiveType() heuristic (/['"]/ in createRules) misfires and
+    // the code-union path below would clobber the CodeableConcept with a bare code
+    // union (regression from bae9e64). Only genuine primitive `code` fields should
+    // take that path, so gate it on the pre-constraint type.
+    const isPrimitiveCodeField = isPrimitiveType(fieldType);
     // Apply ValueSet binding constraints for CodeableConcept types
     fieldType = applyBindingConstraint(fieldType, field, fields);
     // Apply ValueSet binding constraints for primitive code fields (generates union literal type)
-    if (isPrimitiveType(fieldType) && hasNarrowingBinding && field.binding?.codes) {
+    if (isPrimitiveCodeField && hasNarrowingBinding && field.binding?.codes) {
         const vsUri = field.binding.uri?.split('|')[0];
         const vs = vsUri && valueSets ? (valueSets.get(vsUri) || valueSets.get(field.binding.uri)) : undefined;
         if (vs && vs.isSmall && vs.concepts.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.5.12",
+  "version": "1.5.14",
   "description": "BabelFHIR-TS: generate TypeScript interfaces, validators, and helper classes from FHIR R4/R4B/R5 StructureDefinitions (profiles) directly inside package archives.",
   "type": "module",
   "main": "out/src/main.js",