sysml-diagram 0.26.0 → 0.27.0

package/out/main.js

@@ -162703,6 +162703,11 @@ var ACTION_FLOW_STEP_TYPES = /* @__PURE__ */ new Set([
   "ForLoopNode"
 ]);
 var isActionFlowStep = (node) => !!node && ACTION_FLOW_STEP_TYPES.has(node.$type);
+var NESTED_ACTION_LIMIT = 8;
+var withoutCompartments = (compartments, ...titles) => {
+  const kept = (compartments ?? []).filter((compartment) => !titles.includes(compartment.title));
+  return kept.length ? kept : void 0;
+};
 var modifiersOf = (node) => {
   const mods = node.modifiers;
   return Array.isArray(mods) ? mods : [];
@@ -163823,6 +163828,37 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
   /** REQ-196 — is this `perform` a SWIMLANE claim (OMG p.90): a part claiming an
    *  action that another action owns? Such a claim is drawn inside that action,
    *  so it is never content of the part that wrote it. */
+  /** issue #114 — the path a referencing `perform`/`exhibit` names, as written
+   *  (`Mission::prepare`, `flow1.step`). A referencing claim has no local name,
+   *  so the written path is the only thing that identifies it in a text row. */
+  behaviorReferenceText(stmt) {
+    return this.behaviorReferenceSegments(stmt).map((segment, at) => at === 0 ? segment.text : `${segment.separator ?? "::"}${segment.text}`).join("");
+  }
+  /** issue #114 — the `perform` claims of the document, grouped by the action
+   *  each one names, so an action can list the parts that perform it
+   *  (`performed by`, OMG SysML v2 §8.4.13.11 `Parts::Part::performedActions`).
+   *  One walk per parse: the reverse listing is otherwise quadratic in the
+   *  number of drawn nodes. */
+  performClaimsByTarget(root4, index2) {
+    const cache = this.perParse(root4);
+    if (cache.performClaims)
+      return cache.performClaims;
+    const claims = /* @__PURE__ */ new Map();
+    for (const node of this.rootContents(root4)) {
+      if (node.$type !== "PerformStmt")
+        continue;
+      const target = this.performTargetOf(node, index2);
+      if (!target || target === node)
+        continue;
+      const existing = claims.get(target);
+      if (existing)
+        existing.push(node);
+      else
+        claims.set(target, [node]);
+    }
+    cache.performClaims = claims;
+    return claims;
+  }
   isSwimlaneClaim(member, index2) {
     if (member.$type !== "PerformStmt")
       return false;
@@ -165331,7 +165367,10 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
           isDef: part.isDef === true,
           type: typeText(part),
           multiplicity: multText(part),
-          compartments: this.compartmentsFor(part, uri, index2),
+          // issue #114 — this frame already DRAWS the actions the part
+          // performs, so their textual `perform actions` rows would be a
+          // second depiction of the same members (REQ-181/185).
+          compartments: withoutCompartments(this.compartmentsFor(part, uri, index2), "perform actions"),
           ports: ports.length ? ports : void 0,
           source: sourceOf2(part, uri),
           meta: editMeta
@@ -166693,7 +166732,8 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       else
         emitFlowNode(child, ownerFrameId, holder, occurrence, laneParts);
     };
-    const actionFeatureCompartments = (action) => (this.compartmentsFor(action, uri, index2) ?? []).filter((compartment) => compartment.title !== "parameters" && compartment.title !== "actions");
+    const graphicalAfvTitles = ["perform actions", "performed by"];
+    const actionFeatureCompartments = (action) => withoutCompartments(this.compartmentsFor(action, uri, index2), "parameters", "actions", ...graphicalAfvTitles) ?? [];
     const renderContainer = (holder, frameId, parentFrame, depth, seen, isAnchor, inheritedExecutionContext, holderOccurrence = frameId) => {
       if (!occurrenceEdits.has(holderOccurrence)) {
         occurrenceEdits.set(holderOccurrence, {
@@ -166718,7 +166758,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       frameOfNode.set(holder, frameId);
       const framePorts = isPartDecl(holder) ? [...framePins, ...this.portsOf(holder, index2, uri, frameId).ports.filter((port) => !framePins.some((pin) => pin.name === port.name)).map((port) => ({ ...port, meta: { ...port.meta, afvPartPort: true } }))] : framePins;
       registerPins(holder, frameId, framePins, isAnchor);
-      const frameCompartments = isActionDecl(holder) ? actionFeatureCompartments(holder) : this.compartmentsFor(holder, uri, index2);
+      const frameCompartments = isActionDecl(holder) ? actionFeatureCompartments(holder) : withoutCompartments(this.compartmentsFor(holder, uri, index2), ...graphicalAfvTitles);
       frames.push({
         id: frameId,
         label: nameOf2(holder) ?? lastSeg(frameId),
@@ -166800,6 +166840,10 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       return id2;
     };
     const emitLoopFrame = (loop, parentFrameId, executionContext, occurrence, laneParts, wrapper) => {
+      if (nestingExhausted()) {
+        emitFlowNode(wrapper ?? loop, parentFrameId, executionContext, occurrence, laneParts);
+        return;
+      }
       const banner = loopBanner(loop);
       const wrapperName = wrapper ? nameOf2(wrapper) : void 0;
       const loopId = occurrence;
@@ -166852,9 +166896,11 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
         const parentEdit = occurrenceEdits.get(occurrence);
         if (parentEdit)
           occurrenceEdits.set(bodyOccurrence, parentEdit);
+        openFrames.add(loop);
         for (const bm of flowMembersOf(body)) {
           emitChild(bm, loopId, executionContext, bodyOccurrence);
         }
+        openFrames.delete(loop);
       }
       idByNode.set(loop, loopId);
       registerStep(occurrence, loopId, [nameOf2(loop)]);
@@ -166881,10 +166927,11 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       return target && isActionDecl(target) && ownsFlow(target) ? target : void 0;
     };
     const isCompositeAction = (node) => contentSourceOf(node) !== void 0;
-    const openActionFrames = /* @__PURE__ */ new Set();
+    const openFrames = /* @__PURE__ */ new Set();
+    const nestingExhausted = () => openFrames.size >= NESTED_ACTION_LIMIT;
     const emitCompositeActionFrame = (action, parentFrameId, executionContext, occurrence, laneParts) => {
       const content = contentSourceOf(action) ?? action;
-      if (openActionFrames.has(content)) {
+      if (openFrames.has(content) || nestingExhausted()) {
         emitFlowNode(action, parentFrameId, executionContext, occurrence, laneParts);
         return;
       }
@@ -166930,12 +166977,16 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       });
       recordLaneCandidate(id2, true, parentFrameId, laneParts, occurrence);
       actionRecords.push({ m: action, id: id2, performer: executionContext });
-      openActionFrames.add(content);
+      openFrames.add(content);
       for (const child of flowMembersOf(content))
         emitChild(child, id2, executionContext, occurrence);
-      openActionFrames.delete(content);
+      openFrames.delete(content);
     };
     const emitIfFrame = (node, parentFrameId, executionContext, occurrence, laneParts, wrapper) => {
+      if (nestingExhausted()) {
+        emitFlowNode(wrapper ?? node, parentFrameId, executionContext, occurrence, laneParts);
+        return;
+      }
       const inf = node;
       const declaredNode = wrapper ?? (nameOf2(node) ? node : void 0);
       const wrapperName = declaredNode ? nameOf2(declaredNode) : void 0;
@@ -166988,6 +167039,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
         idByNode.set(wrapper, frameId);
         registerStep(occurrence, frameId, [wrapperName]);
       }
+      openFrames.add(node);
       for (const [branch, block2] of [
         ["then", inf.thenBody],
         ["else", inf.elseIf ?? inf.elseBody]
@@ -167019,6 +167071,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
           [branch === "then" ? "structuredThenMemberIds" : "structuredElseMemberIds"]: memberIds
         };
       }
+      openFrames.delete(node);
     };
     const anchorId = qnameOf(anchor) || nameOf2(anchor) || "__anchor__";
     renderContainer(anchor, anchorId, void 0, 0, /* @__PURE__ */ new Set(), true, void 0);
@@ -167147,6 +167200,15 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
         branchInsertable: true
       } : void 0;
     };
+    const drawnRowKeys = /* @__PURE__ */ new Set();
+    const rowKey = (source) => source ? `${source.uri} ${source.range.start.line} ${source.range.start.character}` : void 0;
+    const registerDrawn = (member) => {
+      if (!member)
+        return;
+      const key = rowKey(sourceOf2(member, uri));
+      if (key)
+        drawnRowKeys.add(key);
+    };
     const linkedSuccessions = /* @__PURE__ */ new Set();
     const linkIds = (from, to, label, src, meta) => {
       if (!from || !to)
@@ -167172,6 +167234,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
         source: src ? sourceOf2(src, uri) : void 0,
         meta
       });
