@aaronshaf/ger 1.2.7 → 1.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aaronshaf/ger",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "Gerrit CLI",
   "main": "src/ger.ts",
   "bin": {

package/src/commands/branch.ts

@@ -100,7 +100,7 @@ function output(
         .filter(Boolean)
         .map((str) => `[${str}]`) as string[];
 
-      const approvals = gerritData.currentPatchSet.approvals.map((a) => {
+      const approvals = (gerritData.currentPatchSet.approvals || []).map((a) => {
         let description = a.description;
         if (a.type === "SUBM" && !description) {
           description = "Submitted";

package/src/ger.ts

@@ -12,6 +12,7 @@ program
   .command("branch")
   .description("Get a list of local branches with Gerrit info")
   .option("-v", "Show extra information, i.e. approvals")
+  .option("-d", "Prompt to delete already-merged branches")
   .action((
     _program: any,
   ) => {

package/src/types.d.ts

@@ -19,7 +19,7 @@ export type GerritApproval = {
 
 export type GerritData = {
   currentPatchSet: {
-    approvals: GerritApproval[]
+    approvals?: GerritApproval[]
   }
   id: string;
   status: 'MERGED' | 'ABANDONED';

package/src/utils.ts

@@ -12,22 +12,19 @@ export function bold(text: string) {
   return `\x1b[1m${text}\x1b[0m`;
 }
 
-// grey with transparent background
 export function grey(text: string) {
   return `\x1b[37m\x1b[40m${text}\x1b[0m`;
 }
 
-// brown with transparent background
 export function darkBrown(text: string) {
   // return `\x1b[43m\x1b[30m${text}\x1b[0m`;
   return `\x1b[33m${text}\x1b[0m`;
 }
 
 export function green(text: string) {
-  return `\x1b[42m\x1b[30m${text}\x1b[0m`;
+  return `\x1b[32m${text}\x1b[0m`;
 }
 
-// yellow text with transparent background
 export function yellow(text: string) {
   // return `\x1b[33m\x1b[40m${text}\x1b[0m`;
   return `\x1b[33m${text}\x1b[0m`;
@@ -63,7 +60,7 @@ export function getGerritData(changeIds: string[]) {
   }
 
   // Run the gerrit query command
-  const gerrit_output = execSync(
+  const gerritData = execSync(
     `ssh gerrit "gerrit query --current-patch-set --format=JSON '${query}'"`
   )
     .toString()
@@ -71,7 +68,7 @@ export function getGerritData(changeIds: string[]) {
     .split("\n")
     .map((line) => JSON.parse(line) as GerritData);
 
-  return gerrit_output.reduce<GerritDataMap>((acc, change) => {
+  return gerritData.reduce<GerritDataMap>((acc, change) => {
     return {
       ...acc,
       [change.id]: change,