babelfhir-ts 1.2.3 → 1.2.4

package/out/src/cli/installCommand.js

@@ -22,18 +22,29 @@ function cleanupCache() {
         console.log('Cache cleaned.');
     }
 }
-/** Detect the package manager used in the current working directory */
-function detectPackageManager() {
-    const cwd = process.cwd();
+/** Detect the package manager by walking up from startDir (default: cwd) to find a lock file */
+export function detectPackageManager(startDir) {
     const isWin = process.platform === 'win32';
-    if (fs.existsSync(path.join(cwd, 'bun.lock')) || fs.existsSync(path.join(cwd, 'bun.lockb'))) {
-        return { cmd: isWin ? 'bun.exe' : 'bun', args: ['add'] };
-    }
-    if (fs.existsSync(path.join(cwd, 'pnpm-lock.yaml'))) {
-        return { cmd: isWin ? 'pnpm.cmd' : 'pnpm', args: ['add'] };
-    }
-    if (fs.existsSync(path.join(cwd, 'yarn.lock'))) {
-        return { cmd: isWin ? 'yarn.cmd' : 'yarn', args: ['add'] };
+    // Walk up the directory tree — in monorepos the lock file lives at the root,
+    // not in the package subdirectory where the command is run.
+    let dir = startDir ?? process.cwd();
+    while (true) {
+        if (fs.existsSync(path.join(dir, 'bun.lock')) || fs.existsSync(path.join(dir, 'bun.lockb'))) {
+            return { cmd: isWin ? 'bun.exe' : 'bun', args: ['add'] };
+        }
+        if (fs.existsSync(path.join(dir, 'pnpm-lock.yaml'))) {
+            return { cmd: isWin ? 'pnpm.cmd' : 'pnpm', args: ['add'] };
+        }
+        if (fs.existsSync(path.join(dir, 'yarn.lock'))) {
+            return { cmd: isWin ? 'yarn.cmd' : 'yarn', args: ['add'] };
+        }
+        if (fs.existsSync(path.join(dir, 'package-lock.json'))) {
+            return { cmd: isWin ? 'npm.cmd' : 'npm', args: ['install'] };
+        }
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            break; // reached filesystem root
+        dir = parent;
     }
     return { cmd: isWin ? 'npm.cmd' : 'npm', args: ['install'] };
 }

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

@@ -44,6 +44,25 @@ export function capitalize(str) {
         return str;
     return str.charAt(0).toUpperCase() + str.slice(1);
 }
+/**
+ * Extract base FHIR types from all interface declarations in a file.
+ * Handles:
+ *   - `export interface Foo extends Bar { ... }`
+ *   - `export interface Foo extends Omit<Bar, 'a' | 'b'> { ... }`
+ * Returns ALL candidates — files may have nested types (e.g.,
+ * AllergyIntoleranceReaction) before the main resource interface.
+ */
+function extractBaseTypes(content) {
+    const results = [];
+    const allMatches = [...content.matchAll(/export\s+interface\s+\w+\s+extends\s+(?:Omit|Pick|Partial)<(\w+)|export\s+interface\s+\w+\s+extends\s+(\w+)/g)];
+    for (const m of allMatches) {
+        const candidate = m[1] ?? m[2];
+        if (candidate && candidate !== 'Omit' && candidate !== 'Pick' && candidate !== 'Partial') {
+            results.push(candidate);
+        }
+    }
+    return results;
+}
 export function getResourceTypes(options) {
     const outputDir = options.outputDir;
     if (!fs.existsSync(outputDir)) {
@@ -51,40 +70,44 @@ export function getResourceTypes(options) {
     }
     const files = fs.readdirSync(outputDir);
     const resourceTypes = new Map(); // Maps profile name -> base resource type
-    // Check if index.ts exists
-    const indexPath = path.join(outputDir, "index.ts");
+    // Check if index.ts (or index.d.ts after compilation) exists
+    const indexPath = fs.existsSync(path.join(outputDir, "index.ts"))
+        ? path.join(outputDir, "index.ts")
+        : fs.existsSync(path.join(outputDir, "index.d.ts"))
+            ? path.join(outputDir, "index.d.ts")
+            : null;
     let exportedTypes = null;
-    if (fs.existsSync(indexPath)) {
+    if (indexPath) {
         const indexContent = fs.readFileSync(indexPath, "utf-8");
         exportedTypes = new Set();
-        // Extract exported type names from index.ts
-        const exportRegex = /export \* from ['"]\.\/([\w-]+)\.js['"]/g;
+        // Extract module names from export statements (both wildcard and named)
+        const exportRegex = /export\s+(?:\*|{[^}]+})\s+from\s+['"]\.\/([\w-]+)\.js['"]/g;
         let match;
         while ((match = exportRegex.exec(indexContent)) !== null) {
             exportedTypes.add(match[1]);
         }
     }
     for (const file of files) {
-        if (file.endsWith("Class.ts")) {
-            const profileName = file.replace("Class.ts", "");
-            if (!exportedTypes || exportedTypes.has(profileName)) {
+        if (file.endsWith("Class.ts") || file.endsWith("Class.d.ts")) {
+            const profileName = file.replace(/Class\.(ts|d\.ts)$/, "");
+            if (!exportedTypes || exportedTypes.has(profileName) || exportedTypes.has(`${profileName}Class`)) {
                 const interfaceFile = path.join(outputDir, `${profileName}.ts`);
-                if (fs.existsSync(interfaceFile)) {
-                    const content = fs.readFileSync(interfaceFile, "utf-8");
+                const interfaceDtsFile = path.join(outputDir, `${profileName}.d.ts`);
+                const actualFile = fs.existsSync(interfaceFile) ? interfaceFile : fs.existsSync(interfaceDtsFile) ? interfaceDtsFile : null;
+                if (actualFile) {
+                    const content = fs.readFileSync(actualFile, "utf-8");
                     // Check if it has resourceType property (base resource)
                     const resourceTypeMatch = content.match(/resourceType:\s*["'](\w+)["']/);
                     if (resourceTypeMatch) {
                         resourceTypes.set(profileName, resourceTypeMatch[1]);
                         continue;
                     }
-                    // Check if it extends a FHIR resource
-                    const extendsMatch = content.match(/export\s+interface\s+\w+\s+extends\s+(\w+)/);
-                    if (extendsMatch) {
-                        const baseType = extendsMatch[1];
-                        // Check if it's a known FHIR resource type
-                        if (ctx().resourceNames.includes(baseType)) {
-                            resourceTypes.set(profileName, baseType);
-                        }
+                    // Check if it extends a FHIR resource (handles both `extends Foo` and `extends Omit<Foo, ...>`)
+                    // Try all interface declarations — files may contain nested types before the main resource.
+                    const baseTypes = extractBaseTypes(content);
+                    const knownBase = baseTypes.find(bt => ctx().resourceNames.includes(bt));
+                    if (knownBase) {
+                        resourceTypes.set(profileName, knownBase);
                     }
                 }
             }
@@ -94,19 +117,22 @@ export function getResourceTypes(options) {
 }
 export function getBaseResourceType(profileName, outputDir) {
     const interfaceFile = path.join(outputDir, `${profileName}.ts`);
-    if (!fs.existsSync(interfaceFile)) {
+    const interfaceDtsFile = path.join(outputDir, `${profileName}.d.ts`);
+    const actualFile = fs.existsSync(interfaceFile) ? interfaceFile : fs.existsSync(interfaceDtsFile) ? interfaceDtsFile : null;
+    if (!actualFile) {
         return profileName; // fallback
     }
-    const content = fs.readFileSync(interfaceFile, "utf-8");
+    const content = fs.readFileSync(actualFile, "utf-8");
     // Check for explicit resourceType property
     const resourceTypeMatch = content.match(/resourceType:\s*["'](\w+)["']/);
     if (resourceTypeMatch) {
         return resourceTypeMatch[1];
     }
-    // Check for extends clause
-    const extendsMatch = content.match(/export\s+interface\s+\w+\s+extends\s+(\w+)/);
-    if (extendsMatch) {
-        return extendsMatch[1];
+    // Check for extends clause (handles both `extends Foo` and `extends Omit<Foo, ...>`)
+    const baseTypes = extractBaseTypes(content);
+    if (baseTypes.length > 0) {
+        // Prefer a known resource type, fall back to the first candidate
+        return baseTypes.find(bt => ctx().resourceNames.includes(bt)) ?? baseTypes[0];
     }
     return profileName; // fallback
 }

package/out/src/generator/index.js

@@ -321,6 +321,11 @@ export async function generateIntoPackage(packageArchivePath, outArchivePath, fl
             valueSets = await expandValueSetsWithTx(valueSets, valueSetCodesMap, structureDefinitions, flags.txServer);
         }
         const outputDir = path.join(extractedRoot, 'generated');
+        // Always start with a clean generated/ directory to avoid stale compiled
+        // artifacts (e.g. .d.ts/.js without .ts sources) from a cached extraction.
+        if (fs.existsSync(outputDir)) {
+            fs.rmSync(outputDir, { recursive: true, force: true });
+        }
         ensureDirectoryExists(outputDir);
         // Generate TypeScript files for ValueSets inside the embedded package
         const didGenerateValueSets = emitValueSetFiles(valueSets, outputDir, { deduplicateFilenames: true });
@@ -371,16 +376,12 @@ export async function generateIntoPackage(packageArchivePath, outArchivePath, fl
         // When client is generated, add @babelfhir-ts/client-<version> as dependency (generated client extends base)
         if (!flags?.noClient) {
             generatedPackageJson.dependencies[`@babelfhir-ts/client-${versionSlug()}`] = '^0.2.0';
-            generatedExports['./fhir-client'] = { types: './fhir-client/index.d.ts', import: './fhir-client/index.js' };
         }
         // When zod schemas are generated, add @babelfhir-ts/zod-<version> + zod peer dependency
         if (flags?.schema === 'zod') {
             generatedPackageJson.dependencies[`@babelfhir-ts/zod-${versionSlug()}`] = '^0.1.0';
             generatedPackageJson.peerDependencies['zod'] = '^4.0.0';
         }
-        const generatedPackageJsonPath = path.join(outputDir, 'package.json');
-        fs.writeFileSync(generatedPackageJsonPath, JSON.stringify(generatedPackageJson, null, 2));
-        logger.log(`Created package.json in generated folder: ${packageName}-generated@${packageVersion}`);
         copyFhirAmbientDeclaration(outputDir);
         // Generate index.ts that exports all interfaces
         logger.log('Generating index.ts exports...');
@@ -394,6 +395,13 @@ export async function generateIntoPackage(packageArchivePath, outArchivePath, fl
             });
             logger.log('FHIR client generated');
         }
+        // Only add ./fhir-client export if the directory was actually created
+        if (fs.existsSync(path.join(outputDir, 'fhir-client'))) {
+            generatedExports['./fhir-client'] = { types: './fhir-client/index.d.ts', import: './fhir-client/index.js' };
+        }
+        const generatedPackageJsonPath = path.join(outputDir, 'package.json');
+        fs.writeFileSync(generatedPackageJsonPath, JSON.stringify(generatedPackageJson, null, 2));
+        logger.log(`Created package.json in generated folder: ${packageName}-generated@${packageVersion}`);
         // Install base zod type stubs when --schema zod is enabled (needed for tsc compilation)
         if (flags?.schema === 'zod') {
             const { installBaseZodTypes } = await import('./emitters/zod/zodStubInstaller.js');
@@ -500,6 +508,11 @@ export async function generateIntoPackageDirect(packageArchivePath, flags) {
         valueSets = await expandValueSetsWithTx(valueSets, valueSetCodesMap, structureDefinitions, flags.txServer);
     }
     const outputDir = path.join(extractedRoot, 'generated');
+    // Always start with a clean generated/ directory to avoid stale compiled
+    // artifacts (e.g. .d.ts/.js without .ts sources) from a cached extraction.
+    if (fs.existsSync(outputDir)) {
+        fs.rmSync(outputDir, { recursive: true, force: true });
+    }
     ensureDirectoryExists(outputDir);
     const didGenerateValueSets = emitValueSetFiles(valueSets, outputDir, { deduplicateFilenames: true });
     if (!didGenerateValueSets)
@@ -539,15 +552,11 @@ export async function generateIntoPackageDirect(packageArchivePath, flags) {
     };
     if (!flags?.noClient) {
         generatedPackageJson.dependencies[`@babelfhir-ts/client-${versionSlug()}`] = '^0.2.0';
-        generatedExports['./fhir-client'] = { types: './fhir-client/index.d.ts', import: './fhir-client/index.js' };
     }
     if (flags?.schema === 'zod') {
         generatedPackageJson.dependencies[`@babelfhir-ts/zod-${versionSlug()}`] = '^0.1.0';
         generatedPackageJson.peerDependencies['zod'] = '^4.0.0';
     }
-    const generatedPackageJsonPath = path.join(outputDir, 'package.json');
-    fs.writeFileSync(generatedPackageJsonPath, JSON.stringify(generatedPackageJson, null, 2));
-    logger.log(`Created package.json in generated folder: ${packageName}-generated@${packageVersion}`);
     copyFhirAmbientDeclaration(outputDir);
     logger.log('Generating index.ts exports...');
     await generateIndexFile(outputDir);
@@ -557,6 +566,13 @@ export async function generateIntoPackageDirect(packageArchivePath, flags) {
         generateClient({ outputDir });
         logger.log('FHIR client generated');
     }
+    // Only add ./fhir-client export if the directory was actually created
+    if (fs.existsSync(path.join(outputDir, 'fhir-client'))) {
+        generatedExports['./fhir-client'] = { types: './fhir-client/index.d.ts', import: './fhir-client/index.js' };
+    }
+    const generatedPackageJsonPath = path.join(outputDir, 'package.json');
+    fs.writeFileSync(generatedPackageJsonPath, JSON.stringify(generatedPackageJson, null, 2));
+    logger.log(`Created package.json in generated folder: ${packageName}-generated@${packageVersion}`);
     if (flags?.schema === 'zod') {
         const { installBaseZodTypes } = await import('./emitters/zod/zodStubInstaller.js');
         installBaseZodTypes(outputDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "BabelFHIR-TS: generate TypeScript interfaces, validators, and helper classes from FHIR R4/R4B StructureDefinitions (profiles) directly inside package archives.",
   "type": "module",
   "main": "out/src/main.js",