git-stack-cli 2.3.0 → 2.3.2

package/dist/js/index.js

@@ -32698,34 +32698,34 @@ async function sleep(time) {
 // src/app/Exit.tsx
 function Exit(props) {
   React14.useEffect(() => {
-    handle_exit().catch((err) => {
+    Exit.handle_exit(props).catch((err) => {
       console.error(err);
     });
-    async function handle_exit() {
-      const state = Store.getState();
-      const actions = state.actions;
-      actions.debug(`[Exit] handle_exit ${JSON.stringify(props)}`);
-      let exit_code = props.code;
-      if (state.abort_handler) {
-        exit_code = await state.abort_handler();
-      }
-      if (state.is_dirty_check_stash) {
-        await cli("git stash pop");
-        actions.output(/* @__PURE__ */ React14.createElement(Text, {
-          color: colors.green
-        }, "✅ Changes restored from stash"));
-      }
-      await sleep(1);
-      if (props.clear) {
-        actions.clear();
-      }
-      actions.unmount();
-      process.exitCode = exit_code;
-      process.exit();
-    }
   }, [props.clear, props.code]);
   return null;
 }
+Exit.handle_exit = async function handle_exit(props) {
+  const state = Store.getState();
+  const actions = state.actions;
+  actions.debug(`[Exit] handle_exit ${JSON.stringify(props)}`);
+  let exit_code = props.code;
+  if (state.abort_handler) {
+    exit_code = await state.abort_handler();
+  }
+  if (state.is_dirty_check_stash) {
+    await cli("git stash pop");
+    actions.output(/* @__PURE__ */ React14.createElement(Text, {
+      color: colors.green
+    }, "✅ Changes restored from stash"));
+  }
+  await sleep(1);
+  if (props.clear) {
+    actions.clear();
+  }
+  actions.unmount();
+  process.exitCode = exit_code;
+  process.exit();
+};
 
 // src/app/LogTimestamp.tsx
 var React15 = __toESM(require_react(), 1);
@@ -39193,15 +39193,15 @@ function encode(value) {
 }
 
 // src/commands/Rebase.tsx
-function Rebase() {
+function Rebase(props) {
   return /* @__PURE__ */ React34.createElement(Await, {
     fallback: /* @__PURE__ */ React34.createElement(Text, {
       color: colors.yellow
     }, "Rebasing commits…"),
-    function: Rebase.run
+    function: () => Rebase.run(props)
   });
 }
-Rebase.run = async function run5() {
+Rebase.run = async function run5(props) {
   const state = Store.getState();
   const actions = state.actions;
   const branch_name = state.branch_name;
@@ -39216,7 +39216,7 @@ Rebase.run = async function run5() {
     actions.output(/* @__PURE__ */ React34.createElement(Text, {
       color: colors.red
     }, "\uD83D\uDEA8 Abort"));
-    handle_exit();
+    handle_exit2();
     return 19;
   });
   const temp_branch_name = `${branch_name}_${short_id()}`;
@@ -39293,8 +39293,12 @@ Rebase.run = async function run5() {
   actions.set((state2) => {
     state2.commit_range = next_commit_range;
   });
-  actions.output(/* @__PURE__ */ React34.createElement(Status, null));
-  actions.exit(0);
+  if (props.onComplete) {
+    props.onComplete();
+  } else {
+    actions.output(/* @__PURE__ */ React34.createElement(Status, null));
+    actions.exit(0);
+  }
   function restore_git() {
     const spawn_options = { ignoreExitCode: true };
     cli.sync(`git reset --hard`, spawn_options);
@@ -39306,7 +39310,7 @@ Rebase.run = async function run5() {
     }
     cli.sync(`pwd`, spawn_options);
   }
-  function handle_exit() {
+  function handle_exit2() {
     actions.output(/* @__PURE__ */ React34.createElement(Text, {
       color: colors.yellow
     }, "Restoring ", /* @__PURE__ */ React34.createElement(Brackets, null, branch_name), "…"));
@@ -39319,7 +39323,14 @@ Rebase.run = async function run5() {
 
 // src/app/LocalMergeRebase.tsx
 function LocalMergeRebase() {
-  return /* @__PURE__ */ React35.createElement(Rebase, null);
+  const actions = Store.useActions();
+  return /* @__PURE__ */ React35.createElement(Rebase, {
+    onComplete: () => {
+      actions.set((state) => {
+        state.step = "status";
+      });
+    }
+  });
 }
 
 // src/app/ManualRebase.tsx
@@ -39349,7 +39360,7 @@ async function run6() {
     actions.output(/* @__PURE__ */ React36.createElement(Text, {
       color: colors.red
     }, "\uD83D\uDEA8 Abort"));
-    handle_exit();
+    handle_exit2();
     return 15;
   });
   const temp_branch_name = `${branch_name}_${short_id()}`;
@@ -39428,7 +39439,7 @@ async function run6() {
     }
     cli.sync(`pwd`, spawn_options);
   }
-  function handle_exit() {
+  function handle_exit2() {
     actions.output(/* @__PURE__ */ React36.createElement(Text, {
       color: colors.yellow
     }, "Restoring ", /* @__PURE__ */ React36.createElement(Brackets, null, branch_name), "…"));
@@ -40247,7 +40258,7 @@ async function run9() {
     actions.output(/* @__PURE__ */ React44.createElement(Text, {
       color: colors.red
     }, "\uD83D\uDEA8 Abort"));
-    handle_exit();
+    handle_exit2();
     return 17;
   });
   let DEFAULT_PR_BODY = "";
@@ -40392,7 +40403,7 @@ async function run9() {
       });
     }
   }
-  function handle_exit() {
+  function handle_exit2() {
     actions.output(/* @__PURE__ */ React44.createElement(Text, {
       color: colors.yellow
     }, "Restoring PR state…"));
@@ -40698,7 +40709,9 @@ class ErrorBoundary extends React52.Component {
       component_stack = component_stack.split(`
 `).slice(1).join(`
 `);
-      this.setState({ component_stack });
+      this.setState({ component_stack }, async () => {
+        await Exit.handle_exit({ code: 30, clear: true });
+      });
     }
   }
   render() {
@@ -45653,7 +45666,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).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.3.0").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).option("verbose", GlobalOptions.verbose).wrap(123).strict().version("2.3.2").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.3.0",
+  "version": "2.3.2",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/Exit.tsx

@@ -15,44 +15,44 @@ type Props = {
 export function Exit(props: Props) {
   React.useEffect(() => {
     // immediately handle exit on mount
-    handle_exit().catch((err) => {
+    Exit.handle_exit(props).catch((err) => {
       // eslint-disable-next-line no-console
       console.error(err);
     });
+  }, [props.clear, props.code]);
 
-    async function handle_exit() {
-      const state = Store.getState();
-      const actions = state.actions;
+  return null;
+}
 
-      actions.debug(`[Exit] handle_exit ${JSON.stringify(props)}`);
+Exit.handle_exit = async function handle_exit(props: Props) {
+  const state = Store.getState();
+  const actions = state.actions;
 
-      let exit_code = props.code;
+  actions.debug(`[Exit] handle_exit ${JSON.stringify(props)}`);
 
-      // run abort_handler if it exists
-      if (state.abort_handler) {
-        exit_code = await state.abort_handler();
-      }
+  let exit_code = props.code;
 
-      // 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>);
-      }
+  // run abort_handler if it exists
+  if (state.abort_handler) {
+    exit_code = await state.abort_handler();
+  }
 
-      // ensure output has a chance to render
-      await sleep(1);
+  // 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>);
+  }
 
-      // finally handle the actual app and process exit
-      if (props.clear) {
-        actions.clear();
-      }
+  // ensure output has a chance to render
+  await sleep(1);
 
-      actions.unmount();
+  // finally handle the actual app and process exit
+  if (props.clear) {
+    actions.clear();
+  }
 
-      process.exitCode = exit_code;
-      process.exit();
-    }
-  }, [props.clear, props.code]);
+  actions.unmount();
 
-  return null;
-}
+  process.exitCode = exit_code;
+  process.exit();
+};

package/src/app/LocalMergeRebase.tsx

@@ -1,7 +1,18 @@
 import * as React from "react";
 
+import { Store } from "~/app/Store";
 import { Rebase } from "~/commands/Rebase";
 
 export function LocalMergeRebase() {
-  return <Rebase />;
+  const actions = Store.useActions();
+
+  return (
+    <Rebase
+      onComplete={() => {
+        actions.set((state) => {
+          state.step = "status";
+        });
+      }}
+    />
+  );
 }

package/src/commands/Rebase.tsx

@@ -15,16 +15,20 @@ import { colors } from "~/core/colors";
 import { invariant } from "~/core/invariant";
 import { short_id } from "~/core/short_id";
 
-export function Rebase() {
+type Props = {
+  onComplete?: () => void;
+};
+
+export function Rebase(props: Props) {
   return (
     <Await
       fallback={<Ink.Text color={colors.yellow}>Rebasing commits…</Ink.Text>}
-      function={Rebase.run}
+      function={() => Rebase.run(props)}
     />
   );
 }
 
-Rebase.run = async function run() {
+Rebase.run = async function run(props: Props) {
   const state = Store.getState();
   const actions = state.actions;
   const branch_name = state.branch_name;
@@ -145,9 +149,12 @@ Rebase.run = async function run() {
     state.commit_range = next_commit_range;
   });
 
-  actions.output(<Status />);
-
-  actions.exit(0);
+  if (props.onComplete) {
+    props.onComplete();
+  } else {
+    actions.output(<Status />);
+    actions.exit(0);
+  }
 
   // cleanup git operations if cancelled during manual rebase
   function restore_git() {

package/src/components/ErrorBoundary.tsx

@@ -3,6 +3,7 @@ import * as React from "react";
 
 import * as Ink from "ink-cjs";
 
+import { Exit } from "~/app/Exit";
 import { FormatText } from "~/app/FormatText";
 import { Store } from "~/app/Store";
 import { colors } from "~/core/colors";
@@ -36,7 +37,9 @@ export class ErrorBoundary extends React.Component<Props, State> {
     if (component_stack) {
       // remove first line of component_stack
       component_stack = component_stack.split("\n").slice(1).join("\n");
-      this.setState({ component_stack });
+      this.setState({ component_stack }, async () => {
+        await Exit.handle_exit({ code: 30, clear: true });
+      });
     }
   }