babelfhir-ts 1.0.14 → 1.0.16

package/out/main.js

@@ -12,7 +12,7 @@ function printUsage() {
     console.log("");
     console.log("Usage:");
     console.log("  babelfhir-ts [options] [<input> [output]]");
-    console.log("  babelfhir-ts install [--package] <pkg@version> [--registry <url>] [options]");
+    console.log("  babelfhir-ts install [--package] <pkg@version|path> [--registry <url>] [options]");
     console.log("");
     console.log("Arguments:");
     console.log("  input   Input can be:");
@@ -35,12 +35,13 @@ function printUsage() {
     console.log("  --registry <url>         FHIR package registry URL (default: https://packages.simplifier.net)");
     console.log("");
     console.log("Examples:");
-    console.log("  babelfhir-ts                                              # Process ./input to ./output");
-    console.log("  babelfhir-ts package.tgz                                 # Process package to ./output");
+    console.log("  babelfhir-ts                                             # Process ./input to ./output");
+    console.log("  babelfhir-ts package.tgz                                 # Process package to current directory");
     console.log("  babelfhir-ts package.tgz modified-package.tgz            # Embed interfaces in package");
     console.log("  babelfhir-ts profiles/ generated/                        # Process directory to directory");
     console.log("  babelfhir-ts --package hl7.fhir.us.core@8.0.0            # Download and process from default registry");
     console.log("  babelfhir-ts install de.gematik.isik-basismodul@3.1.0                   # Download, process, and npm install");
+    console.log("  babelfhir-ts install ./package.tgz                                      # Install from local package file");
     console.log("  babelfhir-ts install hl7.fhir.us.core@8.0.0 --registry <url>            # Install from custom registry");
     console.log("  babelfhir-ts install --package hl7.fhir.us.core@8.0.0 --registry <url>  # Alternative syntax");
 }
@@ -203,57 +204,69 @@ async function run() {
         // Package can come from --package flag OR as positional argument after 'install'
         const packageToInstall = packageSpec || positionals[1];
         if (!packageToInstall) {
-            console.error('Error: install command requires a package name');
+            console.error('Error: install command requires a package name or local .tgz/.zip file');
             console.error('Example: babelfhir-ts install de.gematik.isik-basismodul@3.1.0');
             console.error('     or: babelfhir-ts install --package hl7.fhir.us.core@8.0.0');
+            console.error('     or: babelfhir-ts install ./package.tgz');
             process.exit(1);
         }
+        // Force no-cache for install command
+        flags.noCache = true;
         try {
-            // Download and process package
-            const downloadedPath = await downloadPackage(packageToInstall, registry);
+            let downloadedPath;
+            // Check if packageToInstall is a local file path
+            if (fs.existsSync(packageToInstall) && (packageToInstall.endsWith('.tgz') || packageToInstall.endsWith('.zip'))) {
+                console.log(`Using local package: ${packageToInstall}`);
+                downloadedPath = path.resolve(packageToInstall);
+            }
+            else {
+                // Download from registry
+                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`);
             await generateIntoPackage(downloadedPath, outputArchive, flags);
-            // Clean up temp directory
-            const tempDir = path.join(process.cwd(), '.temp-download');
-            if (fs.existsSync(tempDir)) {
-                fs.rmSync(tempDir, { recursive: true, force: true });
+            // 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');
+                if (fs.existsSync(tempDir)) {
+                    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 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();
@@ -262,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 });
@@ -271,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.14",
+  "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",