proschi 0.4.0 → 0.6.0

package/dist/server.cjs

@@ -25577,22 +25577,30 @@ function stripTrailingComment(text) {
   }
   return text;
 }
-function bracketDepth(text) {
-  let depth = 0;
-  let inString = false;
-  for (let i = 0; i < text.length; i++) {
-    const ch = text[i];
-    if (inString) {
-      if (ch === "\\") i++;
-      else if (ch === '"') inString = false;
-      continue;
+var BracketCounter = class {
+  depth = 0;
+  inString = false;
+  escaped = false;
+  /** Adds `text` and returns the depth so far. */
+  feed(text) {
+    for (let i = 0; i < text.length; i++) {
+      const ch = text[i];
+      if (this.escaped) {
+        this.escaped = false;
+        continue;
+      }
+      if (this.inString) {
+        if (ch === "\\") this.escaped = true;
+        else if (ch === '"') this.inString = false;
+        continue;
+      }
+      if (ch === '"') this.inString = true;
+      else if (ch === "{" || ch === "[") this.depth++;
+      else if (ch === "}" || ch === "]") this.depth--;
     }
-    if (ch === '"') inString = true;
-    else if (ch === "{" || ch === "[") depth++;
-    else if (ch === "}" || ch === "]") depth--;
+    return this.depth;
   }
-  return depth;
-}
+};
 
 // ../frontend/src/dsl/paths.ts
 var PARAM2 = /^\{[^{}/]+\}$/;
@@ -25775,6 +25783,7 @@ var HTTP_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"];
 var DEFAULT_TECH = "Rectangle";
 var DEFAULT_GROUP_TECH = "Logical Group";
 var MAX_SCENARIOS = 32;
+var MAX_ALT_DEPTH = 16;
 var REPLICAS = /^x(\d+)$/;
 var PERCENTILES = { p50: 50, p90: 90, p95: 95, p99: 99, p999: 99.9 };
 var FIELD_FLAGS = ["key", "index", "unique", "optional"];
@@ -25802,8 +25811,12 @@ var Parser = class {
   file;
   stack = [];
   diagnostics = [];
+  /** Warnings reported so far (see `warning`). */
+  warned = /* @__PURE__ */ new Set();
   nodes = /* @__PURE__ */ new Map();
   edges = [];
+  /** Connections so far per `from->to`, for the ids of repeated ones. */
+  edgeCount = /* @__PURE__ */ new Map();
   useCases = [];
   references = [];
   imports = [];
@@ -25880,6 +25893,17 @@ var Parser = class {
     const loc = (t) => this.locOf(t, line);
     const top = this.top();
     if (top?.kind === "section") {
+      if (top.skipped !== void 0) {
+        const opens = tokens[tokens.length - 1].kind === "lbrace";
+        if (first.kind !== "rbrace") top.nested = (top.nested ?? 0) + (opens ? 1 : 0);
+        else if (top.nested) top.nested += opens ? 0 : -1;
+        else {
+          this.stack.pop();
+          if (second?.kind === "ident" && second.value === "alt") this.parseAlt(tokens.slice(1), line);
+          else if (second) this.error("Unexpected input after }", loc(second));
+        }
+        return index;
+      }
       if (first.kind === "rbrace") {
         this.stack.pop();
         if (!top.discard) this.closeSection(top);
@@ -26104,6 +26128,12 @@ var Parser = class {
       return;
     }
     this.expectEnd(tokens, i + 1, line);
+    if (this.stack.filter((f) => f.kind === "alt").length >= MAX_ALT_DEPTH) {
+      const loc2 = this.locOf(keyword, line);
+      this.error(`alt blocks can nest at most ${MAX_ALT_DEPTH} deep; this one is skipped`, loc2);
+      this.stack.push({ kind: "section", section: "test", discard: true, skipped: `alt '${nameToken.value}'`, loc: loc2 });
+      return;
+    }
     const owner = top.body;
     let set = owner.openAlt;
     if (!set) {
@@ -26197,12 +26227,16 @@ var Parser = class {
     }
     let label = labelToken?.value ?? "";
     let lastLine = index;
-    if (bracketDepth(label) > 0) {
-      while (bracketDepth(label) > 0 && lastLine + 1 < this.lines.length) {
+    const brackets = new BracketCounter();
+    let depth = brackets.feed(label);
+    if (depth > 0) {
+      while (depth > 0 && lastLine + 1 < this.lines.length) {
         lastLine++;
-        label += "\n" + this.lines[lastLine];
+        const more = "\n" + this.lines[lastLine];
+        label += more;
+        depth = brackets.feed(more);
       }
-      if (bracketDepth(label) > 0) this.error("Unclosed { or [ in payload", this.locOf(labelToken, line));
+      if (depth > 0) this.error("Unclosed { or [ in payload", this.locOf(labelToken, line));
       label = label.trimEnd();
     }
     const loc = {
@@ -26237,7 +26271,8 @@ var Parser = class {
       this.error("'-x' marks a failed call and is only allowed in use case steps", this.locOf(arrowToken, line));
     } else {
       const base = `${from}->${to}`;
-      const count = this.edges.filter((e) => e.id === base || e.id.startsWith(`${base}#`)).length;
+      const count = this.edgeCount.get(base) ?? 0;
+      this.edgeCount.set(base, count + 1);
       this.edges.push({ id: count ? `${base}#${count + 1}` : base, source: from, target: to, label: unquote(label) || void 0, loc });
     }
     return lastLine;
@@ -27163,7 +27198,12 @@ var Parser = class {
     this.diagnostics.push({ severity: "error", message, ...loc });
   }
   warning(message, loc) {
-    if (this.diagnostics.some((d) => d.message === message && d.line === loc.line && d.col === loc.col && d.file === loc.file)) return;
+    const key = `${loc.file ?? ""}
+${loc.line}
+${loc.col}
+${message}`;
+    if (this.warned.has(key)) return;
+    this.warned.add(key);
     this.diagnostics.push({ severity: "warning", message, ...loc });
   }
 };
@@ -27196,6 +27236,7 @@ function isWord(token, word) {
   return token?.kind === "ident" && token.value === word;
 }
 function sectionName(frame) {
+  if (frame.skipped) return frame.skipped;
   if (frame.entity) return `entity '${frame.entity.name}'`;
   if (frame.decision) return `decision '${frame.decision.title}'`;
   if (frame.test) return `test '${frame.test.name}'`;
@@ -27360,13 +27401,13 @@ function classify(lines) {
     }
     if (!inSection && first.kind === "ident" && second?.kind === "arrow" && third?.kind === "ident" && tokens.length <= 4 && (!fourth || fourth.kind === "label")) {
       const entry = { ...base, kind: "connection", from: first.value, arrow: second.value, to: third.value, label: fourth?.value, continuation: [] };
-      if (fourth && bracketDepth(fourth.value) > 0) {
-        const delta = depth * INDENT.length - width(leadingSpace(raw));
-        let label = fourth.value;
-        while (bracketDepth(label) > 0 && i + 1 < lines.length) {
+      const brackets = new BracketCounter();
+      if (fourth && brackets.feed(fourth.value) > 0) {
+        const delta = indent(depth).length - width(leadingSpace(raw));
+        while (i + 1 < lines.length) {
           const next = lines[++i];
-          label += "\n" + next;
           entry.continuation.push(reindent(next, delta));
+          if (brackets.feed("\n" + next) <= 0) break;
         }
         while (entry.continuation[entry.continuation.length - 1] === "") entry.continuation.pop();
       }
@@ -27507,7 +27548,8 @@ var source = (raw, t) => {
 var withComment = (code, comment) => comment ? code + " " + comment : code;
 var leadingSpace = (line) => /^[ \t]*/.exec(line)[0];
 var width = (space) => [...space].reduce((n, ch) => n + (ch === "	" ? INDENT.length : 1), 0);
-var indent = (depth) => INDENT.repeat(depth);
+var MAX_INDENT = 32;
+var indent = (depth) => INDENT.repeat(Math.min(depth, MAX_INDENT));
 var len = (s) => [...s].length;
 var pad = (s, to) => s + " ".repeat(Math.max(0, to - len(s)));
 
@@ -28971,7 +29013,7 @@ function positionAt(text, offset) {
 
 // src/server.ts
 if (process.argv.includes("--version")) {
-  console.log(true ? "0.4.0" : "dev");
+  console.log(true ? "0.6.0" : "dev");
   process.exit(0);
 }
 var connection = (0, import_node.createConnection)(import_node.ProposedFeatures.all);
@@ -29012,7 +29054,7 @@ connection.onInitialize(() => ({
     documentFormattingProvider: true,
     codeActionProvider: { codeActionKinds: [import_node.CodeActionKind.QuickFix] }
   },
-  serverInfo: { name: "proschi-language-server", version: true ? "0.4.0" : "dev" }
+  serverInfo: { name: "proschi-language-server", version: true ? "0.6.0" : "dev" }
 }));
 function validate(document) {
   const analysis = analysisOf(document);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proschi",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Command-line checker and language server for Proschi architecture diagrams",
   "license": "MIT",
   "repository": {