dependency-change-report 1.4.5 → 1.4.7

package/cli.mjs

@@ -9,6 +9,7 @@ import { dirname, join, basename } from 'path';
 import { command, flag, arg, summary, rest } from 'paparam'
 import envPaths from 'env-paths';
 import { executeCommand } from './lib/utils/command-executor.mjs';
+import { mkdir } from 'fs/promises';
 
 const compare = command(
   'compare',
@@ -49,6 +50,14 @@ const compare = command(
         outputDir = workingDir; // Default to working directory
       }
       
+      // Ensure output directory exists
+      try {
+        await mkdir(outputDir, { recursive: true });
+      } catch (error) {
+        console.error(`Failed to create output directory ${outputDir}: ${error.message}`);
+        throw error;
+      }
+      
       console.log(`Analyzing dependency changes for ${repoUrl} between older version (${olderVersion}) and newer version (${newerVersion})`);
       
       const report = await analyzeDependencyChanges(repoUrl, olderVersion, newerVersion, workingDir, null, compare.flags.ignoreDev);
@@ -81,9 +90,18 @@ const compare = command(
       let baseFilename = 'report';
       if (isGitHubActions) {
         const eventName = process.env.GITHUB_EVENT_NAME;
-        const prNumber = process.env.GITHUB_PR_NUMBER || process.env.GITHUB_REF_NAME;
+        let prNumber = process.env.GITHUB_PR_NUMBER;
         const sha = process.env.GITHUB_SHA?.substring(0, 7);
         
+        // Extract PR number from GITHUB_REF_NAME if not in GITHUB_PR_NUMBER
+        if (!prNumber && process.env.GITHUB_REF_NAME) {
+          const refName = process.env.GITHUB_REF_NAME;
+          const prMatch = refName.match(/^(\d+)\/merge$/);
+          if (prMatch) {
+            prNumber = prMatch[1];
+          }
+        }
+        
         if (eventName === 'pull_request' && prNumber) {
           baseFilename = `dependency-report-PR-${prNumber}`;
         } else if (sha) {
@@ -206,6 +224,14 @@ const auto = command(
         outputDir = workingDir; // Default to working directory
       }
       
+      // Ensure output directory exists
+      try {
+        await mkdir(outputDir, { recursive: true });
+      } catch (error) {
+        console.error(`Failed to create output directory ${outputDir}: ${error.message}`);
+        throw error;
+      }
+      
       console.log(`Auto-detecting versions for ${repoUrl}...`);
       
       // Detect versions automatically
@@ -243,9 +269,18 @@ const auto = command(
       let baseFilename = 'report';
       if (isGitHubActions) {
         const eventName = process.env.GITHUB_EVENT_NAME;
-        const prNumber = process.env.GITHUB_PR_NUMBER || process.env.GITHUB_REF_NAME;
+        let prNumber = process.env.GITHUB_PR_NUMBER;
         const sha = process.env.GITHUB_SHA?.substring(0, 7);
         
+        // Extract PR number from GITHUB_REF_NAME if not in GITHUB_PR_NUMBER
+        if (!prNumber && process.env.GITHUB_REF_NAME) {
+          const refName = process.env.GITHUB_REF_NAME;
+          const prMatch = refName.match(/^(\d+)\/merge$/);
+          if (prMatch) {
+            prNumber = prMatch[1];
+          }
+        }
+        
         if (eventName === 'pull_request' && prNumber) {
           baseFilename = `dependency-report-PR-${prNumber}`;
         } else if (sha) {

package/lib/core/analyzer.mjs

@@ -589,10 +589,20 @@ export const analyzeDependencyChanges = async (repoUrl, olderVersion, newerVersi
       const currentBranchName = currentBranch.trim();
       
       if (currentBranchName !== olderVersion) {
-        await executeCommand('git', ['worktree', 'remove', olderVersionDir], process.cwd(), time_1min, 'cleanup older worktree', false);
+        try {
+          await executeCommand('git', ['worktree', 'remove', olderVersionDir], process.cwd(), time_1min, 'cleanup older worktree', false);
+        } catch (removeError) {
+          // If normal remove fails, try with --force
+          await executeCommand('git', ['worktree', 'remove', '--force', olderVersionDir], process.cwd(), time_1min, 'force cleanup older worktree', false);
+        }
       }
       if (currentBranchName !== newerVersion) {
-        await executeCommand('git', ['worktree', 'remove', newerVersionDir], process.cwd(), time_1min, 'cleanup newer worktree', false);
+        try {
+          await executeCommand('git', ['worktree', 'remove', newerVersionDir], process.cwd(), time_1min, 'cleanup newer worktree', false);
+        } catch (removeError) {
+          // If normal remove fails, try with --force
+          await executeCommand('git', ['worktree', 'remove', '--force', newerVersionDir], process.cwd(), time_1min, 'force cleanup newer worktree', false);
+        }
       }
     } catch (cleanupError) {
       console.warn(`⚠️  Failed to clean up worktrees: ${cleanupError.message}`);
@@ -614,15 +624,25 @@ export const analyzeDependencyChanges = async (repoUrl, olderVersion, newerVersi
       if (currentBranchName !== olderVersion) {
         try {
           await executeCommand('git', ['worktree', 'remove', olderVersionDir], process.cwd(), time_1min, 'cleanup older worktree', false);
-        } catch (cleanupError) {
-          // Ignore cleanup errors
+        } catch (removeError) {
+          try {
+            // If normal remove fails, try with --force
+            await executeCommand('git', ['worktree', 'remove', '--force', olderVersionDir], process.cwd(), time_1min, 'force cleanup older worktree', false);
+          } catch (cleanupError) {
+            // Ignore cleanup errors
+          }
         }
       }
       if (currentBranchName !== newerVersion) {
         try {
           await executeCommand('git', ['worktree', 'remove', newerVersionDir], process.cwd(), time_1min, 'cleanup newer worktree', false);
-        } catch (cleanupError) {
-          // Ignore cleanup errors
+        } catch (removeError) {
+          try {
+            // If normal remove fails, try with --force
+            await executeCommand('git', ['worktree', 'remove', '--force', newerVersionDir], process.cwd(), time_1min, 'force cleanup newer worktree', false);
+          } catch (cleanupError) {
+            // Ignore cleanup errors
+          }
         }
       }
     } catch (cleanupError) {

package/lib/generate-html.mjs

@@ -21,9 +21,10 @@ const generateHtmlReport = async (jsonPath, outputPath = null) => {
     
     // If no output path specified, create one with a specific naming format
     if (!outputPath) {
+      const jsonDir = dirname(jsonPath);
       const packageName = reportJson.repository.split('/').pop().replace('.git', '');
       const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
-      outputPath = `dependency-report-${packageName}-${reportJson.olderVersion}-${reportJson.newerVersion}-${timestamp}.html`;
+      outputPath = join(jsonDir, `dependency-report-${packageName}-${reportJson.olderVersion}-${reportJson.newerVersion}-${timestamp}.html`);
     }
     
     // Generate HTML content

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-change-report",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "type": "module",
   "description": "Generate dependency change reports between git references",
   "main": "lib/index.mjs",