babelfhir-ts 1.3.8 → 1.3.10

package/README.md

@@ -202,54 +202,7 @@ const { errors, warnings } = await patient.validate();
 
 <!-- CLI_HELP_START -->
 ```
-BabelFHIR-TS: Generate TypeScript interfaces from FHIR StructureDefinitions
-
-Usage:
-  babelfhir-ts [options] [<input> [output]]
-  babelfhir-ts install [--package] <pkg@version|path> [--registry <url>] [options]
-
-Arguments:
-  input   Input can be:
-          - Canonical URL of a FHIR profile (http://... or https://...)
-          - Directory containing FHIR packages (.tgz/.zip files)
-          - Single FHIR package (.tgz/.zip file)
-          - Single StructureDefinition (.json file)
-          - Directory containing StructureDefinition files
-  output  Output directory or archive name (optional)
-
-Commands:
-  install                Download, process, and npm install package as dependency
-
-Options:
-  -h, --help               Show this help message
-  -v, --version            Show version number
-  --log <dest>             Log destination: console (default) or file
-  --log-level <level>      Log verbosity: error, warn, info (default), or debug
-  --cache-dir <path>       Custom cache directory (default: ~/.fhir/packages for FHIR packages, .cache for working files)
-  --no-cache               Delete .cache working folder after generation (does not affect shared ~/.fhir/packages)
-  --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)
-  --dicomweb               Generate DICOMweb helpers typed to ImagingStudy profiles in the IG
-  --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
-  --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)
-                           When set, expands ValueSets without explicit codes using $expand operation
-
-Examples:
-  babelfhir-ts                                             # Process ./input to ./output
-  babelfhir-ts http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient  # Generate from profile URL
-  babelfhir-ts package.tgz                                 # Process package to current directory
-  babelfhir-ts package.tgz modified-package.tgz            # Embed interfaces in package
-  babelfhir-ts profiles/ generated/                        # Process directory to directory
-  babelfhir-ts --package hl7.fhir.us.core@8.0.0            # Download and process from default registry
-  babelfhir-ts --package hl7.fhir.us.core@8.0.0 output/    # Download and output to directory
-  babelfhir-ts --package pkg@version --log console --log-level debug  # With verbose logging
-  babelfhir-ts install de.gematik.isik-basismodul@3.1.0                   # Download, process, and npm install
-  babelfhir-ts install ./package.tgz                                      # Install from local package file
-  babelfhir-ts install hl7.fhir.us.core@8.0.0 --registry <url>            # Install from custom registry
-  babelfhir-ts install --package hl7.fhir.us.core@8.0.0 --registry <url>  # Alternative syntax
+
 ```
 <!-- CLI_HELP_END -->
 

package/out/src/bin.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import { run } from './main.js';
+import { logger } from './logger.js';
+run()
+    .catch(err => {
+    console.error('Generation failed:', err instanceof Error ? err.message : err);
+    process.exit(1);
+})
+    .finally(() => {
+    logger.close();
+});

package/out/src/cli/installCommand.js

@@ -48,42 +48,59 @@ export function detectPackageManager(startDir) {
     }
     return { cmd: isWin ? 'npm.cmd' : 'npm', args: ['install'] };
 }
