@eldrforge/kodrdriv 1.2.20 → 1.2.22

package/dist/commands/publish.js

@@ -1,18 +1,18 @@
-import path__default from 'path';
+import path from 'path';
 import { execute as execute$1 } from './commit.js';
 import { hasStagedChanges } from '../content/diff.js';
 import { execute as execute$2 } from './release.js';
 import { getDryRunLogger, getLogger } from '../logging.js';
 import { run, localBranchExists, runSecure, runWithDryRunSupport, safeJsonParse, validatePackageJson, validateGitRef, safeSyncBranchWithRemote, isBranchInSyncWithRemote } from '@eldrforge/git-tools';
-import { getCurrentBranchName, findOpenPullRequestByHeadRef, createPullRequest, waitForPullRequestChecks, mergePullRequest, createRelease, closeMilestoneForVersion, getWorkflowsTriggeredByRelease, waitForReleaseWorkflows } from '../util/github.js';
+import * as GitHub from '@eldrforge/github-tools';
 import { create } from '../util/storage.js';
 import { calculateBranchDependentVersion, calculateTargetVersion, checkIfTagExists, confirmVersionInteractively, getOutputPath } from '../util/general.js';
 import { DEFAULT_OUTPUT_DIRECTORY, KODRDRIV_DEFAULTS } from '../constants.js';
