@evanpurkhiser/tooling-personal 1.26.0 → 1.28.0

package/README.md

@@ -7,8 +7,8 @@ This is a set of tools I use in my day to day at work.
 The `pr` command creates or updates a pull request associated to
 one or more commits. The tool handles the following:
 
- * Select which commits should be part of the PR
- * Generates a branch from the commit message, and pushes the
-   commits up to the remote.
- * Prompts for reviewers to assign to the pull request.
- * Creates a pull request and assigns the selected reviewers.
+- Select which commits should be part of the PR
+- Generates a branch from the commit message, and pushes the
+  commits up to the remote.
+- Prompts for reviewers to assign to the pull request.
+- Creates a pull request and assigns the selected reviewers.

package/dist/cmd/pr.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.pr = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const listr2_1 = require("listr2");
 const open_1 = __importDefault(require("open"));
@@ -12,7 +13,9 @@ const editor_1 = require("../editor");
 const fzf_1 = require("../fzf");
 const pulls_1 = require("../pulls");
 const utils_1 = require("../utils");
-const getCommits = () => simple_git_1.default().log({ from: 'HEAD', to: 'origin/master' });
+function getCommits(to) {
+    return simple_git_1.default().log({ from: 'HEAD', to });
+}
 async function pr() {
     const username = await utils_1.getEmailUsername();
     const repo = await utils_1.getRepoKey();
@@ -35,7 +38,7 @@ async function pr() {
     collectInfoTask.add({
         title: 'Getting unpublished commits',
         task: async (ctx, task) => {
-            const commits = await getCommits();
+            const commits = await getCommits('origin/master');
             if (commits.total === 0) {
                 throw new Error('No commits to push');
             }
@@ -97,7 +100,7 @@ async function pr() {
         }
     };
     const doPush = async () => {
-        const newCommits = await getCommits();
+        const newCommits = await getCommits('origin/master');
         const commitIdx = newCommits.all.length - selectedCommits.length;
         const rebaseTargetCommit = newCommits.all[commitIdx];
         const refSpec = `${rebaseTargetCommit.hash}:refs/heads/${branchName}`;
@@ -157,4 +160,4 @@ async function pr() {
     // 08. Open in browser
     open_1.default(createPullRequest.pullRequest.url);
 }
-exports.default = pr;
+exports.pr = pr;

package/dist/cmd/select-commit.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectCommit = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const simple_git_1 = __importDefault(require("simple-git"));
 const fzf_1 = require("../fzf");
@@ -19,4 +20,4 @@ async function selectCommit() {
     const commitHashes = selected.map(commit => commit.hash);
     console.log(commitHashes.join('\n'));
 }
-exports.default = selectCommit;
+exports.selectCommit = selectCommit;

package/dist/fzf.js

@@ -13,11 +13,19 @@ async function fzfSelect({ prompt, genValues, }) {
     ], { shell: true, stdio: ['pipe', 'pipe', 'inherit'] });
     fzf.stdin.setDefaultEncoding('utf-8');
     const options = {};
-    await genValues(option => {
+    const valuesDone = genValues(option => {
+        if (fzf.stdin.destroyed) {
+            return;
+        }
         options[option.id] = option;
         fzf.stdin.write(`${option.id}\t${option.label.trim()}\n`);
     });
-    fzf.stdin.end();
+    if (valuesDone instanceof Promise) {
+        valuesDone.then(() => fzf.stdin.end());
+    }
+    else {
+        fzf.stdin.end();
+    }
     const output = await new Promise(resolve => fzf.stdout.once('data', d => resolve(d.toString())));
     return output
         .split('\n')

package/dist/index.js

@@ -6,8 +6,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
 const yargs_1 = __importDefault(require("yargs"));
-const pr_1 = __importDefault(require("./cmd/pr"));
-const select_commit_1 = __importDefault(require("./cmd/select-commit"));
+const pr_1 = require("./cmd/pr");
+const select_commit_1 = require("./cmd/select-commit");
 yargs_1.default(process.argv.slice(2))
     .option('color', {
     boolean: true,
@@ -18,7 +18,7 @@ yargs_1.default(process.argv.slice(2))
         chalk_1.default.level = args.color ? 3 : 0;
     }
 }, true)
-    .command('pr', 'Create and update PRs', pr_1.default)
-    .command('select-commit', 'Select a commit hash', select_commit_1.default)
+    .command('pr', 'Create and update PRs', pr_1.pr)
+    .command('select-commit', 'Select a commit hash', select_commit_1.selectCommit)
     .demandCommand(1, '')
     .parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanpurkhiser/tooling-personal",
-  "version": "1.26.0",
+  "version": "1.28.0",
   "description": "Evan Purkhiser's personal tooling",
   "repository": "https://github.com/evanpurkhiser/tooling-personal",
   "author": "Evan Purkhiser",
@@ -27,10 +27,10 @@
     "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@evanpurkhiser/eslint-config": "^0.10.1",
+    "@evanpurkhiser/eslint-config": "^0.20.0",
     "@tsconfig/node16": "^1.0.1",
-    "eslint": "^7.31.0",
-    "prettier": "^2.3.2",
+    "eslint": "^8.45.0",
+    "prettier": "^3.0.0",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5"
   },
@@ -42,7 +42,7 @@
     "pt": "./dist/index.js"
   },
   "volta": {
-    "node": "18.11.0",
+    "node": "18.17.0",
     "yarn": "1.22.19"
   }
 }