git-stack-cli 2.7.0 → 2.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/scripts/bun-build.ts

@@ -3,6 +3,7 @@ import path from "node:path";
 import * as util from "util";
 
 import * as file from "~/core/file";
+import { get_local_iso } from "~/core/get_local_iso";
 import { spawn } from "~/core/spawn";
 
 const parsed_args = util.parseArgs({
@@ -25,7 +26,7 @@ const WATCH = parsed_args.values.watch;
 const VERBOSE = parsed_args.values.verbose;
 
 function log(...args: any[]) {
-  const timestamp = new Date().toISOString();
+  const timestamp = get_local_iso(new Date());
   console.debug(`[${timestamp}]`, ...args);
 }
 

package/scripts/core/get_local_iso.ts

@@ -0,0 +1,20 @@
+export function get_local_iso(date: Date) {
+  const d: Record<string, string> = {};
+  for (const part of FORMATTER.formatToParts(date)) {
+    d[part.type] = part.value;
+  }
+
+  const ms = String(date.getMilliseconds()).padStart(3, "0");
+  const timestamp = `${d.year}-${d.month}-${d.day}T${d.hour}:${d.minute}:${d.second}.${ms}Z`;
+  return timestamp;
+}
+
+const FORMATTER = new Intl.DateTimeFormat("en-CA", {
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit",
+  hour: "2-digit",
+  minute: "2-digit",
+  second: "2-digit",
+  hour12: false,
+});

package/src/app/AutoUpdate.tsx

@@ -5,14 +5,15 @@ import * as Ink from "ink-cjs";
 import { Brackets } from "~/app/Brackets";
 import { Command } from "~/app/Command";
 import { FormatText } from "~/app/FormatText";
+import { Url } from "~/app/Url";
 import { YesNoPrompt } from "~/app/YesNoPrompt";
 import { assertNever } from "~/core/assertNever";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import { fetch_json } from "~/core/fetch_json";
+import { get_timeout_fn } from "~/core/get_timeout_fn";
 import { is_finite_value } from "~/core/is_finite_value";
 import { semver_compare } from "~/core/semver_compare";
-import { sleep } from "~/core/sleep";
 
 type Props = {
   name: string;
@@ -26,10 +27,9 @@ type Props = {
 };
 
 type State = {
-  error: null | Error;
+  status: "init" | "prompt" | "install" | "done";
   local_version: null | string;
   latest_version: null | string;
-  status: "init" | "prompt" | "install" | "done";
   is_brew_bun_standalone: boolean;
 };
 
@@ -44,24 +44,94 @@ export function AutoUpdate(props: Props) {
   const [output, set_output] = React.useState<Array<React.ReactNode>>([]);
 
   const [state, patch] = React.useReducer(reducer, {
-    error: null,
+    status: "init",
     local_version: null,
     latest_version: null,
-    status: "init",
     is_brew_bun_standalone: false,
+
+    // // debugging
+    // status: "prompt",
+    // local_version: "2.5.3",
+    // latest_version: "2.7.0",
+    // is_brew_bun_standalone: true,
   });
 
-  function handle_output(node: React.ReactNode) {
-    if (typeof props.onOutput === "function") {
-      props.onOutput(node);
-    } else {
-      set_output((current) => {
-        return [...current, node];
-      });
+  React.useEffect(handle_init_state, []);
+  React.useEffect(handle_status, [state.latest_version]);
+  React.useEffect(handle_on_done, [state.status]);
+
+  const status = render_status();
+
+  return (
+    <React.Fragment>
+      {output}
+      {status}
+    </React.Fragment>
+  );
+
+  function render_status() {
+    switch (state.status) {
+      case "init":
+        return null;
+
+      case "install":
+        return null;
+
+      case "done":
+        return props.children;
+
+      case "prompt": {
+        let install_command = "";
+        if (state.is_brew_bun_standalone) {
+          install_command = "brew install magus/git-stack/git-stack";
+        } else {
+          install_command = `npm install -g ${props.name}@latest`;
+        }
+
+        return (
+          <YesNoPrompt
+            message={
+              <Ink.Box flexDirection="column" gap={1}>
+                <Command>{install_command}</Command>
+                <FormatText
+                  wrapper={<Ink.Text color={colors.yellow} />}
+                  message="Would you like to run the above command to update?"
+                />
+              </Ink.Box>
+            }
+            onNo={() => {
+              patch({ status: "done" });
+            }}
+            onYes={async () => {
+              info(<Command>{install_command}</Command>);
+
+              patch({ status: "install" });
+
+              await cli(install_command, {
+                env: {
+                  ...process.env,
+                  HOMEBREW_COLOR: "1",
+                },
+                onOutput: (data: string) => {
+                  info(<Ink.Text>{data}</Ink.Text>);
+                },
+              });
+
+              info(
+                <Ink.Text key="done">
+                  ✅ Installed <Brackets>{state.latest_version}</Brackets>
+                </Ink.Text>,
+              );
+
+              patch({ status: "done" });
+            }}
+          />
+        );
+      }
     }
   }
 
-  React.useEffect(() => {
+  function handle_on_done() {
     switch (state.status) {
       case "init":
       case "prompt":
@@ -76,199 +146,156 @@ export function AutoUpdate(props: Props) {
       default:
         assertNever(state.status);
     }
-  }, [state.status]);
+  }
 
-  React.useEffect(() => {
-    let status: State["status"] = "init";
-    let latest_version: string | null = null;
-    let is_brew_bun_standalone = false;
+  function handle_init_state() {
+    init_state().catch(abort);
 
-    const local_version = process.env.CLI_VERSION;
-    const is_output = props_ref.current.verbose || props_ref.current.force;
+    async function init_state() {
+      if (state.latest_version !== null) return;
 
-    async function auto_update() {
-      if (!local_version) {
-        throw new Error("Auto update requires process.env.CLI_VERSION to be set");
-      }
+      const local_version = process.env.CLI_VERSION;
+      const latest_version = await get_latest_version();
+      const is_brew_bun_standalone = get_is_brew_bun_standalone();
+      patch({ local_version, latest_version, is_brew_bun_standalone });
+    }
 
+    async function get_latest_version() {
       const timeout_ms = is_finite_value(props.timeoutMs) ? props.timeoutMs : 2 * 1000;
+      const timeout = get_timeout_fn(timeout_ms, "AutoUpdate timeout");
+      const npm_json = await timeout(fetch_json(`https://registry.npmjs.org/${props.name}`));
+      const maybe_version = npm_json?.["dist-tags"]?.latest;
+      if (typeof maybe_version === "string") {
+        return maybe_version;
+      }
+      throw new Error("Unable to retrieve latest version from npm");
+    }
+
+    function get_is_brew_bun_standalone() {
+      const binary_path = process.argv[1];
+      debug(<Ink.Text dimColor>{JSON.stringify({ binary_path })}</Ink.Text>);
+
+      const is_bunfs_path = binary_path.startsWith("/$bunfs");
+      debug(
+        <Ink.Text dimColor>
+          {is_bunfs_path
+            ? "brew install detected (compiled bun standalone)"
+            : "npm install detected"}
+        </Ink.Text>,
+      );
+
+      return is_bunfs_path;
+    }
+  }
 
-      const npm_json = await Promise.race([
-        fetch_json(`https://registry.npmjs.org/${props.name}`),
+  function handle_status() {
+    const latest_version = state.latest_version;
 
-        sleep(timeout_ms).then(() => {
-          throw new Error("AutoUpdate timeout");
-        }),
-      ]);
+    if (latest_version === null) {
+      return;
+    }
 
-      latest_version = npm_json?.["dist-tags"]?.latest;
+    const local_version = state.local_version;
 
-      if (!latest_version) {
-        throw new Error("Unable to retrieve latest version from npm");
-      }
+    if (!local_version) {
+      throw new Error("Auto update requires process.env.CLI_VERSION to be set");
+    }
 
-      const binary_path = process.argv[1];
+    debug(
+      <FormatText
+        key="versions"
+        wrapper={<Ink.Text dimColor />}
+        message="Auto update found latest version {latest_version} and current local version {local_version}"
+        values={{
+          latest_version: <Brackets>{latest_version}</Brackets>,
+          local_version: <Brackets>{local_version}</Brackets>,
+        }}
+      />,
+    );
+
+    const semver_result = semver_compare(latest_version, local_version);
+    debug(<Ink.Text dimColor>{JSON.stringify({ semver_result })}</Ink.Text>);
+
+    switch (semver_result) {
+      case 0: {
+        info(
+          <Ink.Text>
+            ✅ Everything up to date. <Brackets>{latest_version}</Brackets>
+          </Ink.Text>,
+        );
 
-      if (props_ref.current.verbose) {
-        handle_output(<Ink.Text dimColor>{JSON.stringify({ binary_path })}</Ink.Text>);
+        return patch({ status: "done" });
       }
 
-      is_brew_bun_standalone = binary_path.startsWith("/$bunfs");
+      case 1: {
+        const old_tag = local_version;
+        const new_tag = state.latest_version;
+        const url = `https://github.com/magus/git-stack-cli/compare/${old_tag}...${new_tag}`;
 
-      if (props_ref.current.verbose) {
-        if (is_brew_bun_standalone) {
-          handle_output(
-            <Ink.Text dimColor>brew install detected (compiled bun standalone)</Ink.Text>,
-          );
-        } else {
-          handle_output(<Ink.Text dimColor>npm install detected</Ink.Text>);
-        }
+        info(
+          <Ink.Box flexDirection="column" gap={1} paddingTop={1} paddingBottom={1}>
+            <Ink.Text>
+              🆕 New version available! <Brackets>{latest_version}</Brackets>
+            </Ink.Text>
+            <Ink.Box flexDirection="column">
+              <Ink.Text dimColor>Changelog</Ink.Text>
+              <Url>{url}</Url>
+            </Ink.Box>
+          </Ink.Box>,
+        );
+
+        return patch({ status: "prompt" });
       }
 
-      if (props_ref.current.verbose) {
-        handle_output(
+      case -1: {
+        info(
           <FormatText
-            key="versions"
-            wrapper={<Ink.Text />}
-            message="Auto update found latest version {latest_version} and current local version {local_version}"
+            message="⚠️ Local version {local_version} is newer than latest version {latest_version}"
             values={{
-              latest_version: <Brackets>{latest_version}</Brackets>,
               local_version: <Brackets>{local_version}</Brackets>,
+              latest_version: <Brackets>{latest_version}</Brackets>,
             }}
           />,
         );
-      }
 
-      const semver_result = semver_compare(latest_version, local_version);
-      if (props_ref.current.verbose) {
-        handle_output(<Ink.Text dimColor>{JSON.stringify({ semver_result })}</Ink.Text>);
+        return patch({ status: "done" });
       }
 
-      if (semver_result === 0) {
-        status = "done";
-
-        if (is_output) {
-          handle_output(
-            <Ink.Text>
-              ✅ Everything up to date. <Brackets>{latest_version}</Brackets>
-            </Ink.Text>,
-          );
-        }
-        return;
-      }
-
-      if (semver_result === 1) {
-        // trigger yes no prompt
-        status = "prompt";
+      default: {
+        assertNever(semver_result);
+        abort(new Error("AutoUpdate failed"));
       }
+    }
+  }
 
-      throw new Error("AutoUpdate failed");
+  function info(node: React.ReactNode) {
+    if (props_ref.current.verbose || props_ref.current.force) {
+      handle_output(node);
     }
+  }
 
-    const onError = props_ref.current.onError || (() => {});
-
-    auto_update()
-      .then(() => {
-        patch({ status, local_version, latest_version, is_brew_bun_standalone });
-      })
-      .catch((error) => {
-        if (props_ref.current.verbose) {
-          handle_output(
-            <Ink.Text key="error" color={colors.red}>
-              {error?.message}
-            </Ink.Text>,
-          );
-        }
+  function debug(node: React.ReactNode) {
+    if (props_ref.current.verbose) {
+      handle_output(node);
+    }
+  }
+  function abort(error: Error) {
+    info(
+      <Ink.Text key="error" color={colors.red}>
+        {error.message}
+      </Ink.Text>,
+    );
+    patch({ status: "done" });
+    props_ref.current.onError?.(error);
+  }
 
-        // ensure we always exit
-        status = "done";
-        patch({ status, error, local_version, latest_version, is_brew_bun_standalone });
-        onError(error);
+  function handle_output(node: React.ReactNode) {
+    if (typeof props.onOutput === "function") {
+      props.onOutput(node);
+    } else {
+      set_output((current) => {
+        return [...current, node];
       });
-  }, []);
-
-  const status = (function render_status() {
-    switch (state.status) {
-      case "init":
-        return null;
-
-      case "prompt": {
-        let install_command = "";
-        if (state.is_brew_bun_standalone) {
-          install_command = "brew install magus/git-stack/git-stack";
-        } else {
-          install_command = `npm install -g ${props.name}@latest`;
-        }
-
-        return (
-          <YesNoPrompt
-            message={
-              <Ink.Box flexDirection="column">
-                <Ink.Box flexDirection="column">
-                  <Ink.Text color={colors.yellow}>
-                    <FormatText
-                      wrapper={<Ink.Text />}
-                      message="New version available {latest_version}"
-                      values={{
-                        latest_version: <Brackets>{state.latest_version}</Brackets>,
-                      }}
-                    />
-                    ,
-                  </Ink.Text>
-                  <Ink.Text> </Ink.Text>
-                  <Command>{install_command}</Command>
-                  <Ink.Text> </Ink.Text>
-                </Ink.Box>
-                <Ink.Box>
-                  <FormatText
-                    wrapper={<Ink.Text color={colors.yellow} />}
-                    message="Would you like to run the above command to update?"
-                  />
-                </Ink.Box>
-              </Ink.Box>
-            }
-            onYes={async () => {
-              handle_output(<Command>{install_command}</Command>);
-
-              patch({ status: "install" });
-
-              await cli(install_command, {
-                env: {
-                  ...process.env,
-                  HOMEBREW_COLOR: "1",
-                },
-                onOutput: (data: string) => {
-                  handle_output(<Ink.Text>{data}</Ink.Text>);
-                },
-              });
-
-              handle_output(
-                <Ink.Text key="done">
-                  ✅ Installed <Brackets>{state.latest_version}</Brackets>
-                </Ink.Text>,
-              );
-
-              patch({ status: "done" });
-            }}
-            onNo={() => {
-              patch({ status: "done" });
-            }}
-          />
-        );
-      }
-
-      case "install":
-        return null;
-
-      case "done":
-        return props.children;
     }
-  })();
-
-  return (
-    <React.Fragment>
-      {output}
-      {status}
-    </React.Fragment>
-  );
+  }
 }

package/src/app/SelectCommitRanges.tsx

@@ -380,7 +380,11 @@ function SelectCommitRangesInternal(props: Props) {
           {sync_status !== "allow_unassigned" ? null : (
             <FormatText
               wrapper={<Ink.Text color={colors.gray} />}
-              message="Press {s} to {sync} the {count} assigned commits to Github"
+              message={
+                argv.sync
+                  ? "Press {s} to {sync} the {count} assigned commits to Github"
+                  : "Press {s} to {sync} the {count} assigned commits locally"
+              }
               values={{
                 ...S_TO_SYNC_VALUES,
                 count: (
@@ -393,21 +397,15 @@ function SelectCommitRangesInternal(props: Props) {
           )}
         </React.Fragment>
       ) : (
-        <React.Fragment>
-          {argv.sync ? (
-            <FormatText
-              wrapper={<Ink.Text />}
-              message="🎉 Done! Press {s} to {sync} the commits to Github"
-              values={S_TO_SYNC_VALUES}
-            />
-          ) : (
-            <FormatText
-              wrapper={<Ink.Text />}
-              message="🎉 Done! Press {s} to {save} the commits locally"
-              values={S_TO_SYNC_VALUES}
-            />
-          )}
-        </React.Fragment>
+        <FormatText
+          wrapper={<Ink.Text />}
+          message={
+            argv.sync
+              ? "🎉 Done! Press {s} to {sync} the PRs to Github"
+              : "🎉 Done! Press {s} to {sync} the PRs locally"
+          }
+          values={S_TO_SYNC_VALUES}
+        />
       )}
 
       <Ink.Box>

package/src/commands/Rebase.tsx

@@ -78,7 +78,9 @@ Rebase.run = async function run(props: Props) {
     actions.exit(20);
   }
 
+  actions.debug("start CommitMetadata.range");
   const next_commit_range = await CommitMetadata.range();
+  actions.debug("end CommitMetadata.range");
 
   actions.output(
     <FormatText
@@ -167,7 +169,9 @@ Rebase.run = async function run(props: Props) {
     // of original branch to the newly created temporary branch
     await cli(`git branch -f ${branch_name} ${temp_branch_name}`);
 
+    actions.debug("start restore_git()");
     restore_git();
+    actions.debug("end restore_git()");
   }
 
   // cleanup git operations if cancelled during manual rebase

package/src/core/CommitMetadata.ts

@@ -1,9 +1,7 @@
 import { Store } from "~/app/Store";
-import * as Metadata from "~/core/Metadata";
-import { cli } from "~/core/cli";
+import * as git from "~/core/git";
 import * as github from "~/core/github";
 
-export type CommitMetadata = Awaited<ReturnType<typeof commit>>;
 export type CommitRange = Awaited<ReturnType<typeof range>>;
 
 type GithubPRStatus = ReturnType<typeof github.pr_status>;
@@ -15,24 +13,25 @@ type CommitGroup = {
   pr: null | PullRequest;
   base: null | string;
   dirty: boolean;
-  commits: Array<CommitMetadata>;
+  commits: Array<git.Commit>;
 };
 
 export type SimpleGroup = { id: string; title: string };
 type CommitGroupMap = { [sha: string]: SimpleGroup };
 
 export async function range(commit_group_map?: CommitGroupMap) {
-  const master_branch = Store.getState().master_branch;
-
   // gather all open prs in repo first
   // cheaper query to populate cache
   await github.pr_list();
 
-  const commit_list = await get_commit_list();
+  const master_branch = Store.getState().master_branch;
+  const commit_list = await git.get_commits(`${master_branch}..HEAD`);
 
   const pr_lookup: Record<string, void | PullRequest> = {};
 
   let invalid = false;
+  let last_group_id: null | string = null;
+
   const group_map = new Map<string, CommitGroup>();
 
   for (const commit of commit_list) {
@@ -57,10 +56,7 @@ export async function range(commit_group_map?: CommitGroupMap) {
     }
 
     if (id) {
-      const group_key_list = Array.from(group_map.keys());
-      const last_key = group_key_list[group_key_list.length - 1];
-
-      if (group_map.has(id) && last_key !== id) {
+      if (group_map.has(id) && last_group_id !== id) {
         // if we've seen this id before and it's not
         // the last added key then we are out of order
         // console.debug("INVALID", "OUT OF ORDER");
@@ -87,6 +83,7 @@ export async function range(commit_group_map?: CommitGroupMap) {
 
     group.commits.push(commit);
     group_map.set(id, group);
+    last_group_id = id;
   }
 
   // check each group for dirty state and base
@@ -183,53 +180,4 @@ export async function range(commit_group_map?: CommitGroupMap) {
   return { invalid, group_list, commit_list, pr_lookup, UNASSIGNED };
 }
 
-async function get_commit_list() {
-  const master_branch = Store.getState().master_branch;
-  const log_result = await cli(
-    `git log ${master_branch}..HEAD --oneline --format=%H --color=never`,
-  );
-
-  if (!log_result.stdout) {
-    return [];
-  }
-
-  const sha_list = lines(log_result.stdout).reverse();
-
-  const commit_metadata_list = [];
-
-  for (let i = 0; i < sha_list.length; i++) {
-    const sha = sha_list[i];
-    const commit_metadata = await commit(sha);
-    commit_metadata_list.push(commit_metadata);
-  }
-
-  return commit_metadata_list;
-}
-
-export async function commit(sha: string) {
-  const full_message = (await cli(`git show -s --format=%B ${sha}`)).stdout;
-  const metadata = await Metadata.read(full_message);
-  const branch_id = metadata?.id;
-  const subject_line = get_subject_line(full_message);
-  const title = metadata?.title;
-
-  return {
-    sha,
-    full_message,
-    subject_line,
-    branch_id,
-    title,
-  };
-}
-
-function get_subject_line(message: string) {
-  const line_list = lines(message);
-  const first_line = line_list[0];
-  return Metadata.remove(first_line);
-}
-
-function lines(value: string) {
-  return value.split("\n");
-}
-
 export const UNASSIGNED = "unassigned";