git-stack-cli 0.5.2 → 0.7.0

package/dist/app/Status.js

@@ -1,5 +1,6 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 import { invariant } from "../core/invariant.js";
 import { Await } from "./Await.js";
 import { StatusTable } from "./StatusTable.js";
@@ -26,7 +27,7 @@ async function run(args) {
     }
     for (let i = 0; i < commit_range.commit_list.length; i++) {
         const commit = commit_range.commit_list[i];
-        const commit_pr = commit_range.pr_map.get(commit.branch_id || "");
+        const commit_pr = commit_range.pr_lookup[commit.branch_id || ""];
         if (commit.branch_id && !commit_pr) {
             needs_rebase = true;
         }
@@ -51,9 +52,9 @@ async function run(args) {
     }
     else {
         actions.output(React.createElement(Ink.Text, null, "\u2705 Everything up to date."));
-        actions.output(React.createElement(Ink.Text, { color: "gray" },
+        actions.output(React.createElement(Ink.Text, { color: colors.gray },
             React.createElement(Ink.Text, null, "Run with"),
-            React.createElement(Ink.Text, { bold: true, color: "yellow" }, ` --force `),
+            React.createElement(Ink.Text, { bold: true, color: colors.yellow }, ` --force `),
             React.createElement(Ink.Text, null, "to force update all pull requests.")));
         actions.exit(0);
     }

package/dist/app/StatusTable.js

@@ -1,6 +1,7 @@
 import * as React from "react";
 import * as Ink from "ink";
 import { assertNever } from "../core/assertNever.js";
+import { colors } from "../core/colors.js";
 import { invariant } from "../core/invariant.js";
 import { Store } from "./Store.js";
 import { Table } from "./Table.js";
@@ -11,14 +12,12 @@ export function StatusTable() {
     const row_list = [];
     for (const group of commit_range.group_list) {
         const row = {
-            icon: "",
             count: "",
             status: "NEW",
             title: "",
             url: "",
         };
         if (group.id === commit_range.UNASSIGNED) {
-            row.icon = "⭑";
             row.status = "NEW";
             row.title = "Unassigned";
             row.count = `0/${group.commits.length}`;
@@ -26,16 +25,13 @@ export function StatusTable() {
         }
         else {
             if (group.dirty) {
-                row.icon = "!";
                 row.status = "OUTDATED";
             }
             else {
-                row.icon = "✔";
                 row.status = "SYNCED";
             }
             if (group.pr) {
                 if (group.pr.state === "MERGED") {
-                    row.icon = "↗";
                     row.status = "MERGED";
                 }
                 row.title = group.pr.title;
@@ -49,25 +45,21 @@ export function StatusTable() {
         }
         row_list.push(row);
     }
-    return (React.createElement(Table, { data: row_list, fillColumn: "title", 
-        // maxWidth={{
-        //   title: 30,
-        // }}
-        columnGap: 3, columns: {
-            icon: IconColumn,
+    return (React.createElement(Table, { data: row_list, fillColumn: "title", maxWidth: {
+            status: (v) => v + 2,
+        }, columnGap: 3, columns: {
             status: StatusColumn,
             count: CountColumn,
             title: TitleColumn,
             url: UrlColumn,
         } }));
 }
-function IconColumn(props) {
-    const value = props.row[props.column];
-    return (React.createElement(Ink.Text, { color: get_status_color(props.row), bold: get_status_bold(props.row) }, value));
-}
 function StatusColumn(props) {
     const value = props.row[props.column];
-    return (React.createElement(Ink.Text, { color: get_status_color(props.row), bold: get_status_bold(props.row) }, value));
+    return (React.createElement(Ink.Text, { color: get_status_color(props.row), bold: get_status_bold(props.row) },
+        get_status_icon(props.row),
+        " ",
+        value));
 }
 function CountColumn(props) {
     const value = props.row[props.column];
@@ -81,19 +73,35 @@ function UrlColumn(props) {
     const value = props.row[props.column];
     return React.createElement(Url, { dimColor: true }, value);
 }
+function get_status_icon(row) {
+    switch (row.status) {
+        case "NEW":
+            return "⭑";
+        case "OUTDATED":
+            return "!";
+        case "MERGED":
+            return "↗";
+        case "SYNCED":
+            return "✔";
+        default:
+            assertNever(row.status);
+            return "?";
+        // unicode question mark in box
+    }
+}
 function get_status_color(row) {
     switch (row.status) {
         case "NEW":
-            return "yellow";
+            return colors.yellow;
         case "OUTDATED":
-            return "red";
+            return colors.red;
         case "MERGED":
-            return "purple";
+            return colors.purple;
         case "SYNCED":
-            return "green";
+            return colors.green;
         default:
             assertNever(row.status);
-            return "gray";
+            return colors.gray;
     }
 }
 function get_status_bold(row) {

package/dist/app/Store.js

@@ -2,6 +2,7 @@ import * as React from "react";
 import * as Ink from "ink";
 import { createStore, useStore } from "zustand";
 import { immer } from "zustand/middleware/immer";
+import { colors } from "../core/colors.js";
 import { Exit } from "./Exit.js";
 const BaseStore = createStore()(immer((set, get) => ({
     argv: null,
@@ -9,6 +10,7 @@ const BaseStore = createStore()(immer((set, get) => ({
     cwd: null,
     username: null,
     repo_path: null,
+    master_branch: "master",
     head: null,
     merge_base: null,
     branch_name: null,
@@ -41,7 +43,7 @@ const BaseStore = createStore()(immer((set, get) => ({
         },
         error(message) {
             set((state) => {
-                state.mutate.output(state, React.createElement(Ink.Text, { color: "#ef4444" }, message));
+                state.mutate.output(state, React.createElement(Ink.Text, { color: colors.red }, message));
             });
         },
         output(node) {

package/dist/app/Table.js

@@ -6,8 +6,7 @@ export function Table(props) {
         return (React.createElement(Container, null,
             React.createElement(Ink.Text, { dimColor: true }, "No data found.")));
     }
-    const sample_row = props.data[0];
-    const RowColumnList = Object.keys(sample_row);
+    const RowColumnList = Object.keys(props.columns);
     // walk data and discover max width for each column
     const max_col_width = {};
     for (const col of RowColumnList) {
@@ -17,16 +16,19 @@ export function Table(props) {
         for (const col of RowColumnList) {
             const row_col = row[col];
             max_col_width[col] = Math.max(String(row_col).length, max_col_width[col]);
-            const maxWidth = props.maxWidth?.[col];
-            if (is_finite_value(maxWidth)) {
-                max_col_width[col] = Math.min(maxWidth - 1, max_col_width[col]);
-            }
+        }
+    }
+    for (const col of RowColumnList) {
+        const maxWidth = props.maxWidth?.[col];
+        if (maxWidth) {
+            max_col_width[col] = maxWidth(max_col_width[col]);
         }
     }
     const { stdout } = Ink.useStdout();
     const available_width = stdout.columns;
     const columnGap = is_finite_value(props.columnGap) ? props.columnGap : 2;
-    const breathing_room = 0;
+    // single character breathing room to prevent url including next line via overflow
+    const breathing_room = 1;
     if (props.fillColumn) {
         let remaining_space = available_width;
         for (const col of RowColumnList) {
@@ -44,7 +46,7 @@ export function Table(props) {
             max_col_width[props.fillColumn] = Math.min(max_col_width[props.fillColumn], remaining_space);
         }
     }
-    // console.debug({ available_width, remaining_space, max_col_width });
+    // console.debug({ available_width, max_col_width });
     return (React.createElement(Container, null, props.data.map((row, i) => {
         return (React.createElement(Ink.Box, { key: i, 
             // borderStyle="round"

package/dist/app/TextInput.js

@@ -1,10 +1,23 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 export function TextInput(props) {
     const [value, set_value] = React.useState(get_value(props));
     React.useEffect(function sync_value_prop() {
         set_value(get_value(props));
     }, [props.value]);
+    const [caret_visible, set_caret_visible] = React.useState(false);
+    React.useEffect(function blink_caret() {
+        const interval_ms = 500;
+        let timeoutId = setTimeout(tick, interval_ms);
+        function tick() {
+            set_caret_visible((visible) => !visible);
+            timeoutId = setTimeout(tick, interval_ms);
+        }
+        return function cleanup() {
+            clearTimeout(timeoutId);
+        };
+    }, []);
     Ink.useInput((input, key) => {
         let next_value = value;
         // console.debug("[useInput]", { input, key });
@@ -29,8 +42,9 @@ export function TextInput(props) {
         props.onChange?.(next_value);
     });
     // console.debug("[TextInput]", { value });
-    return (React.createElement(Ink.Box, { borderStyle: "single", minHeight: 1, borderColor: "yellow", borderDimColor: true },
-        React.createElement(Ink.Text, null, value || "‎")));
+    return (React.createElement(Ink.Box, { borderStyle: "single", minHeight: 1, borderColor: colors.yellow, borderDimColor: true },
+        React.createElement(Ink.Text, null, value || ""),
+        React.createElement(Ink.Text, { color: colors.yellow, dimColor: true, inverse: caret_visible }, " ")));
 }
 function get_value(props) {
     return props.value || "";

package/dist/app/Url.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 export function Url(props) {
-    const text_color = "#38bdf8";
-    return (React.createElement(Ink.Text, { bold: true, color: text_color, ...props }, props.children));
+    return (React.createElement(Ink.Text, { bold: true, color: colors.blue, ...props }, props.children));
 }

package/dist/app/YesNoPrompt.js

@@ -1,5 +1,6 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { colors } from "../core/colors.js";
 import { Parens } from "./Parens.js";
 export function YesNoPrompt(props) {
     const [answer, set_answer] = React.useState("");
@@ -14,8 +15,8 @@ export function YesNoPrompt(props) {
         }
     });
     // prettier-ignore
-    const y = React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "Y");
-    const n = React.createElement(Ink.Text, { color: "#ef4444" }, "n");
+    const y = React.createElement(Ink.Text, { bold: true, color: colors.green }, "Y");
+    const n = React.createElement(Ink.Text, { color: colors.red }, "n");
     let choices;
     switch (answer) {
         case "y":
@@ -32,8 +33,8 @@ export function YesNoPrompt(props) {
     }
     return (React.createElement(Ink.Box, { flexDirection: "column" },
         React.createElement(Ink.Box, null,
-            typeof props.message === "object" ? (props.message) : (React.createElement(Ink.Text, { color: "yellow" }, props.message)),
+            typeof props.message === "object" ? (props.message) : (React.createElement(Ink.Text, { color: colors.yellow }, props.message)),
             React.createElement(Ink.Text, null, " "),
             React.createElement(Parens, null,
-                React.createElement(Ink.Text, { color: "gray" }, choices)))));
+                React.createElement(Ink.Text, { color: colors.gray }, choices)))));
 }

package/dist/command.js

@@ -7,30 +7,41 @@ export async function command() {
         .option("force", {
         type: "boolean",
         alias: ["f"],
+        default: false,
         description: "Force sync even if no changes are detected",
     })
         .option("check", {
         type: "boolean",
         alias: ["c"],
+        default: false,
         description: "Print status table without syncing",
     })
-        .option("no-verify", {
+        .option("verify", {
         type: "boolean",
+        default: true,
         description: "Disable the pre-push hook, bypassing it completely",
     })
         .option("verbose", {
         type: "boolean",
         alias: ["v"],
+        default: false,
         description: "Enable verbose mode with more detailed output for debugging",
+    })
+        .option("branch", {
+        type: "string",
+        alias: ["b"],
+        description: `Set the master branch name, defaults to "master" (or "main" if "master" is not found)`,
     })
         .option("write-state-json", {
         hidden: true,
         type: "boolean",
+        default: false,
         description: "Write state to local json file for debugging",
     })
         .option("mock-metadata", {
         hidden: true,
         type: "boolean",
+        default: false,
         description: "Mock local store metadata for testing",
     })
         // do not wrap to 80 columns (yargs default)

package/dist/core/CommitMetadata.js

@@ -1,12 +1,14 @@
+import { Store } from "../app/Store.js";
 import * as Metadata from "./Metadata.js";
 import { cli } from "./cli.js";
 import * as github from "./github.js";
 export async function range(commit_group_map) {
+    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 pr_map = new Map();
+    const pr_lookup = {};
     let invalid = false;
     const group_map = new Map();
     for (const commit of commit_list) {
@@ -63,7 +65,7 @@ export async function range(commit_group_map) {
             const pr_result = await github.pr_status(group.id);
             if (pr_result && pr_result.state !== "CLOSED") {
                 group.pr = pr_result;
-                pr_map.set(group.id, pr_result);
+                pr_lookup[group.id] = pr_result;
             }
         }
         // console.debug("group", group.pr?.title.substring(0, 40));
@@ -75,7 +77,7 @@ export async function range(commit_group_map) {
             group_list.push(group);
         }
         if (i === 0) {
-            group.base = "master";
+            group.base = master_branch;
         }
         else {
             const last_group = group_value_list[i - 1];
@@ -119,7 +121,7 @@ export async function range(commit_group_map) {
     if (unassigned_group) {
         group_list.unshift(unassigned_group);
     }
-    return { invalid, group_list, commit_list, pr_map, UNASSIGNED };
+    return { invalid, group_list, commit_list, pr_lookup, UNASSIGNED };
 }
 async function get_commit_list() {
     const log_result = await cli(`git log master..HEAD --oneline --format=%H --color=never`);

package/dist/core/Metadata copy.js

@@ -0,0 +1,37 @@
+import { invariant } from "../core/invariant.js";
+import { safe_quote } from "../core/safe_quote.js";
+export function write(message, branch_id) {
+    let result = message;
+    // escape double-quote for cli
+    result = safe_quote(result);
+    // remove any previous metadata lines
+    result = remove(result);
+    const line_list = [result, "", TEMPLATE.branch_id(branch_id)];
+    const new_message = line_list.join("\n");
+    return new_message;
+}
+export function read(message) {
+    const match = message.match(RE.branch_id);
+    if (!match?.groups) {
+        return null;
+    }
+    const id = match.groups["id"];
+    invariant(id, "id must exist");
+    return id;
+}
+export function remove(message) {
+    let result = message;
+    // remove metadata
+    result = result.replace(new RegExp(RE.branch_id, "g"), "");
+    result = result.trimEnd();
+    return result;
+}
+const TEMPLATE = {
+    branch_id(id) {
+        return `git-stack-id: ${id}`;
+    },
+};
+const RE = {
+    all_double_quote: /"/g,
+    branch_id: new RegExp(TEMPLATE.branch_id("(?<id>[a-z0-9-+]+)"), "i"),
+};

package/dist/core/Metadata.js

@@ -32,6 +32,5 @@ const TEMPLATE = {
     },
 };
 const RE = {
-    all_double_quote: /"/g,
     branch_id: new RegExp(TEMPLATE.branch_id("(?<id>[a-z0-9-+]+)"), "i"),
 };

package/dist/core/StackSummaryTable.js

@@ -0,0 +1,35 @@
+export function write(args) {
+    const group_list = args.commit_range?.group_list;
+    if (!Array.isArray(group_list) || group_list.length === 0) {
+        return "";
+    }
+    const stack_list = [];
+    for (const group of group_list) {
+        if (group.pr?.url) {
+            const selected = args.selected_group_id === group.id;
+            const icon = selected ? "👉" : "⏳";
+            stack_list.push(`- ${icon} ${group.pr.url}`);
+        }
+    }
+    const stack_table = TEMPLATE.stack_table(["", ...stack_list, "", ""].join("\n"));
+    let result = args.body;
+    if (RE.stack_table.test(result)) {
+        // replace stack table
+        result = result.replace(new RegExp(RE.stack_table), stack_table);
+    }
+    else {
+        // append stack table
+        result = `${result}\n\n${stack_table}`;
+    }
+    result = result.trimEnd();
+    return result;
+}
+const TEMPLATE = {
+    stack_table(rows) {
+        return `#### git stack${rows}`;
+    },
+};
+const RE = {
+    // https://regex101.com/r/kqB9Ft/1
+    stack_table: new RegExp(TEMPLATE.stack_table("\\s+(?<rows>(?:- [^\r^\n]*(?:[\r\n]+)?)+)")),
+};

package/dist/core/StackTable.js

@@ -0,0 +1,38 @@
+import { invariant } from "./invariant.js";
+import { safe_quote } from "./safe_quote.js";
+export function write(message, branch_id) {
+    let result = message;
+    // escape double-quote for cli
+    result = safe_quote(result);
+    // remove any previous metadata lines
+    result = remove(result);
+    const line_list = [result, "", TEMPLATE.branch_id(branch_id)];
+    const new_message = line_list.join("\n");
+    return new_message;
+}
+export function read(message) {
+    const match = message.match(RE.branch_id);
+    if (!match?.groups) {
+        return null;
+    }
+    const id = match.groups["id"];
+    invariant(id, "id must exist");
+    return id;
+}
+export function remove(message) {
+    let result = message;
+    // remove metadata
+    result = result.replace(new RegExp(RE.branch_id, "g"), "");
+    result = result.trimEnd();
+    return result;
+}
+const TEMPLATE = {
+    stack_table(rows) {
+        return `"#### git stack\n${rows}"`;
+    },
+};
+const RE = {
+    all_double_quote: /"/g,
+    // https://regex101.com/r/kqB9Ft/1
+    stack_table: new RegExp(TEMPLATE.branch_id("(?<id>[a-z0-9-+]+)"), "i"),
+};

package/dist/core/SummaryTable.js

@@ -0,0 +1,38 @@
+import { invariant } from "./invariant.js";
+import { safe_quote } from "./safe_quote.js";
+export function write(message, branch_id) {
+    let result = message;
+    // escape double-quote for cli
+    result = safe_quote(result);
+    // remove any previous metadata lines
+    result = remove(result);
+    const line_list = [result, "", TEMPLATE.branch_id(branch_id)];
+    const new_message = line_list.join("\n");
+    return new_message;
+}
+export function read(message) {
+    const match = message.match(RE.branch_id);
+    if (!match?.groups) {
+        return null;
+    }
+    const id = match.groups["id"];
+    invariant(id, "id must exist");
+    return id;
+}
+export function remove(message) {
+    let result = message;
+    // remove metadata
+    result = result.replace(new RegExp(RE.branch_id, "g"), "");
+    result = result.trimEnd();
+    return result;
+}
+const TEMPLATE = {
+    stack_table(rows) {
+        return `"#### git stack\n${rows}"`;
+    },
+};
+const RE = {
+    all_double_quote: /"/g,
+    // https://regex101.com/r/kqB9Ft/1
+    stack_table: new RegExp(TEMPLATE.branch_id("(?<id>[a-z0-9-+]+)"), "i"),
+};

package/dist/core/chalk.js

@@ -0,0 +1,83 @@
+import chalk from "chalk";
+function create_color_proxy(base) {
+    return new Proxy(base, {
+        get(target, prop) {
+            switch (prop) {
+                case "test":
+                    return test;
+                case "bracket":
+                    return (str) => [
+                        target.bold.whiteBright("["),
+                        str,
+                        target.bold.whiteBright("]"),
+                    ].join("");
+                case "url":
+                    return target.bold.underline.blueBright;
+                case "cmd":
+                    return target.bold.yellow;
+                case "branch":
+                    return target.bold.green;
+            }
+            const target_prop = target[prop];
+            return target_prop;
+        },
+        apply(target, _this_arg, arguments_list) {
+            return target(...arguments_list);
+        },
+    });
+}
+export const color = create_color_proxy(chalk);
+function test() {
+    const PROP_LIST = [
+        "reset",
+        "bold",
+        "dim",
+        "italic",
+        "underline",
+        "overline",
+        "inverse",
+        "hidden",
+        "strikethrough",
+        "visible",
+        "black",
+        "red",
+        "green",
+        "yellow",
+        "blue",
+        "magenta",
+        "cyan",
+        "white",
+        "blackBright",
+        "gray",
+        "grey",
+        "redBright",
+        "greenBright",
+        "yellowBright",
+        "blueBright",
+        "magentaBright",
+        "cyanBright",
+        "whiteBright",
+        "bgBlack",
+        "bgRed",
+        "bgGreen",
+        "bgYellow",
+        "bgBlue",
+        "bgMagenta",
+        "bgCyan",
+        "bgWhite",
+        "bgBlackBright",
+        "bgGray",
+        "bgGrey",
+        "bgRedBright",
+        "bgGreenBright",
+        "bgYellowBright",
+        "bgBlueBright",
+        "bgMagentaBright",
+        "bgCyanBright",
+        "bgWhiteBright",
+    ];
+    for (const prop of PROP_LIST) {
+        // eslint-disable-next-line no-console
+        console.debug(chalk[prop](prop));
+    }
+}

package/dist/core/colors.js

@@ -0,0 +1,15 @@
+// ink uses chalk internally
+// https://github.com/vadimdemedes/ink#color
+export const colors = {
+    red: "rgb(248, 81, 73)",
+    // red-emphasis rgb(218, 54, 51)
+    green: "rgb(63, 185, 80)",
+    // green-emphasis rgb(35, 134, 54)
+    purple: "rgb(163, 113, 247)",
+    // purple-emphasis rgb(137, 87, 229)
+    blue: "rgb(47, 129, 247)",
+    orange: "rgb(255, 166, 87)",
+    yellow: "rgb(234, 179, 8)",
+    gray: "rgb(110, 118, 129)",
+    lightGray: "rgb(125, 133, 144)",
+};