sysml-diagram 0.20.0 → 0.20.1

package/out/main.js

@@ -180376,6 +180376,28 @@ var SysmlDocumentBuilder = class extends DefaultDocumentBuilder {
       });
     });
   }
+  /** REQ-006/REQ-398 - Wait for an editor change to reach the parsed document before
+   * serving a diagram refresh. Custom LSP requests are not gated by Langium's
+   * standard request pipeline, so a request sent just after applyEdit can
+   * otherwise read the preceding document version and publish a stale model.
+   */
+  async waitForDocumentVersion(uri, minimumVersion, state = DocumentState.IndexedReferences, cancelToken = import_vscode_languageserver25.CancellationToken.None) {
+    while (!cancelToken.isCancellationRequested) {
+      let document2 = await this.getOrCreateTargetDocument(uri, cancelToken);
+      if (!document2)
+        return void 0;
+      if ((document2.textDocument.version ?? -1) >= minimumVersion) {
+        await this.waitUntil(state, uri, cancelToken);
+        document2 = this.langiumDocuments.getDocument(uri);
+        if (document2 && (document2.textDocument.version ?? -1) >= minimumVersion && document2.state >= state) {
+          return document2;
+        }
+        continue;
+      }
+      await this.waitForDocumentVersionPhase(uri, minimumVersion, state, cancelToken);
+    }
+    throw OperationCancelled;
+  }
   // REQ-075, REQ-220 — Build the global symbol graph first for this batch,
   // then link visible documents before background documents. See class doc,
   // point 2.
@@ -180486,6 +180508,34 @@ var SysmlDocumentBuilder = class extends DefaultDocumentBuilder {
     const state = this.buildState.get(doc.uri.toString());
     return Boolean(state && !state.completed);
   }
+  waitForDocumentVersionPhase(uri, minimumVersion, state, cancelToken) {
+    if (cancelToken.isCancellationRequested)
+      return Promise.reject(OperationCancelled);
+    const target = uri.toString();
+    return new Promise((resolve8, reject2) => {
+      let settled = false;
+      let cancelDisposable;
+      const ready = (document2) => document2?.uri.toString() === target && (document2.textDocument.version ?? -1) >= minimumVersion;
+      const finish = (error) => {
+        if (settled)
+          return;
+        settled = true;
+        phaseDisposable.dispose();
+        cancelDisposable?.dispose();
+        if (error)
+          reject2(error);
+        else
+          resolve8();
+      };
+      const phaseDisposable = this.onDocumentPhase(state, (document2) => {
+        if (ready(document2))
+          finish();
+      });
+      cancelDisposable = cancelToken.onCancellationRequested(() => finish(OperationCancelled));
+      if (ready(this.langiumDocuments.getDocument(uri)))
+        finish();
+    });
+  }
   optionsForState(state) {
     return state >= DocumentState.Validated ? this.updateBuildOptions : { validation: false };
   }
@@ -195474,16 +195524,7 @@ function layoutSequence(nodes, edges, overrides) {
     baseX.push(cursorX);
     cursorX += n2.data.w + LIFELINE_MIN_GAP;
   }
