babelfhir-ts 1.2.2 → 1.2.3

package/out/src/cli/installCommand.js

@@ -1,4 +1,4 @@
-import { generateIntoPackage, resetFetchFailureTracking, getFetchFailureWarning } from "../generator/index.js";
+import { generateIntoPackageDirect, resetFetchFailureTracking, getFetchFailureWarning } from "../generator/index.js";
 import { getCacheConfig, clearAllCaches } from "../generator/core/cacheConfig.js";
 import { buildQualityReport, formatReportSummary, resetDiagnostics } from "../generator/core/sdDiagnostics.js";
 import fs from 'fs';
@@ -94,10 +94,10 @@ function npmInstall(packagePath) {
 }
 export async function handleInstallCommand(opts) {
     const { packageToInstall, registry, generationFlags, downloadPackage } = opts;
-    // Default to cleaning cache for install command
-    if (!generationFlags.noCache) {
-        generationFlags.noCache = true;
-    }
+    // 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.
+    let generationCleanup;
     try {
         let downloadedPath;
         if (fs.existsSync(packageToInstall) && (packageToInstall.endsWith('.tgz') || packageToInstall.endsWith('.zip'))) {
@@ -108,11 +108,11 @@ export async function handleInstallCommand(opts) {
             downloadedPath = await downloadPackage(packageToInstall, registry);
         }
         console.log(`Processing package...`);
-        const baseName = path.basename(downloadedPath, path.extname(downloadedPath));
-        const outputArchive = path.join(process.cwd(), `${baseName}.with-generated.tgz`);
         resetFetchFailureTracking();
         resetDiagnostics();
-        await generateIntoPackage(downloadedPath, outputArchive, generationFlags);
+        // Generate directly into extracted package — no intermediate archive round-trip
+        const { generatedDir, cleanup } = await generateIntoPackageDirect(downloadedPath, generationFlags);
+        generationCleanup = cleanup;
         // Clean up temp directory only if we downloaded from registry (not for local files)
         if (!fs.existsSync(packageToInstall) || !(packageToInstall.endsWith('.tgz') || packageToInstall.endsWith('.zip'))) {
             const tempDir = path.join(process.cwd(), '.temp-download');
@@ -120,29 +120,11 @@ export async function handleInstallCommand(opts) {
                 fs.rmSync(tempDir, { recursive: true, force: true });
             }
         }
-        console.log(`✓ Package processed successfully: ${path.basename(outputArchive)}`);
-        // Extract the archive to access generated folder
-        console.log(`Extracting generated code...`);
-        const { extract } = await import('tar');
-        const extractDir = path.join(process.cwd(), '.temp-install');
-        if (!fs.existsSync(extractDir)) {
-            fs.mkdirSync(extractDir, { recursive: true });
-        }
-        await extract({ cwd: extractDir, file: outputArchive });
-        // Look for generated folder - could be at root or under 'package' subfolder
-        let generatedDir = path.join(extractDir, 'generated');
-        if (!fs.existsSync(generatedDir)) {
-            generatedDir = path.join(extractDir, 'package', 'generated');
-        }
-        if (!fs.existsSync(generatedDir)) {
-            throw new Error('Generated folder not found in package archive');
-        }
-        // Verify package.json exists
+        // Verify package.json exists in generated folder
         const pkgJsonPath = path.join(generatedDir, 'package.json');
         if (!fs.existsSync(pkgJsonPath)) {
             throw new Error(`package.json not found in generated folder: ${generatedDir}`);
         }
-        // Create a tarball from the generated folder to avoid symlink issues on Windows
         const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
         const packageName = pkgJson.name;
         console.log(`Creating package tarball for ${packageName}...`);
@@ -163,15 +145,9 @@ export async function handleInstallCommand(opts) {
         }, ['.']);
         console.log(`Installing ${packageName}...`);
         await npmInstall(tarballPath);
-        // Clean up temporary files (but keep the tarball that npm references in package.json under ./lib)
-        console.log(`Cleaning up temporary files...`);
-        if (fs.existsSync(extractDir)) {
-            fs.rmSync(extractDir, { recursive: true, force: true });
-        }
-        if (fs.existsSync(outputArchive)) {
-            fs.unlinkSync(outputArchive);
-            console.log(`✓ Removed ${path.basename(outputArchive)}`);
-        }
+        // Clean up extracted package tree (but keep the tarball under ./lib)
+        generationCleanup();
+        generationCleanup = undefined;
         console.log(`✓ Package tarball saved to ./lib: ${path.basename(tarballPath)}`);
         showGenerationWarnings();
         const report = buildQualityReport();
@@ -184,20 +160,12 @@ export async function handleInstallCommand(opts) {
         console.log(`\n✓ Package ${packageToInstall} installed and ready to use!`);
     }
     catch (error) {
-        // Clean up temporary files on error
-        for (const dir of ['.temp-download', '.temp-install']) {
-            const fullPath = path.join(process.cwd(), dir);
-            if (fs.existsSync(fullPath)) {
-                fs.rmSync(fullPath, { recursive: true, force: true });
-            }
-        }
-        // Clean up any leftover archive
-        const baseName = packageToInstall.includes('@')
-            ? packageToInstall.replace('@', '-').replace(/\//g, '-')
-            : path.basename(packageToInstall, path.extname(packageToInstall));
-        const outputArchive = path.join(process.cwd(), `${baseName}.with-generated.tgz`);
-        if (fs.existsSync(outputArchive)) {
-            fs.unlinkSync(outputArchive);
+        // Clean up extracted package on error
+        generationCleanup?.();
+        // Clean up temp download directory
+        const tempDir = path.join(process.cwd(), '.temp-download');
+        if (fs.existsSync(tempDir)) {
+            fs.rmSync(tempDir, { recursive: true, force: true });
         }
         if (generationFlags.noCache) {
             cleanupCache();

package/out/src/generator/fhir/corePackageResolver.js

@@ -13,7 +13,7 @@
 import fs from 'fs';
 import path from 'path';
 import { getFhirPackagesCacheDir, ensureCacheDir } from '../core/cacheConfig.js';
-import { fetchArrayBuffer } from '../core/fetchUtils.js';
+import { downloadFile } from '../core/utils.js';
 import { logger } from '../../logger.js';
 const log = logger.withTag('core-resolver');
 /**
@@ -58,7 +58,7 @@ export async function ensureCorePackage(corePackageSpec) {
             return candidate;
         }
     }
-    // Not cached — download from registry
+    // Not cached — download from registry (streaming to avoid buffering large packages in RAM)
     ensureCacheDir(configuredCacheDir);
     const packageDir = path.join(configuredCacheDir, dirName);
     let downloaded = false;
@@ -67,8 +67,7 @@ export async function ensureCorePackage(corePackageSpec) {
         const url = `${registry}/${packageName}/${version}`;
         try {
             log.info(`Downloading core package ${corePackageSpec} from ${registry}…`);
-            const response = await fetchArrayBuffer(url);
-            fs.writeFileSync(tgzPath, Buffer.from(response.data));
+            await downloadFile(url, tgzPath);
             downloaded = true;
             break;
         }

package/out/src/generator/fhir/corePackageResolver.ts

@@ -14,7 +14,7 @@
 import fs from 'fs';
 import path from 'path';
 import { getFhirPackagesCacheDir, ensureCacheDir } from '../core/cacheConfig.js';
-import { fetchArrayBuffer } from '../core/fetchUtils.js';
+import { downloadFile } from '../core/utils.js';
 import { logger } from '../../logger.js';
 
 const log = logger.withTag('core-resolver');
@@ -88,7 +88,7 @@ export async function ensureCorePackage(corePackageSpec: string): Promise<string
     }
   }
 
-  // Not cached — download from registry
+  // Not cached — download from registry (streaming to avoid buffering large packages in RAM)
   ensureCacheDir(configuredCacheDir);
   const packageDir = path.join(configuredCacheDir, dirName);
 
@@ -98,8 +98,7 @@ export async function ensureCorePackage(corePackageSpec: string): Promise<string
     const url = `${registry}/${packageName}/${version}`;
     try {
       log.info(`Downloading core package ${corePackageSpec} from ${registry}…`);
-      const response = await fetchArrayBuffer(url);
-      fs.writeFileSync(tgzPath, Buffer.from(response.data));
+      await downloadFile(url, tgzPath);
       downloaded = true;
       break;
     } catch (err) {