git-stack-cli 1.15.0 → 2.0.0-beta

package/src/app/AutoUpdate.tsx

@@ -67,14 +67,10 @@ export function AutoUpdate(props: Props) {
 
     async function auto_update() {
       if (props_ref.current.verbose) {
-        handle_output(
-          <Ink.Text key="init">Checking for latest version...</Ink.Text>
-        );
+        handle_output(<Ink.Text key="init">Checking for latest version...</Ink.Text>);
       }
 
-      const timeout_ms = is_finite_value(props.timeoutMs)
-        ? props.timeoutMs
-        : 2 * 1000;
+      const timeout_ms = is_finite_value(props.timeoutMs) ? props.timeoutMs : 2 * 1000;
 
       const npm_json = await Promise.race([
         fetch_json(`https://registry.npmjs.org/${props.name}`),
@@ -94,12 +90,7 @@ export function AutoUpdate(props: Props) {
       const script_dir = path.dirname(script_path);
 
       // dist/ts/index.js
-      const package_json_path = path.join(
-        script_dir,
-        "..",
-        "..",
-        "package.json"
-      );
+      const package_json_path = path.join(script_dir, "..", "..", "package.json");
 
       type PackageJson = { version: string };
       const package_json = await read_json<PackageJson>(package_json_path);
@@ -121,7 +112,7 @@ export function AutoUpdate(props: Props) {
               latest_version: <Brackets>{latest_version}</Brackets>,
               local_version: <Brackets>{local_version}</Brackets>,
             }}
-          />
+          />,
         );
       }
 
@@ -134,7 +125,7 @@ export function AutoUpdate(props: Props) {
       if (semver_result === -1) {
         // latest version is less than or equal to local version, skip auto update
         throw new Error(
-          `latest version < local_version, skipping auto update [${latest_version} < ${local_version}]`
+          `latest version < local_version, skipping auto update [${latest_version} < ${local_version}]`,
         );
       }
 
@@ -156,7 +147,7 @@ export function AutoUpdate(props: Props) {
           handle_output(
             <Ink.Text key="error" color={colors.red}>
               {error?.message}
-            </Ink.Text>
+            </Ink.Text>,
           );
         }
       })
@@ -185,16 +176,10 @@ export function AutoUpdate(props: Props) {
                   wrapper={<Ink.Text />}
                   message="Installing {name}@{version}..."
                   values={{
-                    name: (
-                      <Ink.Text color={colors.yellow}>{props.name}</Ink.Text>
-                    ),
-                    version: (
-                      <Ink.Text color={colors.blue}>
-                        {state.latest_version}
-                      </Ink.Text>
-                    ),
+                    name: <Ink.Text color={colors.yellow}>{props.name}</Ink.Text>,
+                    version: <Ink.Text color={colors.blue}>{state.latest_version}</Ink.Text>,
                   }}
-                />
+                />,
               );
 
               patch({ status: "install" });

package/src/app/CherryPickCheck.tsx

@@ -40,8 +40,7 @@ export function CherryPickCheck(props: Props) {
         <YesNoPrompt
           message={
             <Ink.Text color={colors.yellow}>
-              <Command>git cherry-pick</Command> detected, would you like to
-              abort it?
+              <Command>git cherry-pick</Command> detected, would you like to abort it?
             </Ink.Text>
           }
           onYes={async () => {

package/src/app/Debug.tsx

@@ -20,12 +20,10 @@ export function Debug() {
   React.useEffect(
     function debugMessageOnce() {
       if (debug) {
-        actions.output(
-          <Ink.Text color={colors.yellow}>Debug mode enabled</Ink.Text>
-        );
+        actions.output(<Ink.Text color={colors.yellow}>Debug mode enabled</Ink.Text>);
       }
     },
-    [argv]
+    [argv],
   );
 
   React.useEffect(
@@ -46,7 +44,7 @@ export function Debug() {
         await fs.writeFile(output_file, content);
       }
     },
-    [argv, state]
+    [argv, state],
   );
 
   return null;

package/src/app/DependencyCheck.tsx

@@ -55,7 +55,7 @@ function CheckGit(props: Props) {
         actions.output(
           <Ink.Text color={colors.yellow}>
             <Command>git</Command> must be installed.
-          </Ink.Text>
+          </Ink.Text>,
         );
 
         actions.exit(2);
@@ -86,7 +86,7 @@ function CheckGithubCli(props: Props) {
         actions.output(
           <Ink.Text color={colors.yellow}>
             <Command>gh</Command> must be installed.
-          </Ink.Text>
+          </Ink.Text>,
         );
 
         actions.output(
@@ -98,7 +98,7 @@ function CheckGithubCli(props: Props) {
 
               command: <Command>gh</Command>,
             }}
-          />
+          />,
         );
 
         actions.exit(3);
@@ -150,7 +150,7 @@ function CheckGithubCliAuth(props: Props) {
 
               command: <Command>gh auth login</Command>,
             }}
-          />
+          />,
         );
 
         actions.exit(4);
@@ -181,7 +181,7 @@ function CheckGitRevise(props: Props) {
         actions.output(
           <Ink.Text color={colors.yellow}>
             <Command>git revise</Command> must be installed.
-          </Ink.Text>
+          </Ink.Text>,
         );
 
         actions.output(
@@ -199,7 +199,7 @@ function CheckGitRevise(props: Props) {
                 </Parens>
               ),
             }}
-          />
+          />,
         );
 
         actions.exit(10);

package/src/app/DetectInitialPR.tsx

@@ -97,11 +97,7 @@ export function DetectInitialPR(props: Props) {
       return (
         <Await
           function={run}
-          fallback={
-            <Ink.Text color={colors.yellow}>
-              Checking for existing PR on Github…
-            </Ink.Text>
-          }
+          fallback={<Ink.Text color={colors.yellow}>Checking for existing PR on Github…</Ink.Text>}
         />
       );
   }
@@ -167,9 +163,7 @@ export function DetectInitialPR(props: Props) {
     // get latest merge_base relative to local master
     const rebase_group_index = 0;
 
-    const rebase_merge_base = (
-      await cli(`git merge-base HEAD ${master_branch}`)
-    ).stdout;
+    const rebase_merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
 
     await GitReviseTodo.execute({
       rebase_group_index,

package/src/app/DirtyCheck.tsx

@@ -33,6 +33,14 @@ export function DirtyCheck(props: Props) {
     case "done":
       return props.children;
 
+    case "stash":
+      return (
+        <FormatText
+          wrapper={<Ink.Text color={colors.yellow} />}
+          message="📦 Stashing uncommitted changes…"
+        />
+      );
+
     case "prompt":
       return (
         <Ink.Box flexDirection="column">
@@ -56,9 +64,15 @@ export function DirtyCheck(props: Props) {
               />
             }
             onYes={async () => {
+              patch({ status: "stash" });
+
               await cli("git stash --include-untracked");
 
-              actions.output(<Ink.Text>📦 Changes saved to stash</Ink.Text>);
+              actions.output(
+                <Ink.Text color={colors.yellow}>
+                  <FormatText message="📦 Changes saved to stash" />
+                </Ink.Text>,
+              );
 
               actions.set((state) => {
                 state.is_dirty_check_stash = true;

package/src/app/Exit.tsx

@@ -36,11 +36,7 @@ export function Exit(props: Props) {
       // restore git stash if necessary
       if (state.is_dirty_check_stash) {
         await cli("git stash pop");
-        actions.output(
-          <Ink.Text color={colors.green}>
-            ✅ Changes restored from stash
-          </Ink.Text>
-        );
+        actions.output(<Ink.Text color={colors.green}>✅ Changes restored from stash</Ink.Text>);
       }
 
       // ensure output has a chance to render

package/src/app/FormatText.tsx

@@ -13,11 +13,7 @@ export function FormatText(props: Props) {
   const wrapper = (props.wrapper as React.ReactElement) || <Ink.Text />;
 
   return (
-    <FormattedMessage
-      id="FormatText"
-      defaultMessage={props.message}
-      values={props.values}
-    >
+    <FormattedMessage id="FormatText" defaultMessage={props.message} values={props.values}>
       {(chunks) => {
         return React.cloneElement(wrapper, {}, chunks);
       }}

package/src/app/GatherMetadata.tsx

@@ -15,9 +15,7 @@ type Props = {
 };
 
 export function GatherMetadata(props: Props) {
-  const fallback = (
-    <Ink.Text color={colors.yellow}>Gathering local git information…</Ink.Text>
-  );
+  const fallback = <Ink.Text color={colors.yellow}>Gathering local git information…</Ink.Text>;
 
   return (
     <Await fallback={fallback} function={run}>
@@ -41,14 +39,12 @@ async function run() {
           values={{
             branch: <Brackets>{argv.branch}</Brackets>,
           }}
-        />
+        />,
       );
 
       master_branch = argv.branch;
     } else {
-      const detect_master = await cli(
-        `git branch --list "${BRANCH.master}" --color=never`
-      );
+      const detect_master = await cli(`git branch --list "${BRANCH.master}" --color=never`);
 
       if (detect_master.stdout !== "") {
         master_branch = BRANCH.master;
@@ -60,7 +56,7 @@ async function run() {
               master: <Brackets>{BRANCH.master}</Brackets>,
               main: <Brackets>{BRANCH.main}</Brackets>,
             }}
-          />
+          />,
         );
 
         master_branch = BRANCH.main;
@@ -84,15 +80,12 @@ async function run() {
     }
 
     const head = (await cli("git rev-parse HEAD")).stdout;
-    const merge_base = (await cli(`git merge-base HEAD ${master_branch}`))
-      .stdout;
+    const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
 
     // handle when there are no detected changes
     if (head === merge_base) {
       actions.newline();
-      actions.output(
-        <Ink.Text color={colors.gray}>No changes detected.</Ink.Text>
-      );
+      actions.output(<Ink.Text color={colors.gray}>No changes detected.</Ink.Text>);
       actions.exit(0);
       return;
     }

package/src/app/GithubApiError.tsx

@@ -69,6 +69,6 @@ async function run() {
           {time_until}
         </Ink.Text>
       </Parens>
-    </Ink.Text>
+    </Ink.Text>,
   );
 }

package/src/app/HandleCtrlCSigint.tsx

@@ -10,8 +10,6 @@ import { sleep } from "~/core/sleep";
 export function HandleCtrlCSigint() {
   const actions = Store.useActions();
 
-  const [exiting, set_exiting] = React.useState(false);
-
   Ink.useInput((input, key) => {
     handle_input().catch((err) => {
       // eslint-disable-next-line no-console
@@ -25,23 +23,14 @@ export function HandleCtrlCSigint() {
         actions.output(
           <Ink.Text color={colors.red}>
             <FormatText message="🚨 Ctrl+C detected" />
-          </Ink.Text>
+          </Ink.Text>,
         );
 
-        set_exiting(true);
         await sleep(1);
         actions.exit(235);
       }
     }
   });
 
-  if (exiting) {
-    return (
-      <Ink.Text color={colors.red}>
-        <FormatText message="🚨 Exiting…" />
-      </Ink.Text>
-    );
-  }
-
   return null;
 }

package/src/app/LocalCommitStatus.tsx

@@ -15,9 +15,7 @@ type Props = {
 export function LocalCommitStatus(props: Props) {
   const argv = Store.useState((state) => state.argv);
 
-  const fallback = (
-    <Ink.Text color={colors.yellow}>Fetching PR status from Github…</Ink.Text>
-  );
+  const fallback = <Ink.Text color={colors.yellow}>Fetching PR status from Github…</Ink.Text>;
 
   if (argv["mock-metadata"]) {
     return (

package/src/app/LogTimestamp.tsx

@@ -4,9 +4,5 @@ import * as Ink from "ink-cjs";
 import { DateTime } from "luxon";
 
 export function LogTimestamp() {
-  return (
-    <Ink.Text dimColor>
-      {DateTime.now().toFormat("[yyyy-MM-dd HH:mm:ss.SSS] ")}
-    </Ink.Text>
-  );
+  return <Ink.Text dimColor>{DateTime.now().toFormat("[yyyy-MM-dd HH:mm:ss.SSS] ")}</Ink.Text>;
 }

package/src/app/ManualRebase.tsx

@@ -16,10 +16,7 @@ import { short_id } from "~/core/short_id";
 
 export function ManualRebase() {
   return (
-    <Await
-      fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
-      function={run}
-    />
+    <Await fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>} function={run} />
   );
 }
 
@@ -48,8 +45,7 @@ async function run() {
 
   try {
     // get latest merge_base relative to local master
-    const merge_base = (await cli(`git merge-base HEAD ${master_branch}`))
-      .stdout;
+    const merge_base = (await cli(`git merge-base HEAD ${master_branch}`)).stdout;
 
     // immediately paint all commit to preserve selected commit ranges
     let commit_range = await CommitMetadata.range(commit_map);
@@ -173,7 +169,7 @@ async function run() {
     actions.output(
       <Ink.Text color={colors.yellow}>
         Restoring <Brackets>{branch_name}</Brackets>…
-      </Ink.Text>
+      </Ink.Text>,
     );
 
     restore_git();
@@ -181,7 +177,7 @@ async function run() {
     actions.output(
       <Ink.Text color={colors.yellow}>
         Restored <Brackets>{branch_name}</Brackets>.
-      </Ink.Text>
+      </Ink.Text>,
     );
   }
 }

package/src/app/MultiSelect.tsx

@@ -51,7 +51,7 @@ export function MultiSelect<T>(props: Props<T>) {
       });
 
       return set;
-    }
+    },
   );
 
   // clamp index to keep in item range
@@ -81,7 +81,7 @@ export function MultiSelect<T>(props: Props<T>) {
       }
 
       return 0;
-    }
+    },
   );
 
   const selectRef = React.useRef(false);

package/src/app/PostRebaseStatus.tsx

@@ -26,4 +26,6 @@ async function run() {
   actions.output(<StatusTable />);
 
   actions.output(<Ink.Text>✅ Everything up to date.</Ink.Text>);
+
+  actions.exit(0);
 }

package/src/app/PreManualRebase.tsx

@@ -51,7 +51,7 @@ async function run() {
           values={{
             pr_filepath: <Brackets>{pr_template_fn("")}</Brackets>,
           }}
-        />
+        />,
       );
 
       break;
@@ -75,12 +75,10 @@ async function run() {
           wrapper={<Ink.Text color={colors.yellow} />}
           message="{count} queryable templates found under {dir}, but not supported."
           values={{
-            count: (
-              <Ink.Text color={colors.blue}>{pr_templates.length}</Ink.Text>
-            ),
+            count: <Ink.Text color={colors.blue}>{pr_templates.length}</Ink.Text>,
             dir: <Brackets>{PR_TEMPLATE.TemplateDir("")}</Brackets>,
           }}
-        />
+        />,
       );
     }
 

package/src/app/RebaseCheck.tsx

@@ -40,8 +40,7 @@ export function RebaseCheck(props: Props) {
         <YesNoPrompt
           message={
             <Ink.Text color={colors.yellow}>
-              <Command>git rebase</Command> detected, would you like to abort
-              it?
+              <Command>git rebase</Command> detected, would you like to abort it?
             </Ink.Text>
           }
           onYes={async () => {

package/src/app/SelectCommitRanges.tsx

@@ -37,7 +37,7 @@ function SelectCommitRangesInternal(props: Props) {
 
   const [selected_group_id, set_selected_group_id] = React.useState(() => {
     const first_group = props.commit_range.group_list.find(
-      (g) => g.id !== props.commit_range.UNASSIGNED
+      (g) => g.id !== props.commit_range.UNASSIGNED,
     );
 
     if (first_group) {
@@ -54,14 +54,11 @@ function SelectCommitRangesInternal(props: Props) {
       const next_group_list = group_list.concat(group);
       return next_group_list;
     },
-    []
+    [],
   );
 
   const [commit_map, update_commit_map] = React.useReducer(
-    (
-      map: Map<string, null | string>,
-      args: { key: string; value: null | string }
-    ) => {
+    (map: Map<string, null | string>, args: { key: string; value: null | string }) => {
       map.set(args.key, args.value);
 
       // console.debug("update_commit_map", map, args);
@@ -74,7 +71,7 @@ function SelectCommitRangesInternal(props: Props) {
       }
 
       return new Map(map);
-    }
+    },
   );
 
   const group_list: Array<SimpleGroup> = [];
@@ -88,8 +85,7 @@ function SelectCommitRangesInternal(props: Props) {
     }
   }
 
-  const total_group_count =
-    new_group_list.length + props.commit_range.group_list.length;
+  const total_group_count = new_group_list.length + props.commit_range.group_list.length;
 
   for (let i = 0; i < props.commit_range.group_list.length; i++) {
     const index = props.commit_range.group_list.length - i - 1;
@@ -411,7 +407,7 @@ function SelectCommitRangesInternal(props: Props) {
           group: <Brackets>{title}</Brackets>,
           note: <Parens>{id}</Parens>,
         }}
-      />
+      />,
     );
 
     // console.debug("submit_group_input", { title, id });

package/src/app/Status.tsx

@@ -59,7 +59,7 @@ async function run() {
           {` --force `}
         </Ink.Text>
         <Ink.Text>to force update all pull requests.</Ink.Text>
-      </Ink.Text>
+      </Ink.Text>,
     );
 
     actions.exit(0);

package/src/app/StatusTable.tsx

@@ -84,10 +84,7 @@ function StatusColumn(props: TableColumnProps<Row>) {
   const value = props.row[props.column];
 
   return (
-    <Ink.Text
-      color={get_status_color(props.row)}
-      bold={get_status_bold(props.row)}
-    >
+    <Ink.Text color={get_status_color(props.row)} bold={get_status_bold(props.row)}>
       {get_status_icon(props.row)} {value}
     </Ink.Text>
   );

package/src/app/Store.tsx

@@ -53,6 +53,7 @@ export type State = {
   sync_github: null | SyncGithubState;
   is_dirty_check_stash: boolean;
   abort_handler: null | AbortHandler;
+  is_exiting: boolean;
 
   step:
     | "github-api-error"
@@ -123,6 +124,7 @@ const BaseStore = createStore<State>()(
     sync_github: null,
     is_dirty_check_stash: false,
     abort_handler: null,
+    is_exiting: false,
 
     step: "loading",
 
@@ -134,6 +136,8 @@ const BaseStore = createStore<State>()(
     actions: {
       exit(code, clear = true) {
         set((state) => {
+          state.is_exiting = true;
+
           const node = <Exit clear={clear} code={code} />;
           state.mutate.output(state, { node });
         });
@@ -260,7 +264,7 @@ const BaseStore = createStore<State>()(
         return state.argv?.verbose || false;
       },
     },
-  }))
+  })),
 );
 
 function renderOutputArgs(args: MutateOutputArgs) {

package/src/app/SyncGithub.tsx

@@ -14,12 +14,7 @@ import { invariant } from "~/core/invariant";
 import type * as CommitMetadata from "~/core/CommitMetadata";
 
 export function SyncGithub() {
-  return (
-    <Await
-      fallback={<Ink.Text color={colors.yellow}>Syncing…</Ink.Text>}
-      function={run}
-    />
-  );
+  return <Await fallback={<Ink.Text color={colors.yellow}>Syncing…</Ink.Text>} function={run} />;
 }
 
 async function run() {
@@ -202,10 +197,7 @@ async function run() {
     }
   }
 
-  async function after_push(args: {
-    group: CommitMetadataGroup;
-    pr_url_list: Array<string>;
-  }) {
+  async function after_push(args: { group: CommitMetadataGroup; pr_url_list: Array<string> }) {
     const { group, pr_url_list } = args;
 
     invariant(group.base, "group.base must exist");
@@ -290,9 +282,7 @@ async function run() {
   }
 
   function handle_exit() {
-    actions.output(
-      <Ink.Text color={colors.yellow}>Restoring PR state…</Ink.Text>
-    );
+    actions.output(<Ink.Text color={colors.yellow}>Restoring PR state…</Ink.Text>);
 
     for (const group of push_group_list) {
       // we may temporarily mark PR as a draft before editing it
@@ -310,9 +300,7 @@ async function run() {
       }
     }
 
-    actions.output(
-      <Ink.Text color={colors.yellow}>Restored PR state.</Ink.Text>
-    );
+    actions.output(<Ink.Text color={colors.yellow}>Restored PR state.</Ink.Text>);
   }
 }
 

package/src/app/Table.tsx

@@ -70,10 +70,7 @@ export function Table<T extends BaseRow>(props: Props<T>) {
     remaining_space -= breathing_room;
 
     if (props.fillColumn) {
-      max_col_width[props.fillColumn] = Math.min(
-        max_col_width[props.fillColumn],
-        remaining_space
-      );
+      max_col_width[props.fillColumn] = Math.min(max_col_width[props.fillColumn], remaining_space);
     }
   }
 
@@ -91,9 +88,7 @@ export function Table<T extends BaseRow>(props: Props<T>) {
             width={available_width}
           >
             {RowColumnList.map((column) => {
-              const ColumnComponent = props.columns[
-                column
-              ] as ColumnComponent<T>;
+              const ColumnComponent = props.columns[column] as ColumnComponent<T>;
 
               return (
                 <Ink.Box key={String(column)} width={max_col_width[column]}>
@@ -122,14 +117,9 @@ type BaseRow = Record<string, string | number>;
 
 type Column<T extends BaseRow> = keyof T;
 
-type ColumnComponent<T extends BaseRow> = (
-  props: TableColumnProps<T>
-) => React.ReactNode;
+type ColumnComponent<T extends BaseRow> = (props: TableColumnProps<T>) => React.ReactNode;
 
-type ColumnComponentMap<T extends BaseRow> = Record<
-  Column<T>,
-  ColumnComponent<T>
->;
+type ColumnComponentMap<T extends BaseRow> = Record<Column<T>, ColumnComponent<T>>;
 
 export type TableColumnProps<T extends BaseRow> = {
   row: T;