@evanpurkhiser/tooling-personal 1.52.0 → 1.54.0

package/dist/assignees.js

@@ -78,9 +78,7 @@ async function* getAssignees(repo) {
     const items = !isOrganization
         ? userAssignees
         : (0, fast_merge_async_iterators_1.default)(userAssignees, teamAssignees);
-    const assigneeesToIgnore = config_1.config
-        .get('ignoreAssignees')
-        .map(value => new RegExp(value));
+    const assigneesToIgnore = 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 => ({
@@ -96,7 +94,7 @@ async function* getAssignees(repo) {
                 name: team.name,
             }));
         // Remove assignees that are ignored
-        const filteredAssignees = assignees.filter(assignee => !assigneeesToIgnore.some(r => r.test(assignee.slug)));
+        const filteredAssignees = assignees.filter(assignee => !assigneesToIgnore.some(r => r.test(assignee.slug)));
         yield* filteredAssignees;
     }
 }

package/dist/cherry-pick.js

@@ -31,16 +31,14 @@ async function buildPickError(git, sha, base, baseSha, parentSha, conflictLines)
         '--',
         ...conflictFiles,
     ])).trim();
-    if (candidateLog) {
-        const count = candidateLog.split('\n').length;
-        return new Error(`Cannot cherry-pick ${sha.slice(0, 8)} onto tip of ${base}: ` +
-            `merge conflicts in ${conflictFiles.join(', ')}. ` +
-            `${count} earlier local commit(s) changed those file(s); ` +
-            `one or more is the source of the conflict and must be on the remote ` +
-            `before a PR can be opened:\n${candidateLog}`);
+    const fileList = conflictFiles.map(file => `- ${file}`).join('\n');
+    const header = `Cannot cherry-pick ${sha.slice(0, 8)} onto tip of ${base}, merge conflicts in:\n${fileList}`;
+    if (!candidateLog) {
+        return new Error(header);
     }
-    return new Error(`Cannot cherry-pick ${sha.slice(0, 8)} onto ${base}: ` +
-        `content conflicts in ${conflictFiles.join(', ')}. Rebase locally and retry.`);
+    const candidates = candidateLog.split('\n');
+    const candidateList = candidates.map(line => `- ${line}`).join('\n');
+    return new Error(`${header}\n\n${candidates.length} earlier local commit(s) changed those file(s):\n${candidateList}`);
 }
 /**
  * Build a commit object equivalent to cherry-picking `sha` onto `base`, without

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@evanpurkhiser/tooling-personal",
-  "version": "1.52.0",
+  "version": "1.54.0",
   "description": "Evan Purkhiser's personal tooling",
   "license": "MIT",
   "author": "Evan Purkhiser",
@@ -13,16 +13,6 @@
     "dist/**",
     "README.md"
   ],
-  "devEngines": {
-    "runtime": {
-      "name": "node",
-      "version": "^24.15.0"
-    },
-    "packageManager": {
-      "name": "pnpm",
-      "version": "11.0.0"
-    }
-  },
   "dependencies": {
     "@octokit/graphql-schema": "^10.54.0",
     "@types/convict": "^6.1.3",
@@ -50,6 +40,16 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   },
+  "devEngines": {
+    "packageManager": {
+      "name": "pnpm",
+      "version": "11.0.0"
+    },
+    "runtime": {
+      "name": "node",
+      "version": "^24.15.0"
+    }
+  },
   "scripts": {
     "build": "tsc && chmod +x ./dist/index.js",
     "start": "ts-node ./src/index.ts",