fix name extraction with linebreak after

Author: Kr0nox

src/features/constraintMenu/ConstraintMenu.ts

@@ -131,13 +131,13 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
                 return;
             }
 
-            this.constraintRegistry.setConstraints(this.editor.getValue());
-
             const model = this.editor?.getModel();
             if (!model) {
                 return;
             }
 
+            this.constraintRegistry.setConstraints(model.getLinesContent());
+
             const content = model.getLinesContent();
             const marker: monaco.editor.IMarkerData[] = [];
             const emptyContent = content.length == 0 || (content.length == 1 && content[0] === "");

src/features/constraintMenu/constraintRegistry.ts

@@ -1,8 +1,6 @@
 import { injectable } from "inversify";
-import { generateRandomSprottyId } from "../../utils";
 
 export interface Constraint {
-    id: string;
     name: string;
     constraint: string;
 }
@@ -12,46 +10,18 @@ export class ConstraintRegistry {
     private constraints: Constraint[] = [];
     private updateCallbacks: (() => void)[] = [];
 
-    public setConstraints(constraints: string): void {
-        this.constraints = ConstraintRegistry.splitToConstraintTexts(constraints).map((t) =>
-            this.constraintFromText(t.text),
-        );
-        //this.constraintListChanged();
+    public setConstraints(constraints: string[]): void {
+        this.constraints = this.splitIntoConstraintTexts(constraints).map((c) => this.mapToConstraint(c));
     }
 
     public setConstraintsFromArray(constraints: Constraint[]): void {
         this.constraints = constraints.map((c) => ({
-            id: c.id || generateRandomSprottyId(),
             name: c.name,
             constraint: c.constraint,
         }));
         this.constraintListChanged();
     }
 
-    private constraintFromText(text: string): Constraint {
-        const parts = text.split(" ");
-        if (parts.length < 2) {
-            return {
-                id: generateRandomSprottyId(),
-                name: "",
-                constraint: "",
-            };
-        }
-        const name = parts[1].endsWith(":") ? parts[1].slice(0, -1) : parts[1];
-        if (parts.length < 3) {
-            return {
-                id: generateRandomSprottyId(),
-                name: name,
-                constraint: "",
-            };
-        }
-        return {
-            id: generateRandomSprottyId(),
-            name: name,
-            constraint: parts.slice(2).join(" "),
-        };
-    }
-
     public clearConstraints(): void {
         this.constraints = [];
         this.constraintListChanged();
@@ -73,26 +43,41 @@ export class ConstraintRegistry {
         return this.constraints;
     }
 
-    public static splitToConstraintTexts(text: string): { text: string; line: number }[] {
-        if (text === "") {
-            return [];
-        }
-        const lines = text.split(/\r?\n/gm);
+    private splitIntoConstraintTexts(text: string[]): string[] {
+        const constraints: string[] = [];
         let currentConstraint = "";
-        const constraints: { text: string; line: number }[] = [];
-        let lastStart = 0;
-        for (let i = 0; i < lines.length; i++) {
-            const line = lines[i].trim();
-            if (line.startsWith("-")) {
-                if (currentConstraint) {
-                    constraints.push({ text: currentConstraint, line: lastStart });
+        for (const line of text) {
+            if (line.startsWith("- ")) {
+                if (currentConstraint !== "") {
+                    constraints.push(currentConstraint);
                 }
-                lastStart = i;
                 currentConstraint = line;
             } else {
                 currentConstraint += `\n${line}`;
             }
         }
-        return currentConstraint ? [...constraints, { text: currentConstraint, line: lastStart }] : constraints;
+        if (currentConstraint !== "") {
+            constraints.push(currentConstraint);
+        }
+        return constraints;
+    }
+
+    private mapToConstraint(constraint: string): Constraint {
+        // the brackets ensure its a capturing split
+        const parts = constraint.split(/(\s+)/);
+        // if less than 3 parts are present no name or constraint can be extracted (e.g. "- " -> ["-", " "])
+        if (parts.length < 3) {
+            return { name: "", constraint: "" };
+        }
+        let name = parts[2];
+        if (name.endsWith(":")) {
+            name = name.slice(0, -1);
+        }
+        let constraintText = "";
+        // the first 4 parts are "- ", whitespace, `${name}:`, whitespace --> Thus the constraint starts at index 4
+        for (let i = 4; i < parts.length; i++) {
+            constraintText += parts[i];
+        }
+        return { name, constraint: constraintText };
     }
 }

src/features/serialize/defaultDiagram.json

@@ -614,7 +614,6 @@
     ],
     "constraints": [
         {
-            "id": "j4nz39",
             "name": "Test",
             "constraint": "data Sensitivity.Personal neverFlows vertex Location.nonEU"
         }