+      registerDrawn(src);
       return true;
     };
     const linkInlineTerminate = (action, actionId) => {
@@ -167300,6 +167363,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
               label: this.flowPayloadText(fm) ?? typeText(m) ?? transferredFeature ?? nameOf2(m),
               source: sourceOf2(m, uri)
             });
+            registerDrawn(m);
           }
         } else if (m.$type === "BindStmt" || m.$type === "BindingConnectorStmt" || m.$type === "BindingDecl") {
           const binding = m;
@@ -167309,6 +167373,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
           const to = resolvePin(right, occurrenceContext);
           if (from && to) {
             edges.push({ id: `e${e++}`, from, to, kind: "binding", label: "=", source: sourceOf2(m, uri) });
+            registerDrawn(m);
           }
         } else {
           const memberName = localFlowName(m);
@@ -167598,6 +167663,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       const toId = match ? nodeIdOf(match.m) : void 0;
       if (fromId && toId) {
         edges.push({ id: `e${e++}`, from: fromId, to: toId, kind: "message", label: payload, source: sourceOf2(s.m, uri) });
+        registerDrawn(s.m);
       }
     }
     this.emitBehaviorDefinitions([
@@ -167612,6 +167678,23 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       bare.notes = ["No actions found to flow."];
       return bare;
     }
+    if (drawnRowKeys.size) {
+      for (const element of [...frames, ...nodes]) {
+        const full = element.compartments;
+        if (!full?.length)
+          continue;
+        const kept = full.map((compartment) => ({
+          title: compartment.title,
+          items: compartment.items.filter((row) => {
+            const key = rowKey(row.source);
+            return !key || !drawnRowKeys.has(key);
+          })
+        })).filter((compartment) => compartment.items.length > 0);
+        if (kept.length === full.length && kept.every((c, at) => c.items.length === full[at].items.length))
+          continue;
+        element.compartments = kept.length ? kept : void 0;
+      }
+    }
     const model = this.model("afv", anchor, nodes, edges);
     model.frames = frames;
     model.meta = { ...model.meta, unified: true, groupMode: "nested" };
@@ -170331,6 +170414,31 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       return item(m, `${head2} { ${expr} }`.replace(/\s+/g, " ").trim());
     }));
     add("actions", usages(isActionDecl).map((m) => item(m)));