+/**
+ * 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.
+ * Exported for testing.
+ */
+export function buildInstallArgs(opts) {
+    const { packagePath, pmArgs, cwd, packageJsonContent } = opts;
+    const tgzRelPath = './' + path.relative(cwd, packagePath).replace(/\\/g, '/');
+    if (packageJsonContent) {
+        try {
+            const projectPkg = JSON.parse(packageJsonContent);
+            const deps = projectPkg.dependencies || {};
+            for (const [, value] of Object.entries(deps)) {
+                if (typeof value === 'string' && (value === tgzRelPath || value === packagePath)) {
+                    return { args: ['install'] };
+                }
+            }
+            const tgzBaseName = path.basename(packagePath, '.tgz').replace(/^-/, '');
+            for (const name of Object.keys(deps)) {
+                if (name.replace(/[@/]/g, '-') === tgzBaseName) {
+                    deps[name] = tgzRelPath;
+                    projectPkg.dependencies = deps;
+                    return {
+                        args: ['install'],
+                        updatedPackageJson: JSON.stringify(projectPkg, null, 2) + '\n',
+                    };
+                }
+            }
+        }
+        catch { /* ignore, fall through to normal add */ }
+    }
+    return { args: [...pmArgs, tgzRelPath] };
+}
 function npmInstall(packagePath) {
     return new Promise((resolve, reject) => {
         const pm = detectPackageManager();
         const pmName = path.basename(pm.cmd).replace(/\.(cmd|exe)$/, '');
-        // Check if the package already exists in package.json to avoid dependency loops.
         const projectPkgPath = path.join(process.cwd(), 'package.json');
-        let useInstallOnly = false;
-        if (fs.existsSync(projectPkgPath)) {
-            try {
-                const tgzRelPath = './' + path.relative(process.cwd(), packagePath).replace(/\\/g, '/');
-                const projectPkg = JSON.parse(fs.readFileSync(projectPkgPath, 'utf8'));
-                const deps = projectPkg.dependencies || {};
-                for (const [name, value] of Object.entries(deps)) {
-                    if (typeof value === 'string' && (value === tgzRelPath || value === packagePath)) {
-                        console.log(`Package ${name} already in dependencies, running ${pmName} install`);
-                        useInstallOnly = true;
-                        break;
-                    }
-                }
-                if (!useInstallOnly) {
-                    const tgzBaseName = path.basename(packagePath, '.tgz').replace(/^-/, '');
-                    for (const name of Object.keys(deps)) {
-                        if (name.replace(/[@/]/g, '-') === tgzBaseName) {
-                            deps[name] = tgzRelPath;
-                            projectPkg.dependencies = deps;
-                            fs.writeFileSync(projectPkgPath, JSON.stringify(projectPkg, null, 2) + '\n');
-                            console.log(`Updated ${name} dependency to ${tgzRelPath}`);
-                            useInstallOnly = true;
-                            break;
-                        }
-                    }
-                }
-            }
-            catch { /* ignore, fall through to normal add */ }
+        const packageJsonContent = fs.existsSync(projectPkgPath)
+            ? fs.readFileSync(projectPkgPath, 'utf8')
+            : undefined;
+        const result = buildInstallArgs({
+            packagePath,
+            pmArgs: pm.args,
+            cwd: process.cwd(),
+            packageJsonContent,
+        });
+        if (result.updatedPackageJson) {
+            fs.writeFileSync(projectPkgPath, result.updatedPackageJson);
+            console.log(`Updated dependency path in package.json`);
         }
-        const args = useInstallOnly ? ['install'] : [...pm.args, packagePath];
+        const { args } = result;
         console.log(`Installing package with ${pmName}...`);
         const child = spawn(pm.cmd, args, {
             stdio: 'inherit',

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

@@ -67,8 +67,8 @@ export function getCacheConfig() {
 }
 /**
  * Override the cache configuration (useful for testing or CLI options).
- * When rootDir is changed, fhirPackagesDir is also updated to <rootDir>/.fhir/packages/
- * unless fhirPackagesDir is explicitly provided.
+ * Only rootDir (working cache) is updated; fhirPackagesDir stays at ~/.fhir/packages
+ * unless explicitly provided or FHIR_CACHE_ROOT is set.
  */
 export function setCacheConfig(config) {
     const current = getCacheConfig();
@@ -77,8 +77,8 @@ export function setCacheConfig(config) {
         ...current,
         ...config,
         rootDir: newRootDir,
-        // If rootDir changed but fhirPackagesDir not explicitly set, derive from new rootDir
-        fhirPackagesDir: config.fhirPackagesDir ?? (config.rootDir ? path.join(newRootDir, '.fhir', 'packages') : current.fhirPackagesDir),
+        // Only override fhirPackagesDir if explicitly provided; --cache-dir should NOT move the shared FHIR package cache
+        fhirPackagesDir: config.fhirPackagesDir ?? current.fhirPackagesDir,
     };
 }
 /**

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

@@ -19,26 +19,6 @@ export function writeInterfaceAndValidatorToFile(outputDir, interfaceName, inter
     const content = `${interfaceContent}\n\n${validateFunctionContent}`;
     caseAwareWriteFile(filePath, content);
 }
-export function extractFieldsFromInterface(interfaceDecl) {
-    return interfaceDecl.getProperties().map((property) => {
-        const name = property.getName();
-        const type = property.getType().getText();
-        const isOptional = property.hasQuestionToken();
-        const isArray = type.endsWith("[]");
-        return {
-            constraints: [], // Placeholder for constraints
-            elements: [], // Placeholder for nested elements
-            fromBase: true, // Mark as coming from the base resource
-            isForbidden: false, // Interfaces extracted this way cannot infer forbidden state
-            isArray,
-            isOptional,
-            name,
-            type: isArray ? type.slice(0, -2) : type,
-            // Interfaces parsed from existing code cannot know profiling source
-            isProfiled: false,
-        };
-    });
-}
 export function capitalize(str) {
     if (!str)
         return str;

package/out/src/generator/sdProcessor.js

@@ -250,7 +250,7 @@ export async function processStructureDefinition(sd, ctx) {
         if (f.isOptional || f.isForbidden)
             continue;
         const parentFieldName = parts[1].split(':')[0];
-        let relativePath = parts.slice(2).map(p => p.split(':')[0]).join('.');
+        let relativePath = parts.slice(2).map((p) => p.split(':')[0]).join('.');
         if (relativePath.includes('[x]') && f.type && f.type !== 'any' && f.type !== 'unknown') {
             const fType = f.type;
             relativePath = relativePath.replace(/(\w+)\[x\]/g, (_match, baseName) => {

package/out/src/main.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { generateIntoPackage, generateForDirectory, generateFromJsonFile, generateFromProfileUrl, resetFetchFailureTracking, getFetchFailureWarning, getTimingSummary, formatTimingSummary } from "./generator/index.js";
 import { generateClient } from "./generator/emitters/client/clientGenerator.js";
 import { extractPackage } from "./generator/parser/packageParser.js";
@@ -9,7 +8,6 @@ import { buildQualityReport, formatReportSummary, resetDiagnostics } from "./gen
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { logger } from './logger.js';
 // Resolve package.json relative to this file — works from both src/ (dev) and out/src/ (compiled)
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const _pkgJsonPath = [
@@ -290,7 +288,7 @@ export function parseCliArgs(argv) {
     }
     return out;
 }
-async function run() {
+export async function run() {
     const argv = process.argv.slice(2);
     let parsed;
     try {
@@ -450,11 +448,5 @@ async function run() {
     console.error("Use --help for usage information");
     process.exit(1);
 }
-run()
-    .catch(err => {
-    console.error('Generation failed:', err instanceof Error ? err.message : err);
-    process.exit(1);
-})
-    .finally(() => {
-    logger.close();
-});
+// Note: run() is exported and called from bin.ts (the CLI entry point).
+// Do NOT call run() here — importing this module should have no side effects.

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.3.8",
+  "version": "1.3.10",
   "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",
   "bin": {
-    "babelfhir-ts": "./out/src/main.js"
+    "babelfhir-ts": "./out/src/bin.js"
   },
   "files": [
     "out/src/generator/",
     "out/src/cli/",
+    "out/src/bin.js",
     "out/src/main.js",
     "out/src/logger.js",
     "out/fhir-r4.d.ts",
@@ -32,7 +33,7 @@
     "lint:output": "eslint output || exit 0",
     "typecheck": "tsc --noEmit",
     "typecheck:output": "tsc -p tsconfig.output.json",
-    "generate": "tsx src/main.ts",
+    "generate": "tsx src/bin.ts",
     "generate:check": "npm run generate && npm run typecheck && npm run typecheck:output && npm run lint:output",
     "generate:check:package": "tsx scripts/generate-check-package.ts",
     "generate:check:pas": "tsx scripts/generate-check-package.ts hl7.fhir.us.davinci-pas@2.0.1 --list-errors --keep-output",
@@ -97,7 +98,6 @@
     "consola": "^3.4.2",
     "fhirpath": "^4.9.1",
     "tar": "^7.4.3",
-    "ts-morph": "^27.0.2",
     "tsx": "^4.19.3",
     "unzipper": "^0.12.3"
   }