git-stack-cli 1.5.0 → 1.5.1

package/dist/cjs/index.cjs

@@ -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.5.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.5.0",
+  "version": "1.5.1",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/core/StackSummaryTable.test.ts

@@ -155,3 +155,41 @@ test("persists removed pr urls from previous stack table", () => {
 
   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
+  const rerun_output = StackSummaryTable.write({ ...args, body: output });
+
+  expect(rerun_output).toBe(output);
+});

package/src/core/StackSummaryTable.ts

@@ -88,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);
   }
 
@@ -117,6 +121,8 @@ const RE = {
       pr_url: "(?<pr_url>.+)",
     })
   ),
+
+  pr_url: /^https:\/\/.*$/,
 };
 
 type StackTableRow = {