git-stack-cli 0.5.1 → 0.6.0

package/dist/app/AutoUpdate.js

@@ -3,7 +3,9 @@ import fs from "node:fs";
 import path from "node:path";
 import * as Ink from "ink";
 import { cli } from "../core/cli.js";
+import { fetch_json } from "../core/fetch_json.js";
 import { read_json } from "../core/read_json.js";
+import { semver_compare } from "../core/semver_compare.js";
 import { sleep } from "../core/sleep.js";
 import { Brackets } from "./Brackets.js";
 import { FormatText } from "./FormatText.js";
@@ -41,13 +43,12 @@ export function AutoUpdate(props) {
                 handle_output(React.createElement(Ink.Text, { key: "init", dimColor: true }, "Checking for latest version..."));
             }
             const timeout_ms = 2 * 1000;
-            const npm_res = await Promise.race([
-                fetch(`https://registry.npmjs.org/${props.name}`),
+            const npm_json = await Promise.race([
+                fetch_json(`https://registry.npmjs.org/${props.name}`),
                 sleep(timeout_ms).then(() => {
                     throw new Error("timeout");
                 }),
             ]);
-            const npm_json = await npm_res.json();
             latest_version = npm_json?.["dist-tags"]?.latest;
             if (!latest_version) {
                 throw new Error("unable to retrieve latest version from npm");
@@ -119,29 +120,3 @@ export function AutoUpdate(props) {
         output,
         status));
 }
-// returns +1 if version_a is greater than version_b
-// returns -1 if version_a is less than version_b
-// returns +0 if version_a is exactly equal to version_b
-//
-// Examples
-//
-//   semver_compare("0.1.1", "0.0.2"); //  1
-//   semver_compare("1.0.1", "0.0.2"); //  1
-//   semver_compare("0.0.1", "1.0.2"); // -1
-//   semver_compare("0.0.1", "0.1.2"); // -1
-//   semver_compare("1.0.1", "1.0.1"); //  0
-//
-function semver_compare(version_a, version_b) {
-    const split_a = version_a.split(".").map(Number);
-    const split_b = version_b.split(".").map(Number);
-    const max_split_parts = Math.max(split_a.length, split_b.length);
-    for (let i = 0; i < max_split_parts; i++) {
-        const num_a = split_a[i] || 0;
-        const num_b = split_b[i] || 0;
-        if (num_a > num_b)
-            return 1;
-        if (num_a < num_b)
-            return -1;
-    }
-    return 0;
-}

package/dist/app/DependencyCheck.js

@@ -3,6 +3,7 @@ import * as Ink from "ink";
 import { cli } from "../core/cli.js";
 import { is_command_available } from "../core/is_command_available.js";
 import { match_group } from "../core/match_group.js";
+import { semver_compare } from "../core/semver_compare.js";
 import { Await } from "./Await.js";
 import { Command } from "./Command.js";
 import { Parens } from "./Parens.js";
@@ -23,45 +24,59 @@ export function DependencyCheck(props) {
             actions.exit(2);
         } },
         React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" },
