git-stack-cli 0.3.0 → 0.3.1

package/README.md

@@ -1,5 +1,7 @@
 # git-stack-cli
 
+> create stacked diffs (PRs) on Github from a single branch by grouping commits
+
 ## install
 
 ```bash

package/dist/app/App copy.js

@@ -0,0 +1,30 @@
+import * as React from "react";
+import { Debug } from "./Debug.js";
+import { DependencyCheck } from "./DependencyCheck.js";
+import { GatherMetadata } from "./GatherMetadata.js";
+import { GithubApiError } from "./GithubApiError.js";
+import { Main } from "./Main.js";
+import { Output } from "./Output.js";
+import { Store } from "./Store.js";
+export function App() {
+    const ink = Store.useState((state) => state.ink);
+    const argv = Store.useState((state) => state.argv);
+    if (!ink || !argv) {
+        return null;
+    }
+    // // debug component
+    // return (
+    //   <React.Fragment>
+    //     <Debug />
+    //     <Output />
+    //     <GithubApiError />
+    //   </React.Fragment>
+    // );
+    return (React.createElement(Providers, null,
+        React.createElement(Debug, null),
+        React.createElement(Output, null),
+        !argv.debug ? null : React.createElement(GithubApiError, null),
+        React.createElement(DependencyCheck, null,
+            React.createElement(GatherMetadata, null,
+                React.createElement(Main, null)))));
+}

package/dist/app/App.js

@@ -5,6 +5,7 @@ import { GatherMetadata } from "./GatherMetadata.js";
 import { GithubApiError } from "./GithubApiError.js";
 import { Main } from "./Main.js";
 import { Output } from "./Output.js";
+import { Providers } from "./Providers.js";
 import { Store } from "./Store.js";
 export function App() {
     const ink = Store.useState((state) => state.ink);
@@ -20,7 +21,7 @@ export function App() {
     //     <GithubApiError />
     //   </React.Fragment>
     // );
-    return (React.createElement(React.Fragment, null,
+    return (React.createElement(Providers, null,
         React.createElement(Debug, null),
         React.createElement(Output, null),
         !argv.debug ? null : React.createElement(GithubApiError, null),

package/dist/app/FormatText.js

@@ -0,0 +1,7 @@
+import * as React from "react";
+import { FormattedMessage } from "react-intl";
+export function FormatText(props) {
+    return (React.createElement(FormattedMessage, { id: "FormatText", defaultMessage: props.message, values: props.values }, (chunks) => {
+        return React.cloneElement(props.wrapper, {}, chunks);
+    }));
+}

package/dist/app/Providers.js

@@ -0,0 +1,5 @@
+import * as React from "react";
+import { IntlProvider } from "react-intl";
+export function Providers(props) {
+    return React.createElement(IntlProvider, { locale: "en" }, props.children);
+}

package/dist/app/SelectCommitRanges.js

@@ -3,6 +3,7 @@ import * as Ink from "ink";
 import { v4 as uuid_v4 } from "uuid";
 import { invariant } from "../core/invariant.js";
 import { wrap_index } from "../core/wrap_index.js";
+import { FormatText } from "./FormatText.js";
 import { MultiSelect } from "./MultiSelect.js";
 import { Parens } from "./Parens.js";
 import { Store } from "./Store.js";
@@ -47,10 +48,10 @@ function SelectCommitRangesInternal(props) {
     }
     group_list.push(...new_group_list);
     for (const group of props.commit_range.group_list) {
-        if (group.pr) {
+        if (group.id !== props.commit_range.UNASSIGNED) {
             group_list.push({
                 id: group.id,
-                title: group.pr.title,
+                title: group.pr?.title || group.id,
             });
         }
     }
@@ -59,7 +60,8 @@ function SelectCommitRangesInternal(props) {
     const current_index = group_list.findIndex((g) => g.id === selected_group_id);
     Ink.useInput((input, key) => {
         const inputLower = input.toLowerCase();
-        if (unassigned_count === 0 && (inputLower === "r" || inputLower === "s")) {
+        const hasUnassignedCommits = unassigned_count > 0;
+        if (!hasUnassignedCommits && (inputLower === "r" || inputLower === "s")) {
             actions.set((state) => {
                 state.commit_map = {};
                 for (const [sha, id] of commit_map.entries()) {
@@ -78,7 +80,7 @@ function SelectCommitRangesInternal(props) {
             return;
         }
         // only allow create when on unassigned group
-        if (isUnassigned && inputLower === "c") {
+        if (hasUnassignedCommits && inputLower === "c") {
             const id = uuid_v4();
             actions.output(React.createElement(Ink.Box, null,
                 React.createElement(Ink.Text, { dimColor: true }, "Created new group "),
@@ -127,10 +129,10 @@ function SelectCommitRangesInternal(props) {
         };
     });
     items.reverse();
-    // console.debug({ group, isUnassigned });
+    // console.debug({ current_index, group, isUnassigned });
     return (React.createElement(Ink.Box, { flexDirection: "column" },
         React.createElement(Ink.Box, { height: 1 }),
-        React.createElement(MultiSelect, { key: current_index, items: items, onSelect: (args) => {
+        React.createElement(MultiSelect, { key: group.id, items: items, onSelect: (args) => {
                 // console.debug("onSelect", args);
                 const key = args.item.sha;
                 let value;
@@ -150,17 +152,13 @@ function SelectCommitRangesInternal(props) {
                 React.createElement(Ink.Text, { wrap: "truncate-end" }, title)),
             React.createElement(Ink.Text, null, right_arrow)),
         React.createElement(Ink.Box, { height: 1 }),
-        unassigned_count > 0 ? (React.createElement(Ink.Text, { color: "gray" },
-            React.createElement(Ink.Text, { color: "#3b82f6", bold: true }, unassigned_count),
-            React.createElement(Ink.Text, null, " unassigned commits"),
-            !isUnassigned ? null : (React.createElement(Ink.Text, { color: "gray" },
-                React.createElement(Ink.Text, null, ", press "),
-                React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "c"),
-                " to ",
-                React.createElement(Ink.Text, { bold: true, color: "#22c55e" },
+        unassigned_count > 0 ? (React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: "gray" }), message: "{count} unassigned commits, press {c} to {create} a new group", values: {
+                count: (React.createElement(Ink.Text, { color: "#3b82f6", bold: true }, unassigned_count)),
+                c: (React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "c")),
+                create: (React.createElement(Ink.Text, { bold: true, color: "#22c55e" },
                     React.createElement(Parens, null, "c"),
-                    "reate"),
-                " a new group")))) : (React.createElement(React.Fragment, null,
+                    "reate")),
+            } })) : (React.createElement(React.Fragment, null,
             React.createElement(Ink.Text, null,
                 "🎉 Done! Press ",
                 React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "s"),

package/dist/app/StatusTable.js

@@ -14,6 +14,7 @@ export function StatusTable() {
             status: "",
             title: "",
             url: "",
+            id: group.id,
         };
         if (group.id === commit_range.UNASSIGNED) {
             row.icon = "⭑";
@@ -32,6 +33,10 @@ export function StatusTable() {
                 row.status = "SYNCED";
             }
             if (group.pr) {
+                if (group.pr.state === "MERGED") {
+                    row.icon = "↗";
+                    row.status = "MERGED";
+                }
                 row.title = group.pr.title;
                 row.count = `${group.pr.commits.length}/${group.commits.length}`;
                 row.url = group.pr.url;
@@ -81,7 +86,7 @@ export function StatusTable() {
     return (React.createElement(Ink.Box, { flexDirection: "column", width: available_width },
         React.createElement(Ink.Box, { height: 1 }),
         row_list.map((row) => {
-            return (React.createElement(Ink.Box, { key: row.url, 
+            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 },

package/dist/app/YesNoPrompt.js

@@ -13,13 +13,27 @@ export function YesNoPrompt(props) {
                 return props.onYes();
         }
     });
+    // prettier-ignore
+    const y = React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "Y");
+    const n = React.createElement(Ink.Text, { color: "#ef4444" }, "n");
+    let choices;
+    switch (answer) {
+        case "y":
+            choices = y;
+            break;
+        case "n":
+            choices = n;
+            break;
+        default:
+            choices = (React.createElement(React.Fragment, null,
+                y,
+                React.createElement(Ink.Text, null, "/"),
+                n));
+    }
     return (React.createElement(Ink.Box, { flexDirection: "column" },
         React.createElement(Ink.Box, null,
             React.createElement(Ink.Text, { color: "yellow" }, props.message),
             React.createElement(Ink.Text, null, " "),
             React.createElement(Parens, null,
-                React.createElement(Ink.Text, { color: "gray" },
-                    answer && answer !== "y" ? null : (React.createElement(Ink.Text, { bold: true, color: "#22c55e" }, "Y")),
-                    answer ? null : React.createElement(Ink.Text, null, "/"),
-                    answer && answer !== "n" ? null : (React.createElement(Ink.Text, { color: "#ef4444" }, "n")))))));
+                React.createElement(Ink.Text, { color: "gray" }, choices)))));
 }

package/dist/core/CommitMetadata.js

@@ -51,7 +51,7 @@ export async function range(commit_map) {
         const group = group_value_list[i];
         if (group.id !== UNASSIGNED) {
             const pr_result = await github.pr_status(group.id);
-            if (pr_result && pr_result.state === "OPEN") {
+            if (pr_result && pr_result.state !== "CLOSED") {
                 group.pr = pr_result;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -29,6 +29,7 @@
     "immer": "^10.0.3",
     "ink": "^4.4.1",
     "react": "^18.2.0",
+    "react-intl": "^6.5.5",
     "uuid": "^9.0.1",
     "yargs": "^17.7.2",
     "zustand": "^4.4.4"