git-stack-cli 0.8.5 → 0.8.7

package/dist/app/LocalMergeRebase.js

@@ -49,7 +49,7 @@ async function run() {
             if (merged_pr) {
                 if (actions.isDebug()) {
                     actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Dropping {commit_message} {pr_status}", values: {
-                            commit_message: React.createElement(Brackets, null, commit.message),
+                            commit_message: React.createElement(Brackets, null, commit.subject_line),
                             pr_status: React.createElement(Parens, null, "MERGED"),
                         } }));
                 }
@@ -58,7 +58,7 @@ async function run() {
             // cherry-pick and amend commits one by one
             if (actions.isDebug()) {
                 actions.output(React.createElement(FormatText, { wrapper: React.createElement(Ink.Text, { color: colors.yellow, wrap: "truncate-end" }), message: "Picking {commit_message}", values: {
-                        commit_message: React.createElement(Brackets, null, commit.message),
+                        commit_message: React.createElement(Brackets, null, commit.subject_line),
                     } }));
             }
             // ensure clean base to avoid conflicts when applying patch
@@ -71,10 +71,10 @@ async function run() {
             await cli(`git add --all`);
             let new_message;
             if (commit.branch_id) {
-                new_message = await Metadata.write(commit.message, commit.branch_id);
+                new_message = await Metadata.write(commit.full_message, commit.branch_id);
             }
             else {
-                new_message = commit.message;
+                new_message = commit.full_message;
             }
             const git_commit_comand = [`git commit -m "${new_message}"`];
             if (argv.verify === false) {
@@ -88,7 +88,7 @@ async function run() {
                         } }));
                 }
                 // missing PR, clear branch id from commit
-                const new_message = await Metadata.remove(commit.message);
+                const new_message = await Metadata.remove(commit.full_message);
                 await cli(`git commit --amend -m "${new_message}"`);
             }
         }

package/dist/app/ManualRebase.js

