git-stack-cli 2.5.3 → 2.6.0

package/dist/js/index.js

@@ -37445,7 +37445,7 @@ function AutoUpdate(props) {
     let status2 = "done";
     let latest_version = null;
     let is_brew_bun_standalone = false;
-    const local_version = "2.5.3";
+    const local_version = "2.6.0";
     const is_output = props_ref.current.verbose || props_ref.current.force;
     async function auto_update() {
       if (!local_version) {
@@ -38409,15 +38409,19 @@ function GitReviseTodo(args) {
 GitReviseTodo.todo = function todo(args) {
   const entry_list = [];
   for (const commit2 of args.commit_list) {
-    const id = commit2.branch_id;
-    const title = commit2.title;
-    invariant(id, "commit.branch_id must exist");
-    invariant(title, "commit.title must exist");
-    const metadata = { id, title };
-    const unsafe_message_with_id = write(commit2.full_message, metadata);
-    let message_with_id = unsafe_message_with_id;
     const sha = commit2.sha.slice(0, 12);
-    const entry_lines = [`++ pick ${sha}`, message_with_id];
+    const entry_lines = [`++ pick ${sha}`];
+    const id = commit2.branch_id;
+    if (id == null || id === UNASSIGNED) {
+      entry_lines.push(commit2.full_message);
+    } else {
+      const title = commit2.title;
+      invariant(title, "commit.title must exist");
+      const metadata = { id, title };
+      const unsafe_message_with_id = write(commit2.full_message, metadata);
+      const message_with_id = unsafe_message_with_id;
+      entry_lines.push(message_with_id);
+    }
     const entry = entry_lines.join(`
 `);
     entry_list.push(entry);
@@ -39667,17 +39671,18 @@ function MultiSelect(props) {
     let last_enabled;
     for (let i2 = props.items.length - 1;i2 >= 0; i2--) {
       const item = props.items[i2];
-      if (!item.disabled) {
-        last_enabled = i2;
+      if (item.disabled) {
+        continue;
       }
-      if (!item.selected && !item.disabled) {
+      last_enabled = i2;
+      if (!item.selected) {
         return i2;
       }
     }
     if (is_finite_value(last_enabled)) {
       return last_enabled;
     }
-    return 0;
+    return props.startIndex || 0;
   });
   const selectRef = React41.useRef(false);
   React41.useEffect(() => {
@@ -39825,7 +39830,13 @@ function TextInput(props) {
   }, []);
   use_input_default((input, key) => {
     let next_value = value;
-    if (key.backspace || key.delete) {
+    if (key.escape) {
+      if (value === "") {
+        props.onCancel?.();
+      } else {
+        next_value = "";
+      }
+    } else if (key.backspace || key.delete) {
       next_value = value.slice(0, -1);
     } else if (key.return) {
       props.onSubmit?.(next_value);
@@ -39898,9 +39909,12 @@ function SelectCommitRangesInternal(props) {
   });
   const group_list = [];
   let unassigned_count = 0;
+  let assigned_count = 0;
   for (const [, group_id] of commit_map.entries()) {
     if (group_id === null) {
       unassigned_count++;
+    } else {
+      assigned_count++;
     }
   }
   const total_group_count = new_group_list.length + props.commit_range.group_list.length;
@@ -39928,29 +39942,37 @@ function SelectCommitRangesInternal(props) {
   if (current_index === -1) {
     current_index = 0;
   }
+  const has_unassigned_commits = unassigned_count > 0;
+  const has_assigned_commits = assigned_count > 0;
+  const sync_status = detect_sync_status();
   use_input_default((input, key) => {
-    const inputLower = input.toLowerCase();
-    const hasUnassignedCommits = unassigned_count > 0;
-    if (!hasUnassignedCommits && inputLower === "s") {
+    const input_lower = input.toLowerCase();
+    if (input_lower === SYMBOL.s) {
+      if (group_input) {
+        return;
+      }
+      if (sync_status === "disabled") {
+        return;
+      }
       actions.set((state) => {
-        state.commit_map = {};
-        for (const [sha, id] of commit_map.entries()) {
-          if (id) {
-            const group2 = group_list.find((g2) => g2.id === id);
-            if (group2) {
-              state.commit_map[sha] = group2;
-            }
+        const state_commit_map = {};
+        for (let [sha, id] of commit_map.entries()) {
+          if (!id) {
+            id = props.commit_range.UNASSIGNED;
+            const title = "allow_unassigned";
+            state_commit_map[sha] = { id, title };
+            continue;
           }
+          const group2 = group_list.find((g2) => g2.id === id);
+          invariant(group2, "group must exist");
+          state_commit_map[sha] = group2;
         }
-        switch (inputLower) {
-          case "s":
-            state.step = "pre-manual-rebase";
-            break;
-        }
+        state.commit_map = state_commit_map;
+        state.step = "pre-manual-rebase";
       });
       return;
     }
-    if (hasUnassignedCommits && inputLower === "c") {
+    if (has_unassigned_commits && input_lower === SYMBOL.c) {
       set_group_input(true);
       return;
     }
@@ -39968,12 +39990,17 @@ function SelectCommitRangesInternal(props) {
   const group = group_list[current_index];
   const multiselect_disabled = group_input;
   const multiselect_disableSelect = group.id === props.commit_range.UNASSIGNED;
+  const max_width = 80;
+  const [focused, set_focused] = React43.useState("");
+  const has_groups = group.id !== props.commit_range.UNASSIGNED;
   const items = props.commit_range.commit_list.map((commit2) => {
     const commit_metadata_id = commit_map.get(commit2.sha);
     const selected = commit_metadata_id !== null;
     let disabled;
     if (group_input) {
       disabled = true;
+    } else if (!has_groups) {
+      disabled = true;
     } else {
       disabled = Boolean(selected && commit_metadata_id !== group.id);
     }
@@ -39985,24 +40012,84 @@ function SelectCommitRangesInternal(props) {
     };
   });
   items.reverse();
-  const left_arrow = `${SYMBOL.left} `;
-  const right_arrow = ` ${SYMBOL.right}`;
-  const group_position = `(${current_index + 1}/${group_list.length}) `;
-  const max_group_label_width = 80;
-  let group_title_width = max_group_label_width;
-  group_title_width -= group_position.length;
-  group_title_width -= left_arrow.length + right_arrow.length;
-  group_title_width = Math.min(group.title.length, group_title_width);
-  let max_item_width = max_group_label_width;
-  max_item_width -= left_arrow.length + right_arrow.length;
-  const [focused, set_focused] = React43.useState("");
   return /* @__PURE__ */ React43.createElement(Box_default, {
     flexDirection: "column"
   }, /* @__PURE__ */ React43.createElement(Box_default, {
     height: 1
+  }), has_groups || group_input ? null : /* @__PURE__ */ React43.createElement(Box_default, {
+    flexDirection: "column"
+  }, /* @__PURE__ */ React43.createElement(Text, {
+    bold: true,
+    color: colors.blue
+  }, "\uD83D\uDC4B Welcome to ", /* @__PURE__ */ React43.createElement(Command, null, "git stack"), "!"), /* @__PURE__ */ React43.createElement(Text, {
+    color: colors.blue
+  }, /* @__PURE__ */ React43.createElement(FormatText, {
+    message: "Press {c} to {create} a new PR group",
+    values: {
+      c: /* @__PURE__ */ React43.createElement(Text, {
+        bold: true,
+        color: colors.green
+      }, "c"),
+      create: /* @__PURE__ */ React43.createElement(Text, {
+        bold: true,
+        color: colors.green
+      }, /* @__PURE__ */ React43.createElement(Parens, null, "c"), "reate")
+    }
+  }))), !has_groups || group_input ? null : /* @__PURE__ */ React43.createElement(React43.Fragment, null, /* @__PURE__ */ React43.createElement(Box_default, {
+    width: max_width,
+    flexDirection: "row"
+  }, /* @__PURE__ */ React43.createElement(Box_default, {
+    flexDirection: "row"
+  }, /* @__PURE__ */ React43.createElement(Text, {
+    bold: true,
+    color: colors.green
+  }, SYMBOL.left), /* @__PURE__ */ React43.createElement(Box_default, {
+    width: 1
+  }), /* @__PURE__ */ React43.createElement(Text, {
+    color: colors.gray
+  }, "Pull request"), /* @__PURE__ */ React43.createElement(Box_default, {
+    width: 1
+  }), /* @__PURE__ */ React43.createElement(Text, {
+    color: colors.gray
+  }, `(${current_index + 1}/${group_list.length})`), /* @__PURE__ */ React43.createElement(Box_default, {
+    width: 1
+  }), /* @__PURE__ */ React43.createElement(Text, {
+    bold: true,
+    color: colors.green
+  }, SYMBOL.right))), /* @__PURE__ */ React43.createElement(Box_default, {
+    width: max_width
+  }, /* @__PURE__ */ React43.createElement(Text, {
+    wrap: "truncate-end",
+    bold: true,
+    color: colors.green
+  }, group.title))), !group_input ? null : /* @__PURE__ */ React43.createElement(React43.Fragment, null, /* @__PURE__ */ React43.createElement(Box_default, {
+    height: 1
+  }), /* @__PURE__ */ React43.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React43.createElement(Text, {
+      color: colors.gray
+    }),
+    message: "Enter a title for the PR {note}",
+    values: {
+      note: /* @__PURE__ */ React43.createElement(Parens, null, /* @__PURE__ */ React43.createElement(FormatText, {
+        message: "press {enter} to submit",
+        values: {
+          enter: /* @__PURE__ */ React43.createElement(Text, {
+            bold: true,
+            color: colors.green
+          }, SYMBOL.enter)
+        }
+      }))
+    }
+  }), /* @__PURE__ */ React43.createElement(TextInput, {
+    defaultValue: focused,
+    onSubmit: submit_group_input,
+    onCancel: () => set_group_input(false)
+  })), /* @__PURE__ */ React43.createElement(Box_default, {
+    height: 1
   }), /* @__PURE__ */ React43.createElement(MultiSelect, {
+    startIndex: items.length - 1,
     items,
-    maxWidth: max_item_width,
+    maxWidth: max_width,
     disabled: multiselect_disabled,
     disableSelect: multiselect_disableSelect,
     onFocus: (args) => {
@@ -40020,26 +40107,23 @@ function SelectCommitRangesInternal(props) {
     }
   }), /* @__PURE__ */ React43.createElement(Box_default, {
     height: 1
-  }), /* @__PURE__ */ React43.createElement(Box_default, {
-    width: max_group_label_width,
-    flexDirection: "row"
-  }, /* @__PURE__ */ React43.createElement(Text, null, left_arrow), /* @__PURE__ */ React43.createElement(Text, null, group_position), /* @__PURE__ */ React43.createElement(Box_default, {
-    width: group_title_width,
-    justifyContent: "center"
-  }, /* @__PURE__ */ React43.createElement(Text, {
-    wrap: "truncate-end"
-  }, group.title)), /* @__PURE__ */ React43.createElement(Text, null, right_arrow)), /* @__PURE__ */ React43.createElement(Box_default, {
-    height: 1
-  }), unassigned_count > 0 ? /* @__PURE__ */ React43.createElement(FormatText, {
+  }), has_unassigned_commits ? /* @__PURE__ */ React43.createElement(React43.Fragment, null, /* @__PURE__ */ React43.createElement(FormatText, {
     wrapper: /* @__PURE__ */ React43.createElement(Text, {
       color: colors.gray
     }),
-    message: "{count} unassigned commits, press {c} to {create} a new group",
+    message: "{count} unassigned commits",
     values: {
       count: /* @__PURE__ */ React43.createElement(Text, {
         color: colors.yellow,
         bold: true
-      }, unassigned_count),
+      }, unassigned_count)
+    }
+  }), group_input ? null : /* @__PURE__ */ React43.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React43.createElement(Text, {
+      color: colors.gray
+    }),
+    message: "Press {c} to {create} a new PR group",
+    values: {
       c: /* @__PURE__ */ React43.createElement(Text, {
         bold: true,
         color: colors.green
@@ -40049,55 +40133,26 @@ function SelectCommitRangesInternal(props) {
         color: colors.green
       }, /* @__PURE__ */ React43.createElement(Parens, null, "c"), "reate")
     }
-  }) : /* @__PURE__ */ React43.createElement(React43.Fragment, null, argv.sync ? /* @__PURE__ */ React43.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React43.createElement(Text, null),
-    message: "\uD83C\uDF89 Done! Press {s} to {sync} the commits to Github",
-    values: {
-      s: /* @__PURE__ */ React43.createElement(Text, {
-        bold: true,
-        color: colors.green
-      }, "s"),
-      sync: /* @__PURE__ */ React43.createElement(Text, {
-        bold: true,
-        color: colors.green
-      }, /* @__PURE__ */ React43.createElement(Parens, null, "s"), "ync")
-    }
-  }) : /* @__PURE__ */ React43.createElement(FormatText, {
-    wrapper: /* @__PURE__ */ React43.createElement(Text, null),
-    message: "\uD83C\uDF89 Done! Press {s} to {save} the commits locally",
-    values: {
-      s: /* @__PURE__ */ React43.createElement(Text, {
-        bold: true,
-        color: colors.green
-      }, "s"),
-      save: /* @__PURE__ */ React43.createElement(Text, {
-        bold: true,
-        color: colors.green
-      }, /* @__PURE__ */ React43.createElement(Parens, null, "s"), "save")
-    }
-  })), !group_input ? null : /* @__PURE__ */ React43.createElement(React43.Fragment, null, /* @__PURE__ */ React43.createElement(Box_default, {
-    height: 1
-  }), /* @__PURE__ */ React43.createElement(FormatText, {
+  }), sync_status !== "allow_unassigned" ? null : /* @__PURE__ */ React43.createElement(FormatText, {
     wrapper: /* @__PURE__ */ React43.createElement(Text, {
       color: colors.gray
     }),
-    message: "Enter a title for the PR {note}",
+    message: "Press {s} to {sync} the {count} assigned commits to Github",
     values: {
-      note: /* @__PURE__ */ React43.createElement(Parens, null, /* @__PURE__ */ React43.createElement(FormatText, {
-        message: "press {enter} to submit",
-        values: {
-          enter: /* @__PURE__ */ React43.createElement(Text, {
-            bold: true,
-            color: colors.green
-          }, SYMBOL.enter)
-        }
-      }))
+      ...S_TO_SYNC_VALUES,
+      count: /* @__PURE__ */ React43.createElement(Text, {
+        color: colors.yellow,
+        bold: true
+      }, assigned_count)
     }
-  }), /* @__PURE__ */ React43.createElement(TextInput, {
-    defaultValue: focused,
-    onSubmit: submit_group_input
-  }), /* @__PURE__ */ React43.createElement(Box_default, {
-    height: 1
+  })) : /* @__PURE__ */ React43.createElement(React43.Fragment, null, argv.sync ? /* @__PURE__ */ React43.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React43.createElement(Text, null),
+    message: "\uD83C\uDF89 Done! Press {s} to {sync} the commits to Github",
+    values: S_TO_SYNC_VALUES
+  }) : /* @__PURE__ */ React43.createElement(FormatText, {
+    wrapper: /* @__PURE__ */ React43.createElement(Text, null),
+    message: "\uD83C\uDF89 Done! Press {s} to {save} the commits locally",
+    values: S_TO_SYNC_VALUES
   })), /* @__PURE__ */ React43.createElement(Box_default, null, /* @__PURE__ */ React43.createElement(FormatText, {
     wrapper: /* @__PURE__ */ React43.createElement(Text, {
       color: colors.gray
@@ -40140,7 +40195,7 @@ function SelectCommitRangesInternal(props) {
       wrapper: /* @__PURE__ */ React43.createElement(Text, {
         dimColor: true
       }),
-      message: "Created new group {group} {note}",
+      message: "Created new PR group {group} {note}",
       values: {
         group: /* @__PURE__ */ React43.createElement(Brackets, null, title),
         note: /* @__PURE__ */ React43.createElement(Parens, null, id)
@@ -40150,11 +40205,49 @@ function SelectCommitRangesInternal(props) {
     set_selected_group_id(id);
     set_group_input(false);
   }
+  function detect_sync_status() {
+    if (!has_unassigned_commits) {
+      return "allow";
+    }
+    if (!has_assigned_commits) {
+      return "disabled";
+    }
+    let allow_unassigned_sync = null;
+    for (let i2 = 0;i2 < props.commit_range.commit_list.length; i2++) {
+      const commit2 = props.commit_range.commit_list[i2];
+      const group_id = commit_map.get(commit2.sha);
+      if (allow_unassigned_sync === null) {
+        if (group_id === null) {
+          allow_unassigned_sync = true;
+        }
+      } else {
+        if (group_id) {
+          allow_unassigned_sync = false;
+        }
+      }
+    }
+    if (allow_unassigned_sync) {
+      return "allow_unassigned";
+    }
+    return "disabled";
+  }
 }
 var SYMBOL = {
   left: "←",
   right: "→",
-  enter: "Enter"
+  enter: "Enter",
+  c: "c",
+  s: "s"
+};
+var S_TO_SYNC_VALUES = {
+  s: /* @__PURE__ */ React43.createElement(Text, {
+    bold: true,
+    color: colors.green
+  }, "s"),
+  sync: /* @__PURE__ */ React43.createElement(Text, {
+    bold: true,
+    color: colors.green
+  }, /* @__PURE__ */ React43.createElement(Parens, null, "s"), "ync")
 };
 
 // src/app/SyncGithub.tsx
@@ -40307,15 +40400,15 @@ async function run9() {
       git_push_command.push(target);
     }
     await cli(git_push_command);
-    const pr_url_list = commit_range.group_list.map(get_group_url);
+    const pr_url_list = push_group_list.map(get_group_url);
     const after_push_tasks = [];
     for (const group of push_group_list) {
       after_push_tasks.push(after_push({ group, pr_url_list }));
     }
     await Promise.all(after_push_tasks);
     const update_pr_body_tasks = [];
-    for (let i2 = 0;i2 < commit_range.group_list.length; i2++) {
-      const group = commit_range.group_list[i2];
+    for (let i2 = 0;i2 < push_group_list.length; i2++) {
+      const group = push_group_list[i2];
       const selected_url = pr_url_list[i2];
       const task = update_pr_body({ group, selected_url, pr_url_list });
       update_pr_body_tasks.push(task);
@@ -40343,7 +40436,9 @@ async function run9() {
         break;
       }
       const group = commit_range.group_list[index];
-      push_group_list2.unshift(group);
+      if (group.id !== commit_range.UNASSIGNED) {
+        push_group_list2.unshift(group);
+      }
     }
     return push_group_list2;
   }
@@ -45675,7 +45770,7 @@ var yargs_default = Yargs;
 
 // src/command.ts
 async function command2() {
-  return yargs_default(hideBin(process.argv)).scriptName("git stack").usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).command(["update", "upgrade"], "Check and install the latest version of git stack", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.5.3").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
+  return yargs_default(hideBin(process.argv)).scriptName("git stack").usage("Usage: git stack [command] [options]").command("$0", "Sync commit ranges to Github", (yargs) => yargs.options(DefaultOptions)).command("fixup [commit]", "Amend staged changes to a specific commit in history", (yargs) => yargs.positional("commit", FixupOptions.commit)).command("log [args...]", "Print an abbreviated log with numbered commits, useful for git stack fixup", (yargs) => yargs.strict(false)).command("rebase", "Update local branch via rebase with latest changes from origin master branch", (yargs) => yargs).command(["update", "upgrade"], "Check and install the latest version of git stack", (yargs) => yargs).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.6.0").showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`").help("help", "Show usage via `git stack help`").argv;
 }
 var GlobalOptions = {
   verbose: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.5.3",
+  "version": "2.6.0",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "test": "bun test",
     "test:watch": "pnpm run test --watch",
     "test:types": "tsc",
-    "test:all": "pnpm run prettier:check && pnpm run lint:check && pnpm run test:types",
+    "test:all": "pnpm run prettier:check && pnpm run lint:check && pnpm run test:types && pnpm run test",
     "prepublishOnly": "bun run scripts/npm-prepublishOnly.ts"
   },
   "dependencies": {

package/src/app/ManualRebase.tsx

@@ -59,6 +59,11 @@ async function run() {
       commit.title = group_from_map.title;
     }
 
+    // // capture commit_range for GitReviseTodo test
+    // // doc-link capture-git-revise-todo
+    // console.debug(JSON.stringify(commit_range, null, 2));
+    // throw new Error("STOP");
+
     await GitReviseTodo.execute({
       rebase_group_index: 0,
       rebase_merge_base: merge_base,

package/src/app/MultiSelect.tsx

@@ -14,6 +14,7 @@ type Props<T> = {
   disabled?: boolean;
   disableSelect?: boolean;
   maxWidth?: number;
+  startIndex?: number;
 };
 
 type Item<T> = {
@@ -67,11 +68,13 @@ export function MultiSelect<T>(props: Props<T>) {
       for (let i = props.items.length - 1; i >= 0; i--) {
         const item = props.items[i];
 
-        if (!item.disabled) {
-          last_enabled = i;
+        if (item.disabled) {
+          continue;
         }
 
-        if (!item.selected && !item.disabled) {
+        last_enabled = i;
+
+        if (!item.selected) {
           return i;
         }
       }
@@ -80,7 +83,7 @@ export function MultiSelect<T>(props: Props<T>) {
         return last_enabled;
       }
 
-      return 0;
+      return props.startIndex || 0;
     },
   );