@evanpurkhiser/tooling-personal 1.47.0 → 1.49.0

package/dist/assignees.js

@@ -13,8 +13,8 @@ const fzf_1 = require("./fzf");
 const graphql_1 = require("./graphql");
 var AssigneeType;
 (function (AssigneeType) {
-    AssigneeType[AssigneeType["User"] = 0] = "User";
-    AssigneeType[AssigneeType["Team"] = 1] = "Team";
+    AssigneeType["User"] = "user";
+    AssigneeType["Team"] = "team";
 })(AssigneeType || (exports.AssigneeType = AssigneeType = {}));
 function isUser(obj) {
     return obj.repository !== undefined;

package/dist/blame.js

@@ -111,7 +111,7 @@ async function blameFile(file, hunks, rev) {
             continue;
         }
         if (line.startsWith('author-mail ')) {
-            const email = line.slice('author-mail '.length).replace(/^<|>$/g, '');
+            const email = line.slice('author-mail '.length).replaceAll(/^<|>$/g, '');
             if (!shaToEmail.has(last.sha)) {
                 shaToEmail.set(last.sha, email);
             }

package/dist/cherry-pick.js

@@ -33,7 +33,7 @@ async function cherryPickOnto(sha, base) {
         ])).trim();
     }
     catch (error) {
-        throw new Error(`Conflicts applying ${sha.slice(0, 8)} onto ${base}. Rebase locally and retry.\n${error}`);
+        throw new Error(`Conflicts applying ${sha.slice(0, 8)} onto ${base}. Rebase locally and retry.\n${error}`, { cause: error });
     }
     const info = await git.raw(['show', '-s', '--format=%an%n%ae%n%aI%n%B', sha]);
     const lines = info.split('\n');

package/dist/cmd/pr-create.js

