Fix partial class replace operation

graph-selector/src/operate/operate.test.ts

@@ -73,4 +73,27 @@ describe("operate", () => {
       }),
     ).toBe("hello .world");
   });
+
+  /* This test is combatting a specific bug found in the wild. */
+  test("can add/remove classes from edges with similar names", () => {
+    const classes = ["triangle", "source-triangle-tee", "source-circle-triangle"];
+
+    // removes all classes and then adds one
+    function addClass(text: string, c: string) {
+      let newText = operate(text, {
+        lineNumber: 1,
+        operation: ["removeClassesFromEdge", { classNames: classes }],
+      });
+      newText = operate(newText, {
+        lineNumber: 1,
+        operation: ["addClassesToEdge", { classNames: [c] }],
+      });
+      return newText;
+    }
+
+    let text = "  foo";
+    text = addClass(text, "source-triangle-tee");
+    text = addClass(text, "source-circle-triangle");
+    expect(text).toBe("  .source-circle-triangle: foo");
+  });
 });

graph-selector/src/operate/removeClassesFromEdge.test.ts

@@ -81,13 +81,27 @@ describe("removeClassesFromEdge", () => {
     expect(result).toBe("  edge: container {");
   });
 
-  it.todo("should not remove partial class");
-  // 👇
-  // it("should not remove partial class", () => {
-  //   const result = removeClassesFromEdge({
-  //     line: "  .some-class edge: my node",
-  //     classNames: ["some"],
-  //   });
-  //   expect(result).toBe("  .some-class edge: my node");
-  // });
+  it("should not remove partial class", () => {
+    const result = removeClassesFromEdge({
+      line: "  .some-class edge: my node",
+      classNames: ["some"],
+    });
+    expect(result).toBe("  .some-class edge: my node");
+  });
+
+  it("should not remove partial class when valid part of label", () => {
+    const result = removeClassesFromEdge({
+      line: "  period.cool: my node",
+      classNames: ["cool"],
+    });
+    expect(result).toBe("  period.cool: my node");
+  });
+
+  it("doesn't remove class from node obviously", () => {
+    const result = removeClassesFromEdge({
+      line: "  my node .some-class",
+      classNames: ["some-class"],
+    });
+    expect(result).toBe("  my node .some-class");
+  });
 });

graph-selector/src/operate/removeClassesFromEdge.ts

@@ -1,4 +1,4 @@
-import { getEdgeBreakIndex } from "../regexps";
+import { getEdgeBreakIndex, getFeaturesIndex } from "../regexps";
 
 export function removeClassesFromEdge({
   line,
@@ -29,9 +29,33 @@ export function removeClassesFromEdge({
     line = line.slice(edgeBreakIndex + 1);
   }
 
+  // need to check for start of label
+  // if label start is before feature data start, then everything that
+  // looks like a feature is actually in the label
+  // and we don't have anything to change
+  if (edge.trim()) {
+    const labelStart = /\w/.exec(edge)?.index ?? -1;
+    const featuresStart = getFeaturesIndex(edge);
+    if (labelStart < featuresStart) {
+      return indent + edge + line + containerStart;
+    }
+  }
+
   // remove class names from edge
   for (const className of classNames) {
-    edge = edge.replace(new RegExp(`\.${className}`), "");
+    // match class and stop character
+    const match = new RegExp(`\.${className}(?<stopCharacter>\\.|$| |:|：)`).exec(edge);
+    // if it's not there, continue
+    if (!match) continue;
+
+    // get stop character
+    const stopCharacter = match.groups?.stopCharacter || "";
+
+    // get the index of the match
+    const index = match.index;
+
+    // remove the match up to the stop character
+    edge = edge.slice(0, index) + stopCharacter + edge.slice(index + match[0].length);
   }
 
   // remove leading whitespace before beginning of line if it exists

graph-selector/src/operate/removeClassesFromNode.test.ts

@@ -73,4 +73,13 @@ describe("removeClassFromNode", () => {
     });
     expect(line).toBe("hello {");
   });
+
+  test("doesn't remove a partial class", () => {
+    let line = "hello .some-class";
+    line = removeClassesFromNode({
+      line,
+      classNames: ["some"],
+    });
+    expect(line).toBe("hello .some-class");
+  });
 });

graph-selector/src/operate/removeClassesFromNode.ts

@@ -31,7 +31,19 @@ export function removeClassesFromNode({
 
   // remove class names
   for (const className of classNames) {
-    line = line.replace(new RegExp(`\.${className}`), "");
+    // need to match class and stop character to avoid partial matching
+    const match = new RegExp(`\.${className}(?<stopCharacter>\\.|$| |:|：)`).exec(line);
+    // if no match, continue
+    if (!match) continue;
+
+    // get the stop character
+    const stopCharacter = match.groups?.stopCharacter || "";
+
+    // get the index of the match
+    const index = match.index;
+
+    // remove the match up to the stop character
+    line = line.slice(0, index) + stopCharacter + line.slice(index + match[0].length);
   }
 
   // remove trailing whitespace before end of line if it exists