git-stack-cli 2.1.1-beta → 2.1.2

package/dist/js/index.js

@@ -37090,11 +37090,24 @@ var BaseStore = createStore()(immer2((set2, get) => ({
         state.mutate.output(state, { node });
       });
     },
-    error(message) {
-      set2((state) => {
-        const node = /* @__PURE__ */ React16.createElement(Text, {
+    error(error) {
+      let node;
+      if (typeof error === "string") {
+        node = /* @__PURE__ */ React16.createElement(Text, {
+          color: colors.red
+        }, error);
+      } else if (error instanceof Error) {
+        node = /* @__PURE__ */ React16.createElement(Box_default, {
+          flexDirection: "column"
+        }, /* @__PURE__ */ React16.createElement(Text, {
+          color: colors.red
+        }, error.stack));
+      } else {
+        node = /* @__PURE__ */ React16.createElement(Text, {
           color: colors.red
-        }, message);
+        }, `Unhandled error: ${JSON.stringify(error)}`);
+      }
+      set2((state) => {
         state.mutate.output(state, { node });
       });
     },
@@ -37280,9 +37293,7 @@ async function cli(unsafe_command, unsafe_options) {
       };
       state.actions.set((state2) => state2.mutate.end_pending_output(state2, id));
       state.actions.debug(log.end(result));
-      state.actions.debug(result.output);
-      state.actions.debug(`
-`);
+      state.actions.debug(log.output(result));
       if (!options.ignoreExitCode && result.code !== 0) {
         reject(new Error(log.error(result)));
       } else {
@@ -37318,7 +37329,7 @@ cli.sync = function cli_sync(unsafe_command, unsafe_options) {
     duration
   };
   state.actions.debug(log.end(result));
-  state.actions.debug(result.output);
+  state.actions.debug(log.output(result));
   if (!options.ignoreExitCode && result.code !== 0) {
     throw new Error(log.error(result));
   }
@@ -37336,6 +37347,10 @@ var log = {
     const { command, code, duration } = result;
     return `[end] ${command} (exit_code=${code} duration=${duration})`;
   },
+  output(result) {
+    return `${result.output}
+`;
+  },
   error(result) {
     const { command, code, duration } = result;
     return `${command} (exit_code=${code} duration=${duration})`;
@@ -45625,7 +45640,7 @@ var yargs_default = Yargs;
 
 // src/command.ts
 async function command2() {
-  return yargs_default(hideBin(process.argv)).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.1.1-beta").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)).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.1.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.1.1-beta",
+  "version": "2.1.2",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/Store.tsx

@@ -84,7 +84,7 @@ export type State = {
     unmount(): void;
     newline(): void;
     json(value: pretty_json.JSONValue): void;
-    error(message: string): void;
+    error(error: unknown): void;
     output(node: React.ReactNode): void;
     debug(node: React.ReactNode, id?: string): void;
 
@@ -176,9 +176,24 @@ const BaseStore = createStore<State>()(
         });
       },
 
-      error(message) {
+      error(error) {
+        let node: React.ReactNode;
+
+        if (typeof error === "string") {
+          node = <Ink.Text color={colors.red}>{error}</Ink.Text>;
+        } else if (error instanceof Error) {
+          node = (
+            <Ink.Box flexDirection="column">
+              <Ink.Text color={colors.red}>{error.stack}</Ink.Text>
+            </Ink.Box>
+          );
+        } else {
+          node = (
+            <Ink.Text color={colors.red}>{`Unhandled error: ${JSON.stringify(error)}`}</Ink.Text>
+          );
+        }
+
         set((state) => {
-          const node = <Ink.Text color={colors.red}>{message}</Ink.Text>;
           state.mutate.output(state, { node });
         });
       },

package/src/core/cli.ts

@@ -79,8 +79,7 @@ export async function cli(
 
       state.actions.set((state) => state.mutate.end_pending_output(state, id));
       state.actions.debug(log.end(result));
-      state.actions.debug(result.output);
-      state.actions.debug("\n");
+      state.actions.debug(log.output(result));
 
       if (!options.ignoreExitCode && result.code !== 0) {
         reject(new Error(log.error(result)));
@@ -131,7 +130,7 @@ cli.sync = function cli_sync(
   };
 
   state.actions.debug(log.end(result));
-  state.actions.debug(result.output);
+  state.actions.debug(log.output(result));
 
   if (!options.ignoreExitCode && result.code !== 0) {
     throw new Error(log.error(result));
@@ -154,6 +153,10 @@ const log = {
     return `[end] ${command} (exit_code=${code} duration=${duration})`;
   },
 
+  output(result: Return) {
+    return `${result.output}\n`;
+  },
+
   error(result: Return) {
     const { command, code, duration } = result;
     return `${command} (exit_code=${code} duration=${duration})`;