+    const performRowText = (m) => {
+      const referenced = this.behaviorReferenceText(m);
+      if (this.isAnonymousBehaviorReference(m))
+        return referenced || this.featureText(m);
+      const declared = this.featureText(m);
+      return referenced && referenced !== nameOf2(m) ? `${declared} references ${referenced}` : declared;
+    };
+    add("perform actions", members.filter((m) => m.$type === "PerformStmt").filter(isNonVariantMember).map((m) => item(m, performRowText(m))));
+    if (isActionFlowStep(node)) {
+      const scope = qnameOf(this.packageScopeOf(node));
+      const performerName = (part) => {
+        const qualified = qnameOf(part);
+        if (!qualified)
+          return nameOf2(part) ?? "?";
+        return scope && qualified.startsWith(`${scope}::`) ? qualified.slice(scope.length + 2) : qualified;
+      };
+      const claims = this.performClaimsByTarget(this.documentRootOf(node), index2).get(node) ?? [];
+      const seenPerformers = /* @__PURE__ */ new Set();
+      add("performed by", claims.map((claim) => ({ claim, part: this.declaringOwnerOf(claim) })).filter((entry) => !!entry.part && isPartDecl(entry.part)).map(({ claim, part }) => ({ text: performerName(part), source: sourceOf2(claim, uri) })).filter((row) => {
+        if (seenPerformers.has(row.text))
+          return false;
+        seenPerformers.add(row.text);
+        return true;
+      }));
+    }
     add("concerns", usages(isConcernDecl).map((m) => item(m)));
     add("viewpoints", usages(isViewpointDecl).map((m) => item(m)));
     add("exposes", members.filter((m) => m.$type === "ExposeMember").flatMap((m) => (m.paths ?? []).map((path10) => item(path10, this.featurePath(path10) ?? (path10.$cstNode?.text ?? "").replace(/\s+/g, " ").trim()))));
@@ -205018,7 +205126,7 @@ async function runExport(command) {
 }
 
 // src/main.ts
-var VERSION2 = true ? "0.26.0" : "dev";
+var VERSION2 = true ? "0.27.0" : "dev";
 function display(file) {
   const rel2 = path9.relative(process.cwd(), file);
   return rel2 && !rel2.startsWith("..") ? rel2.split(path9.sep).join("/") : file;