babelfhir-ts 1.5.21 → 1.6.0

package/out/src/generator/sdProcessor.js

@@ -10,7 +10,7 @@ import path from 'path';
 import { generateClass } from './emitters/class/classGenerator.js';
 import { generateInterfaces } from './emitters/interface/interfaceGenerator.js';
 import { fetchStructureDefinition, parseStructureDefinition } from './parser/sdParser.js';
-import { writeInterfaceAndValidatorToFile, mergeFields, alignFields, writeToFile, getBaseResource, sanitizeIdentifier, toPascalCase, stripVersionFromCanonicalUrl } from './core/utils.js';
+import { writeInterfaceAndValidatorToFile, mergeFields, alignFields, writeToFile, getBaseResource, sanitizeIdentifier, toPascalCase, stripVersionFromCanonicalUrl, stripSliceSuffix } from './core/utils.js';
 import { extensionElements, collectSubExtensionSlices, readSubExtensionMin, readBinding } from './core/extensionSdReader.js';
 import { generateValidateProfileFunction } from './emitters/validator/validatorGenerator.js';
 import { generateZodSchema } from './emitters/zod/zodSchemaGenerator.js';
@@ -113,7 +113,10 @@ async function fillUnstatedFromBaseResource(fields, resourceType) {
         if (!current)
             continue;
         for (let i = next; i < segments.length && current; i++) {
-            current = resolveComplexTypeChildType(current, segments[i]);
+            const segment = segments[i];
+            if (segment === undefined)
+                break;
+            current = resolveComplexTypeChildType(current, segment);
         }
         if (current) {
             field.type = current;
@@ -193,11 +196,12 @@ async function fillSliceProfileUrlsFromBaseProfiles(fields, baseDefinition) {
 async function resolveExtensionMetadata(fields) {
     const extUrls = new Set();
     for (const f of fields) {
-        if (!f.sliceName || !f.profileUrls?.length)
+        const firstProfile = f.sliceName ? f.profileUrls?.[0] : undefined;
+        if (!firstProfile)
             continue;
-        const basePath = (f.name || '').replace(/^[^.]+\./, '').split(':')[0];
+        const basePath = stripSliceSuffix((f.name || '').replace(/^[^.]+\./, ''));
         if (basePath.endsWith('extension') || basePath.endsWith('modifierExtension')) {
-            extUrls.add(f.profileUrls[0]);
+            extUrls.add(firstProfile);
         }
     }
     if (extUrls.size === 0)
@@ -242,8 +246,9 @@ async function resolveExtensionMetadata(fields) {
             // Check binding on value[x] first, then fall back to typed slices
             // (e.g., Extension.valueCode may carry the binding instead of Extension.value[x])
             let binding = readBinding(valueEl);
-            if (!binding && types.length === 1) {
-                const suffix = types[0].charAt(0).toUpperCase() + types[0].slice(1);
+            const onlyType = types.length === 1 ? types[0] : undefined;
+            if (!binding && onlyType) {
+                const suffix = onlyType.charAt(0).toUpperCase() + onlyType.slice(1);
                 const sliceEl = els.find(el => el.id === `Extension.value[x]:value${suffix}` ||
                     el.path === `Extension.value${suffix}` ||
                     el.id === `Extension.value${suffix}`);
@@ -274,12 +279,13 @@ async function resolveExtensionMetadata(fields) {
 async function resolveDatatypeProfilePins(fields) {
     const urls = new Set();
     for (const f of fields) {
-        if (!f.sliceName || !f.profileUrls?.length)
+        const firstProfile = f.sliceName ? f.profileUrls?.[0] : undefined;
+        if (!firstProfile)
             continue;
-        const basePath = (f.name || '').replace(/^[^.]+\./, '').split(':')[0];
+        const basePath = stripSliceSuffix((f.name || '').replace(/^[^.]+\./, ''));
         if (basePath.endsWith('extension') || basePath.endsWith('modifierExtension'))
             continue;
-        urls.add(f.profileUrls[0]);
+        urls.add(firstProfile);
     }
     if (urls.size === 0)
         return undefined;
@@ -514,8 +520,11 @@ export async function processStructureDefinition(sd, ctx) {
             continue;
         if (f.isOptional || f.isForbidden)
             continue;
-        const parentFieldName = parts[1].split(':')[0];
-        let relativePath = parts.slice(2).map((p) => p.split(':')[0]).join('.');
+        const parentSegment = parts[1];
+        if (!parentSegment)
+            continue;
+        const parentFieldName = stripSliceSuffix(parentSegment);
+        let relativePath = parts.slice(2).map((p) => stripSliceSuffix(p)).join('.');
         if (relativePath.includes('[x]')) {
             const resolvedPath = resolveChoiceSegments(f, parts, candidateRequiredFields);
             // An intermediate choice we cannot narrow to one type has no property name.
@@ -566,9 +575,9 @@ export async function processStructureDefinition(sd, ctx) {
                 const parentPath = parts.slice(0, -1).join('.');
                 const parentField = candidateRequiredFields.find(pf => pf?.name === parentPath && pf.type && pf.type !== 'any' && pf.type !== 'unknown')
                     || parsed.oldFields.find(pf => pf?.name === parentPath && pf.type && pf.type !== 'any' && pf.type !== 'unknown');
-                if (parentField?.type) {
-                    const childName = parts[parts.length - 1].split(':')[0];
-                    fieldType = resolveComplexTypeChildType(parentField.type, childName);
+                const leafSegment = parts.at(-1);
+                if (parentField?.type && leafSegment) {
+                    fieldType = resolveComplexTypeChildType(parentField.type, stripSliceSuffix(leafSegment));
                 }
             }
         }
@@ -640,8 +649,8 @@ export async function processStructureDefinition(sd, ctx) {
             if (originalField?.typeOptions?.[0]?.targetProfileUrls?.[0]) {
                 const targetUrl = stripVersionFromCanonicalUrl(originalField.typeOptions[0].targetProfileUrls[0]);
                 const match = targetUrl.match(/\/([^/]+)$/);
-                if (match) {
-                    const candidate = match[1];
+                const candidate = match?.[1];
+                if (candidate) {
                     const knownResourceNames = versionCtx().resourceNames;
                     if (knownResourceNames.includes(candidate)) {
                         rf.targetResourceType = candidate;
@@ -651,9 +660,9 @@ export async function processStructureDefinition(sd, ctx) {
                         let resolved = false;
                         for (const bf of baseFields) {
                             for (const tp of bf.typeOptions?.[0]?.targetProfileUrls ?? []) {
-                                const bm = tp.match(/\/([^/]+)$/);
-                                if (bm && knownResourceNames.includes(bm[1])) {
-                                    rf.targetResourceType = bm[1];
+                                const bmCandidate = tp.match(/\/([^/]+)$/)?.[1];
+                                if (bmCandidate && knownResourceNames.includes(bmCandidate)) {
+                                    rf.targetResourceType = bmCandidate;
                                     resolved = true;
                                     break;
                                 }
@@ -732,7 +741,7 @@ export async function processStructureDefinition(sd, ctx) {
         writeToFile(path.join(outputDir, `${interfaceName}Class.ts`), classContent);
     }
     if (flags?.schema === 'zod') {
-        const zodResult = generateZodSchema(interfaceName, aligned.alignedNewFields, baseResource, parsed.oldFields, valueSets);
+        const zodResult = generateZodSchema(interfaceName, aligned.alignedNewFields, baseResource, parsed.oldFields, valueSets, !!flags?.zodInvariants);
         writeToFile(path.join(outputDir, `${interfaceName}.zod.ts`), zodResult.code);
     }
     if (flags?.prefab) {

package/out/src/main.js

@@ -57,6 +57,7 @@ function printUsage() {
     console.log("  --no-classes             Only generate interfaces and types (skip class generation)");
     console.log("  --no-client              Skip FHIR client generation (client generated by default)");
     console.log("  --schema <format>        Generate schema files alongside outputs (supported: zod)");
+    console.log("  --zod-invariants         Emit FHIRPath invariants into Zod schemas (fuller checking, slower parse)");
     console.log("  --dicomweb               Generate DICOMweb helpers typed to ImagingStudy profiles in the IG");
     console.log("  --prefab                 Generate Prefab UI render functions per profile (@maxhealth.tech/prefab)");
     console.log("  --prefab-styles <path>   Path to styles module (.ts/.js) copied into the generated prefab/ folder");
@@ -366,6 +367,10 @@ export function parseCliArgs(argv) {
             i++;
             continue;
         }
+        if (arg === '--zod-invariants') {
+            out.flags.zodInvariants = true;
+            continue;
+        }
         if (arg === '--fhir-version') {
             const val = argv[i + 1];
             if (!val || val.startsWith('-'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.5.21",
+  "version": "1.6.0",
   "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",
@@ -87,23 +87,23 @@
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@max-health/config": "github:max-health-inc/config",
-    "@maxhealth.tech/prefab": "^0.3.5",
+    "@maxhealth.tech/prefab": "^0.3.7",
     "@types/node": "^25.9.5",
-    "@types/semver": "^7.7.1",
+    "@types/semver": "^7.8.0",
     "@types/unzipper": "^0.10.11",
     "@vitest/coverage-v8": "^4.1.10",
-    "@vitest/eslint-plugin": "^1.6.24",
+    "@vitest/eslint-plugin": "^1.6.26",
     "@vitest/ui": "^4.1.10",
     "cross-env": "^10.1.0",
     "eslint": "^10.8.0",
-    "fhirpath": "^5.0.0",
-    "globals": "^17.7.0",
+    "fhirpath": "^5.1.0",
+    "globals": "^17.9.0",
     "rimraf": "^6.1.3",
     "semver": "^7.8.5",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.65.0",
+    "typescript-eslint": "^8.66.0",
     "vitepress": "^1.6.4",
-    "vitepress-plugin-llms": "^1.13.3",
+    "vitepress-plugin-llms": "^1.13.4",
     "vitest": "^4.1.10",
     "zod": "4.3.6"
   },
@@ -111,7 +111,10 @@
     "@types/fhir": "^0.0.44",
     "consola": "^3.4.2",
     "tar": "^7.5.22",
-    "tsx": "^4.23.1",
+    "tsx": "^4.23.7",
     "unzipper": "^0.12.5"
+  },
+  "overrides": {
+    "brace-expansion": "^5.0.9"
   }
 }

package/parity-matrix.json

@@ -116,6 +116,12 @@
       "category": "us",
       "fhirVersion": "r4"
     },
+    {
+      "name": "vitals",
+      "spec": "hl7.fhir.us.vitals@1.0.0",
+      "category": "us",
+      "fhirVersion": "r4"
+    },
     {
       "name": "sdc",
       "spec": "hl7.fhir.uv.sdc@4.0.0",