@evanpurkhiser/tooling-personal 1.31.0 → 1.33.0

package/dist/cmd/pr.js

@@ -143,30 +143,57 @@ async function pr(argv) {
         console.log(chalk_1.default.red `Missing PR title, aborting`);
         process.exit(1);
     }
-    // 06. Create a Pull Request
-    const pr = pulls_1.createPull({
-        baseRefName: defaultBranch,
-        headRefName: branchName,
-        repositoryId: repoId,
-        draft: argv.draft,
-        title,
-        body,
+    const createPrTask = async (ctx) => {
+        const pr = await pulls_1.createPull({
+            baseRefName: defaultBranch,
+            headRefName: branchName,
+            repositoryId: repoId,
+            draft: argv.draft,
+            title,
+            body,
+        });
+        ctx.pr = pr.createPullRequest.pullRequest;
+    };
+    const setAutoMergeTask = async (ctx, task) => {
+        const pullRequestId = ctx.pr.id;
+        try {
+            await pulls_1.enableAutoMerge({ pullRequestId, mergeMethod: 'SQUASH' });
+        }
+        catch (err) {
+            task.skip('Auto Merge not available');
+        }
+    };
+    const prTasks = new listr2_1.Listr([], { rendererOptions });
+    // 06-a. Create a Pull Request
+    prTasks.add({
+        title: 'Creating Pull Request',
+        task: createPrTask,
+    });
+    // 06-a. Enable auto merge
+    prTasks.add({
+        enabled: !!argv.autoMerge,
+        title: 'Enabling auto merge',
+        task: setAutoMergeTask,
     });
+    const asyncPrTasks = prTasks.run();
+    // Do not let asyncPrTasks interfere with assignee selection
+    process.stdout.cork();
     const reviewers = await assignees_1.selectAssignee(repo);
-    const { createPullRequest } = await pr;
+    const { pr } = await asyncPrTasks;
+    process.stdout.uncork();
     // 07. Request reviews
     const reviewRequestTask = new listr2_1.Listr([], { rendererOptions });
     reviewRequestTask.add({
         enabled: () => reviewers.length > 0,
         title: 'Requesting Reviewers',
         task: () => pulls_1.requestReview({
-            pullRequestId: createPullRequest.pullRequest.id,
+            pullRequestId: pr.id,
             userIds: reviewers.filter(a => a.type === assignees_1.AssigneeType.User).map(a => a.id),
             teamIds: reviewers.filter(a => a.type === assignees_1.AssigneeType.Team).map(a => a.id),
         }),
     });
     await reviewRequestTask.run();
     // 08. Open in browser
-    open_1.default(createPullRequest.pullRequest.url);
+    open_1.default(pr.url);
 }
 exports.pr = pr;

package/dist/index.js

@@ -18,7 +18,17 @@ yargs_1.default(process.argv.slice(2))
         chalk_1.default.level = args.color ? 3 : 0;
     }
 }, true)
-    .command('pr', 'Create and update PRs', y => y.option('draft', { alias: 'd', boolean: true, desc: 'Create PR as a draft' }), pr_1.pr)
+    .command('pr', 'Create and update PRs', y => y
+    .option('draft', {
+    alias: 'd',
+    boolean: true,
+    desc: 'Create PR as a draft',
+})
+    .option('autoMerge', {
+    alias: 'm',
+    boolean: true,
+    desc: 'Enable auto merge for the PR',
+}), pr_1.pr)
     .command('select-commit', 'Select a commit hash', select_commit_1.selectCommit)
     .demandCommand(1, '')
     .parse();

package/dist/pulls.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestReview = exports.createPull = exports.getPulls = exports.getRepoInfo = void 0;
+exports.requestReview = exports.enableAutoMerge = exports.createPull = exports.getPulls = exports.getRepoInfo = void 0;
 const graphql_request_1 = require("graphql-request");
 const graphql_1 = require("./graphql");
 async function getRepoInfo(repo) {
@@ -83,6 +83,22 @@ function createPull(input) {
     return graphql_1.request(prGql, { input });
 }
 exports.createPull = createPull;
+/**
+ * Enables auto merge for a pull request
+ */
+function enableAutoMerge(input) {
+    const autoMergeGql = graphql_request_1.gql `
+    mutation enableAutoMerge($input: EnablePullRequestAutoMergeInput!) {
+      enablePullRequestAutoMerge(input: $input) {
+        pullRequest {
+          id
+        }
+      }
+    }
+  `;
+    return graphql_1.request(autoMergeGql, { input });
+}
+exports.enableAutoMerge = enableAutoMerge;
 /**
  * Assign reviewers to an existing pull request
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanpurkhiser/tooling-personal",
-  "version": "1.31.0",
+  "version": "1.33.0",
   "description": "Evan Purkhiser's personal tooling",
   "repository": "https://github.com/evanpurkhiser/tooling-personal",
   "author": "Evan Purkhiser",