@@ -50,9 +50,6 @@ async function resolveReviewers(repo, slugs) {
     return found;
 }
 async function prCreate(argv) {
-    if (!argv.title && !argv.updateOnly) {
-        throw new Error('--title is required when creating a PR');
-    }
     const username = await (0, utils_1.getEmailUsername)();
     const repo = await (0, utils_1.getRepoKey)();
     const { head, origin } = await (0, utils_1.getBranchNames)();
@@ -78,22 +75,15 @@ async function prCreate(argv) {
     }
     const branchName = (0, utils_1.branchFromMessage)(username, commit.message);
     const existingPr = prs.find(p => p.headRefName === branchName);
-    if (argv.updateOnly && !existingPr) {
-        throw new Error(`No existing PR for branch ${branchName}`);
+    if (existingPr) {
+        throw new Error(`PR already exists for branch ${branchName} (#${existingPr.number}). Use 'pr-update' to push changes.`);
     }
     const reviewerSlugs = parseSlugs(argv.reviewer);
-    // Reviewers only apply on PR creation (matches `pt pr` behavior).
-    const reviewers = existingPr ? [] : await resolveReviewers(repo, reviewerSlugs);
+    const reviewers = await resolveReviewers(repo, reviewerSlugs);
     console.error(chalk_1.default.gray(`Cherry-picking ${commit.hash.slice(0, 8)} onto ${origin}`));
     const newSha = await (0, cherry_pick_1.cherryPickOnto)(commit.hash, origin);
     console.error(chalk_1.default.gray(`Pushing ${branchName}`));
     await (0, simple_git_1.default)().push(['--force', 'origin', `${newSha}:refs/heads/${branchName}`]);
-    if (existingPr) {
-        const url = `https://github.com/${repo.fullName}/pull/${existingPr.number}`;
-        console.error(chalk_1.default.green(`Updated existing PR #${existingPr.number}: ${existingPr.title}`));
-        console.log(url);
-        return;
-    }
     console.error(chalk_1.default.gray('Creating Pull Request'));
     const { createPullRequest } = await (0, pulls_1.createPull)({
         baseRefName: repoDetails.defaultBranch,

package/dist/cmd/pr-update.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prUpdate = prUpdate;
+const chalk_1 = __importDefault(require("chalk"));
+const simple_git_1 = __importDefault(require("simple-git"));
+const cherry_pick_1 = require("../cherry-pick");
+const pulls_1 = require("../pulls");
+const utils_1 = require("../utils");
+async function prUpdate(argv) {
+    const username = await (0, utils_1.getEmailUsername)();
+    const repo = await (0, utils_1.getRepoKey)();
+    const { head, origin } = await (0, utils_1.getBranchNames)();
+    if (head === null) {
+        throw new Error('Cannot determine HEAD branch name');
+    }
+    if (origin === null) {
+        throw new Error('Cannot determine upstream HEAD branch name');
+    }
+    const unpublished = (0, simple_git_1.default)().log({ from: 'HEAD', to: origin });
+    const [commits, prs] = await Promise.all([unpublished, (0, pulls_1.getPulls)(repo)]);
+    const commit = commits.all.find(c => c.hash.startsWith(argv.sha));
+    if (!commit) {
+        throw new Error(`Commit ${argv.sha} not found in unpublished commits`);
+    }
+    const branchName = (0, utils_1.branchFromMessage)(username, commit.message);
+    const existingPr = prs.find(p => p.headRefName === branchName);
+    if (!existingPr) {
+        throw new Error(`No existing PR for branch ${branchName}. Use 'pr-create' to open one.`);
+    }
+    console.error(chalk_1.default.gray(`Cherry-picking ${commit.hash.slice(0, 8)} onto ${origin}`));
+    const newSha = await (0, cherry_pick_1.cherryPickOnto)(commit.hash, origin);
+    console.error(chalk_1.default.gray(`Pushing ${branchName}`));
+    await (0, simple_git_1.default)().push(['--force', 'origin', `${newSha}:refs/heads/${branchName}`]);
+    const url = `https://github.com/${repo.fullName}/pull/${existingPr.number}`;
+    console.error(chalk_1.default.green(`Updated existing PR #${existingPr.number}: ${existingPr.title}`));
+    console.log(url);
+}

package/dist/cmd/pr.js

@@ -149,7 +149,7 @@ async function pr(argv) {
     });
     // 05-b. Enable auto merge
     prTasks.add({
-        enabled: !!argv.autoMerge,
+        enabled: Boolean(argv.autoMerge),
         title: 'Enabling auto merge',
         task: setAutoMergeTask,
     });

package/dist/config.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (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 js_yaml_1 = require("js-yaml");
+const node_path_1 = require("node:path");
+convict_1.default.addParser({ extension: ['yml', 'yaml'], parse: js_yaml_1.load });
 const config = (0, convict_1.default)({
     ignoreAssignees: {
         doc: 'Assignee names / teams to ignore. Should be a regex expression.',
@@ -17,6 +17,6 @@ const config = (0, convict_1.default)({
 });
 exports.config = config;
 const home = process.env.HOME;
-const configDir = process.env.XDG_CONFIG_HOME || (0, path_1.join)(home, '.config');
-config.loadFile((0, path_1.join)(configDir, 'pt', 'config.yml'));
+const configDir = process.env.XDG_CONFIG_HOME || (0, node_path_1.join)(home, '.config');
+config.loadFile((0, node_path_1.join)(configDir, 'pt', 'config.yml'));
 config.validate();

package/dist/editor.js

@@ -4,17 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.editPullRequest = editPullRequest;
-const child_process_1 = require("child_process");
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = __importDefault(require("path"));
+const node_child_process_1 = require("node:child_process");
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
 const utils_1 = require("./utils");
 async function editPullRequest(commit) {
     const messageBody = commit.body;
     const split = messageBody.length > 0 ? '\n\n' : '';
     const prTemplate = `${commit.message}${split}${messageBody}`;
-    const pullEditFile = path_1.default.join(await (0, utils_1.getRepoPath)(), '.git', 'PULLREQ_EDITMSG');
+    const pullEditFile = node_path_1.default.join(await (0, utils_1.getRepoPath)(), '.git', 'PULLREQ_EDITMSG');
     await promises_1.default.writeFile(pullEditFile, prTemplate);
-    const editor = (0, child_process_1.spawn)(process.env.EDITOR ?? 'vim', [pullEditFile], {
+    const editor = (0, node_child_process_1.spawn)(process.env.EDITOR ?? 'vim', [pullEditFile], {
         shell: true,
         stdio: 'inherit',
     });

package/dist/fzf.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fzfSelect = fzfSelect;
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 async function fzfSelect({ prompt, multi = true, genValues, }) {
     const fzfArgs = [
         '--ansi',
@@ -13,7 +13,7 @@ async function fzfSelect({ prompt, multi = true, genValues, }) {
     if (multi) {
         fzfArgs.push('-m');
     }
-    const fzf = (0, child_process_1.spawn)('fzf', fzfArgs, { shell: true, stdio: ['pipe', 'pipe', 'inherit'] });
+    const fzf = (0, node_child_process_1.spawn)('fzf', fzfArgs, { shell: true, stdio: ['pipe', 'pipe', 'inherit'] });
     fzf.stdin.setDefaultEncoding('utf-8');
     const options = {};
     const valuesDone = genValues(option => {

package/dist/identity.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadAssignableUsers = loadAssignableUsers;
 exports.buildResolver = buildResolver;
 const graphql_request_1 = require("graphql-request");
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = require("path");
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = require("node:path");
 const graphql_1 = require("./graphql");
 function cachePath(repo) {
-    const base = process.env.XDG_CACHE_HOME || (0, path_1.join)(process.env.HOME ?? '', '.cache');
-    return (0, path_1.join)(base, 'pt', `assignees-${repo.owner}-${repo.repo}.json`);
+    const base = process.env.XDG_CACHE_HOME || (0, node_path_1.join)(process.env.HOME ?? '', '.cache');
+    return (0, node_path_1.join)(base, 'pt', `assignees-${repo.owner}-${repo.repo}.json`);
 }
 async function readCache(repo) {
     try {
@@ -24,7 +24,7 @@ async function readCache(repo) {
 }
 async function writeCache(repo, users) {
     const path = cachePath(repo);
-    await promises_1.default.mkdir((0, path_1.join)(path, '..'), { recursive: true });
+    await promises_1.default.mkdir((0, node_path_1.join)(path, '..'), { recursive: true });
     await promises_1.default.writeFile(path, JSON.stringify(users));
 }
 /**
@@ -85,8 +85,8 @@ function parseNoreplyLogin(email) {
  */
 function normalizeName(name) {
     return name
-        .replace(/[^\p{L}\p{N}\s-]/gu, ' ')
-        .replace(/\s+/g, ' ')
+        .replaceAll(/[^\p{L}\p{N}\s-]/gu, ' ')
+        .replaceAll(/\s+/g, ' ')
         .trim()
         .toLowerCase();
 }

package/dist/index.js

@@ -8,6 +8,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const yargs_1 = __importDefault(require("yargs"));
 const pr_1 = require("./cmd/pr");
 const pr_create_1 = require("./cmd/pr-create");
+const pr_update_1 = require("./cmd/pr-update");
 const select_commit_1 = require("./cmd/select-commit");
 const suggest_assignees_1 = require("./cmd/suggest-assignees");
 (0, yargs_1.default)(process.argv.slice(2))
@@ -31,7 +32,7 @@ const suggest_assignees_1 = require("./cmd/suggest-assignees");
     boolean: true,
     desc: 'Enable auto merge for the PR',
 }), pr_1.pr)
-    .command('pr-create <sha>', 'Non-interactively create or update a PR for a single commit. Body is read from stdin.', y => y
+    .command('pr-create <sha>', 'Non-interactively create a PR for a single commit. Body is read from stdin.', y => y
     .positional('sha', {
     type: 'string',
     demandOption: true,
@@ -55,15 +56,16 @@ const suggest_assignees_1 = require("./cmd/suggest-assignees");
     alias: 'm',
     boolean: true,
     desc: 'Enable auto merge for the PR',
-})
-    .option('updateOnly', {
-    boolean: true,
-    desc: 'Only update an existing PR; fail if none exists for the generated branch',
 })
     .option('noOpen', {
     boolean: true,
     desc: 'Do not open the PR in the browser after creation',
 }), pr_create_1.prCreate)
+    .command('pr-update <sha>', 'Non-interactively push an amended commit to its existing PR branch.', y => y.positional('sha', {
+    type: 'string',
+    demandOption: true,
+    desc: 'Commit SHA (full or prefix) whose PR branch should be updated',
+}), pr_update_1.prUpdate)
     .command('suggest-assignees', 'Suggest reviewers for current diff based on blame ownership', y => y
     .option('commit', {
     type: 'string',

package/dist/utils.js

@@ -11,7 +11,7 @@ exports.getAccessToken = getAccessToken;
 exports.branchFromMessage = branchFromMessage;
 const git_url_parse_1 = __importDefault(require("git-url-parse"));
 const simple_git_1 = __importDefault(require("simple-git"));
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 /**
  * Get's the current repo information
  */
@@ -64,7 +64,7 @@ async function getBranchNames() {
  */
 function getAccessToken() {
     try {
-        return (0, child_process_1.execSync)('gh auth token').toString().trim();
+        return (0, node_child_process_1.execSync)('gh auth token').toString().trim();
     }
     catch {
         throw new Error('Cannot get token from `gh auth token`');

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@evanpurkhiser/tooling-personal",
-  "version": "1.47.0",
+  "version": "1.49.0",
   "description": "Evan Purkhiser's personal tooling",
   "license": "MIT",
   "author": "Evan Purkhiser",
@@ -16,7 +16,7 @@
   "scripts": {
     "build": "tsc && chmod +x ./dist/index.js",
     "start": "ts-node ./src/index.ts",
-    "lint": "oxlint src",
+    "lint": "oxlint src/",
     "format": "oxfmt .",
     "format:check": "oxfmt --check ."
   },
@@ -40,10 +40,10 @@
     "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@evanpurkhiser/oxc-config": "^0.5.0",
+    "@evanpurkhiser/oxc-config": "^0.8.0",
     "@tsconfig/node16": "^1.0.1",
-    "oxfmt": "^0.41.0",
-    "oxlint": "^1.56.0",
+    "oxfmt": "^0.47.0",
+    "oxlint": "^1.62.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   },