babelfhir-ts 1.1.0 → 1.1.3

package/README.md

@@ -135,6 +135,8 @@ Options:
   --no-cache               Delete .cache folder after generation
   --no-classes             Only generate interfaces and types (skip class generation)
   --no-client              Skip FHIR client generation (client generated by default)
+  --schema <format>        Generate schema files alongside outputs (supported: zod)
+  --fhir-version <ver>     FHIR version to target: r4 (default) or r4b
   --package <pkg@version>  Download FHIR package from registry and process it
   --registry <url>         FHIR package registry URL (default: https://packages.simplifier.net)
   --tx-server <url>        Terminology server URL for ValueSet expansion (e.g., https://tx.fhir.org/r4)

package/out/src/generator/{constants.js → core/constants.js}

@@ -10,10 +10,11 @@ import { fileURLToPath } from 'url';
 import path from 'path';
 const require = createRequire(import.meta.url);
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-// Resolve package.json — works from both src/generator/ (dev) and out/src/generator/ (compiled)
+// Resolve package.json — works from src/generator/core (dev) and out/src/generator/core (compiled)
 const _pkgPath = [
     path.resolve(__dirname, '../../package.json'),
     path.resolve(__dirname, '../../../package.json'),
+    path.resolve(__dirname, '../../../../package.json'),
 ].find(p => {
     try {
         return JSON.parse(require('fs').readFileSync(p, 'utf8')).name === 'babelfhir-ts';

package/out/src/generator/{utils.js → core/utils.js}

@@ -1,7 +1,7 @@
 import fs from "fs";
 import path from "path";
-import { logger } from "../logger.js";
-import fhirResourceNames from "./fhirResources.json" with { type: "json" };
+import { logger } from "../../logger.js";
+import { ctx } from '../fhir/versionContext.js';
 /**
  * Strips the version suffix from a FHIR canonical URL.
  * FHIR canonical URLs use '|' to separate the URL from the version.
@@ -82,7 +82,7 @@ export function getResourceTypes(options) {
                     if (extendsMatch) {
                         const baseType = extendsMatch[1];
                         // Check if it's a known FHIR resource type
-                        if (fhirResourceNames.includes(baseType)) {
+                        if (ctx().resourceNames.includes(baseType)) {
                             resourceTypes.set(profileName, baseType);
                         }
                     }

package/out/src/generator/{classGenerator.js → emitters/class/classGenerator.js}

@@ -1,5 +1,5 @@
-import { FHIR_PRIMITIVE_TYPES, CORE_RESOURCE_BASES } from './fhirR4Rules.js';
-import { TS, } from './constants.js';
+import { ctx } from '../../fhir/versionContext.js';
+import { TS, } from '../../core/constants.js';
 import { primitivePlaceholder, generateCodeDefault, makeCodeableConcept, chooseChoiceVariant, applyRequiredFieldHeuristic, deriveIdentifierConfig, } from './classHeuristics.js';
 import { generateSliceElement, buildNestedRequirementsObject } from './sliceElementGenerator.js';
 /**
@@ -83,6 +83,7 @@ function generatePatternMetadata(fieldPatterns, forbiddenFields, valueSetBinding
 }
 export function generateClass(className, interfaceName, baseResource, requiredFields = [], profileUrl, fieldPatterns = [], forbiddenFields = [], valueSetBindings = {}, fieldOrder = []) {
     // Decide whether to emit resourceType. If baseResource points at a known resource or ends with 'Resource'.
+    const CORE_RESOURCE_BASES = ctx().coreResourceBases;
     const addResourceType = !!baseResource && CORE_RESOURCE_BASES.has(baseResource);
     const resourceTypeLine = addResourceType && baseResource && baseResource !== 'Resource' ? `resourceType: '${baseResource}',` : (addResourceType ? `resourceType: 'Resource',` : '');
     // Only true FHIR Resources (not datatypes like Identifier, Attachment, Extension) can carry meta.profile.
@@ -117,7 +118,7 @@ export function generateClass(className, interfaceName, baseResource, requiredFi
     };
     // Helper to check if a field's type (or baseType) matches a given type name
     // Handles profiled types like 'CodeableConcept-uv-ips' mapping back to 'CodeableConcept'
-    const isType = (rf, typeName) => rf.type === typeName || rf.baseType === typeName;
+    const _isType = (rf, typeName) => rf.type === typeName || rf.baseType === typeName;
     for (const rf0 of requiredFields) {
         if (rf0.name === 'id' || rf0.name === 'resourceType')
             continue;
@@ -367,10 +368,25 @@ export function generateClass(className, interfaceName, baseResource, requiredFi
             requiredInits.push(`${key(rf.name)}: ${initExpr}`);
             continue;
         }
-        if (['string', 'number', 'boolean', 'code'].includes(rf.type)) {
+        // Handle all FHIR primitive types: string-like (uri, url, canonical, etc.), number-like (decimal, integer, etc.)
+        if (['string', 'uri', 'url', 'canonical', 'oid', 'uuid', 'id', 'markdown', 'base64Binary', 'xhtml'].includes(rf.type)) {
+            const initExpr = buildValueExpression(rf, primitivePlaceholder('string'));
+            requiredInits.push(`${key(rf.name)}: ${initExpr}`);
+            continue;
+        }
+        if (['number', 'decimal', 'integer', 'positiveInt', 'unsignedInt'].includes(rf.type)) {
+            const initExpr = buildValueExpression(rf, primitivePlaceholder('number'));
+            requiredInits.push(`${key(rf.name)}: ${initExpr}`);
+            continue;
+        }
+        if (rf.type === 'boolean') {
+            const initExpr = buildValueExpression(rf, primitivePlaceholder('boolean'));
+            requiredInits.push(`${key(rf.name)}: ${initExpr}`);
+            continue;
+        }
+        if (rf.type === 'code') {
             // For 'code' type without binding, generate based on field name to pick a sensible default
-            const expr = rf.type === 'code' ? generateCodeDefault(rf.name) : primitivePlaceholder(rf.type);
-            const initExpr = buildValueExpression(rf, expr);
+            const initExpr = buildValueExpression(rf, generateCodeDefault(rf.name));
             requiredInits.push(`${key(rf.name)}: ${initExpr}`);
             continue;
         }
@@ -546,7 +562,7 @@ export function generateClass(className, interfaceName, baseResource, requiredFi
         // Skip FHIR primitive types - they cannot have nested properties (only _fieldName extensions)
         if (rf.nestedRequirements && rf.nestedRequirements.length > 0 &&
             rf.type !== 'Reference' && rf.type !== 'Extension' &&
-            !FHIR_PRIMITIVE_TYPES.has(rf.type)) {
+            !ctx().primitiveTypes.has(rf.type)) {
             const objectLiteral = buildNestedRequirementsObject(rf.nestedRequirements);
             if (objectLiteral) {
                 const initExpr = buildValueExpression(rf, objectLiteral, { isObjectLiteral: true });
@@ -562,8 +578,13 @@ export function generateClass(className, interfaceName, baseResource, requiredFi
             requiredInits.push(`${key(rf.name)}: ${initExpr}`);
             continue;
         }
-        // For other complex types not in skeleton map, don't initialize - let enrichment handle it
-        // This includes Extension, BackboneElement, and other complex types
+        // For other complex types not in skeleton map, generate a minimal empty object
+        // This handles logical model types (e.g., DocumentSection) and other custom complex types
+        if (rf.type !== 'Extension' && !ctx().primitiveTypes.has(rf.type)) {
+            const initExpr = buildValueExpression(rf, '{}', { isObjectLiteral: true });
+            requiredInits.push(`${key(rf.name)}: ${initExpr}`);
+            continue;
+        }
     }
     // Special constraint handling: Organization org-1 requires name OR identifier
     // If neither is already in requiredInits, add name as the simplest solution

package/out/src/generator/{classHeuristics.js → emitters/class/classHeuristics.js}

@@ -1,4 +1,4 @@
-import { TS, FALLBACK_CODES, CODE_FIELD_DEFAULTS, DEFAULT_CONTENT_TYPE, DEFAULT_BASE64, resolveValueSetDefault, pickPreferredCode, } from './constants.js';
+import { TS, FALLBACK_CODES, CODE_FIELD_DEFAULTS, DEFAULT_CONTENT_TYPE, DEFAULT_BASE64, resolveValueSetDefault, pickPreferredCode, } from '../../core/constants.js';
 /**
  * Generate a simple placeholder value expression for a primitive type.
  * We keep this VERY small to avoid pulling in heavy util logic.
@@ -40,7 +40,21 @@ export function chooseChoiceVariant(rf) {
                 // Extract the type from the slice name (e.g., "valueQuantity" -> "Quantity")
                 const typeSuffix = slice.name.slice(base.length);
                 if (typeSuffix) {
-                    return { propertyName: slice.name, chosenType: typeSuffix };
+                    // Normalize primitive type suffixes to lowercase to match typeOptions convention
+                    // (e.g., "Boolean" -> "boolean", "Integer" -> "integer", "DateTime" -> "dateTime")
+                    const normalizedType = typeSuffix === 'Boolean' ? 'boolean'
+                        : typeSuffix === 'Integer' ? 'integer'
+                            : typeSuffix === 'String' ? 'string'
+                                : typeSuffix === 'DateTime' ? 'dateTime'
+                                    : typeSuffix === 'Instant' ? 'instant'
+                                        : typeSuffix === 'Decimal' ? 'decimal'
+                                            : typeSuffix === 'Date' ? 'date'
+                                                : typeSuffix === 'Time' ? 'time'
+                                                    : typeSuffix === 'Code' ? 'code'
+                                                        : typeSuffix === 'PositiveInt' ? 'positiveInt'
+                                                            : typeSuffix === 'UnsignedInt' ? 'unsignedInt'
+                                                                : typeSuffix;
+                    return { propertyName: slice.name, chosenType: normalizedType };
                 }
             }
         }

package/out/src/generator/{enrichResourceHandlers.js → emitters/class/enrichResourceHandlers.js}

@@ -1,4 +1,5 @@
-import { DEFAULT_COUNTRY, TS } from './constants.js';
+import { DEFAULT_COUNTRY, TS } from '../../core/constants.js';
+import { versionString } from '../../fhir/versionContext.js';
 export function generateEnrichResourceEnd() {
     return `    // Device (exact match — not DeviceRequest)
     if (/^Device$/i.test(baseResource)) {
@@ -29,7 +30,9 @@ export function generateEnrichResourceEnd() {
     // ValueSet - url must be a valid absolute URI (HTTP URL or proper URN)
     if (/ValueSet/i.test(baseResource)) {
       if (!('status' in base)) base.status = 'active';
-      if (!('url' in base)) base.url = 'https://acme.org/fhir/ValueSet/' + randomId();
+      if (!('url' in base) || (typeof base.url === 'string' && !base.url.startsWith('http') && !base.url.startsWith('urn:'))) {
+        base.url = 'https://acme.org/fhir/ValueSet/' + randomId();
+      }
       // name must be machine-readable identifier (no spaces, starts with letter)
       if (!('name' in base)) base.name = 'ExampleValueSet' + randomId().replace(/-/g, '');
       else if (typeof base.name === 'string' && /^[0-9a-f-]+$/i.test(base.name)) {
@@ -40,9 +43,9 @@ export function generateEnrichResourceEnd() {
       if (!('compose' in base)) base.compose = { include: [{ system: '${TS.LOINC}', concept: [{ code: '4548-4', display: 'Hemoglobin A1c/Hemoglobin.total in Blood' }] }] };
       // Handle useContext when pattern for 'code' is present (ISiK ValueSet)
       // The pattern key 'code' refers to useContext.code
-      if (fieldPatterns && 'code' in fieldPatterns && !('useContext' in base)) {
+      if (fieldPatterns && 'code' in fieldPatterns) {
         const codePattern = fieldPatterns['code'] as Record<string, unknown>;
-        base.useContext = [{
+        const validUseContext = {
           code: {
             system: codePattern.system || '${TS.USAGE_CONTEXT_TYPE}',
             code: codePattern.code || 'focus'
@@ -50,7 +53,18 @@ export function generateEnrichResourceEnd() {
           valueCodeableConcept: {
             coding: [{ system: 'http://hl7.org/fhir/resource-types', code: 'ValueSet' }]
           }
-        }];
+        };
+        if (!('useContext' in base)) {
+          base.useContext = [validUseContext];
+        } else if (Array.isArray(base.useContext)) {
+          // Repair empty useContext entries generated by skeleton fallback
+          for (let i = 0; i < (base.useContext as Array<Record<string, unknown>>).length; i++) {
+            const entry = (base.useContext as Array<Record<string, unknown>>)[i];
+            if (!entry || Object.keys(entry).length === 0) {
+              (base.useContext as Array<Record<string, unknown>>)[i] = validUseContext;
+            }
+          }
+        }
       }
     }
 
@@ -58,7 +72,9 @@ export function generateEnrichResourceEnd() {
     if (/CodeSystem/i.test(baseResource)) {
       if (!('status' in base)) base.status = 'active';
       if (!('content' in base)) base.content = 'complete';
-      if (!('url' in base)) base.url = 'https://acme.org/fhir/CodeSystem/' + randomId();
+      if (!('url' in base) || (typeof base.url === 'string' && !base.url.startsWith('http') && !base.url.startsWith('urn:'))) {
+        base.url = 'https://acme.org/fhir/CodeSystem/' + randomId();
+      }
       if (!('name' in base)) base.name = 'ExampleCodeSystem';
       if (!('version' in base)) base.version = '1.0.0';
       if (!('concept' in base)) base.concept = [{ code: 'example', display: 'Example Code' }];
@@ -121,9 +137,14 @@ export function generateEnrichResourceEnd() {
     }
 
     // Binary
-    if (/Binary/i.test(baseResource)) {
+    if (/^Binary$/i.test(baseResource)) {
       if (!('contentType' in base)) base.contentType = 'application/pdf';
-      if (!('data' in base)) base.data = 'SGVsbG8gV29ybGQ=';
+      if (!('data' in base)) {
+        base.data = 'SGVsbG8gV29ybGQ=';
+      } else if (typeof base.data === 'string' && !/^[A-Za-z0-9+/=\\s]+$/.test(base.data)) {
+        // data must be valid base64 — replace if skeleton generated a non-base64 value
+        base.data = 'SGVsbG8gV29ybGQ=';
+      }
     }
 
     // Coverage
@@ -202,7 +223,7 @@ export function generateEnrichResourceEnd() {
           .filter(ext => ext && typeof ext === 'object' && 'url' in ext && typeof ext.url === 'string');
         // If no valid extensions remain, add a placeholder FHIR version extension
         if (validExtensions.length === 0) {
-          validExtensions.push({ url: 'http://hl7.org/fhir/StructureDefinition/endpoint-fhir-version', valueCode: '4.0.1' });
+          validExtensions.push({ url: 'http://hl7.org/fhir/StructureDefinition/endpoint-fhir-version', valueCode: '${versionString()}' });
         }
         base.extension = validExtensions;
       }
@@ -393,17 +414,27 @@ export function generateEnrichResourceEnd() {
 
     // Generic narrative for DomainResource derivatives
     // Bundle, Binary, and Parameters are pure Resource (not DomainResource) and do NOT support text/narrative
-    if (!/^(Bundle|Binary|Parameters)$/.test(baseResource)) {
+    // Data types (CodeableConcept, Identifier, etc.) do NOT have resourceType and must be excluded
+    if ('resourceType' in base && !/^(Bundle|Binary|Parameters)$/.test(baseResource)) {
       if (!('text' in base)) {
         // Check if there's a pattern constraint for text.status
         const textStatusPattern = getPrimitivePattern('text.status');
         const status = textStatusPattern !== undefined ? textStatusPattern : 'generated';
         base.text = { status: status, div: '<div xmlns="http://www.w3.org/1999/xhtml">Generated</div>' };
       } else if (typeof base.text === 'object' && base.text !== null) {
+        const textObj = base.text as Record<string, unknown>;
         // Apply text.status pattern to existing text object
         const textStatusPattern = getPrimitivePattern('text.status');
         if (textStatusPattern !== undefined) {
-          (base.text as Record<string, unknown>).status = textStatusPattern;
+          textObj.status = textStatusPattern;
+        }
+        // Backfill div if missing — Narrative.div is required (1..1)
+        if (!('div' in textObj)) {
+          textObj.div = '<div xmlns="http://www.w3.org/1999/xhtml">Generated</div>';
+        }
+        // Backfill status if missing — Narrative.status is required (1..1)
+        if (!('status' in textObj)) {
+          textObj.status = 'generated';
         }
       }
     }

package/out/src/generator/{enrichResourceTemplate.js → emitters/class/enrichResourceTemplate.js}

@@ -1,4 +1,4 @@
-import { DEFAULT_COUNTRY, TS } from './constants.js';
+import { DEFAULT_COUNTRY, TS } from '../../core/constants.js';
 export function generateEnrichResourceStart() {
     return `
 /** Resolved code from a ValueSet binding */
@@ -500,7 +500,9 @@ export function enrichResource(
       // Force correct status - 'active' is NOT valid for QuestionnaireResponse.status
       base.status = 'completed';
       // questionnaire must be an absolute canonical URL, not a relative reference
-      if (!('questionnaire' in base)) base.questionnaire = 'urn:uuid:' + randomUUID();
+      if (!('questionnaire' in base) || (typeof base.questionnaire === 'string' && !base.questionnaire.startsWith('http') && !base.questionnaire.startsWith('urn:'))) {
+        base.questionnaire = 'urn:uuid:' + randomUUID();
+      }
       if (!('subject' in base)) base.subject = { reference: 'Patient/' + randomId() };
       if (!('authored' in base)) base.authored = new Date().toISOString();
       if (!('author' in base)) base.author = { reference: 'Practitioner/' + randomId() };

package/out/src/generator/{fieldPatternExtractor.js → emitters/class/fieldPatternExtractor.js}

@@ -1,4 +1,4 @@
-import { fetchStructureDefinition } from './sdParser.js';
+import { fetchStructureDefinition } from '../../parser/sdParser.js';
 export async function extractFieldPatternsAndMetadata(patternSources, baseResource, sd, requiredFields, candidateRequiredFields, nestedRequirementsMap, resolvedProfilePatterns) {
     const patternMap = new Map();
     for (const src of patternSources) {

package/out/src/generator/{randomUtilitiesTemplate.js → emitters/class/randomUtilitiesTemplate.js}

@@ -1,8 +1,10 @@
-import { DEFAULT_COUNTRY, TS } from './constants.js';
+import { DEFAULT_COUNTRY, TS } from '../../core/constants.js';
+import { fhirModuleSpecifier } from '../../fhir/versionContext.js';
 export function generateRandomUtilities() {
+    const fhirModule = fhirModuleSpecifier();
     return `// Auto-generated helper for random resource generation with optional deterministic seeding
-// Uses official FHIR R4 TypeScript definitions
-import type { HumanName, Address, Coding, CodeableConcept, Identifier, Reference, Period, ContactPoint, Quantity } from 'fhir/r4';
+// Uses official FHIR TypeScript definitions
+import type { HumanName, Address, Coding, CodeableConcept, Identifier, Reference, Period, ContactPoint, Quantity } from '${fhirModule}';
 let __seed = Date.now() & 0xffffffff;
 export function setRandomSeed(seed: number) { __seed = seed >>> 0; }
 function rng(): number { // simple LCG (Numerical Recipes variant)

package/out/src/generator/{sliceElementGenerator.js → emitters/class/sliceElementGenerator.js}

@@ -1,7 +1,20 @@
-import { logger } from '../logger.js';
+import { logger } from '../../../logger.js';
 import { capitalise, deriveIdentifierConfig } from './classHeuristics.js';
-import { TS, DEFAULT_BASE64, DEFAULT_BASE64_HELLO, DEFAULT_CONTENT_TYPE, EXAMPLE_ID_SYSTEM, DEFAULT_COUNTRY, RESOURCE_SKELETONS, compositionSkeleton, bundleEntry, matchSkeletonBySliceName, } from './constants.js';
+import { TS, DEFAULT_BASE64, DEFAULT_BASE64_HELLO, DEFAULT_CONTENT_TYPE, EXAMPLE_ID_SYSTEM, DEFAULT_COUNTRY, RESOURCE_SKELETONS, compositionSkeleton, bundleEntry, matchSkeletonBySliceName, } from '../../core/constants.js';
 const log = logger.withTag('classGenerator');
+/**
+ * Fields that are arrays in FHIR base complex types (0..*) and must always
+ * be serialized as JSON arrays, even when a profile constrains max to 1.
+ * FHIR JSON encoding is governed by the base StructureDefinition cardinality.
+ */
+const FHIR_BASE_ARRAY_FIELDS = new Set([
+    'coding', // CodeableConcept.coding is 0..*
+    'extension', // Element.extension is 0..*
+    'line', // Address.line is 0..*
+    'given', // HumanName.given is 0..*
+    'prefix', // HumanName.prefix is 0..*
+    'suffix', // HumanName.suffix is 0..*
+]);
 /**
  * Build an object literal expression from nested requirements.
  * This handles BackboneElement and other complex types with deeply nested required fields.
@@ -116,8 +129,12 @@ export function buildNestedRequirementsObject(nestedRequirements) {
             // Type-based defaults
             value = getDefaultValueForType(req.type, lastPart);
         }
-        // If the final segment is an array segment, wrap the value in an array
-        if (allArraySegments.has(lastPart) && !Array.isArray(value)) {
+        // If the final segment is an array segment, wrap the value in an array.
+        // Also wrap if the field is inherently an array in FHIR base types
+        // (profiles may constrain max=1 but JSON encoding stays as array).
+        const shouldWrap = (allArraySegments.has(lastPart) || FHIR_BASE_ARRAY_FIELDS.has(lastPart))
+            && !Array.isArray(value);
+        if (shouldWrap) {
             current[lastPart] = [value];
         }
         else {

package/out/src/generator/{clientGenerator.js → emitters/client/clientGenerator.js}

@@ -1,9 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
-import { getResourceTypes, getBaseResourceType } from "./utils.js";
-import { logger } from "../logger.js";
+import { getResourceTypes, getBaseResourceType } from "../../core/utils.js";
+import { logger } from "../../../logger.js";
 import { generateSmartAuth, generateSmartClient } from './smartAuthGenerator.js';
 import { generateReadme, installBaseClientTypes } from './clientReadmeGenerator.js';
+import { versionSlug } from '../../fhir/versionContext.js';
 const log = logger.withTag('client');
 /**
  * Generate FHIR client code for all resource types
@@ -34,7 +35,7 @@ export function generateClient(options) {
     generateSmartClient(clientDir, resourceTypes);
     generateIndex(clientDir, resourceTypes);
     generateReadme(clientDir);
-    // Install base client type declarations so tsc can resolve @babelfhir-ts/client-r4
+    // Install base client type declarations so tsc can resolve @babelfhir-ts/client-<version>
     installBaseClientTypes(options.outputDir);
     log.success(`Generated FHIR client with ${resourceTypes.length} resource types + SMART auth`);
 }
@@ -545,17 +546,19 @@ function generateFhirClient(clientDir, resourceTypes) {
   }`;
     })
         .join("\n\n");
+    const slug = versionSlug();
+    const clientPkg = `@babelfhir-ts/client-${slug}`;
     const content = `import {
   FhirReadClient as BaseFhirReadClient,
   FhirWriteClient as BaseFhirWriteClient,
   type FetchFn,
-} from "@babelfhir-ts/client-r4";
+} from "${clientPkg}";
 import type * as GeneratedTypes from "../index.js";
 
 /**
  * Profile-specific FHIR Read Client.
- * Extends the base R4 read client with typed profile accessors.
- * Inherits all base R4 resource methods from @babelfhir-ts/client-r4.
+ * Extends the base ${slug.toUpperCase()} read client with typed profile accessors.
+ * Inherits all base ${slug.toUpperCase()} resource methods from ${clientPkg}.
  */
 export class FhirReadClient extends BaseFhirReadClient {
 ${readerMethods}
@@ -563,8 +566,8 @@ ${readerMethods}
 
 /**
  * Profile-specific FHIR Write Client.
- * Extends the base R4 write client with typed profile accessors.
- * Inherits all base R4 resource methods from @babelfhir-ts/client-r4.
+ * Extends the base ${slug.toUpperCase()} write client with typed profile accessors.
+ * Inherits all base ${slug.toUpperCase()} resource methods from ${clientPkg}.
  */
 export class FhirWriteClient extends BaseFhirWriteClient {
 ${writerMethods}
@@ -572,7 +575,7 @@ ${writerMethods}
 
 /**
  * Main FHIR Client — works with plain fetch or an authenticated fetch wrapper.
- * Provides both base R4 accessors (inherited) and profile-specific accessors.
+ * Provides both base ${slug.toUpperCase()} accessors (inherited) and profile-specific accessors.
  *
  * @example
  * // Unauthenticated
@@ -581,7 +584,7 @@ ${writerMethods}
  * // With custom fetch (e.g. from SmartFhirClient)
  * const client = new FhirClient("https://fhir.example.com", authenticatedFetch);
  *
- * // Base R4 methods (inherited from @babelfhir-ts/client-r4)
+ * // Base ${slug.toUpperCase()} methods (inherited from ${clientPkg})
  * const pt = await client.read().patient().read("123");
  *
  * // Profile-specific methods (generated)

package/out/src/generator/{clientReadmeGenerator.js → emitters/client/clientReadmeGenerator.js}

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
+import { versionSlug } from '../../fhir/versionContext.js';
 /**
  * Generate README.md
  */
@@ -189,16 +190,18 @@ const client = new FhirClient('https://fhir.example.com/fhir', loggingFetch);
     fs.writeFileSync(path.join(clientDir, "README.md"), content);
 }
 /**
- * Install @babelfhir-ts/client-r4 type declarations into the generated output's
+ * Install @babelfhir-ts/client-<version> type declarations into the generated output's
  * node_modules so tsc can resolve the import during compilation.
  * At runtime, the consumer installs the actual package via npm.
  */
 export function installBaseClientTypes(outputDir) {
-    const pkgDir = path.join(outputDir, "node_modules", "@babelfhir-ts", "client-r4");
+    const slug = versionSlug();
+    const clientPkg = `client-${slug}`;
+    const pkgDir = path.join(outputDir, "node_modules", "@babelfhir-ts", clientPkg);
     fs.mkdirSync(pkgDir, { recursive: true });
     // Minimal package.json
     fs.writeFileSync(path.join(pkgDir, "package.json"), JSON.stringify({
-        name: "@babelfhir-ts/client-r4",
+        name: `@babelfhir-ts/${clientPkg}`,
         version: "0.0.0-types",
         types: "index.d.ts"
     }, null, 2));

package/out/src/generator/{smartAuthGenerator.js → emitters/client/smartAuthGenerator.js}

@@ -504,7 +504,7 @@ export class SmartAuth {
 /**
  * Generate smart-client.ts — SmartFhirClient that wraps FhirClient with SMART auth
  */
-export function generateSmartClient(clientDir, resourceTypes) {
+export function generateSmartClient(clientDir, _resourceTypes) {
     const content = `import { FhirClient, FhirReadClient, FhirWriteClient } from "./fhir-client.js";
 import { SmartAuth } from "./smart-auth.js";
 import type { SmartConfig, SmartToken, LaunchMode } from "./smart-auth.js";

package/out/src/generator/{importManager.js → emitters/interface/importManager.js}

@@ -1,10 +1,10 @@
-import fhirInterfaceNames from "./fhirInterfaces.json" with { type: 'json' };
-import { sanitizeIdentifier, toPascalCase, stripVersionFromCanonicalUrl } from './utils.js';
-import { logger } from "../logger.js";
+import { ctx, fhirModuleSpecifier } from '../../fhir/versionContext.js';
+import { sanitizeIdentifier, toPascalCase, stripVersionFromCanonicalUrl } from '../../core/utils.js';
+import { logger } from "../../../logger.js";
 /**
  * Manages TypeScript import statements for generated FHIR interfaces.
  * Handles three types of imports:
- * 1. FHIR base types from '@types/fhir' (via 'fhir/r4')
+ * 1. FHIR base types from '@types/fhir' (via 'fhir/<version>')
  * 2. Custom local types (other generated profiles in the same package)
  * 3. External profiled types (to be fetched/generated separately)
  * 4. Path-based imports (custom relative paths, e.g., ValueSets in subdirectories)
@@ -162,10 +162,10 @@ export class ImportManager {
      */
     generateImportStatements() {
         const statements = [];
-        // FHIR imports from 'fhir/r4'
+        // FHIR imports from version-specific module
         if (this.fhirImports.size > 0) {
             const sortedFhirImports = Array.from(this.fhirImports).sort();
-            statements.push(`import { ${sortedFhirImports.join(', ')} } from "fhir/r4";`);
+            statements.push(`import { ${sortedFhirImports.join(', ')} } from "${fhirModuleSpecifier()}";`);
         }
         // Path-based imports (e.g., ValueSets from subdirectories)
         const sortedPathBasedImports = Array.from(this.pathBasedImports.entries()).sort((a, b) => a[0].localeCompare(b[0]));
@@ -196,8 +196,8 @@ export class ImportManager {
      * Removes import statements for types that aren't actually used.
      */
     pruneUnusedImports(output) {
-        // Prune unused FHIR imports
-        output = output.replace(/import \{([^}]+)\} from "fhir\/r4";?/g, (full, inside) => {
+        // Prune unused FHIR imports (match any fhir/<version> module specifier)
+        output = output.replace(/import \{([^}]+)\} from "fhir\/[^"]+";?/g, (full, inside) => {
             const used = [];
             const specifiers = inside.split(',').map((s) => s.trim()).filter(Boolean);
             for (const name of specifiers) {
@@ -206,7 +206,7 @@ export class ImportManager {
                     used.push(name);
                 }
             }
-            return used.length ? `import { ${used.join(', ')} } from "fhir/r4";` : '';
+            return used.length ? `import { ${used.join(', ')} } from "${fhirModuleSpecifier()}";` : '';
         });
         // Prune unused custom imports (both path-based and standard custom imports)
         output = output.replace(/import \{([^}]+)\} from "\.\/(.+?)";?/g, (full, inside, path) => {
@@ -226,14 +226,14 @@ export class ImportManager {
     }
     /**
      * Reorganizes imports to prefer local types over FHIR types where appropriate.
-     * Moves locally-generated types from fhir/r4 imports to local imports.
+     * Moves locally-generated types from fhir/<version> imports to local imports.
      */
     reorganizeImports(output) {
         if (!this.existingProfiles || this.existingProfiles.size === 0) {
             return output;
         }
-        // Extract ALL types from fhir/r4 imports (there may be multiple import lines)
-        const fhirImportRegex = /import \{([^}]+)\} from "fhir\/r4";/g;
+        // Extract ALL types from fhir/<version> imports (there may be multiple import lines)
+        const fhirImportRegex = /import \{([^}]+)\} from "fhir\/[^"]+";/g;
         const allFhirTypes = [];
         let match;
         while ((match = fhirImportRegex.exec(output)) !== null) {
@@ -247,7 +247,7 @@ export class ImportManager {
         const remainingFhirTypes = [];
         for (const typeName of allFhirTypes) {
             if (this.existingProfiles.has(typeName)) {
-                // Never move FhirResource to local imports; it must stay from fhir/r4
+                // Never move FhirResource to local imports; it must stay from fhir/<version>
                 if (typeName !== 'FhirResource') {
                     localTypes.push(typeName);
                 }
@@ -259,12 +259,12 @@ export class ImportManager {
                 remainingFhirTypes.push(typeName);
             }
         }
-        // Remove ALL old fhir/r4 import lines
-        output = output.replace(/import \{[^}]+\} from "fhir\/r4";\n?/g, '');
+        // Remove ALL old fhir/<version> import lines
+        output = output.replace(/import \{[^}]+\} from "fhir\/[^"]+";\n?/g, '');
         // Add back the imports at the top
         let newImports = '';
         if (remainingFhirTypes.length > 0) {
-            newImports += `import { ${remainingFhirTypes.join(', ')} } from "fhir/r4";\n`;
+            newImports += `import { ${remainingFhirTypes.join(', ')} } from "${fhirModuleSpecifier()}";\n`;
         }
         for (const localType of localTypes) {
             newImports += `import { ${localType} } from "./${localType}";\n`;
@@ -287,7 +287,7 @@ export class ImportManager {
      * Checks if a type is a known FHIR type from @types/fhir.
      */
     isFhirType(type) {
-        return type === 'FhirResource' || fhirInterfaceNames.includes(type);
+        return type === 'FhirResource' || ctx().interfaceNames.includes(type);
     }
     /**
      * Checks if a type name looks like a primitive that shouldn't be imported.