babelfhir-ts 1.5.6 → 1.5.8

package/README.md

@@ -237,6 +237,7 @@ Options:
   --prefab-styles <path>   Path to styles module (.ts/.js) copied into the generated prefab/ folder
   --recursive              (update only) Recursively search subdirectories for lib/ folders
   --force                  (update only) Force regeneration even if version and flags haven't changed
+  --skip-install           (install only) Generate tarball without running package manager install
   --outDir <dir>           Output directory (alias for second positional argument)
   --fhir-version <ver>     FHIR version to target: r4, r4b, or r5 (auto-detected from package if omitted)
   --package <pkg[@version]>  Download FHIR package from registry and process it (latest if no version)

package/out/fhir-r4.d.ts

@@ -437,6 +437,7 @@ declare module 'fhir/r4' {
   export type MolecularSequenceStructureVariantOuter = fhir4.MolecularSequenceStructureVariantOuter;
   export type MolecularSequenceVariant = fhir4.MolecularSequenceVariant;
   export type Money = fhir4.Money;
+  export type MoneyQuantity = fhir4.MoneyQuantity;
   export type NamingSystem = fhir4.NamingSystem;
   export type NamingSystemUniqueId = fhir4.NamingSystemUniqueId;
   export type Narrative = fhir4.Narrative;
@@ -540,6 +541,7 @@ declare module 'fhir/r4' {
   export type SearchParameterComponent = fhir4.SearchParameterComponent;
   export type ServiceRequest = fhir4.ServiceRequest;
   export type Signature = fhir4.Signature;
+  export type SimpleQuantity = fhir4.SimpleQuantity;
   export type Slot = fhir4.Slot;
   export type Specimen = fhir4.Specimen;
   export type SpecimenCollection = fhir4.SpecimenCollection;
@@ -673,8 +675,4 @@ declare module 'fhir/r4' {
   export type VisionPrescription = fhir4.VisionPrescription;
   export type VisionPrescriptionLensSpecification = fhir4.VisionPrescriptionLensSpecification;
   export type VisionPrescriptionLensSpecificationPrism = fhir4.VisionPrescriptionLensSpecificationPrism;
-  /** Constraint profile on Quantity — missing from @types/fhir */
-  export type MoneyQuantity = fhir4.Quantity;
-  /** Constraint profile on Quantity — missing from @types/fhir */
-  export type SimpleQuantity = fhir4.Quantity;
 }

package/out/fhir-r4b.d.ts

@@ -468,6 +468,7 @@ declare module 'fhir/r4b' {
   export type MolecularSequenceStructureVariantOuter = fhir4b.MolecularSequenceStructureVariantOuter;
   export type MolecularSequenceVariant = fhir4b.MolecularSequenceVariant;
   export type Money = fhir4b.Money;
+  export type MoneyQuantity = fhir4b.MoneyQuantity;
   export type NamingSystem = fhir4b.NamingSystem;
   export type NamingSystemUniqueId = fhir4b.NamingSystemUniqueId;
   export type Narrative = fhir4b.Narrative;
@@ -579,6 +580,7 @@ declare module 'fhir/r4b' {
   export type SearchParameterComponent = fhir4b.SearchParameterComponent;
   export type ServiceRequest = fhir4b.ServiceRequest;
   export type Signature = fhir4b.Signature;
+  export type SimpleQuantity = fhir4b.SimpleQuantity;
   export type Slot = fhir4b.Slot;
   export type Specimen = fhir4b.Specimen;
   export type SpecimenCollection = fhir4b.SpecimenCollection;
@@ -693,8 +695,5 @@ declare module 'fhir/r4b' {
   export type VisionPrescription = fhir4b.VisionPrescription;
   export type VisionPrescriptionLensSpecification = fhir4b.VisionPrescriptionLensSpecification;
   export type VisionPrescriptionLensSpecificationPrism = fhir4b.VisionPrescriptionLensSpecificationPrism;
-  /** Constraint profile on Quantity — missing from @types/fhir */
-  export type MoneyQuantity = fhir4b.Quantity;
-  /** Constraint profile on Quantity — missing from @types/fhir */
-  export type SimpleQuantity = fhir4b.Quantity;
+
 }

package/out/src/cli/installCommand.js

@@ -52,11 +52,18 @@ export function detectPackageManager(startDir) {
  * Build the install arguments for the package manager.
  * Returns `['install']` when the dep already exists, or `[...pmArgs, relativePath]` for new deps.
  * Always uses a relative path (e.g. `./lib/foo.tgz`) — never an absolute path.
+ *
+ * For pnpm: always writes the dep into package.json and returns `['install']`.
+ * This avoids `pnpm add` triggering full resolution that chokes on `workspace:*`
+ * protocol dependencies in monorepo setups (see issue #104).
+ *
  * Exported for testing.
  */
 export function buildInstallArgs(opts) {
-    const { packagePath, pmArgs, cwd, packageJsonContent } = opts;
+    const { packagePath, pmArgs, cwd, packageJsonContent, pmCmd, packageName } = opts;
     const tgzRelPath = './' + path.relative(cwd, packagePath).replace(/\\/g, '/');
+    // pnpm and yarn both support workspace:* protocol which chokes `add` commands
+    const isWorkspaceAwarePm = pmCmd ? (pmCmd.includes('pnpm') || pmCmd.includes('yarn')) : false;
     if (packageJsonContent) {
         try {
             const projectPkg = JSON.parse(packageJsonContent);
@@ -71,21 +78,71 @@ export function buildInstallArgs(opts) {
             }
             const tgzBaseName = path.basename(packagePath, '.tgz').replace(/^-/, '');
             for (const name of Object.keys(deps)) {
-                if (name.replace(/[@/]/g, '-') === tgzBaseName) {
+                if (name.replace(/[@/]/g, '-').replace(/^-/, '') === tgzBaseName) {
                     deps[name] = tgzRelPath;
                     projectPkg.dependencies = deps;
+                    // For workspace-aware PMs: write dep and use plain install to avoid
+                    // workspace:* resolution failure
+                    if (isWorkspaceAwarePm) {
+                        return {
+                            args: ['install'],
+                            updatedPackageJson: JSON.stringify(projectPkg, null, 2) + '\n',
+                        };
+                    }
                     return {
                         args: [...pmArgs, tgzRelPath],
                         updatedPackageJson: JSON.stringify(projectPkg, null, 2) + '\n',
                     };
                 }
             }
+            // For workspace-aware PMs: write the dep directly into package.json and use `install`
+            // instead of `add` to avoid full resolution that chokes on workspace:* protocol
+            if (isWorkspaceAwarePm && packageName) {
+                if (!projectPkg.dependencies)
+                    projectPkg.dependencies = {};
+                projectPkg.dependencies[packageName] = tgzRelPath;
+                return {
+                    args: ['install'],
+                    updatedPackageJson: JSON.stringify(projectPkg, null, 2) + '\n',
+                };
+            }
+            // For workspace-aware PMs without packageName: still prefer plain install
+            // over add to avoid workspace:* resolution failure. The tgz won't be in
+            // package.json but at least the command won't crash.
+            if (isWorkspaceAwarePm) {
+                return { args: ['install'] };
+            }
+        }
+        catch {
+            // JSON parse failed (empty string, malformed content, etc.)
+            // For workspace-aware PMs: fall through to safe install path below
+            if (isWorkspaceAwarePm && packageName) {
+                const newPkg = { dependencies: { [packageName]: tgzRelPath } };
+                return {
+                    args: ['install'],
+                    updatedPackageJson: JSON.stringify(newPkg, null, 2) + '\n',
+                };
+            }
+            if (isWorkspaceAwarePm) {
+                return { args: ['install'] };
+            }
+            /* non-workspace PMs: fall through to normal add */
         }
-        catch { /* ignore, fall through to normal add */ }
+    }
+    // For workspace-aware PMs without package.json: prefer install over add
+    if (isWorkspaceAwarePm && packageName && !packageJsonContent) {
+        const newPkg = { dependencies: { [packageName]: tgzRelPath } };
+        return {
+            args: ['install'],
+            updatedPackageJson: JSON.stringify(newPkg, null, 2) + '\n',
+        };
+    }
+    if (isWorkspaceAwarePm) {
+        return { args: ['install'] };
     }
     return { args: [...pmArgs, tgzRelPath] };
 }
-function npmInstall(packagePath) {
+function npmInstall(packagePath, packageName) {
     return new Promise((resolve, reject) => {
         const pm = detectPackageManager();
         const pmName = path.basename(pm.cmd).replace(/\.(cmd|exe)$/, '');
@@ -98,6 +155,8 @@ function npmInstall(packagePath) {
             pmArgs: pm.args,
             cwd: process.cwd(),
             packageJsonContent,
+            pmCmd: pm.cmd,
+            packageName,
         });
         if (result.updatedPackageJson) {
             fs.writeFileSync(projectPkgPath, result.updatedPackageJson);
@@ -174,7 +233,7 @@ function clearBunCache(packageName) {
     }
 }
 export async function handleInstallCommand(opts) {
-    const { packageToInstall, registry, generationFlags, downloadPackage } = opts;
+    const { packageToInstall, registry, generationFlags, downloadPackage, skipInstall } = opts;
     // Keep cache by default — dependency packages are large (hl7.fhir.r4.core ~50 MB)
     // and re-downloading them every run is the single biggest bottleneck.
     // Users can opt in to cache cleanup with --no-cache.
@@ -229,8 +288,13 @@ export async function handleInstallCommand(opts) {
         // Workaround: nuke the .bun cache entry so bun is forced to re-extract.
         // See: https://github.com/oven-sh/bun/issues/29372
         clearBunCache(packageName);
-        console.log(`Installing ${packageName}...`);
-        await npmInstall(tarballPath);
+        if (skipInstall) {
+            console.log(`Skipping install (--skip-install). Tarball saved to ./lib/${path.basename(tarballPath)}`);
+        }
+        else {
+            console.log(`Installing ${packageName}...`);
+            await npmInstall(tarballPath, packageName);
+        }
         // Clean up extracted package tree (but keep the tarball under ./lib)
         generationCleanup();
         generationCleanup = undefined;
@@ -243,7 +307,7 @@ export async function handleInstallCommand(opts) {
         if (generationFlags.noCache) {
             cleanupCache();
         }
-        console.log(`\n✓ Package ${packageToInstall} installed and ready to use!`);
+        console.log(`\n✓ Package ${packageToInstall} ${skipInstall ? 'generated' : 'installed'} and ready to use!`);
     }
     catch (error) {
         // Clean up extracted package on error

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

@@ -353,10 +353,11 @@ export function processFields(ctx, fields, parentInterfaceName, parentFieldType,
             }
         }
         // Conservative mode: if we failed to fetch base metadata (no base fields) skip emitting certain core properties
-        // to avoid degrading their types to primitives. Only skip if not profiled and not fixed.
+        // to avoid degrading their types to primitives. Only skip if not profiled, not fixed, and no narrowing binding.
         if (baseFieldByLastSegment.size === 0 && parentInterfaceName === interfaceName && fieldParts.length === 2 && fieldParts[0] === baseResource) {
             const conservativeSkip = new Set(['gender', 'status', 'intent', 'hospitalization', 'payor', 'entry', 'concept', 'identifier', 'use', 'system', 'priority']);
-            if (!field.isProfiled && field.fixedValue === undefined && conservativeSkip.has(fieldName)) {
+            const hasNarrowingBinding = !!(field.binding?.codes && field.binding.codes.length > 0 && field.binding.strength === 'required');
+            if (!field.isProfiled && field.fixedValue === undefined && !hasNarrowingBinding && conservativeSkip.has(fieldName)) {
                 debug('conservative skip (no base metadata)', field.name);
                 return;
             }

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

@@ -13,10 +13,13 @@ export function handleFlatField(args) {
     const conservative = baseFieldByLastSegment.size === 0;
     const isRootInterface = parentInterfaceName === interfaceName;
     const isNested = isRootInterface ? fieldParts.length > 1 : fieldParts.length >= 1;
+    // Does this field carry a narrowing required ValueSet binding with resolved codes?
+    // If so, it should bypass skip heuristics so we can emit a union literal type.
+    const hasNarrowingBinding = !!(field.binding?.codes && field.binding.codes.length > 0 && field.binding.strength === 'required');
     // Skip deeply nested enumerated fields at root level - they'll be handled by nested interfaces
     // (e.g., Patient.telecom.system should be emitted in UKCorePatientTelecom, not UKCorePatient)
     const enumeratedCodeFields = new Set(['system', 'use', 'status', 'gender', 'intent', 'priority', 'class', 'category', 'clinicalStatus', 'verificationStatus']);
-    if (fieldParts.length >= 3 && enumeratedCodeFields.has(fieldName) && !field.fixedValue) {
+    if (fieldParts.length >= 3 && enumeratedCodeFields.has(fieldName) && !field.fixedValue && !hasNarrowingBinding) {
         debug('skip deeply nested enumerated field at root level', field.name);
         return true;
     }
@@ -73,7 +76,7 @@ export function handleFlatField(args) {
         // Even if cardinality or mustSupport changed, we should NOT emit if it would widen the type
         // (e.g., base has category?: ('food'|'medication'|'environment'|'biologic')[] but we'd emit category: string[])
         // TypeScript doesn't allow assigning string[] to a more specific string literal union array
-        if (isPrimitiveType(mapped) && !hasExtensionSlices && !hasIdentifierSlices && !field.isProfiled && !field.fixedValue) {
+        if (isPrimitiveType(mapped) && !hasExtensionSlices && !hasIdentifierSlices && !field.isProfiled && !field.fixedValue && !hasNarrowingBinding) {
             debug('skip primitive override of base child - would widen type', field.name, 'mappedType=', mapped);
             return true;
         }
@@ -118,7 +121,7 @@ export function handleFlatField(args) {
     const enumeratedSkip = new Set(['status', 'gender', 'class', 'category', 'concept', 'entry', 'clinicalStatus', 'verificationStatus', 'use', 'system', 'priority']);
     const mustSupportChanged = baseField && (!baseField.mustSupport && field.mustSupport);
     const cardinalityChanged = baseField && (baseField.isOptional !== field.isOptional || baseField.isArray !== field.isArray);
-    if (parentInterfaceName === interfaceName && !field.fixedValue && !mustSupportChanged && !cardinalityChanged) {
+    if (parentInterfaceName === interfaceName && !field.fixedValue && !hasNarrowingBinding && !mustSupportChanged && !cardinalityChanged) {
         if (enumeratedSkip.has(fieldName))
             return true;
         if (baseResource === 'UsageContext' && fieldName === 'code' && field.type === 'string')
@@ -160,7 +163,7 @@ export function handleFlatField(args) {
         }
         // Special cases: known enumerated code fields (status, gender, intent, class, category) -> avoid overriding unless fixed or mustSupport changed
         const mustSupportChanged = baseField.mustSupport !== field.mustSupport && field.mustSupport === true;
-        if (!field.fixedValue && !mustSupportChanged && ['status', 'gender', 'intent', 'class', 'category', 'lifecycleStatus', 'clinicalStatus', 'verificationStatus', 'use', 'system', 'priority'].includes(fieldName)) {
+        if (!field.fixedValue && !hasNarrowingBinding && !mustSupportChanged && ['status', 'gender', 'intent', 'class', 'category', 'lifecycleStatus', 'clinicalStatus', 'verificationStatus', 'use', 'system', 'priority'].includes(fieldName)) {
             return true;
         }
         // CodeSystem.concept & Bundle.entry etc complex arrays: avoid overriding unless truly adding constraints
@@ -171,11 +174,12 @@ export function handleFlatField(args) {
         if (['concept', 'entry', 'content'].includes(fieldName) && !field.fixedValue)
             return true;
         // Even if mustSupport changes, we should inherit the base enum type, not override with string
-        if (['gender', 'status', 'intent', 'lifecycleStatus', 'clinicalStatus', 'verificationStatus', 'content', 'use', 'system', 'priority'].includes(fieldName) && isPrimitiveType(mapped)) {
+        if (['gender', 'status', 'intent', 'lifecycleStatus', 'clinicalStatus', 'verificationStatus', 'content', 'use', 'system', 'priority'].includes(fieldName) && isPrimitiveType(mapped) && !hasNarrowingBinding) {
             return true;
         }
         // Skip if identical to base (same type, array flag, optionality, AND mustSupport)
-        if (!field.fixedValue && !hasExtensionSlices) {
+        // Exception: fields with narrowing bindings should still be emitted (they constrain the type)
+        if (!field.fixedValue && !hasExtensionSlices && !hasNarrowingBinding) {
             const mappedType = mapTypeToTS(field.type || 'string');
             const mustSupportSame = baseField.mustSupport === field.mustSupport;
             if ((baseField.type === field.type || baseField.type === mappedType) && baseField.isArray === field.isArray && baseField.isOptional === field.isOptional && mustSupportSame) {
@@ -449,6 +453,25 @@ export function handleFlatField(args) {
     }
     // 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) {
+        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) {
+            // Import the ValueSet Code type from the generated valuesets directory
+            const sanitizedVSName = sanitizeValueSetName(vs.name);
+            const vsTypeName = `${sanitizedVSName}Code`;
+            importManager.addPathBasedImport(vsTypeName, './valuesets/ValueSet-' + sanitizedVSName);
+            fieldType = vsTypeName;
+            debug(`Applied code binding constraint for ${field.name}: ${vsTypeName}`);
+        }
+        else {
+            // Fall back to inline union from binding.codes (wrap in parens for array compatibility)
+            const inlineUnion = field.binding.codes.map(c => JSON.stringify(c.code)).join(' | ');
+            fieldType = field.binding.codes.length > 1 ? `(${inlineUnion})` : inlineUnion;
+            debug(`Applied inline code binding constraint for ${field.name}: ${fieldType}`);
+        }
+    }
     // Preserve arrayness from base when known; if base metadata is missing and field name is a known repeating element (e.g., 'coverage' on Account),
     // default to array to avoid incorrect narrowing.
     // Skip adding [] if fieldType already contains array syntax (e.g., from identifier/extension union types)

package/out/src/main.js

@@ -61,6 +61,7 @@ function printUsage() {
     console.log("  --prefab-styles <path>   Path to styles module (.ts/.js) copied into the generated prefab/ folder");
     console.log("  --recursive              (update only) Recursively search subdirectories for lib/ folders");
     console.log("  --force                  (update only) Force regeneration even if version and flags haven't changed");
+    console.log("  --skip-install           (install only) Generate tarball without running package manager install");
     console.log("  --outDir <dir>           Output directory (alias for second positional argument)");
     console.log("  --fhir-version <ver>     FHIR version to target: r4, r4b, or r5 (auto-detected from package if omitted)");
     console.log("  --package <pkg[@version]>  Download FHIR package from registry and process it (latest if no version)");
@@ -230,6 +231,10 @@ export function parseCliArgs(argv) {
             out.flags.noClient = true;
             continue;
         }
+        if (arg === '--skip-install') {
+            out.flags.skipInstall = true;
+            continue;
+        }
         if (arg === '--dicomweb') {
             out.flags.dicomweb = true;
             continue;
@@ -410,6 +415,7 @@ export async function run() {
                 registry,
                 generationFlags,
                 downloadPackage,
+                skipInstall: !!generationFlags.skipInstall,
             });
         }
         return;
@@ -429,7 +435,8 @@ export async function run() {
             packageToInstall,
             registry,
             generationFlags,
-            downloadPackage
+            downloadPackage,
+            skipInstall: !!generationFlags.skipInstall,
         });
         return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "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",
@@ -98,7 +98,7 @@
     "zod": "^4.3.6"
   },
   "dependencies": {
-    "@types/fhir": "^0.0.42",
+    "@types/fhir": "^0.0.43",
     "consola": "^3.4.2",
     "fhirpath": "^4.10.0",
     "tar": "^7.4.3",