git-stack-cli 1.2.7 → 1.3.0

package/dist/cjs/index.cjs

@@ -26197,9 +26197,10 @@ function LogTimestamp() {
 }
 
 const BaseStore = createStore()(immer((set, get) => ({
-    argv: null,
-    ink: null,
-    cwd: null,
+    // set immediately in `index.tsx` so no `null` scenario
+    argv: {},
+    ink: {},
+    cwd: "",
     username: null,
     repo_path: null,
     repo_root: null,
@@ -26675,12 +26676,6 @@ function AutoUpdate(props) {
         status));
 }
 
-function invariant(condition, message) {
-    if (!condition) {
-        throw new Error(message);
-    }
-}
-
 function serialize(obj) {
     if (obj instanceof Map) {
         return {
@@ -26728,7 +26723,6 @@ function Debug() {
         }
     }, [argv]);
     reactExports.useEffect(function syncStateJson() {
-        invariant(state.cwd, "state.cwd must exist");
         if (!argv?.["write-state-json"]) {
             return;
         }
@@ -26783,6 +26777,12 @@ function cache(cacheable) {
     return { reset, check, read };
 }
 
+function invariant(condition, message) {
+    if (!condition) {
+        throw new Error(message);
+    }
+}
+
 function Await(props) {
     const [display_fallback, set_display_fallback] = reactExports.useState(false);
     // const id = React.useId();
@@ -26983,15 +26983,12 @@ function CheckGitRevise(props) {
 }
 
 function GatherMetadata(props) {
-    const argv = Store.useState((state) => state.argv);
-    invariant(argv, "argv must exist");
     const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Gathering local git information..."));
     return (reactExports.createElement(Await, { fallback: fallback, function: gather_metadata$1 }, props.children));
 }
 async function gather_metadata$1() {
     const actions = Store.getState().actions;
     const argv = Store.getState().argv;
-    invariant(argv, "argv must exist");
     try {
         // default to master branch, fallback to main
         let master_branch;
@@ -27083,8 +27080,6 @@ function format_time(date) {
 }
 
 function GithubApiError() {
-    const argv = Store.useState((state) => state.argv);
-    invariant(argv, "argv must exist");
     return reactExports.createElement(Await, { fallback: null, function: run$4 });
 }
 async function run$4() {
@@ -27435,7 +27430,6 @@ const UNASSIGNED = "unassigned";
 
 function LocalCommitStatus(props) {
     const argv = Store.useState((state) => state.argv);
-    invariant(argv, "argv must exist");
     const fallback = (reactExports.createElement(Text, { color: colors.yellow }, "Fetching PR status from Github..."));
     if (argv["mock-metadata"]) {
         return (reactExports.createElement(Await, { fallback: fallback, function: mock_metadata }, props.children));
@@ -27541,10 +27535,8 @@ async function run$3() {
     const master_branch = state.master_branch;
     const cwd = state.cwd;
     const repo_root = state.repo_root;
-    invariant(argv, "argv must exist");
     invariant(branch_name, "branch_name must exist");
     invariant(commit_range, "commit_range must exist");
-    invariant(cwd, "cwd must exist");
     invariant(repo_root, "repo_root must exist");
     // always listen for SIGINT event and restore git state
     process.once("SIGINT", handle_exit);
@@ -27654,7 +27646,6 @@ async function run$3() {
             }
         }
         // restore back to original dir
-        invariant(cwd, "cwd must exist");
         if (fs.existsSync(cwd)) {
             process.chdir(cwd);
         }
@@ -27825,10 +27816,10 @@ const RE = {
     })),
 };
 
-function ManualRebase(props) {
-    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits..."), function: () => run$2(props) }));
+function ManualRebase() {
+    return (reactExports.createElement(Await, { fallback: reactExports.createElement(Text, { color: colors.yellow }, "Rebasing commits..."), function: run$2 }));
 }
-async function run$2(props) {
+async function run$2() {
     const state = Store.getState();
     const actions = state.actions;
     const argv = state.argv;
@@ -27837,10 +27828,8 @@ async function run$2(props) {
     const master_branch = state.master_branch;
     const cwd = state.cwd;
     const repo_root = state.repo_root;
-    invariant(argv, "argv must exist");
     invariant(branch_name, "branch_name must exist");
     invariant(commit_map, "commit_map must exist");
-    invariant(cwd, "cwd must exist");
     invariant(repo_root, "repo_root must exist");
     // always listen for SIGINT event and restore git state
     process.once("SIGINT", handle_exit);
@@ -27897,7 +27886,6 @@ async function run$2(props) {
         handle_exit();
     }
     async function rebase_git_revise() {
-        invariant(argv, "argv must exist");
         actions.debug(`rebase_git_revise`);
         actions.output(reactExports.createElement(Text, { color: colors.yellow, wrap: "truncate-end" }, "Rebasing\u2026"));
         // generate temporary directory and drop sequence editor script
@@ -27991,7 +27979,6 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
         await update_pr_tables(pr_url_list);
     }
     async function rebase_cherry_pick() {
-        invariant(argv, "argv must exist");
         actions.debug("rebase_cherry_pick");
         // create temporary branch based on merge base
         await cli(`git checkout -b ${temp_branch_name} ${rebase_merge_base}`);
@@ -28025,11 +28012,10 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
         await update_pr_tables(pr_url_list);
     }
     async function sync_group_github(args) {
-        if (props.skipSync) {
+        if (!argv.sync) {
             return;
         }
         const { group, pr_url_list } = args;
-        invariant(argv, "argv must exist");
         invariant(group.base, "group.base must exist");
         actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Syncing {group}\u2026", values: {
                 group: (reactExports.createElement(Brackets, null, group.pr?.title || group.title || group.id)),
@@ -28131,7 +28117,6 @@ echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"
             }
         }
         // restore back to original dir
-        invariant(cwd, "cwd must exist");
         if (fs.existsSync(cwd)) {
             process.chdir(cwd);
         }
@@ -28330,8 +28315,6 @@ function get_status_bold(row) {
 }
 
 function PostRebaseStatus() {
-    const argv = Store.useState((state) => state.argv);
-    invariant(argv, "argv must exist");
     return reactExports.createElement(Await, { fallback: null, function: run$1 });
 }
 async function run$1() {
@@ -28349,7 +28332,6 @@ async function run$1() {
 function PreLocalMergeRebase() {
     const actions = Store.useActions();
     const argv = Store.useState((state) => state.argv);
-    invariant(argv, "argv must exist");
     reactExports.useEffect(() => {
         if (argv.force) {
             Store.setState((state) => {
@@ -28367,7 +28349,6 @@ function PreLocalMergeRebase() {
 function PreSelectCommitRanges() {
     const actions = Store.useActions();
     const argv = Store.useState((state) => state.argv);
-    invariant(argv, "argv must exist");
     reactExports.useEffect(() => {
         if (argv.force) {
             Store.setState((state) => {
@@ -28660,7 +28641,6 @@ function SelectCommitRangesInternal(props) {
                 switch (inputLower) {
                     case "s":
                         state.step = "manual-rebase";
-                        // state.step = "manual-rebase-no-sync";
                         break;
                 }
             });
@@ -28767,7 +28747,7 @@ function SelectCommitRangesInternal(props) {
                     enter: (reactExports.createElement(Text, { bold: true, color: colors.green }, SYMBOL.enter)),
                 } }))));
     function submit_group_input(title) {
-        const id = short_id();
+        const id = `gs-${short_id()}`;
         actions.output(reactExports.createElement(FormatText, { wrapper: reactExports.createElement(Text, { dimColor: true }), message: "Created new group {group} {note}", values: {
                 group: reactExports.createElement(Brackets, null, title),
                 note: reactExports.createElement(Parens, null, id),
@@ -28785,12 +28765,12 @@ const SYMBOL = {
 };
 
 function Status() {
-    const argv = Store.useState((state) => state.argv);
-    invariant(argv, "argv must exist");
-    return reactExports.createElement(Await, { fallback: null, function: () => run({ argv }) });
+    return reactExports.createElement(Await, { fallback: null, function: run });
 }
-async function run(args) {
-    const actions = Store.getState().actions;
+async function run() {
+    const state = Store.getState();
+    const actions = state.actions;
+    const argv = state.argv;
     const commit_range = Store.getState().commit_range;
     invariant(commit_range, "commit_range must exist");
     actions.output(reactExports.createElement(StatusTable, null));
@@ -28811,7 +28791,7 @@ async function run(args) {
             needs_rebase = true;
         }
     }
-    if (args.argv.check) {
+    if (argv.check) {
         actions.exit(0);
     }
     else if (needs_rebase) {
@@ -28824,7 +28804,7 @@ async function run(args) {
             state.step = "pre-select-commit-ranges";
         });
     }
-    else if (args.argv.force) {
+    else if (argv.force) {
         Store.setState((state) => {
             state.step = "select-commit-ranges";
         });
@@ -28842,10 +28822,10 @@ async function run(args) {
 function Main() {
     const step = Store.useState((state) => state.step);
     switch (step) {
-        case "github-api-error":
-            return reactExports.createElement(GithubApiError, null);
         case "loading":
             return null;
+        case "github-api-error":
+            return reactExports.createElement(GithubApiError, null);
         case "status":
             return reactExports.createElement(Status, null);
         case "local-merge-rebase":
@@ -28858,8 +28838,6 @@ function Main() {
             return reactExports.createElement(SelectCommitRanges, null);
         case "manual-rebase":
             return reactExports.createElement(ManualRebase, null);
-        case "manual-rebase-no-sync":
-            return reactExports.createElement(ManualRebase, { skipSync: true });
         case "post-rebase-status":
             return reactExports.createElement(PostRebaseStatus, null);
         default:
@@ -28894,8 +28872,6 @@ function reducer(state, patch) {
 }
 function RebaseCheck(props) {
     const actions = Store.useActions();
-    const argv = Store.useState((state) => state.argv);
-    invariant(argv, "argv must exist");
     const [state, patch] = reactExports.useReducer(reducer, {
         status: "init",
     });
@@ -28914,8 +28890,6 @@ function RebaseCheck(props) {
     }
     async function rebase_check() {
         const actions = Store.getState().actions;
-        const argv = Store.getState().argv;
-        invariant(argv, "argv must exist");
         try {
             const repo_root = (await cli(`git rev-parse --absolute-git-dir`)).stdout;
             let is_rebase = false;
@@ -34284,12 +34258,18 @@ async function command() {
         type: "boolean",
         alias: ["c"],
         default: false,
-        description: "Print status table without syncing",
+        description: "Print status table and exit without syncing",
+    })
+        .option("sync", {
+        type: "boolean",
+        alias: ["s"],
+        default: true,
+        description: "Sync commit ranges to Github, disable with --no-sync",
     })
         .option("verify", {
         type: "boolean",
         default: true,
-        description: "Skip git hooks such as pre-commit and pre-push",
+        description: "Run git hooks such as pre-commit and pre-push, disable with --no-verify",
     })
         .option("rebase", {
         type: "string",
@@ -34336,7 +34316,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.2.7" )
+        .version("1.3.0" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`").argv);
 }
@@ -34353,6 +34333,7 @@ command()
         state.argv = argv;
         state.cwd = process.cwd();
     });
+    Store.getState().actions.debug(JSON.stringify(argv, null, 2));
 })
     // eslint-disable-next-line no-console
     .catch(console.error);

package/package.json

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

package/src/app/Debug.tsx

@@ -7,7 +7,6 @@ import * as Ink from "ink-cjs";
 
 import { Store } from "~/app/Store";
 import { colors } from "~/core/colors";
-import { invariant } from "~/core/invariant";
 import * as json from "~/core/json";
 
 export function Debug() {
@@ -29,8 +28,6 @@ export function Debug() {
 
   React.useEffect(
     function syncStateJson() {
-      invariant(state.cwd, "state.cwd must exist");
-
       if (!argv?.["write-state-json"]) {
         return;
       }

package/src/app/GatherMetadata.tsx

@@ -8,7 +8,6 @@ import { FormatText } from "~/app/FormatText";
 import { Store } from "~/app/Store";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
-import { invariant } from "~/core/invariant";
 import { match_group } from "~/core/match_group";
 
 type Props = {
@@ -16,9 +15,6 @@ type Props = {
 };
 
 export function GatherMetadata(props: Props) {
-  const argv = Store.useState((state) => state.argv);
-  invariant(argv, "argv must exist");
-
   const fallback = (
     <Ink.Text color={colors.yellow}>
       Gathering local git information...
@@ -36,8 +32,6 @@ async function gather_metadata() {
   const actions = Store.getState().actions;
   const argv = Store.getState().argv;
 
-  invariant(argv, "argv must exist");
-
   try {
     // default to master branch, fallback to main
     let master_branch: string;

package/src/app/GithubApiError.tsx

@@ -9,12 +9,8 @@ import { Store } from "~/app/Store";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import * as date from "~/core/date";
-import { invariant } from "~/core/invariant";
 
 export function GithubApiError() {
-  const argv = Store.useState((state) => state.argv);
-  invariant(argv, "argv must exist");
-
   return <Await fallback={null} function={run} />;
 }
 

package/src/app/LocalCommitStatus.tsx

@@ -6,7 +6,6 @@ import { Await } from "~/app/Await";
 import { Store } from "~/app/Store";
 import * as CommitMetadata from "~/core/CommitMetadata";
 import { colors } from "~/core/colors";
-import { invariant } from "~/core/invariant";
 import * as json from "~/core/json";
 
 type Props = {
@@ -15,7 +14,6 @@ type Props = {
 
 export function LocalCommitStatus(props: Props) {
   const argv = Store.useState((state) => state.argv);
-  invariant(argv, "argv must exist");
 
   const fallback = (
     <Ink.Text color={colors.yellow}>Fetching PR status from Github...</Ink.Text>

package/src/app/LocalMergeRebase.tsx

@@ -35,10 +35,8 @@ async function run() {
   const cwd = state.cwd;
   const repo_root = state.repo_root;
 
-  invariant(argv, "argv must exist");
   invariant(branch_name, "branch_name must exist");
   invariant(commit_range, "commit_range must exist");
-  invariant(cwd, "cwd must exist");
   invariant(repo_root, "repo_root must exist");
 
   // always listen for SIGINT event and restore git state
@@ -200,7 +198,6 @@ async function run() {
     }
 
     // restore back to original dir
-    invariant(cwd, "cwd must exist");
     if (fs.existsSync(cwd)) {
       process.chdir(cwd);
     }

package/src/app/Main.tsx

@@ -15,12 +15,12 @@ export function Main() {
   const step = Store.useState((state) => state.step);
 
   switch (step) {
-    case "github-api-error":
-      return <GithubApiError />;
-
     case "loading":
       return null;
 
+    case "github-api-error":
+      return <GithubApiError />;
+
     case "status":
       return <Status />;
 
@@ -39,9 +39,6 @@ export function Main() {
     case "manual-rebase":
       return <ManualRebase />;
 
-    case "manual-rebase-no-sync":
-      return <ManualRebase skipSync />;
-
     case "post-rebase-status":
       return <PostRebaseStatus />;
 

package/src/app/ManualRebase.tsx

@@ -20,20 +20,16 @@ import * as github from "~/core/github";
 import { invariant } from "~/core/invariant";
 import { short_id } from "~/core/short_id";
 
-type Props = {
-  skipSync?: boolean;
-};
-
-export function ManualRebase(props: Props) {
+export function ManualRebase() {
   return (
     <Await
       fallback={<Ink.Text color={colors.yellow}>Rebasing commits...</Ink.Text>}
-      function={() => run(props)}
+      function={run}
     />
   );
 }
 
-async function run(props: Props) {
+async function run() {
   const state = Store.getState();
   const actions = state.actions;
   const argv = state.argv;
@@ -43,10 +39,8 @@ async function run(props: Props) {
   const cwd = state.cwd;
   const repo_root = state.repo_root;
 
-  invariant(argv, "argv must exist");
   invariant(branch_name, "branch_name must exist");
   invariant(commit_map, "commit_map must exist");
-  invariant(cwd, "cwd must exist");
   invariant(repo_root, "repo_root must exist");
 
   // always listen for SIGINT event and restore git state
@@ -120,8 +114,6 @@ async function run(props: Props) {
   }
 
   async function rebase_git_revise() {
-    invariant(argv, "argv must exist");
-
     actions.debug(`rebase_git_revise`);
 
     actions.output(
@@ -212,8 +204,6 @@ async function run(props: Props) {
   }
 
   async function rebase_cherry_pick() {
-    invariant(argv, "argv must exist");
-
     actions.debug("rebase_cherry_pick");
 
     // create temporary branch based on merge base
@@ -273,13 +263,12 @@ async function run(props: Props) {
     pr_url_list: Array<string>;
     skip_checkout: boolean;
   }) {
-    if (props.skipSync) {
+    if (!argv.sync) {
       return;
     }
 
     const { group, pr_url_list } = args;
 
-    invariant(argv, "argv must exist");
     invariant(group.base, "group.base must exist");
 
     actions.output(
@@ -412,7 +401,6 @@ async function run(props: Props) {
     }
 
     // restore back to original dir
-    invariant(cwd, "cwd must exist");
     if (fs.existsSync(cwd)) {
       process.chdir(cwd);
     }

package/src/app/PostRebaseStatus.tsx

@@ -6,12 +6,8 @@ import { Await } from "~/app/Await";
 import { StatusTable } from "~/app/StatusTable";
 import { Store } from "~/app/Store";
 import * as CommitMetadata from "~/core/CommitMetadata";
-import { invariant } from "~/core/invariant";
 
 export function PostRebaseStatus() {
-  const argv = Store.useState((state) => state.argv);
-  invariant(argv, "argv must exist");
-
   return <Await fallback={null} function={run} />;
 }
 

package/src/app/PreLocalMergeRebase.tsx

@@ -2,12 +2,10 @@ import * as React from "react";
 
 import { Store } from "~/app/Store";
 import { YesNoPrompt } from "~/app/YesNoPrompt";
-import { invariant } from "~/core/invariant";
 
 export function PreLocalMergeRebase() {
   const actions = Store.useActions();
   const argv = Store.useState((state) => state.argv);
-  invariant(argv, "argv must exist");
 
   React.useEffect(() => {
     if (argv.force) {

package/src/app/PreSelectCommitRanges.tsx

@@ -2,12 +2,10 @@ import * as React from "react";
 
 import { Store } from "~/app/Store";
 import { YesNoPrompt } from "~/app/YesNoPrompt";
-import { invariant } from "~/core/invariant";
 
 export function PreSelectCommitRanges() {
   const actions = Store.useActions();
   const argv = Store.useState((state) => state.argv);
-  invariant(argv, "argv must exist");
 
   React.useEffect(() => {
     if (argv.force) {

package/src/app/RebaseCheck.tsx

@@ -10,7 +10,6 @@ import { Store } from "~/app/Store";
 import { YesNoPrompt } from "~/app/YesNoPrompt";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
-import { invariant } from "~/core/invariant";
 
 type Props = {
   children: React.ReactNode;
@@ -26,8 +25,6 @@ function reducer(state: State, patch: Partial<State>) {
 
 export function RebaseCheck(props: Props) {
   const actions = Store.useActions();
-  const argv = Store.useState((state) => state.argv);
-  invariant(argv, "argv must exist");
 
   const [state, patch] = React.useReducer(reducer, {
     status: "init",
@@ -68,9 +65,6 @@ export function RebaseCheck(props: Props) {
 
   async function rebase_check() {
     const actions = Store.getState().actions;
-    const argv = Store.getState().argv;
-
-    invariant(argv, "argv must exist");
 
     try {
       const repo_root = (await cli(`git rev-parse --absolute-git-dir`)).stdout;

package/src/app/SelectCommitRanges.tsx

@@ -130,7 +130,6 @@ function SelectCommitRangesInternal(props: Props) {
         switch (inputLower) {
           case "s":
             state.step = "manual-rebase";
-            // state.step = "manual-rebase-no-sync";
             break;
         }
       });
@@ -346,7 +345,7 @@ function SelectCommitRangesInternal(props: Props) {
   );
 
   function submit_group_input(title: string) {
-    const id = short_id();
+    const id = `gs-${short_id()}`;
 
     actions.output(
       <FormatText

package/src/app/Status.tsx

@@ -8,21 +8,15 @@ import { Store } from "~/app/Store";
 import { colors } from "~/core/colors";
 import { invariant } from "~/core/invariant";
 
-import type { Argv } from "~/command";
-
 export function Status() {
-  const argv = Store.useState((state) => state.argv);
-  invariant(argv, "argv must exist");
-
-  return <Await fallback={null} function={() => run({ argv })} />;
+  return <Await fallback={null} function={run} />;
 }
 
-type Args = {
-  argv: Argv;
-};
+async function run() {
+  const state = Store.getState();
+  const actions = state.actions;
+  const argv = state.argv;
 
-async function run(args: Args) {
-  const actions = Store.getState().actions;
   const commit_range = Store.getState().commit_range;
 
   invariant(commit_range, "commit_range must exist");
@@ -51,7 +45,7 @@ async function run(args: Args) {
     }
   }
 
-  if (args.argv.check) {
+  if (argv.check) {
     actions.exit(0);
   } else if (needs_rebase) {
     Store.setState((state) => {
@@ -61,7 +55,7 @@ async function run(args: Args) {
     Store.setState((state) => {
       state.step = "pre-select-commit-ranges";
     });
-  } else if (args.argv.force) {
+  } else if (argv.force) {
     Store.setState((state) => {
       state.step = "select-commit-ranges";
     });

package/src/app/Store.tsx

@@ -25,10 +25,11 @@ type MutateOutputArgs = {
 };
 
 export type State = {
-  argv: null | Argv;
-  ink: null | InkInstance;
+  // set immediately in `index.tsx` so no `null` scenario
+  argv: Argv;
+  ink: InkInstance;
+  cwd: string;
 
-  cwd: null | string;
   username: null | string;
   repo_path: null | string;
   repo_root: null | string;
@@ -47,7 +48,6 @@ export type State = {
     | "pre-select-commit-ranges"
     | "select-commit-ranges"
     | "manual-rebase"
-    | "manual-rebase-no-sync"
     | "post-rebase-status";
 
   output: Array<React.ReactNode>;
@@ -85,10 +85,11 @@ export type State = {
 
 const BaseStore = createStore<State>()(
   immer((set, get) => ({
-    argv: null,
-    ink: null,
+    // set immediately in `index.tsx` so no `null` scenario
+    argv: {} as Argv,
+    ink: {} as InkInstance,
+    cwd: "",
 
-    cwd: null,
     username: null,
     repo_path: null,
     repo_root: null,

package/src/command.ts

@@ -22,13 +22,21 @@ export async function command() {
         type: "boolean",
         alias: ["c"],
         default: false,
-        description: "Print status table without syncing",
+        description: "Print status table and exit without syncing",
+      })
+
+      .option("sync", {
+        type: "boolean",
+        alias: ["s"],
+        default: true,
+        description: "Sync commit ranges to Github, disable with --no-sync",
       })
 
       .option("verify", {
         type: "boolean",
         default: true,
-        description: "Skip git hooks such as pre-commit and pre-push",
+        description:
+          "Run git hooks such as pre-commit and pre-push, disable with --no-verify",
       })
 
       .option("rebase", {

package/src/index.tsx

@@ -17,6 +17,8 @@ command()
       state.argv = argv;
       state.cwd = process.cwd();
     });
+
+    Store.getState().actions.debug(JSON.stringify(argv, null, 2));
   })
   // eslint-disable-next-line no-console
   .catch(console.error);