git-stack-cli 0.8.6 → 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

@@ -60,8 +60,7 @@ export function parse(body) {
         const row_match = row.match(RE.row);
         const parsed_row = row_match?.groups;
         if (!parsed_row) {
-            // eslint-disable-next-line no-console
-            console.error(`parse row [${row}]`);
+            // skip invalid row
             continue;
         }
         result.set(parsed_row.pr_url, parsed_row);

package/dist/core/StackSummaryTable.test.js

@@ -10,7 +10,35 @@ test("blank", () => {
 });
 test("no prs does not modify body", () => {
     const args = {
-        body: `## Problem\n\nDescription of the problem\n\n## Solution\n\nSolved problem by doing x, y, z.`,
+        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: "",
     };
@@ -19,7 +47,15 @@ test("no prs does not modify body", () => {
 });
 test("builds list of prs with selected emoji", () => {
     const args = {
-        body: "## Problem\n\nDescription of the problem\n\n## Solution\n\nSolved problem by doing x, y, z.",
+        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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -19,9 +19,9 @@
   "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": "bun test src",
     "test:watch": "npm run test -- --watch",