@@ -76,7 +76,7 @@ async function run(props) {
                 await cli(`rm ${PATCH_FILE}`);
                 // add all changes to stage
                 await cli(`git add --all`);
-                const new_message = await Metadata.write(commit.message, group.id);
+                const new_message = await Metadata.write(commit.full_message, group.id);
                 const git_commit_comand = [`git commit -m "${new_message}"`];
                 if (argv.verify === false) {
                     git_commit_comand.push("--no-verify");

package/dist/app/SelectCommitRanges.js

@@ -116,7 +116,7 @@ function SelectCommitRangesInternal(props) {
             disabled = Boolean(selected && commit_metadata_id !== group.id);
         }
         return {
-            label: commit.message,
+            label: commit.subject_line,
             value: commit,
             selected,
             disabled,

package/dist/core/CommitMetadata.js

@@ -138,17 +138,17 @@ async function get_commit_list() {
     return commit_metadata_list;
 }
 export async function commit(sha) {
-    const raw_message = (await cli(`git show -s --format=%B ${sha}`)).stdout;
-    const branch_id = await Metadata.read(raw_message);
-    const message = display_message(raw_message);
+    const full_message = (await cli(`git show -s --format=%B ${sha}`)).stdout;
+    const branch_id = await Metadata.read(full_message);
+    const subject_line = get_subject_line(full_message);
     return {
         sha,
-        message,
-        raw_message,
+        full_message,
+        subject_line,
         branch_id,
     };
 }
-function display_message(message) {
+function get_subject_line(message) {
     const line_list = lines(message);
     const first_line = line_list[0];
     return Metadata.remove(first_line);

package/dist/core/Metadata.js

@@ -1,17 +1,17 @@
 import { invariant } from "../core/invariant.js";
 import { safe_quote } from "../core/safe_quote.js";
-export function write(message, branch_id) {
+export function write(message, stack_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 line_list = [result, "", TEMPLATE.stack_id(stack_id)];
     const new_message = line_list.join("\n");
     return new_message;
 }
 export function read(message) {
-    const match = message.match(RE.branch_id);
+    const match = message.match(RE.stack_id);
     if (!match?.groups) {
         return null;
     }
@@ -22,15 +22,15 @@ export function read(message) {
 export function remove(message) {
     let result = message;
     // remove metadata
-    result = result.replace(new RegExp(RE.branch_id, "g"), "");
+    result = result.replace(new RegExp(RE.stack_id, "gmi"), "");
     result = result.trimEnd();
     return result;
 }
 const TEMPLATE = {
-    branch_id(id) {
+    stack_id(id) {
         return `git-stack-id: ${id}`;
     },
 };
 const RE = {
-    branch_id: new RegExp(TEMPLATE.branch_id("(?<id>[a-z0-9-+=]+)"), "i"),
+    stack_id: new RegExp(TEMPLATE.stack_id("(?<id>[a-z0-9-+=]+)"), "i"),
 };

package/dist/core/Metadata.test.js

@@ -0,0 +1,34 @@
+import { test, expect } from "bun:test";
+import * as Metadata from "./Metadata.js";
+test("read handles bulleted lists", () => {
+    const body = [
+        "[feat] implement various features",
+        "",
+        "- keyboard modality escape key",
+        "- centralize settings",
+        "- move logic inside if branch",
+        "",
+        "git-stack-id: DdKIFyufW",
+    ].join("\n");
+    expect(Metadata.read(body)).toEqual("DdKIFyufW");
+});
+test("write handles bulleted lists", () => {
+    const body = [
+        "[feat] implement various features",
+        "",
+        "- keyboard modality escape key",
+        "- centralize settings",
+        "- move logic inside if branch",
+        "",
+        "git-stack-id: DdKIFyufW",
+    ].join("\n");
+    expect(Metadata.write(body, "abcd1234")).toEqual([
+        "[feat] implement various features",
+        "",
+        "- keyboard modality escape key",
+        "- centralize settings",
+        "- move logic inside if branch",
+        "",
+        "git-stack-id: abcd1234",
+    ].join("\n"));
+});

package/dist/core/StackSummaryTable.js

@@ -1,28 +1,9 @@
 export function write(args) {
-    const stack_list = [];
-    const digits = String(args.pr_url_list.length).length;
-    for (let i = 0; i < args.pr_url_list.length; i++) {
-        const pr_url = args.pr_url_list[i];
-        if (pr_url) {
-            const selected = args.selected_url === pr_url;
-            const icon = selected ? "👉" : "⏳";
-            const num = String(i + 1).padStart(digits, "0");
-            stack_list.push(`- ${icon} \`${num}\` ${pr_url}`);
-        }
-    }
-    // reverse order of pr list to match the order of git stack
-    stack_list.reverse();
-    let stack_table;
-    if (stack_list.length > 1) {
-        stack_table = TEMPLATE.stack_table(["", ...stack_list, "", ""].join("\n"));
-    }
-    else {
-        stack_table = "";
-    }
+    const stack_table = table(args);
     let result = args.body;
     if (RE.stack_table.test(result)) {
         // replace stack table
-        result = result.replace(new RegExp(RE.stack_table), stack_table);
+        result = result.replace(RE.stack_table, stack_table);
     }
     else {
         // append stack table
@@ -31,12 +12,75 @@ export function write(args) {
     result = result.trimEnd();
     return result;
 }
+export function table(args) {
+    const stack_pr_url_list = [...args.pr_url_list];
+    const old_stack = parse(args.body);
+    // remove existing stack pr urls from the old stack pr urls
+    for (const pr_url of stack_pr_url_list) {
+        old_stack.delete(pr_url);
+    }
+    // add remaining old stack pr urls to the front of stack pr url list
+    for (const pr_url of old_stack.keys()) {
+        stack_pr_url_list.unshift(pr_url);
+    }
+    const stack_list = [];
+    const num_digits = String(stack_pr_url_list.length).length;
+    for (let i = 0; i < stack_pr_url_list.length; i++) {
+        const pr_url = stack_pr_url_list[i];
+        const selected = args.selected_url === pr_url;
+        let icon;
+        if (old_stack.has(pr_url)) {
+            icon = "✅";
+        }
+        else if (selected) {
+            icon = "👉";
+        }
+        else {
+            icon = "⏳";
+        }
+        const num = String(i + 1).padStart(num_digits, "0");
+        stack_list.push(TEMPLATE.row({ icon, num, pr_url }));
+    }
+    if (!stack_list.length) {
+        return "";
+    }
+    // reverse order of pr list to match the order of git stack
+    stack_list.reverse();
+    return TEMPLATE.stack_table(["", ...stack_list, "", ""].join("\n"));
+}
+export function parse(body) {
+    const stack_table_match = body.match(RE.stack_table);
+    if (!stack_table_match?.groups) {
+        return new Map();
+    }
+    const rows_string = stack_table_match.groups["rows"];
+    const row_list = rows_string.split("\n");
+    const result = new Map();
+    for (const row of row_list) {
+        const row_match = row.match(RE.row);
+        const parsed_row = row_match?.groups;
+        if (!parsed_row) {
+            // skip invalid row
+            continue;
+        }
+        result.set(parsed_row.pr_url, parsed_row);
+    }
+    return result;
+}
 const TEMPLATE = {
     stack_table(rows) {
         return `#### git stack${rows}`;
     },
+    row(args) {
+        return `- ${args.icon} \`${args.num}\` ${args.pr_url}`;
+    },
 };
 const RE = {
     // https://regex101.com/r/kqB9Ft/1
     stack_table: new RegExp(TEMPLATE.stack_table("\\s+(?<rows>(?:- [^\r^\n]*(?:[\r\n]+)?)+)")),
+    row: new RegExp(TEMPLATE.row({
+        icon: "(?<icon>.+)",
+        num: "(?<num>\\d+)",
+        pr_url: "(?<pr_url>.+)",
+    })),
 };

package/dist/core/StackSummaryTable.test.js

@@ -0,0 +1,134 @@
+import { test, expect } from "bun:test";
+import * as StackSummaryTable from "./StackSummaryTable.js";
+test("blank", () => {
+    const output = StackSummaryTable.write({
+        body: "",
+        pr_url_list: [],
+        selected_url: "",
+    });
+    expect(output).toBe("");
+});
+test("no prs does not modify body", () => {
+    const args = {
+        body: [
+            "## Problem,",
+            "",
+            ",Description of the problem,",
+            "",
+            ",## Solution,",
+            "",
+            ",Solved problem by doing x, y, z.",
+        ].join("\n"),
+        pr_url_list: [],
+        selected_url: "",
+    };
+    const output = StackSummaryTable.write(args);
+    expect(output).toBe(args.body);
+});
+test("handles bulleted lists", () => {
+    const body = [
+        "## Problem",
+        "",
+        "Description of the problem",
+        "",
+        "## Solution",
+        "",
+        "- keyboard modality escape key",
+        "- centralize settings",
+        "- move logic inside if branch",
+    ].join("\n");
+    const args = {
+        body,
+        pr_url_list: [],
+        selected_url: "",
+    };
+    const output = StackSummaryTable.write(args);
+    expect(output).toBe(args.body);
+});
+test("builds list of prs with selected emoji", () => {
+    const args = {
+        body: [
+            "## Problem,",
+            "",
+            ",Description of the problem,",
+            "",
+            ",## Solution,",
+            "",
+            ",Solved problem by doing x, y, z.",
+        ].join("\n"),
+        pr_url_list: [
+            "https://github.com/magus/git-multi-diff-playground/pull/43",
+            "https://github.com/magus/git-multi-diff-playground/pull/47",
+        ],
+        selected_url: "https://github.com/magus/git-multi-diff-playground/pull/43",
+    };
+    const output = StackSummaryTable.write(args);
+    expect(output.split("\n")).toEqual([
+        ...args.body.split("\n"),
+        "",
+        "#### git stack",
+        "- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47",
+        "- 👉 `1` https://github.com/magus/git-multi-diff-playground/pull/43",
+    ]);
+});
+test("can parse stack table from body", () => {
+    const body_line_list = [
+        "",
+        "",
+        "#### git stack",
+        "- invalid line that will be dropped",
+        "- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47",
+        "- 👉 `1` https://github.com/magus/git-multi-diff-playground/pull/43",
+    ];
+    const parsed = StackSummaryTable.parse(body_line_list.join("\n"));
+    expect(Array.from(parsed.entries())).toEqual([
+        [
+            "https://github.com/magus/git-multi-diff-playground/pull/47",
+            {
+                icon: "⏳",
+                num: "2",
+                pr_url: "https://github.com/magus/git-multi-diff-playground/pull/47",
+            },
+        ],
+        [
+            "https://github.com/magus/git-multi-diff-playground/pull/43",
+            {
+                icon: "👉",
+                num: "1",
+                pr_url: "https://github.com/magus/git-multi-diff-playground/pull/43",
+            },
+        ],
+    ]);
+});
+test("persists removed pr urls from previous stack table", () => {
+    const args = {
+        body: [
+            "Summary of problem",
+            "",
+            "#### git stack",
+            "- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47",
+            "- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/44",
+            "- ⏳ `1` https://github.com/magus/git-multi-diff-playground/pull/43",
+        ].join("\n"),
+        pr_url_list: [
+            "https://github.com/magus/git-multi-diff-playground/pull/47",
+            "https://github.com/magus/git-multi-diff-playground/pull/54",
+            "https://github.com/magus/git-multi-diff-playground/pull/61",
+        ],
+        selected_url: "https://github.com/magus/git-multi-diff-playground/pull/47",
+    };
+    const output = StackSummaryTable.write(args);
+    expect(output.split("\n")).toEqual([
+        "Summary of problem",
+        "",
+        "#### git stack",
+        "- ⏳ `5` https://github.com/magus/git-multi-diff-playground/pull/61",
+        "- ⏳ `4` https://github.com/magus/git-multi-diff-playground/pull/54",
+        "- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47",
+        "- ✅ `2` https://github.com/magus/git-multi-diff-playground/pull/44",
+        "- ✅ `1` https://github.com/magus/git-multi-diff-playground/pull/43",
+    ]);
+    // run again on the output to make sure it doesn't change
+    const rerun_output = StackSummaryTable.write({ ...args, body: output });
+    expect(rerun_output).toBe(output);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -19,12 +19,14 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "lint:check": "eslint .",
+    "lint:check": "eslint . --cache",
     "lint": "npm run lint:check -- --fix",
-    "prettier:check": "prettier ./src --check",
+    "prettier:check": "prettier ./src --check --cache",
     "prettier": "npm run prettier:check -- --write",
-    "test": "npm run prettier:check && npm run lint:check && npm run build",
-    "prepublishOnly": "npm test"
+    "test": "bun test src",
+    "test:watch": "npm run test -- --watch",
+    "test:all": "npm run prettier:check && npm run lint:check && npm run build",
+    "prepublishOnly": "npm run test:all"
   },
   "dependencies": {
     "chalk": "^5.3.0",
@@ -42,6 +44,7 @@
     "@types/yargs": "^17.0.29",
     "@typescript-eslint/eslint-plugin": "^6.9.0",
     "@typescript-eslint/parser": "^6.9.0",
+    "bun-types": "^1.0.21",
     "eslint": "^8.52.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.0",