git-stack-cli 1.4.0 → 1.5.1

package/dist/cjs/index.cjs

@@ -27835,7 +27835,9 @@ function table(args) {
         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()) {
+    const old_pr_list = Array.from(old_stack.keys());
+    old_pr_list.reverse();
+    for (const pr_url of old_pr_list) {
         stack_pr_url_list.unshift(pr_url);
     }
     const stack_list = [];
@@ -27859,8 +27861,6 @@ function table(args) {
     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"));
 }
 function parse(body) {
@@ -27878,6 +27878,9 @@ function parse(body) {
             // skip invalid row
             continue;
         }
+        if (!RE.pr_url.test(parsed_row.pr_url)) {
+            continue;
+        }
         result.set(parsed_row.pr_url, parsed_row);
     }
     return result;
@@ -27898,6 +27901,7 @@ const RE = {
         num: "(?<num>\\d+)",
         pr_url: "(?<pr_url>.+)",
     })),
+    pr_url: /^https:\/\/.*$/,
 };
 
 function ManualRebase() {
@@ -34418,7 +34422,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.4.0" )
+        .version("1.5.1" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`").argv);
 }

package/package.json

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

package/src/core/StackSummaryTable.test.ts

@@ -80,8 +80,8 @@ test("builds list of prs with selected emoji", () => {
     ...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",
+    "- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/47",
   ]);
 });
 
@@ -123,9 +123,9 @@ test("persists removed pr urls from previous stack table", () => {
       "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",
+      "- ⏳ `2` https://github.com/magus/git-multi-diff-playground/pull/44",
+      "- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47",
     ].join("\n"),
 
     pr_url_list: [
@@ -143,11 +143,49 @@ test("persists removed pr urls from previous stack table", () => {
     "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",
+    "- ✅ `1` https://github.com/magus/git-multi-diff-playground/pull/43",
     "- ✅ `2` https://github.com/magus/git-multi-diff-playground/pull/44",
+    "- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47",
+    "- ⏳ `4` https://github.com/magus/git-multi-diff-playground/pull/54",
+    "- ⏳ `5` https://github.com/magus/git-multi-diff-playground/pull/61",
+  ]);
+
+  // 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);
+});
+
+test("persist only valid urls, removed broken branch ids from interrupted sync", () => {
+  const args = {
+    body: [
+      "Summary of problem",
+      "",
+      "#### git stack",
+      "- ✅ `1` https://github.com/magus/git-multi-diff-playground/pull/43",
+      "- ✅ `2` gs-P4EBkJm+q",
+      "- 👉 `3` https://github.com/magus/git-multi-diff-playground/pull/47",
+    ].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",
     "- ✅ `1` https://github.com/magus/git-multi-diff-playground/pull/43",
+    "- 👉 `2` https://github.com/magus/git-multi-diff-playground/pull/47",
+    "- ⏳ `3` https://github.com/magus/git-multi-diff-playground/pull/54",
+    "- ⏳ `4` https://github.com/magus/git-multi-diff-playground/pull/61",
   ]);
 
   // run again on the output to make sure it doesn't change

package/src/core/StackSummaryTable.ts

@@ -32,7 +32,9 @@ export function table(args: WriteArgs) {
   }
 
   // add remaining old stack pr urls to the front of stack pr url list
-  for (const pr_url of old_stack.keys()) {
+  const old_pr_list = Array.from(old_stack.keys());
+  old_pr_list.reverse();
+  for (const pr_url of old_pr_list) {
     stack_pr_url_list.unshift(pr_url);
   }
 
@@ -62,9 +64,6 @@ export function table(args: WriteArgs) {
     return "";
   }
 
-  // reverse order of pr list to match the order of git stack
-  stack_list.reverse();
-
   return TEMPLATE.stack_table(["", ...stack_list, "", ""].join("\n"));
 }
 
@@ -89,6 +88,10 @@ export function parse(body: string): Map<string, StackTableRow> {
       continue;
     }
 
+    if (!RE.pr_url.test(parsed_row.pr_url)) {
+      continue;
+    }
+
     result.set(parsed_row.pr_url, parsed_row);
   }
 
@@ -118,6 +121,8 @@ const RE = {
       pr_url: "(?<pr_url>.+)",
     })
   ),
+
+  pr_url: /^https:\/\/.*$/,
 };
 
 type StackTableRow = {