babelfhir-ts 1.0.43 → 1.1.3

package/README.md

@@ -21,7 +21,7 @@
 - **Random data builders** for testing and development (when class generation is enabled)
 - **Zero manual mapping**—consume any FHIR package or Implementation Guide directly from registries
 - **Fast and lightweight**—minimal runtime deps; only `fhirpath` is required for validators
-- **Type-safe FHIR client** — generated client extends [`@babelfhir-ts/client-r4`](https://www.npmjs.com/package/@babelfhir-ts/client-r4) with profile-specific methods (e.g., `.usCorePatient()`, `.pASClaim()`) on top of 145 base R4 resource accessors
+- **Type-safe FHIR client** — generated client extends [`@babelfhir-ts/client-r4`](https://www.npmjs.com/package/@babelfhir-ts/client-r4) with profile-specific methods (e.g., `.usCorePatient()`, `.pASClaim()`) on top of base R4 resource accessors
 - **Install any FHIR profile as a node module**—use `babelfhir-ts install` to add Implementation Guides directly to your project
 
 <!-- PARITY-BADGES:START - Do not remove or modify this section -->
@@ -57,8 +57,6 @@ The first pipeline validates generated resources using the [Firely .NET SDK vali
 ![CH Core 5.0.0](https://img.shields.io/endpoint?url=https://max-health-inc.github.io/BabelFHIR-TS/badges/badge-ch-core.json)
 ![DaVinci PAS 2.0.1](https://img.shields.io/endpoint?url=https://max-health-inc.github.io/BabelFHIR-TS/badges/badge-davinci-pas.json)
 
-> 11 profiles are excluded from this pipeline due to schema loading issues in the Firely SDK. These profiles validate successfully with the HL7 Java Validator below. Details in [docs/FIRELY-VALIDATOR-BUGS.md](./docs/FIRELY-VALIDATOR-BUGS.md).
-
 ### Validation with HL7 Java Validator
 
 The second pipeline validates using the [official HL7 FHIR Validator](https://confluence.hl7.org/display/FHIR/Using+the+FHIR+Validator) (v6.9.1), the reference implementation for FHIR conformance checking:
@@ -137,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';
@@ -254,15 +255,13 @@ const procedure = (mp) => `{ resourceType: 'Procedure', id: randomId()${mp}, sta
 const device = (mp) => `{ resourceType: 'Device', id: randomId()${mp}, type: { coding: [{ system: '${TS.SNOMED}', code: '49062001', display: 'Device' }] } }`;
 const claimResponse = (mp) => `{ resourceType: 'ClaimResponse', id: randomId()${mp}, status: 'active', type: { coding: [{ system: '${TS.CLAIM_TYPE}', code: 'professional' }] }, use: 'preauthorization', patient: { reference: 'Patient/' + randomId() }, created: new Date().toISOString().split('T')[0], insurer: { reference: 'Organization/' + randomId() }, outcome: 'complete' }`;
 const claim = (mp) => `{ resourceType: 'Claim', id: randomId()${mp}, status: 'active', type: { coding: [{ system: '${TS.CLAIM_TYPE}', code: 'professional' }] }, use: 'preauthorization', patient: { reference: 'Patient/' + randomId() }, created: new Date().toISOString().split('T')[0], provider: { reference: 'Practitioner/' + randomId() }, priority: { coding: [{ system: '${TS.PROCESS_PRIORITY}', code: 'normal' }] }, insurance: [{ sequence: 1, focal: true, coverage: { reference: 'Coverage/' + randomId() } }] }`;
-/**
- * Build a Composition skeleton.  The factory accepts an optional LOINC code
- * and textStatus override for profile-specific requirements
- * (e.g. ISiKBerichtSubSysteme needs text.status='extensions' and code '55112-7').
- */
 export function compositionSkeleton(metaProfile, opts = {}) {
     const loincCode = opts.loincCode ?? '60591-5';
     const textStatus = opts.textStatus ?? 'generated';
-    return `{ resourceType: 'Composition', id: 'comp-' + randomId()${metaProfile}, text: { status: '${textStatus}', div: '<div xmlns="http://www.w3.org/1999/xhtml">Composition Narrative</div>' }, status: 'final', type: { coding: [{ system: '${TS.LOINC}', code: '${loincCode}' }], text: '${loincCode}' }, subject: { reference: 'Patient/' + randomId(), display: 'Example Patient' }, date: new Date().toISOString(), author: [{ reference: 'Practitioner/' + randomId(), display: 'Example Practitioner' }], title: 'Document Title', section: [{ title: 'Section', text: { status: 'generated', div: '<div xmlns="http://www.w3.org/1999/xhtml">Content</div>' } }] }`;
+    const sectionExpr = opts.sections && opts.sections.length > 0
+        ? opts.sections.map(s => `{ title: '${s.title}', code: { coding: [{ system: '${TS.LOINC}', code: '${s.loincCode}' }] }, text: { status: 'generated', div: '<div xmlns="http://www.w3.org/1999/xhtml">${s.title}</div>' }, emptyReason: { coding: [{ system: 'http://terminology.hl7.org/CodeSystem/list-empty-reason', code: 'unavailable', display: 'Unavailable' }] } }`).join(', ')
+        : `{ title: 'Section', text: { status: 'generated', div: '<div xmlns="http://www.w3.org/1999/xhtml">Content</div>' } }`;
+    return `{ resourceType: 'Composition', id: 'comp-' + randomId()${metaProfile}, text: { status: '${textStatus}', div: '<div xmlns="http://www.w3.org/1999/xhtml">Composition Narrative</div>' }, status: 'final', type: { coding: [{ system: '${TS.LOINC}', code: '${loincCode}' }], text: '${loincCode}' }, subject: { reference: 'Patient/' + randomId(), display: 'Example Patient' }, date: new Date().toISOString(), author: [{ reference: 'Practitioner/' + randomId(), display: 'Example Practitioner' }], title: 'Document Title', section: [${sectionExpr}] }`;
 }
 /**
  * Registry of resource skeletons indexed by resource type.

package/out/src/generator/core/sdTypes.js

@@ -0,0 +1,5 @@
+/**
+ * Core data types shared across the generator pipeline.
+ * Extracted from sdParser.ts for maintainability (issue #37).
+ */
+export {};

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);
                         }
                     }