git-stack-cli 2.7.4 → 2.7.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.7.4",
+  "version": "2.7.6",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "tsconfig.json"
   ],
   "scripts": {
-    "dev": "pnpm run build --watch",
+    "dev": "pnpm run build --dev --watch",
     "build": "bun run scripts/bun-build.ts",
     "compile": "bun run scripts/bun-compile.ts",
     "release:npm": "bun run scripts/release-npm.ts",

package/scripts/bun-build.ts

@@ -2,7 +2,10 @@ import * as fs from "node:fs/promises";
 import path from "node:path";
 import * as util from "util";
 
+import type { BuildConfig } from "bun";
+
 import * as file from "~/core/file";
+import { get_define } from "~/core/get_define";
 import { get_local_iso } from "~/core/get_local_iso";
 import { spawn } from "~/core/spawn";
 
@@ -13,6 +16,10 @@ const parsed_args = util.parseArgs({
       type: "boolean",
       default: false,
     },
+    dev: {
+      type: "boolean",
+      default: false,
+    },
     verbose: {
       type: "boolean",
       default: false,
@@ -24,6 +31,7 @@ const parsed_args = util.parseArgs({
 
 const WATCH = parsed_args.values.watch;
 const VERBOSE = parsed_args.values.verbose;
+const DEV = parsed_args.values.dev;
 
 function log(...args: any[]) {
   const timestamp = get_local_iso(new Date());
@@ -38,38 +46,25 @@ if (VERBOSE) {
 
 const REPO_ROOT = (await spawn.sync("git rev-parse --show-toplevel")).stdout;
 
-async function get_define() {
-  const PACKAGE_JSON = await file.read_json(path.join(REPO_ROOT, "package.json"));
-  const GIT_SEQUENCE_EDITOR_SCRIPT_PATH = path.join(REPO_ROOT, "scripts", "git-sequence-editor.sh");
-  const UNSAFE_GIT_SEQUENCE_EDITOR_SCRIPT = await file.read_text(GIT_SEQUENCE_EDITOR_SCRIPT_PATH);
-  const GIT_SEQUENCE_EDITOR_SCRIPT = UNSAFE_GIT_SEQUENCE_EDITOR_SCRIPT.replace(/`/g, "\\`");
+const define = await get_define();
 
-  const define = {
-    "process.env.NODE_ENV": JSON.stringify("production"),
-    "process.env.CLI_VERSION": JSON.stringify(String(PACKAGE_JSON.version)),
-    "process.env.GIT_SEQUENCE_EDITOR_SCRIPT": JSON.stringify(GIT_SEQUENCE_EDITOR_SCRIPT),
-  };
+const BUILD_CONFIG = {
+  entrypoints: ["./src/index.tsx"],
+  outdir: "./dist/js",
+  target: "node",
+  env: "inline",
+  format: "esm",
+  sourcemap: "inline",
+  define,
+  minify: !DEV,
+} satisfies BuildConfig;
 
-  return define;
-}
+log({ BUILD_CONFIG });
 
 async function run_build() {
   const start = Date.now();
 
-  const define = await get_define();
-
-  if (VERBOSE) {
-    log({ define });
-  }
-
-  const result = await Bun.build({
-    entrypoints: ["./src/index.tsx"],
-    outdir: "./dist/js",
-    target: "node",
-    env: "inline",
-    format: "esm",
-    define,
-  });
+  const result = await Bun.build(BUILD_CONFIG);
 
   const duration_ms = Date.now() - start;
 

package/scripts/bun-compile.ts

@@ -2,6 +2,7 @@ import path from "node:path";
 import * as util from "util";
 
 import * as file from "~/core/file";
+import { get_define } from "~/core/get_define";
 import { spawn } from "~/core/spawn";
 
 const parsed_args = util.parseArgs({
@@ -30,12 +31,12 @@ if (VERBOSE) {
 
 const REPO_ROOT = (await spawn.sync("git rev-parse --show-toplevel")).stdout;
 const DIST_DIR = path.join(REPO_ROOT, "dist");
-const INPUT_JS = path.join(DIST_DIR, "js", "index.js");
+const INPUT_JS = path.join(REPO_ROOT, "/src/index.tsx");
 
 if (!(await file.exists(INPUT_JS))) {
   console.error(`❌ Missing ${path.relative(REPO_ROOT, INPUT_JS)}`);
   console.debug("Run `pnpm run build` first to generate the input file.");
-  process.exit(12);
+  process.exit(6);
 }
 
 if (TARGET) {
@@ -58,11 +59,23 @@ async function compile_target(args: CompileTargetArgs) {
 
   const start = Date.now();
 
+  // https://bun.com/docs/bundler/executables#build-time-constants
+  const defines: Array<string> = [];
+  for (const [key, value] of Object.entries(await get_define())) {
+    // --define BUILD_VERSION='"1.2.3"'
+    defines.push("--define", `${key}=${value}`);
+  }
+
   // pnpm bun build --compile --target=bun-darwin-arm64 ./dist/js/index.js --outfile git-stack-bun-darwin-arm64
+  // https://bun.com/docs/bundler/executables
   const bun_compile = await spawn.sync([
     "bun",
     "build",
     "--compile",
+    "--minify",
+    "--sourcemap",
+    // "--bytecode",
+    ...defines,
     `--target=${args.target}`,
     INPUT_JS,
     `--outfile=${outfile}`,

package/scripts/core/get_define.ts

@@ -0,0 +1,21 @@
+import path from "node:path";
+
+import * as file from "~/core/file";
+import { spawn } from "~/core/spawn";
+
+const REPO_ROOT = (await spawn.sync("git rev-parse --show-toplevel")).stdout;
+
+export async function get_define() {
+  const PACKAGE_JSON = await file.read_json(path.join(REPO_ROOT, "package.json"));
+  const GIT_SEQUENCE_EDITOR_SCRIPT_PATH = path.join(REPO_ROOT, "scripts", "git-sequence-editor.sh");
+  const UNSAFE_GIT_SEQUENCE_EDITOR_SCRIPT = await file.read_text(GIT_SEQUENCE_EDITOR_SCRIPT_PATH);
+  const GIT_SEQUENCE_EDITOR_SCRIPT = UNSAFE_GIT_SEQUENCE_EDITOR_SCRIPT.replace(/`/g, "\\`");
+
+  const define = {
+    "process.env.NODE_ENV": JSON.stringify("production"),
+    "process.env.CLI_VERSION": JSON.stringify(String(PACKAGE_JSON.version)),
+    "process.env.GIT_SEQUENCE_EDITOR_SCRIPT": JSON.stringify(GIT_SEQUENCE_EDITOR_SCRIPT),
+  };
+
+  return define;
+}

package/scripts/npm-prepublishOnly.ts

@@ -4,5 +4,5 @@
 if (!process.env.GS_RELEASE_NPM) {
   console.error("Must publish using `pnpm run release:npm`");
   console.error();
-  process.exit(10);
+  process.exit(5);
 }

package/src/app/App.tsx

@@ -95,6 +95,8 @@ function MaybeMain() {
     return <Update />;
   } else if (positional_list.has("config")) {
     return <Config />;
+  } else if (positional_list.has("api")) {
+    return <GithubApiError exit />;
   } else if (positional_list.has("rebase")) {
     return (
       <DependencyCheck>

package/src/app/Exit.tsx

@@ -2,6 +2,7 @@ import * as React from "react";
 
 import * as Ink from "ink-cjs";
 
+import { FormatText } from "~/app/FormatText";
 import { Store } from "~/app/Store";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
@@ -37,6 +38,14 @@ Exit.handle_exit = async function handle_exit(props: Props) {
     exit_code = await state.abort_handler();
   }
 
+  if (!state.argv.verbose && props.code > 0) {
+    actions.output(
+      <Ink.Text color={colors.gray}>
+        <FormatText message="Try again with `--verbose` to see more information." />
+      </Ink.Text>,
+    );
+  }
+
   // restore git stash if necessary
   if (state.is_dirty_check_stash) {
     await cli("git stash pop");

package/src/app/GithubApiError.tsx

@@ -10,11 +10,15 @@ import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import * as date from "~/core/date";
 
-export function GithubApiError() {
-  return <Await fallback={null} function={run} />;
+type Props = {
+  exit?: boolean;
+};
+
+export function GithubApiError(props: Props) {
+  return <Await fallback={null} function={() => run(props)} />;
 }
 
-async function run() {
+async function run(props: Props) {
   const actions = Store.getState().actions;
 
   const res = await cli(`gh api https://api.github.com/rate_limit`);
@@ -42,7 +46,7 @@ async function run() {
   }
 
   actions.output(
-    <Ink.Text dimColor>
+    <Ink.Text>
       <Ink.Text>{"Github "}</Ink.Text>
 
       <Brackets>graphql</Brackets>
@@ -71,4 +75,8 @@ async function run() {
       </Parens>
     </Ink.Text>,
   );
+
+  if (props.exit) {
+    actions.exit(0);
+  }
 }

package/src/app/HandleCtrlCSigint.tsx

@@ -12,6 +12,8 @@ export function HandleCtrlCSigint() {
 
   Ink.useInput((input, key) => {
     handle_input().catch((err) => {
+      // eslint-disable-next-line no-console
+      console.error("🚨 HandleCtrlCSigint catch");
       // eslint-disable-next-line no-console
       console.error(err);
     });
@@ -27,10 +29,17 @@ export function HandleCtrlCSigint() {
         );
 
         await sleep(1);
-        actions.exit(235);
+
+        try {
+          actions.exit(HandleCtrlCSigint.ExitCode);
+        } catch {
+          // ignore intentional throw from actions.exit
+        }
       }
     }
   });
 
   return null;
 }
+
+HandleCtrlCSigint.ExitCode = 235;

package/src/app/Store.tsx

@@ -141,6 +141,8 @@ const BaseStore = createStore<State>()(
 
     actions: {
       exit(code, args) {
+        const clear = args?.clear ?? true;
+
         set((state) => {
           if (args?.quiet ?? code === 0) {
             state.exit_mode = "quiet";
@@ -148,11 +150,13 @@ const BaseStore = createStore<State>()(
             state.exit_mode = "normal";
           }
 
-          let clear = args?.clear ?? true;
-
           const node = <Exit clear={clear} code={code} />;
           state.mutate.output(state, { node });
         });
+
+        if (code > 0) {
+          throw new Error(`exit(${JSON.stringify({ code, clear })})`);
+        }
       },
 
       clear() {

package/src/app/SyncGithub.tsx

@@ -135,7 +135,7 @@ async function run() {
       actions.error("Try again with `--verbose` to see more information.");
     }
 
-    actions.exit(18);
+    actions.exit(15);
   }
 
   function get_push_group_list() {

package/src/command.ts

@@ -60,7 +60,14 @@ export async function command(argv: string[], options: CommandOptions = {}) {
     .command(
       "config",
       "Generate a one-time configuration json based on the passed arguments",
-      (yargs) => yargs.options(DefaultOptions),
+      (yargs) => yargs,
+    )
+
+    .command(
+      //
+      "api",
+      "Check Github API quota and rate limits",
+      (yargs) => yargs,
     )
 
     .option("verbose", GlobalOptions.verbose)

package/src/commands/Config.tsx

@@ -69,7 +69,7 @@ function parse_env_config() {
     console.error(`ERROR GIT_STACK_CONFIG=${GIT_STACK_CONFIG}`);
     // eslint-disable-next-line no-console
     console.error("ERROR GIT_STACK_CONFIG environment variable is not valid JSON");
-    process.exit(18);
+    process.exit(6);
   }
 }
 

package/src/commands/Rebase.tsx

@@ -75,7 +75,7 @@ Rebase.run = async function run(props: Props) {
       actions.error(err.message);
     }
 
-    actions.exit(20);
+    actions.exit(8);
   }
 
   actions.debug("start CommitMetadata.range");

package/src/components/ErrorBoundary.tsx

@@ -38,7 +38,7 @@ export class ErrorBoundary extends React.Component<Props, State> {
       // remove first line of component_stack
       component_stack = component_stack.split("\n").slice(1).join("\n");
       this.setState({ component_stack }, async () => {
-        await Exit.handle_exit({ code: 30, clear: true });
+        await Exit.handle_exit({ code: 5, clear: false });
       });
     }
   }

package/src/core/GitReviseTodo.ts

@@ -154,7 +154,7 @@ GitReviseTodo.execute = async function grt_execute(args: ExecuteArgs) {
         actions.error("🚨 git revise failed to sign commit");
         actions.error("💡 Try again with `--no-revise-sign`?");
         actions.error("\n\n");
-        actions.exit(21);
+        actions.exit(18);
       }
     }
   }

package/src/core/cache.ts

@@ -22,17 +22,15 @@ export function cache<T, E>(cacheable: Cacheable<T>) {
     // cacheable is a function to allow deferred reads
     // this will call cacheable to kickoff async promise
     if (!suspender) {
-      suspender = Promise.resolve().then(() => {
-        cacheable()
-          .then((res: T) => {
-            status = "success";
-            response = res;
-          })
-          .catch((err: E) => {
-            status = "error";
-            response = err;
-          });
-      });
+      suspender = cacheable()
+        .then((res: T) => {
+          status = "success";
+          response = res;
+        })
+        .catch((err: E) => {
+          status = "error";
+          response = err;
+        });
     }
 
     switch (status) {

package/src/core/git.ts

@@ -1,3 +1,4 @@
+import { Store } from "~/app/Store";
 import * as Metadata from "~/core/Metadata";
 import { cli } from "~/core/cli";
 
@@ -20,6 +21,15 @@ export async function get_commits(dot_range: string) {
 
     const [sha, full_message] = record.split(SEP.field);
 
+    // ensure sha is a hex string, otherwise we should throw an error
+    if (!RE.git_sha.test(sha)) {
+      const actions = Store.getState().actions;
+      const sep_values = JSON.stringify(Object.values(SEP));
+      const message = `unable to parse git commits, maybe commit message contained ${sep_values}`;
+      actions.error(message);
+      actions.exit(19);
+    }
+
     const metadata = Metadata.read(full_message);
     const branch_id = metadata.id;
     const subject_line = metadata.subject || "";
@@ -53,3 +63,7 @@ const SEP = {
 };
 
 const FORMAT = `%H${SEP.field}%B${SEP.record}`;
+
+const RE = {
+  git_sha: /^[0-9a-fA-F]{40}$/,
+};

package/src/index.tsx

@@ -74,9 +74,11 @@ import { pretty_json } from "~/core/pretty_json";
       }
     }
   } catch (err) {
+    console.error("🚨 main catch");
     console.error(err);
     process.exit(236);
   }
 })().catch((err) => {
+  console.error("🚨 index catch");
   console.error(err);
 });