git-stack-cli 1.8.2 → 1.9.0

package/src/core/GitReviseTodo.ts

@@ -61,7 +61,10 @@ export function GitReviseTodo(args: Args): string {
         commit.full_message,
         metadata
       );
-      const message_with_id = unsafe_message_with_id.replace(/"/g, '\\"');
+
+      let message_with_id = unsafe_message_with_id;
+
+      message_with_id = message_with_id.replace(/[^\\]"/g, '\\"');
 
       // get first 12 characters of commit sha
       const sha = commit.sha.slice(0, 12);

package/src/core/Metadata.test.ts

@@ -52,6 +52,91 @@ test("write handles bulleted lists", () => {
   );
 });
 
+test("read handles slashes in branch name", () => {
+  const body = [
+    "[fix] slash in branch name",
+    "",
+    "git-stack-id: dev/noah/fix-slash-branch",
+    "git-stack-title: fix slash branch",
+  ].join("\n");
+
+  const metadata = Metadata.read(body);
+
+  expect(metadata).toEqual({
+    id: "dev/noah/fix-slash-branch",
+    title: "fix slash branch",
+  });
+});
+
+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");
+
+  const metadata = {
+    id: "fix-slash-branch",
+    title: "fix slash branch",
+  };
+
+  expect(Metadata.write(body, metadata)).toEqual(
+    [
+      "[feat] implement various features",
+      "",
+      "- keyboard modality escape key",
+      "- centralize settings",
+      "- move logic inside if branch",
+      "",
+      "git-stack-id: fix-slash-branch",
+      "git-stack-title: fix slash branch",
+    ].join("\n")
+  );
+});
+
+test("read handles double quotes", () => {
+  const body = [
+    'Revert "[abc / 123] subject (#1234)"',
+    "",
+    "git-stack-id: dev/noah/fix-slash-branch",
+    'git-stack-title: Revert \\"[abc / 123] subject (#1234)\\"',
+  ].join("\n");
+
+  const metadata = Metadata.read(body);
+
+  expect(metadata).toEqual({
+    id: "dev/noah/fix-slash-branch",
+    title: 'Revert \\"[abc / 123] subject (#1234)\\"',
+  });
+});
+
+test("write handles double quotes", () => {
+  const body = [
+    // force line break
+    'Revert "[abc / 123] subject (#1234)"',
+    "",
+  ].join("\n");
+
+  const metadata = {
+    id: "abc123",
+    title: 'Revert "[abc / 123] subject (#1234)"',
+  };
+
+  expect(Metadata.write(body, metadata)).toEqual(
+    [
+      // force line break
+      'Revert \\"[abc / 123] subject (#1234)\\"',
+      "",
+      "git-stack-id: abc123",
+      'git-stack-title: Revert \\"[abc / 123] subject (#1234)\\"',
+    ].join("\n")
+  );
+});
+
 test("removes metadata", () => {
   const body = [
     "[feat] implement various features",

package/src/core/Metadata.ts

@@ -14,9 +14,6 @@ type OutputMetadataValues = {
 export function write(message: string, values: InputMetadataValues) {
   let result = message;
 
-  // escape double-quote for cli
-  result = safe_quote(result);
-
   // remove any previous metadata lines
   result = remove(result);
 
@@ -26,7 +23,9 @@ export function write(message: string, values: InputMetadataValues) {
     line_list.push(TEMPLATE.group_title(values.title));
   }
 
-  const new_message = line_list.join("\n");
+  let new_message = line_list.join("\n");
+
+  new_message = safe_quote(new_message);
 
   return new_message;
 }
@@ -73,6 +72,7 @@ const TEMPLATE = {
 };
 
 const RE = {
-  stack_id: new RegExp(TEMPLATE.stack_id("(?<id>[a-z0-9-+=]+)"), "i"),
+  // https://regex101.com/r/wLmGVq/1
+  stack_id: new RegExp(`${TEMPLATE.stack_id("(?<id>[^\\s]+)")}`, "i"),
   group_title: new RegExp(TEMPLATE.group_title("(?<title>[^\\n^\\r]+)"), "i"),
 };

package/src/index.tsx

@@ -14,6 +14,7 @@ command()
 
     Store.setState((state) => {
       state.ink = ink;
+      state.process_argv = process.argv;
       state.argv = argv;
       state.cwd = process.cwd();
     });