babelfhir-ts 1.0.15 → 1.0.16

package/out/main.js

@@ -210,6 +210,8 @@ async function run() {
             console.error('     or: babelfhir-ts install ./package.tgz');
             process.exit(1);
         }
+        // Force no-cache for install command
+        flags.noCache = true;
         try {
             let downloadedPath;
             // Check if packageToInstall is a local file path
@@ -234,38 +236,37 @@ async function run() {
             }
             console.log(`✓ Package processed successfully: ${path.basename(outputArchive)}`);
             // Extract the archive to access generated folder
-            console.log(`Extracting package for installation...`);
+            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 });
-            // Create a tarball from the generated folder
-            const generatedDir = path.join(extractDir, 'generated');
+            // 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');
             }
-            console.log(`Creating package from generated folder...`);
-            const { create } = await import('tar');
-            const generatedTarball = path.join(process.cwd(), `${baseName}-generated.tgz`);
-            await create({
-                gzip: true,
-                file: generatedTarball,
-                cwd: generatedDir
-            }, ['.']);
-            // Install the generated tarball with npm
-            await npmInstall(generatedTarball);
-            // Clean up extraction directory and archives
+            // Verify package.json exists
+            const pkgJsonPath = path.join(generatedDir, 'package.json');
+            if (!fs.existsSync(pkgJsonPath)) {
+                throw new Error(`package.json not found in generated folder: ${generatedDir}`);
+            }
+            console.log(`Installing from: ${path.relative(process.cwd(), generatedDir)}`);
+            // Install directly from the generated folder
+            await npmInstall(generatedDir);
+            // Clean up temporary files
             console.log(`Cleaning up temporary files...`);
             if (fs.existsSync(extractDir)) {
                 fs.rmSync(extractDir, { recursive: true, force: true });
             }
             if (fs.existsSync(outputArchive)) {
                 fs.unlinkSync(outputArchive);
-            }
-            if (fs.existsSync(generatedTarball)) {
-                fs.unlinkSync(generatedTarball);
+                console.log(`✓ Removed ${path.basename(outputArchive)}`);
             }
             if (flags.noCache) {
                 cleanupCache();
@@ -274,7 +275,7 @@ async function run() {
             return;
         }
         catch (error) {
-            // Clean up temp directory and archive on error
+            // Clean up temporary files on error
             const tempDir = path.join(process.cwd(), '.temp-download');
             if (fs.existsSync(tempDir)) {
                 fs.rmSync(tempDir, { recursive: true, force: true });
@@ -283,6 +284,14 @@ async function run() {
             if (fs.existsSync(extractDir)) {
                 fs.rmSync(extractDir, { 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);
+            }
             console.error(`Error: ${error.message}`);
             process.exit(1);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "BabelFHIR-TS: generate TypeScript interfaces, validators, and helper classes from FHIR R4 StructureDefinitions (profiles) directly inside package archives.",
   "type": "module",
   "main": "out/main.js",
@@ -66,6 +66,7 @@
     "@vitest/eslint-plugin": "^1.1.44",
     "axios": "^1.8.4",
     "fhirpath": "^4.0.0",
+    "pink.admission-generated": "file:.temp-install/generated",
     "tar": "^7.4.3",
     "ts-morph": "^25.0.1",
     "tsx": "^4.19.3",