@eldrforge/kodrdriv 1.2.20 → 1.2.21

package/dist/commands/publish.js

@@ -4,7 +4,7 @@ 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';
@@ -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.`);
         }
@@ -277,7 +277,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 +393,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 +509,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}`);
@@ -758,7 +758,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 +770,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.');
             }
@@ -785,7 +785,7 @@ const execute = async (runConfig)=>{
         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, {
+        await GitHub.waitForPullRequestChecks(pr.number, {
             timeout,
             skipUserConfirmation
         });
@@ -795,7 +795,7 @@ const execute = async (runConfig)=>{
         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 +1004,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 +1049,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 +1060,7 @@ const execute = async (runConfig)=>{
                     workflowNames = undefined; // Fall back to monitoring all workflows
                 }
             }
-            await waitForReleaseWorkflows(tagName, {
+            await GitHub.waitForReleaseWorkflows(tagName, {
                 timeout: workflowTimeout,
                 workflowNames,
                 skipUserConfirmation