-  const msgHandlesOf = /* @__PURE__ */ new Map();
-  const pushHandle = (lid, id2, y) => {
-    const arr = msgHandlesOf.get(lid) ?? [];
-    arr.push({ id: id2, y });
-    msgHandlesOf.set(lid, arr);
-  };
-  edges.forEach((e, i) => {
-    pushHandle(e.source, `m${i}`, msgY[i]);
-    pushHandle(e.target, `m${i}`, msgY[i]);
-  });
+  const msgHandles = edges.map((_edge, i) => ({ id: `m${i}`, y: msgY[i] }));
   const insertHandles = Array.from({ length: Math.max(maxSlot, -1) + 2 }, (_2, k) => ({
     id: `d${k}`,
     y: sequenceSlotBoundaryY(k),
@@ -195507,7 +195548,7 @@ function layoutSequence(nodes, edges, overrides) {
         lineBottom: bodyH,
         ...activation ? { activation } : {},
         ...eventsByLifeline.has(n2.id) ? { eventMarks: eventsByLifeline.get(n2.id) } : {},
-        ...msgHandlesOf.has(n2.id) ? { msgHandles: msgHandlesOf.get(n2.id) } : {},
+        msgHandles,
         insertHandles
       },
       draggable: true
@@ -199108,35 +199149,37 @@ function PlanAxes({ g, marker }) {
   const sy = (mv) => g.oy - (mv - g.minV) * g.scale;
   const top = sy(g.maxV) - 14;
   const right = sx(g.maxX) + 20;
+  const originX = sx(0);
+  const originY = sy(0);
   const xticks = ticks(g.minX, g.maxX);
   const vticks = ticks(g.minV, g.maxV);
   const originOnFrame = g.minX <= 0 && g.maxX >= 0 && g.minV <= 0 && g.maxV >= 0;
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("g", { children: [
     xticks.map((v) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("g", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("line", { className: "dgeo-grid", x1: sx(v), y1: top, x2: sx(v), y2: g.oy, stroke: GRID }),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("text", { className: "dgeo-tick", x: sx(v), y: g.oy + 12, textAnchor: "middle", children: v })
+      v === 0 ? null : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("text", { className: "dgeo-tick", x: sx(v), y: originY + 12, textAnchor: "middle", children: v })
     ] }, `gx${v}`)),
     vticks.map((v) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("g", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("line", { className: "dgeo-grid", x1: g.ox, y1: sy(v), x2: right, y2: sy(v), stroke: GRID }),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("text", { className: "dgeo-tick", x: g.ox - 6, y: sy(v) + 3, textAnchor: "end", children: v })
+      v === 0 ? null : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("text", { className: "dgeo-tick", x: originX - 6, y: sy(v) + 3, textAnchor: "end", children: v })
     ] }, `gv${v}`)),
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("line", { x1: g.ox, y1: g.oy, x2: g.ox, y2: top, stroke: AXIS, strokeWidth: "1", markerEnd: `url(#${marker})` }),
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("text", { className: "dnode-kind", x: g.ox + 6, y: top + 4, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("line", { x1: originX, y1: g.oy, x2: originX, y2: top, stroke: AXIS, strokeWidth: "1", markerEnd: `url(#${marker})` }),
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("text", { className: "dnode-kind", x: originX + 6, y: top + 4, children: [
       g.vLabel,
       " [",
       g.unit,
       "]"
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("line", { x1: g.ox, y1: g.oy, x2: right, y2: g.oy, stroke: AXIS, strokeWidth: "1", markerEnd: `url(#${marker})` }),
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("text", { className: "dnode-kind", x: right, y: g.oy + 14, textAnchor: "end", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("line", { x1: g.ox, y1: originY, x2: right, y2: originY, stroke: AXIS, strokeWidth: "1", markerEnd: `url(#${marker})` }),
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("text", { className: "dnode-kind", x: right, y: originY + 14, textAnchor: "end", children: [
       g.hLabel,
       " [",
       g.unit,
       "]"
     ] }),
     originOnFrame ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("g", { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("circle", { cx: sx(0), cy: sy(0), r: "3", fill: "var(--violet, #a890e0)" }),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("text", { className: "dnode-kind", x: sx(0) - 4, y: sy(0) + 14, textAnchor: "end", children: "0" })
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("circle", { cx: originX, cy: originY, r: "3", fill: "var(--violet, #a890e0)" }),
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("text", { className: "dnode-kind", x: originX - 4, y: originY + 14, textAnchor: "end", children: "0" })
     ] }) : null
   ] });
 }
@@ -201177,7 +201220,7 @@ async function runExport(command) {
 }
 
 // src/main.ts
-var VERSION2 = true ? "0.20.0" : "dev";
+var VERSION2 = true ? "0.20.1" : "dev";
 function display(file) {
   const rel2 = path9.relative(process.cwd(), file);
   return rel2 && !rel2.startsWith("..") ? rel2.split(path9.sep).join("/") : file;