@evanpurkhiser/tooling-personal 1.30.0 → 1.32.0

package/dist/assignees.js

@@ -7,6 +7,7 @@ exports.selectAssignee = exports.AssigneeType = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const fast_merge_async_iterators_1 = __importDefault(require("fast-merge-async-iterators"));
 const graphql_request_1 = require("graphql-request");
+const config_1 = require("./config");
 const fzf_1 = require("./fzf");
 const graphql_1 = require("./graphql");
 var AssigneeType;
@@ -76,6 +77,9 @@ async function* getAssignees(repo) {
     const items = !isOrganization
         ? userAssignees
         : fast_merge_async_iterators_1.default(userAssignees, teamAssignees);
+    const assigneeesToIgnore = config_1.config
+        .get('ignoreAssignees')
+        .map(value => new RegExp(value));
     for await (const result of items) {
         const assignees = isUser(result)
             ? result.repository.assignableUsers.nodes.map(user => ({
@@ -90,7 +94,9 @@ async function* getAssignees(repo) {
                 slug: team.combinedSlug,
                 name: team.name,
             }));
-        yield* assignees;
+        // Remove assignees that are ignored
+        const filteredAssignees = assignees.filter(assignee => !assigneeesToIgnore.some(r => r.test(assignee.slug)));
+        yield* filteredAssignees;
     }
 }
 /**

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/config.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = void 0;
+const convict_1 = __importDefault(require("convict"));
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const path_1 = require("path");
+convict_1.default.addParser({ extension: ['yml', 'yaml'], parse: js_yaml_1.default.load });
+const config = convict_1.default({
+    ignoreAssignees: {
+        doc: 'Assignee names / teams to ignore. Should be a regex expression.',
+        format: Array,
+        default: [],
+    },
+});
+exports.config = config;
+const home = process.env.HOME;
+const configDir = process.env.XDG_CONFIG_HOME || path_1.join(home, '.config');
+config.loadFile(path_1.join(configDir, 'pt', 'config.yml'));
+config.validate();

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/dist/utils.js

@@ -5,10 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.branchFromMessage = exports.getAccessToken = exports.getBranchNames = exports.getRepoPath = exports.getEmailUsername = exports.getRepoKey = void 0;
 const git_url_parse_1 = __importDefault(require("git-url-parse"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
 const simple_git_1 = __importDefault(require("simple-git"));
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
+const child_process_1 = require("child_process");
 /**
  * Get's the current repo information
  */
@@ -61,12 +59,15 @@ async function getBranchNames() {
 }
 exports.getBranchNames = getBranchNames;
 /**
- * Get's the GitHub Oauth token from the hub config
+ * Get's the GitHub Oauth token from the gh auth token command
  */
 function getAccessToken() {
-    const hubFile = path_1.default.join(process.env.XDG_DATA_HOME ?? '~/.local/share', 'tooling-personal', 'auth.yml');
-    const hubConfig = js_yaml_1.default.load(fs_1.readFileSync(hubFile).toString());
-    return hubConfig['token'];
+    try {
+        return child_process_1.execSync('gh auth token').toString().trim();
+    }
+    catch {
+        throw new Error('Cannot get token from `gh auth token`');
+    }
 }
 exports.getAccessToken = getAccessToken;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanpurkhiser/tooling-personal",
-  "version": "1.30.0",
+  "version": "1.32.0",
   "description": "Evan Purkhiser's personal tooling",
   "repository": "https://github.com/evanpurkhiser/tooling-personal",
   "author": "Evan Purkhiser",
@@ -11,11 +11,13 @@
   ],
   "dependencies": {
     "@octokit/graphql-schema": "^10.54.0",
+    "@types/convict": "^6.1.3",
     "@types/git-url-parse": "^9.0.1",
     "@types/js-yaml": "^4.0.2",
     "@types/node": "^16.3.3",
     "@types/yargs": "^17.0.2",
     "chalk": "^4.1.1",
+    "convict": "^6.2.4",
     "fast-merge-async-iterators": "^1.0.5",
     "git-url-parse": "^11.5.0",
     "graphql": "^15.5.1",