-import fs__default from 'fs/promises';
+import fs from 'fs/promises';
 
 const scanNpmrcForEnvVars = async (storage)=>{
     const logger = getLogger();
-    const npmrcPath = path__default.join(process.cwd(), '.npmrc');
+    const npmrcPath = path.join(process.cwd(), '.npmrc');
     const envVars = [];
     if (await storage.exists(npmrcPath)) {
         try {
@@ -42,18 +42,18 @@ const scanNpmrcForEnvVars = async (storage)=>{
  * and cleans them up if found by removing package-lock.json and regenerating it.
  */ const cleanupNpmLinkReferences = async (isDryRun)=>{
     const logger = getDryRunLogger(isDryRun);
-    const packageLockPath = path__default.join(process.cwd(), 'package-lock.json');
+    const packageLockPath = path.join(process.cwd(), 'package-lock.json');
     try {
         // Check if package-lock.json exists
         try {
-            await fs__default.access(packageLockPath);
+            await fs.access(packageLockPath);
         } catch  {
             // No package-lock.json, nothing to clean
             logger.verbose('No package-lock.json found, skipping npm link cleanup');
             return;
         }
         // Read and parse package-lock.json
-        const packageLockContent = await fs__default.readFile(packageLockPath, 'utf-8');
+        const packageLockContent = await fs.readFile(packageLockPath, 'utf-8');
         const packageLock = safeJsonParse(packageLockContent, packageLockPath);
         // Check for file: dependencies in the lockfile
         let hasFileReferences = false;
@@ -91,7 +91,7 @@ const scanNpmrcForEnvVars = async (storage)=>{
                 logger.info('DRY RUN: Would remove package-lock.json and regenerate it');
             } else {
                 // Remove package-lock.json
-                await fs__default.unlink(packageLockPath);
+                await fs.unlink(packageLockPath);
                 logger.verbose('Removed package-lock.json with npm link references');
                 // Regenerate clean package-lock.json
                 logger.verbose('Regenerating package-lock.json from package.json...');
@@ -171,7 +171,7 @@ const runPrechecks = async (runConfig, targetBranch)=>{
     if (isDryRun) {
         logger.info(`Would verify current branch is not the target branch (${effectiveTargetBranch})`);
     } else {
-        const currentBranch = await getCurrentBranchName();
+        const currentBranch = await GitHub.getCurrentBranchName();
         if (currentBranch === effectiveTargetBranch) {
             throw new Error(`Cannot run publish from the target branch '${effectiveTargetBranch}'. Please switch to a different branch before running publish.`);
         }
@@ -210,9 +210,35 @@ const runPrechecks = async (runConfig, targetBranch)=>{
             logger.info(`ℹ️  Target branch '${effectiveTargetBranch}' does not exist locally - will be created when needed.`);
         }
     }
+    // Check GitHub Actions workflow configuration
+    logger.info('Checking GitHub Actions workflow configuration...');
+    if (isDryRun) {
+        logger.info('Would check if GitHub Actions workflows are configured for pull requests');
+    } else {
+        try {
+            // TODO: Re-enable when checkWorkflowConfiguration is exported from github-tools
+            // const workflowConfig = await GitHub.checkWorkflowConfiguration(effectiveTargetBranch);
+            const workflowConfig = {
+                hasWorkflows: true,
+                hasPullRequestTriggers: true,
+                workflowCount: 0,
+                triggeredWorkflowNames: []
+            };
+            if (!workflowConfig.hasWorkflows) ; else if (!workflowConfig.hasPullRequestTriggers) ; else {
+                logger.info(`✅ Found ${workflowConfig.triggeredWorkflowNames.length} workflow(s) that will run on PRs to ${effectiveTargetBranch}:`);
+                for (const workflowName of workflowConfig.triggeredWorkflowNames){
+                    logger.info(`   - ${workflowName}`);
+                }
+            }
+        } catch (error) {
+            // Don't fail the precheck if we can't verify workflows
+            // The wait logic will handle it later
+            logger.debug(`Could not verify workflow configuration: ${error.message}`);
+        }
+    }
     // Check if prepublishOnly script exists in package.json
     logger.info('Checking for prepublishOnly script...');
-    const packageJsonPath = path__default.join(process.cwd(), 'package.json');
+    const packageJsonPath = path.join(process.cwd(), 'package.json');
     if (!await storage.exists(packageJsonPath)) {
         if (!isDryRun) {
             throw new Error('package.json not found in current directory.');
@@ -277,7 +303,7 @@ const sortObjectKeys = (value)=>{
 const isReleaseNecessaryComparedToTarget = async (targetBranch, isDryRun)=>{
     const logger = getDryRunLogger(isDryRun);
     // We compare current HEAD branch to the provided target branch
-    const currentBranch = await getCurrentBranchName();
+    const currentBranch = await GitHub.getCurrentBranchName();
     // Check if target branch exists before trying to compare
     try {
         // Validate target branch exists and is accessible
@@ -393,7 +419,7 @@ const execute = async (runConfig)=>{
     if (isDryRun) {
         currentBranch = 'mock-branch';
     } else {
-        currentBranch = await getCurrentBranchName();
+        currentBranch = await GitHub.getCurrentBranchName();
         // Fetch latest remote information to avoid conflicts
         logger.info('📡 Fetching latest remote information to avoid conflicts...');
         try {
@@ -509,8 +535,8 @@ const execute = async (runConfig)=>{
         logger.info('Would check for existing pull request');
         logger.info('Assuming no existing PR found for demo purposes');
     } else {
-        const branchName = await getCurrentBranchName();
-        pr = await findOpenPullRequestByHeadRef(branchName);
+        const branchName = await GitHub.getCurrentBranchName();
+        pr = await GitHub.findOpenPullRequestByHeadRef(branchName);
     }
     if (pr) {
         logger.info(`Found existing pull request for branch: ${pr.html_url}`);
@@ -536,7 +562,10 @@ const execute = async (runConfig)=>{
         await runWithDryRunSupport('npm run prepublishOnly', isDryRun, {}, true); // Use inherited stdio
         // STEP 2: Commit dependency updates if any (still no version bump)
         logger.verbose('Staging dependency updates for commit');
-        await runWithDryRunSupport('git add package.json package-lock.json', isDryRun);
+        // Check if package-lock.json exists before trying to stage it
+        const packageLockExists = await storage.exists('package-lock.json');
+        const filesToStage = packageLockExists ? 'package.json package-lock.json' : 'package.json';
+        await runWithDryRunSupport(`git add ${filesToStage}`, isDryRun);
         logger.verbose('Checking for staged dependency updates...');
         if (isDryRun) {
             logger.verbose('Would create dependency update commit if changes are staged');
@@ -637,7 +666,10 @@ const execute = async (runConfig)=>{
                             const { stdout: mergeChangesStatus } = await run('git status --porcelain');
                             if (mergeChangesStatus.trim()) {
                                 logger.verbose('Staging post-merge changes for commit');
-                                await run('git add package.json package-lock.json');
+                                // Check if package-lock.json exists before trying to stage it
+                                const packageLockExistsPostMerge = await storage.exists('package-lock.json');
+                                const filesToStagePostMerge = packageLockExistsPostMerge ? 'package.json package-lock.json' : 'package.json';
+                                await run(`git add ${filesToStagePostMerge}`);
                                 if (await hasStagedChanges()) {
                                     logger.verbose('Committing post-merge changes...');
                                     await execute$1(runConfig);
@@ -704,7 +736,10 @@ const execute = async (runConfig)=>{
         }
         // STEP 5: Commit version bump as a separate commit
         logger.verbose('Staging version bump for commit');
-        await runWithDryRunSupport('git add package.json package-lock.json', isDryRun);
+        // Check if package-lock.json exists before trying to stage it
+        const packageLockExistsVersionBump = await storage.exists('package-lock.json');
+        const filesToStageVersionBump = packageLockExistsVersionBump ? 'package.json package-lock.json' : 'package.json';
+        await runWithDryRunSupport(`git add ${filesToStageVersionBump}`, isDryRun);
         if (isDryRun) {
             logger.verbose('Would create version bump commit');
         } else {
@@ -758,7 +793,7 @@ const execute = async (runConfig)=>{
         }
         logger.info('Pushing to origin...');
         // Get current branch name and push explicitly to avoid pushing to wrong remote/branch
-        const branchName = await getCurrentBranchName();
+        const branchName = await GitHub.getCurrentBranchName();
         await runWithDryRunSupport(`git push origin ${branchName}`, isDryRun);
         logger.info('Creating pull request...');
         if (isDryRun) {
@@ -770,7 +805,7 @@ const execute = async (runConfig)=>{
             };
         } else {
             const { stdout: commitTitle } = await run('git log -1 --pretty=%B');
-            pr = await createPullRequest(commitTitle, 'Automated release PR.', branchName, targetBranch);
+            pr = await GitHub.createPullRequest(commitTitle, 'Automated release PR.', branchName, targetBranch);
             if (!pr) {
                 throw new Error('Failed to create pull request.');
             }
@@ -779,23 +814,41 @@ const execute = async (runConfig)=>{
     }
     logger.info(`Waiting for PR #${pr.number} checks to complete...`);
     if (!isDryRun) {
-        var _runConfig_publish15, _runConfig_publish16, _runConfig_publish17;
-        // Configure timeout and user confirmation behavior
-        const timeout = ((_runConfig_publish15 = runConfig.publish) === null || _runConfig_publish15 === void 0 ? void 0 : _runConfig_publish15.checksTimeout) || KODRDRIV_DEFAULTS.publish.checksTimeout;
-        const senditMode = ((_runConfig_publish16 = runConfig.publish) === null || _runConfig_publish16 === void 0 ? void 0 : _runConfig_publish16.sendit) || false;
-        // sendit flag overrides skipUserConfirmation - if sendit is true, skip confirmation
-        const skipUserConfirmation = senditMode || ((_runConfig_publish17 = runConfig.publish) === null || _runConfig_publish17 === void 0 ? void 0 : _runConfig_publish17.skipUserConfirmation) || false;
-        await waitForPullRequestChecks(pr.number, {
-            timeout,
-            skipUserConfirmation
-        });
+        // Check if we already know from prechecks that no workflows will trigger
+        let shouldSkipWait = false;
+        try {
+            // TODO: Re-enable when checkWorkflowConfiguration is exported from github-tools
+            // const workflowConfig = await GitHub.checkWorkflowConfiguration(targetBranch);
+            const workflowConfig = {
+                hasWorkflows: true,
+                hasPullRequestTriggers: true,
+                workflowCount: 0,
+                triggeredWorkflowNames: []
+            };
+            if (!workflowConfig.hasWorkflows || !workflowConfig.hasPullRequestTriggers) ;
+        } catch (error) {
+            // If we can't verify, proceed with waiting to be safe
+            logger.debug(`Could not verify workflow configuration for wait skip: ${error.message}`);
+        }
+        if (!shouldSkipWait) {
+            var _runConfig_publish15, _runConfig_publish16, _runConfig_publish17;
+            // Configure timeout and user confirmation behavior
+            const timeout = ((_runConfig_publish15 = runConfig.publish) === null || _runConfig_publish15 === void 0 ? void 0 : _runConfig_publish15.checksTimeout) || KODRDRIV_DEFAULTS.publish.checksTimeout;
+            const senditMode = ((_runConfig_publish16 = runConfig.publish) === null || _runConfig_publish16 === void 0 ? void 0 : _runConfig_publish16.sendit) || false;
+            // sendit flag overrides skipUserConfirmation - if sendit is true, skip confirmation
+            const skipUserConfirmation = senditMode || ((_runConfig_publish17 = runConfig.publish) === null || _runConfig_publish17 === void 0 ? void 0 : _runConfig_publish17.skipUserConfirmation) || false;
+            await GitHub.waitForPullRequestChecks(pr.number, {
+                timeout,
+                skipUserConfirmation
+            });
+        }
     }
     const mergeMethod = ((_runConfig_publish2 = runConfig.publish) === null || _runConfig_publish2 === void 0 ? void 0 : _runConfig_publish2.mergeMethod) || 'squash';
     if (isDryRun) {
         logger.info(`Would merge PR #${pr.number} using ${mergeMethod} method`);
     } else {
         try {
-            await mergePullRequest(pr.number, mergeMethod, false); // Don't delete branch
+            await GitHub.mergePullRequest(pr.number, mergeMethod, false); // Don't delete branch
         } catch (error) {
             // Check if this is a merge conflict error
             if (error.message && (error.message.includes('not mergeable') || error.message.includes('Pull Request is not mergeable') || error.message.includes('merge conflict'))) {
@@ -1004,14 +1057,14 @@ const execute = async (runConfig)=>{
         while(retries > 0){
             try {
                 var _runConfig_publish19;
-                await createRelease(tagName, releaseTitle, releaseNotesContent);
+                await GitHub.createRelease(tagName, releaseTitle, releaseNotesContent);
                 logger.info(`GitHub release created successfully for tag: ${tagName}`);
                 // Close milestone for this version if enabled
                 const milestonesEnabled = !((_runConfig_publish19 = runConfig.publish) === null || _runConfig_publish19 === void 0 ? void 0 : _runConfig_publish19.noMilestones);
                 if (milestonesEnabled) {
                     logger.info('🏁 Closing milestone for released version...');
                     const version = tagName.replace(/^v/, ''); // Remove 'v' prefix if present
-                    await closeMilestoneForVersion(version);
+                    await GitHub.closeMilestoneForVersion(version);
                 } else {
                     logger.debug('Milestone integration disabled via --no-milestones');
                 }
@@ -1049,7 +1102,7 @@ const execute = async (runConfig)=>{
             if (!workflowNames || workflowNames.length === 0) {
                 logger.info('No specific workflow names configured, auto-detecting workflows triggered by release events...');
                 try {
-                    workflowNames = await getWorkflowsTriggeredByRelease();
+                    workflowNames = await GitHub.getWorkflowsTriggeredByRelease();
                     if (workflowNames.length === 0) {
                         logger.info('No workflows found that are triggered by release events.');
                     } else {
@@ -1060,7 +1113,7 @@ const execute = async (runConfig)=>{
                     workflowNames = undefined; // Fall back to monitoring all workflows
                 }
             }
-            await waitForReleaseWorkflows(tagName, {
+            await GitHub.waitForReleaseWorkflows(tagName, {
                 timeout: workflowTimeout,
                 workflowNames,
                 skipUserConfirmation