babelfhir-ts 1.5.13 → 1.5.15

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/validator/sliceValidatorGenerator.js

@@ -456,9 +456,9 @@ function generatePatternCodingValidation(slice, relPath, errorPath, sliceLabel,
         if (isNestedInOptionalSlice) {
             out.push(`
   // Required slice validation for ${relPath}:${sliceLabel} (nested in array: ${arrayParentPath}, parent slice is optional)
-  if (resource.${arrayParentPath} && Array.isArray(resource.${arrayParentPath}) && resource.${arrayParentPath}.length > 0) {
+  if ((resource as any).${arrayParentPath} && Array.isArray((resource as any).${arrayParentPath}) && (resource as any).${arrayParentPath}.length > 0) {
     const ${varName}Elements: Array<{ system?: string; code?: string }> = [];
-    for (const item of resource.${arrayParentPath}) {
+    for (const item of (resource as any).${arrayParentPath}) {
       const nestedArray = item.${optionalPath};
       if (nestedArray && Array.isArray(nestedArray)) {
         for (const coding of nestedArray) { if (${matchExpr.replace(/item\./g, 'coding.')}) ${varName}Elements.push(coding); }
@@ -473,9 +473,9 @@ function generatePatternCodingValidation(slice, relPath, errorPath, sliceLabel,
             out.push(`
   // Required slice validation for ${relPath}:${sliceLabel} (nested in array: ${arrayParentPath})
   // Only check when parent array exists — parent absence is reported by separate required-field checks
-  if (resource.${arrayParentPath} && Array.isArray(resource.${arrayParentPath})) {
+  if ((resource as any).${arrayParentPath} && Array.isArray((resource as any).${arrayParentPath})) {
     const ${varName}Elements: Array<{ system?: string; code?: string }> = [];
-    for (const item of resource.${arrayParentPath}) {
+    for (const item of (resource as any).${arrayParentPath}) {
       const nestedArray = item.${optionalPath};
       if (nestedArray && Array.isArray(nestedArray)) {
         for (const coding of nestedArray) { if (${matchExpr.replace(/item\./g, 'coding.')}) ${varName}Elements.push(coding); }
@@ -496,9 +496,9 @@ function generatePatternCodingValidation(slice, relPath, errorPath, sliceLabel,
             out.push(`
   // Required slice validation for ${relPath}:${sliceLabel}
   // Only check nested slice if parent field exists (parent absence is already reported separately)
-  if (resource.${parentPath}) {
-    if (resource.${optionalPath} && Array.isArray(resource.${optionalPath})) {
-      const ${varName}Elements = (resource.${optionalPath} as Array<{ system?: string; code?: string }>).filter((item) => 
+  if ((resource as any).${parentPath}) {
+    if ((resource as any).${optionalPath} && Array.isArray((resource as any).${optionalPath})) {
+      const ${varName}Elements = ((resource as any).${optionalPath} as Array<{ system?: string; code?: string }>).filter((item) => 
         ${matchExpr}
       );
       if (${varName}Elements.length < ${min}) {
@@ -512,8 +512,8 @@ function generatePatternCodingValidation(slice, relPath, errorPath, sliceLabel,
         else {
             out.push(`
   // Required slice validation for ${relPath}:${sliceLabel}
-  if (resource.${optionalPath} && Array.isArray(resource.${optionalPath})) {
-    const ${varName}Elements = (resource.${optionalPath} as Array<{ system?: string; code?: string }>).filter((item) => 
+  if ((resource as any).${optionalPath} && Array.isArray((resource as any).${optionalPath})) {
+    const ${varName}Elements = ((resource as any).${optionalPath} as Array<{ system?: string; code?: string }>).filter((item) => 
       ${matchExpr}
     );
     if (${varName}Elements.length < ${min}) {
@@ -627,8 +627,8 @@ function generateProfiledChildDelegation(slice, relPath, childFieldsWithFixedVal
                 out.push(`
   // Profiled sub-resource delegation for ${relPath}:${sliceLabel}.${childRelPath} → ${delegateName}
   {
-    if (resource.${arrayParentPath} && Array.isArray(resource.${arrayParentPath})) {
-      for (const _parentItem of resource.${arrayParentPath}) {
+    if ((resource as any).${arrayParentPath} && Array.isArray((resource as any).${arrayParentPath})) {
+      for (const _parentItem of (resource as any).${arrayParentPath}) {
         const _pi: any = _parentItem;
         const _nestedArr = _pi?.${remainingPath};
         if (_nestedArr && Array.isArray(_nestedArr)) {
@@ -775,9 +775,9 @@ function generateProfileDiscriminatorValidation(slice, relPath, errorPath, slice
     const { resourceType, profileUrls } = match;
     const max = typeof slice.max === 'number' && slice.max !== Infinity ? slice.max : undefined;
     const parentPath = relPath.includes('.') ? relPath.split('.').slice(0, -1).join('.') : '';
-    const accessor = parentPath ? `(resource as any)?.${parentPath.replace(/\./g, '?.')}` : `resource.${relPath}`;
+    const accessor = parentPath ? `(resource as any)?.${parentPath.replace(/\./g, '?.')}` : `(resource as any).${relPath}`;
     // For top-level entry slices, access resource.entry directly
-    const arrayAccessor = relPath === 'entry' || !relPath.includes('.') ? `resource.${relPath}` : accessor;
+    const arrayAccessor = relPath === 'entry' || !relPath.includes('.') ? `(resource as any).${relPath}` : accessor;
     // Resolve profiled validator for delegation
     let delegateInterfaceName;
     if (ctx.profileUrlToName && ctx.validatorImports) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.5.13",
+  "version": "1.5.15",
   "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",