-                React.createElement(Ink.Text, null,
-                    "Checking ",
-                    React.createElement(Command, null, "gh"),
-                    " install...")), function: async () => {
-                if (is_command_available("gh")) {
+                "Checking ",
+                React.createElement(Command, null, "node"),
+                " install..."), function: async () => {
+                const process_version = process.version.substring(1);
+                const semver_result = semver_compare(process_version, "14.0.0");
+                if (semver_result >= 0) {
                     return;
                 }
                 actions.output(React.createElement(Ink.Text, { color: "yellow" },
-                    React.createElement(Command, null, "gh"),
+                    React.createElement(Command, null, "node"),
                     " must be installed."));
-                actions.output(React.createElement(Ink.Text, { color: "yellow" },
-                    React.createElement(Ink.Text, null, "Visit "),
-                    React.createElement(Url, null, "https://cli.github.com"),
-                    React.createElement(Ink.Text, null, " to install the github cli "),
-                    React.createElement(Parens, null,
-                        React.createElement(Command, null, "gh"))));
-                actions.exit(3);
+                actions.exit(2);
             } },
             React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" },
                     React.createElement(Ink.Text, null,
                         "Checking ",
-                        React.createElement(Command, null, "gh auth status"),
-                        "...")), function: async () => {
-                    const auth_output = await cli(`gh auth status`, {
-                        ignoreExitCode: true,
-                    });
-                    if (auth_output.code === 0) {
-                        const username = match_group(auth_output.stdout, RE.auth_username, "username");
-                        actions.set((state) => {
-                            state.username = username;
-                        });
+                        React.createElement(Command, null, "gh"),
+                        " install...")), function: async () => {
+                    if (is_command_available("gh")) {
                         return;
                     }
                     actions.output(React.createElement(Ink.Text, { color: "yellow" },
                         React.createElement(Command, null, "gh"),
-                        React.createElement(Ink.Text, null, " requires login, please run "),
-                        React.createElement(Command, null, "gh auth login")));
-                    actions.exit(4);
-                } }, props.children))));
+                        " must be installed."));
+                    actions.output(React.createElement(Ink.Text, { color: "yellow" },
+                        React.createElement(Ink.Text, null, "Visit "),
+                        React.createElement(Url, null, "https://cli.github.com"),
+                        React.createElement(Ink.Text, null, " to install the github cli "),
+                        React.createElement(Parens, null,
+                            React.createElement(Command, null, "gh"))));
+                    actions.exit(3);
+                } },
+                React.createElement(Await, { fallback: React.createElement(Ink.Text, { color: "yellow" },
+                        React.createElement(Ink.Text, null,
+                            "Checking ",
+                            React.createElement(Command, null, "gh auth status"),
+                            "...")), function: async () => {
+                        const auth_status = await cli(`gh auth status`, {
+                            ignoreExitCode: true,
+                        });
+                        if (auth_status.code === 0) {
+                            const username = match_group(auth_status.stdout, RE.auth_username, "username");
+                            actions.set((state) => {
+                                state.username = username;
+                            });
+                            return;
+                        }
+                        actions.output(React.createElement(Ink.Text, { color: "yellow" },
+                            React.createElement(Command, null, "gh"),
+                            React.createElement(Ink.Text, null, " requires login, please run "),
+                            React.createElement(Command, null, "gh auth login")));
+                        actions.exit(4);
+                    } }, props.children)))));
 }
 const RE = {
     // Logged in to github.com as magus

package/dist/app/ManualRebase.js

@@ -2,6 +2,7 @@ import * as React from "react";
 import * as Ink from "ink";
 import * as CommitMetadata from "../core/CommitMetadata.js";
 import * as Metadata from "../core/Metadata.js";
+import * as StackSummaryTable from "../core/StackSummaryTable.js";
 import { cli } from "../core/cli.js";
 import * as github from "../core/github.js";
 import { invariant } from "../core/invariant.js";
@@ -71,7 +72,15 @@ async function run(props) {
                 await cli(git_push_command.join(" "));
                 if (group.pr) {
                     // ensure base matches pr in github
-                    await github.pr_base(group.id, group.base);
+                    await github.pr_edit({
+                        branch: group.id,
+                        base: group.base,
+                        body: StackSummaryTable.write({
+                            body: group.pr.body,
+                            commit_range,
+                            selected_group_id: group.id,
+                        }),
+                    });
                 }
                 else {
                     // delete local group branch if leftover
@@ -83,6 +92,11 @@ async function run(props) {
                         branch: group.id,
                         base: group.base,
                         title: group.title,
+                        body: StackSummaryTable.write({
+                            body: "",
+                            commit_range,
+                            selected_group_id: group.id,
+                        }),
                     });
                     // move back to temp branch
                     await cli(`git checkout ${temp_branch_name}`);

package/dist/app/MultiSelect.js

@@ -54,7 +54,7 @@ export function MultiSelect(props) {
     }, [selected_set]);
     Ink.useInput((_input, key) => {
         if (props.disabled) {
-            console.debug("[MultiSelect] disabled, ignoring input");
+            // console.debug("[MultiSelect] disabled, ignoring input");
             return;
         }
         if (key.return) {

package/dist/app/Table.js

@@ -26,7 +26,8 @@ export function Table(props) {
     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) {

package/dist/app/TextInput.js

@@ -5,6 +5,18 @@ export function TextInput(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 });
@@ -30,7 +42,8 @@ export function TextInput(props) {
     });
     // console.debug("[TextInput]", { value });
     return (React.createElement(Ink.Box, { borderStyle: "single", minHeight: 1, borderColor: "yellow", borderDimColor: true },
-        React.createElement(Ink.Text, null, value || "‎")));
+        React.createElement(Ink.Text, null, value || "‎"),
+        !caret_visible ? null : (React.createElement(Ink.Text, { color: "yellow", dimColor: true }, "|"))));
 }
 function get_value(props) {
     return props.value || "";

package/dist/command.js

@@ -7,30 +7,36 @@ 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("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/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/fetch_json.js

@@ -0,0 +1,24 @@
+import https from "node:https";
+export async function fetch_json(url) {
+    return new Promise((resolve, reject) => {
+        https
+            .get(url, (res) => {
+            let data = "";
+            res.on("data", (chunk) => {
+                data += chunk;
+            });
+            res.on("end", () => {
+                try {
+                    const json = JSON.parse(data);
+                    resolve(json);
+                }
+                catch (error) {
+                    reject(error);
+                }
+            });
+        })
+            .on("error", (error) => {
+            reject(error);
+        });
+    });
+}

package/dist/core/github.js

@@ -1,4 +1,7 @@
 import * as React from "react";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 import * as Ink from "ink";
 import { Brackets } from "../app/Brackets.js";
 import { Store } from "../app/Store.js";
@@ -6,7 +9,7 @@ import { cli } from "./cli.js";
 import { invariant } from "./invariant.js";
 import { safe_quote } from "./safe_quote.js";
 // prettier-ignore
-const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,url";
+const JSON_FIELDS = "--json number,state,baseRefName,headRefName,commits,title,body,url";
 export async function pr_list() {
     const state = Store.getState();
     const actions = state.actions;
@@ -79,13 +82,15 @@ export async function pr_status(branch) {
 }
 export async function pr_create(args) {
     const title = safe_quote(args.title);
-    const cli_result = await cli(`gh pr create --fill --head ${args.branch} --base ${args.base} --title="${title}"`);
+    const cli_result = await cli(`gh pr create --fill --head ${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`);
     if (cli_result.code !== 0) {
         handle_error(cli_result.output);
     }
 }
-export async function pr_base(branch, base) {
-    const cli_result = await cli(`gh pr edit ${branch} --base ${base}`);
+export async function pr_edit(args) {
+    const cli_result = await cli(
+    // prettier-ignore
+    `gh pr edit ${args.branch} --base ${args.base} --body-file="${body_file(args.body)}"`);
     if (cli_result.code !== 0) {
         handle_error(cli_result.output);
     }
@@ -98,3 +103,13 @@ function handle_error(output) {
     });
     throw new Error(output);
 }
+// convert a string to a file for use via github cli `--body-file`
+function body_file(body) {
+    const temp_dir = os.tmpdir();
+    const temp_path = path.join(temp_dir, "git-stack-body");
+    if (fs.existsSync(temp_path)) {
+        fs.rmSync(temp_path);
+    }
+    fs.writeFileSync(temp_path, body);
+    return temp_path;
+}

package/dist/core/semver_compare.js

@@ -0,0 +1,26 @@
+// returns +1 if version_a is greater than version_b
+// returns -1 if version_a is less than version_b
+// returns +0 if version_a is exactly equal to version_b
+//
+// Examples
+//
+//   semver_compare("0.1.1", "0.0.2"); //  1
+//   semver_compare("1.0.1", "0.0.2"); //  1
+//   semver_compare("0.0.1", "1.0.2"); // -1
+//   semver_compare("0.0.1", "0.1.2"); // -1
+//   semver_compare("1.0.1", "1.0.1"); //  0
+//
+export function semver_compare(version_a, version_b) {
+    const split_a = version_a.split(".").map(Number);
+    const split_b = version_b.split(".").map(Number);
+    const max_split_parts = Math.max(split_a.length, split_b.length);
+    for (let i = 0; i < max_split_parts; i++) {
+        const num_a = split_a[i] || 0;
+        const num_b = split_b[i] || 0;
+        if (num_a > num_b)
+            return 1;
+        if (num_a < num_b)
+            return -1;
+    }
+    return 0;
+}

package/package.json

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