git-stack-cli 0.5.0 → 0.5.2

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/MultiSelect.js

@@ -53,6 +53,10 @@ export function MultiSelect(props) {
         props.onSelect({ item, selected, state });
     }, [selected_set]);
     Ink.useInput((_input, key) => {
+        if (props.disabled) {
+            // console.debug("[MultiSelect] disabled, ignoring input");
+            return;
+        }
         if (key.return) {
             selectRef.current = true;
             const item = props.items[index];

package/dist/app/SelectCommitRanges.js

@@ -135,12 +135,8 @@ function SelectCommitRangesInternal(props) {
     max_item_width -= left_arrow.length + right_arrow.length;
     return (React.createElement(Ink.Box, { flexDirection: "column" },
         React.createElement(Ink.Box, { height: 1 }),
-        React.createElement(MultiSelect, { key: group.id, items: items, maxWidth: max_item_width, onSelect: (args) => {
+        React.createElement(MultiSelect, { key: group.id, items: items, maxWidth: max_item_width, disabled: group_input, onSelect: (args) => {
                 // console.debug("onSelect", args);
-                if (group_input) {
-                    // console.debug("group_input is true, ignoring onSelect");
-                    return;
-                }
                 const key = args.item.sha;
                 let value;
                 if (args.selected) {

package/dist/app/StatusTable.js

@@ -1,7 +1,10 @@
 import * as React from "react";
 import * as Ink from "ink";
+import { assertNever } from "../core/assertNever.js";
 import { invariant } from "../core/invariant.js";
 import { Store } from "./Store.js";
+import { Table } from "./Table.js";
+import { Url } from "./Url.js";
 export function StatusTable() {
     const commit_range = Store.useState((state) => state.commit_range);
     invariant(commit_range, "commit_range must exist");
@@ -10,10 +13,9 @@ export function StatusTable() {
         const row = {
             icon: "",
             count: "",
-            status: "",
+            status: "NEW",
             title: "",
             url: "",
-            id: group.id,
         };
         if (group.id === commit_range.UNASSIGNED) {
             row.icon = "⭑";
@@ -41,69 +43,65 @@ export function StatusTable() {
                 row.url = group.pr.url;
             }
             else {
-                row.title = group.id;
+                row.title = group.title || group.id;
                 row.count = `0/${group.commits.length}`;
             }
         }
         row_list.push(row);
     }
-    if (!row_list.length) {
-        return (React.createElement(Container, null,
-            React.createElement(Ink.Text, { dimColor: true }, "No data found.")));
-    }
-    // walk data and discover max width for each column
-    const sample_row = row_list[0];
-    const col_list = Object.keys(sample_row);
-    const max_col_width = {};
-    for (const col of col_list) {
-        max_col_width[col] = 0;
-    }
-    for (const row of row_list) {
-        for (const col of col_list) {
-            const value = row[col];
-            max_col_width[col] = Math.max(value.length, max_col_width[col]);
-        }
+    return (React.createElement(Table, { data: row_list, fillColumn: "title", 
+        // maxWidth={{
+        //   title: 30,
+        // }}
+        columnGap: 3, columns: {
+            icon: IconColumn,
+            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));
+}
+function CountColumn(props) {
+    const value = props.row[props.column];
+    return React.createElement(Ink.Text, { dimColor: true }, value);
+}
+function TitleColumn(props) {
+    const value = props.row[props.column];
+    return React.createElement(Ink.Text, { wrap: "truncate-end" }, value);
+}
+function UrlColumn(props) {
+    const value = props.row[props.column];
+    return React.createElement(Url, { dimColor: true }, value);
+}
+function get_status_color(row) {
+    switch (row.status) {
+        case "NEW":
+            return "yellow";
+        case "OUTDATED":
+            return "red";
+        case "MERGED":
+            return "purple";
+        case "SYNCED":
+            return "green";
+        default:
+            assertNever(row.status);
+            return "gray";
     }
-    const { stdout } = Ink.useStdout();
-    const available_width = stdout.columns;
-    const columnGap = 2;
-    const breathing_room = 0;
-    const remaining_space = available_width -
-        // icon
-        max_col_width.icon -
-        // status
-        max_col_width.status -
-        // commits
-        max_col_width.count -
-        // url
-        max_col_width.url -
-        // gap * col count (minus one for row.id which is not shown but used at key)
-        columnGap * (col_list.length - 1) -
-        // remove some extra space
-        breathing_room;
-    // add one for ellipsis character
-    const title_width = Math.min(max_col_width.title, remaining_space + 1);
-    // prettier-ignore
-    // console.debug({ available_width, remaining_space, title_width, max_col_width });
-    return (React.createElement(Container, null, row_list.map((row) => {
-        return (React.createElement(Ink.Box, { key: row.id, 
-            // borderStyle="round"
-            flexDirection: "row", columnGap: columnGap, width: available_width },
-            React.createElement(Ink.Box, { width: max_col_width.icon },
-                React.createElement(Ink.Text, null, row.icon)),
-            React.createElement(Ink.Box, { width: max_col_width.status },
-                React.createElement(Ink.Text, null, row.status)),
-            React.createElement(Ink.Box, { width: max_col_width.count },
-                React.createElement(Ink.Text, null, row.count)),
-            React.createElement(Ink.Box, { width: title_width },
-                React.createElement(Ink.Text, { wrap: "truncate-end" }, row.title)),
-            React.createElement(Ink.Box, { width: max_col_width.url },
-                React.createElement(Ink.Text, null, row.url))));
-    })));
 }
-function Container(props) {
-    return (React.createElement(Ink.Box, { flexDirection: "column" },
-        React.createElement(Ink.Box, { height: 1 }),
-        props.children,
-        React.createElement(Ink.Box, { height: 1 })));
+function get_status_bold(row) {
+    switch (row.status) {
+        case "NEW":
+        case "OUTDATED":
+            return true;
+        default:
+            return false;
+    }
 }

package/dist/app/Table.js

@@ -0,0 +1,63 @@
+import * as React from "react";
+import * as Ink from "ink";
+import { is_finite_value } from "../core/is_finite_value.js";
+export function Table(props) {
+    if (!props.data.length) {
+        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);
+    // walk data and discover max width for each column
+    const max_col_width = {};
+    for (const col of RowColumnList) {
+        max_col_width[col] = 0;
+    }
+    for (const row of props.data) {
+        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]);
+            }
+        }
+    }
+    const { stdout } = Ink.useStdout();
+    const available_width = stdout.columns;
+    const columnGap = is_finite_value(props.columnGap) ? props.columnGap : 2;
+    const breathing_room = 0;
+    if (props.fillColumn) {
+        let remaining_space = available_width;
+        for (const col of RowColumnList) {
+            // skip fill column from calculation
+            if (props.fillColumn === col) {
+                continue;
+            }
+            remaining_space -= max_col_width[col];
+        }
+        // gap * col count
+        remaining_space -= columnGap * (RowColumnList.length - 1);
+        // remove some extra space
+        remaining_space -= breathing_room;
+        if (props.fillColumn) {
+            max_col_width[props.fillColumn] = Math.min(max_col_width[props.fillColumn], remaining_space);
+        }
+    }
+    // console.debug({ available_width, remaining_space, max_col_width });
+    return (React.createElement(Container, null, props.data.map((row, i) => {
+        return (React.createElement(Ink.Box, { key: i, 
+            // borderStyle="round"
+            flexDirection: "row", columnGap: columnGap, width: available_width }, RowColumnList.map((column) => {
+            const ColumnComponent = props.columns[column];
+            return (React.createElement(Ink.Box, { key: String(column), width: max_col_width[column] },
+                React.createElement(ColumnComponent, { row: row, column: column })));
+        })));
+    })));
+}
+function Container(props) {
+    return (React.createElement(Ink.Box, { flexDirection: "column" },
+        React.createElement(Ink.Box, { height: 1 }),
+        props.children,
+        React.createElement(Ink.Box, { height: 1 })));
+}

package/dist/app/Url.js

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

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/invariant copy.js

@@ -0,0 +1,5 @@
+export function invariant(condition, message) {
+    if (!condition) {
+        throw new Error(message);
+    }
+}

package/dist/core/isFiniteValue.js

@@ -0,0 +1,3 @@
+export function isFiniteValue(value) {
+    return typeof value === "number" && Number.isFinite(value);
+}

package/dist/core/is_finite_value.js

@@ -0,0 +1,3 @@
+export function is_finite_value(value) {
+    return typeof value === "number" && Number.isFinite(value);
+}

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.0",
+  "version": "0.5.2",
   "description": "",
   "author": "magus",
   "license": "MIT",