git-stack-cli 0.7.0 → 0.7.2

package/dist/app/ManualRebase.js

@@ -50,9 +50,11 @@ async function run(props) {
     try {
         // create temporary branch based on merge base
         await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
+        const pr_url_list = commit_range.group_list.map(get_group_url);
         for (let i = rebase_group_index; i < commit_range.group_list.length; i++) {
             const group = commit_range.group_list[i];
             invariant(group.base, "group.base must exist");
+            const selected_url = get_group_url(group);
             // cherry-pick and amend commits one by one
             for (const commit of group.commits) {
                 await cli(`git cherry-pick ${commit.sha}`);
@@ -78,8 +80,8 @@ async function run(props) {
                         base: group.base,
                         body: StackSummaryTable.write({
                             body: group.pr.body,
-                            commit_range,
-                            selected_group_id: group.id,
+                            pr_url_list,
+                            selected_url,
                         }),
                     });
                 }
@@ -89,21 +91,51 @@ async function run(props) {
                     // move to temporary branch for creating pr
                     await cli(`git checkout -b ${group.id}`);
                     // create pr in github
-                    await github.pr_create({
+                    const pr_url = await github.pr_create({
                         branch: group.id,
                         base: group.base,
                         title: group.title,
-                        body: StackSummaryTable.write({
-                            body: "",
-                            commit_range,
-                            selected_group_id: group.id,
-                        }),
+                        body: "",
                     });
+                    if (!pr_url) {
+                        throw new Error("unable to create pr");
+                    }
+                    // update pr_url_list with created pr_url
+                    for (let i = 0; i < pr_url_list.length; i++) {
+                        const url = pr_url_list[i];
+                        if (url === selected_url) {
+                            pr_url_list[i] = pr_url;
+                        }
+                    }
                     // move back to temp branch
                     await cli(`git checkout ${temp_branch_name}`);
                 }
             }
         }
+        // finally, ensure all prs have the updated stack table from updated pr_url_list
+        for (let i = 0; i < commit_range.group_list.length; i++) {
+            const group = commit_range.group_list[i];
+            // use the updated pr_url_list to get the actual selected_url
+            const selected_url = pr_url_list[i];
+            invariant(group.base, "group.base must exist");
+            const body = group.pr?.body || "";
+            const update_body = StackSummaryTable.write({
+                body,
+                pr_url_list,
+                selected_url,
+            });
+            if (update_body === body) {
+                actions.debug(`Skipping body update for ${selected_url}`);
+            }
+            else {
+                actions.debug(`Update body for ${selected_url}`);
+                await github.pr_edit({
+                    branch: group.id,
+                    base: group.base,
+                    body: update_body,
+                });
+            }
+        }
         // after all commits have been cherry-picked and amended
         // move the branch pointer to the newly created temporary branch
         // now we are in locally in sync with github and on the original branch
@@ -152,3 +184,4 @@ async function run(props) {
         actions.exit(5);
     }
 }
+const get_group_url = (group) => group.pr?.url || group.id;

package/dist/app/MultiSelect.js

@@ -2,6 +2,7 @@ import * as React from "react";
 import * as Ink from "ink";
 import { clamp } from "../core/clamp.js";
 import { colors } from "../core/colors.js";
+import { is_finite_value } from "../core/is_finite_value.js";
 import { wrap_index } from "../core/wrap_index.js";
 export function MultiSelect(props) {
     const [selected_set, select] = React.useReducer((state, value) => {
@@ -25,18 +26,18 @@ export function MultiSelect(props) {
     const [index, set_index] = React.useReducer((_, value) => {
         return clamp(value, 0, props.items.length - 1);
     }, 0, function find_initial_index() {
-        let firstEnabled;
+        let last_enabled;
         for (let i = props.items.length - 1; i >= 0; i--) {
             const item = props.items[i];
-            if (!item.disabled && firstEnabled === undefined) {
-                firstEnabled = i;
+            if (!item.disabled) {
+                last_enabled = i;
             }
-            if (item.selected && !item.disabled) {
+            if (!item.selected && !item.disabled) {
                 return i;
             }
         }
-        if (typeof firstEnabled === "number") {
-            return firstEnabled;
+        if (is_finite_value(last_enabled)) {
+            return last_enabled;
         }
         return 0;
     });

package/dist/core/StackSummaryTable.js

@@ -1,17 +1,19 @@
 export function write(args) {
-    const group_list = args.commit_range?.group_list;
-    if (!Array.isArray(group_list) || group_list.length === 0) {
-        return "";
-    }
     const stack_list = [];
-    for (const group of group_list) {
-        if (group.pr?.url) {
-            const selected = args.selected_group_id === group.id;
+    for (const pr_url of args.pr_url_list) {
+        if (pr_url) {
+            const selected = args.selected_url === pr_url;
             const icon = selected ? "👉" : "⏳";
-            stack_list.push(`- ${icon} ${group.pr.url}`);
+            stack_list.push(`- ${icon} ${pr_url}`);
         }
     }
-    const stack_table = TEMPLATE.stack_table(["", ...stack_list, "", ""].join("\n"));
+    let stack_table;
+    if (stack_list.length > 1) {
+        stack_table = TEMPLATE.stack_table(["", ...stack_list, "", ""].join("\n"));
+    }
+    else {
+        stack_table = "";
+    }
     let result = args.body;
     if (RE.stack_table.test(result)) {
         // replace stack table

package/dist/core/github.js

@@ -86,7 +86,9 @@ export async function pr_create(args) {
     const cli_result = await cli(`gh pr create --fill --head ${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`);
     if (cli_result.code !== 0) {
         handle_error(cli_result.output);
+        return null;
     }
+    return cli_result.stdout;
 }
 export async function pr_edit(args) {
     const cli_result = await cli(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "",
   "author": "magus",
   "license": "MIT",