sysml-diagram 0.27.0 → 0.27.1

package/out/main.js

@@ -167715,11 +167715,12 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
     };
     const ownStates = (holder) => membersOf(holder).map((member) => this.thenActionMemberNode(member) ?? member).filter((member) => isStateDecl(member) && nameOf2(member) !== void 0);
     const nestedStates = (holder) => {
-      const out = ownStates(holder);
+      const out = ownStates(holder).map((node) => ({ node, borrowed: false }));
       const def = definitionOf(holder);
       for (const inherited of def ? ownStates(def) : []) {
-        if (!out.some((m) => nameOf2(m) === nameOf2(inherited)))
-          out.push(inherited);
+        if (!out.some((m) => nameOf2(m.node) === nameOf2(inherited))) {
+          out.push({ node: inherited, borrowed: true });
+        }
       }
       return out;
     };
@@ -167769,8 +167770,10 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       namesByFrame.set(key, created);
       return created;
     };
-    const renderState = (s, parentFrame, depth, seen) => {
-      const id2 = qnameOf(s) || nameOf2(s);
+    const scopedId = (scope2, name) => `${scope2}::${name}`;
+    const machineScopeId = anchorFrameId ?? qnameOf(anchor) ?? nameOf2(anchor) ?? "__stv__";
+    const renderState = (s, parentFrame, depth, seen, scope2, borrowed) => {
+      const id2 = borrowed ? scopedId(scope2, nameOf2(s)) : qnameOf(s) || nameOf2(s);
       byName.set(nameOf2(s), id2);
       namesIn(parentFrame).set(nameOf2(s), id2);
       registerDrawn(s);
@@ -167791,10 +167794,10 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
           meta: { composite: true, ...isParallel ? { parallel: true } : {} },
           source: sourceOf2(s, uri)
         });
-        compositeFrames.push({ state: s, frameId: id2 });
+        compositeFrames.push({ state: s, frameId: id2, borrowed });
         const next = typeQ ? /* @__PURE__ */ new Set([...seen, typeQ]) : seen;
         for (const ss of subStates)
-          renderState(ss, id2, depth + 1, next);
+          renderState(ss.node, id2, depth + 1, next, id2, borrowed || ss.borrowed);
       } else {
         nodes.push({
           id: id2,
@@ -167809,8 +167812,9 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
         });
       }
     };
-    for (const s of topStates)
-      renderState(s, anchorFrameId, 0, /* @__PURE__ */ new Set());
+    for (const s of topStates) {
+      renderState(s.node, anchorFrameId, 0, /* @__PURE__ */ new Set(), machineScopeId, s.borrowed);
+    }
     const endpointName = (path10) => typeof path10 === "string" ? path10.split(/::|\./).pop() || void 0 : void 0;
     const controlNodeInfo = (m) => {
       switch (m.$type) {
@@ -167844,10 +167848,11 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       const entry = member;
       return !!entry && entry.$type === "EntryAction" && !entry.name && !entry.actionKw && !entry.send && !entry.accept && !entry.assign;
     };
-    const machineNodeIds = /* @__PURE__ */ new Map();
+    const machineNodesByFrame = /* @__PURE__ */ new Map();
+    const machineNodeIdIn = (frameId, member) => machineNodesByFrame.get(frameId ?? "")?.get(member);
     const machineNodeMembers = [];
     let anonymousNodes = 0;
-    const emitMachineNodes = (holder, frameId) => {
+    const emitMachineNodes = (holder, frameId, borrowed) => {
       const members = membersOf(holder);
       const drawnHere = namesIn(frameId);
       for (const raw of members) {
@@ -167858,7 +167863,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
         const name = nameOf2(member);
         if (name && drawnHere.has(name))
           continue;
-        const id2 = name ? qnameOf(member) || `${frameId}::${name}` : `${frameId}::__stv_${member.$type}_${anonymousNodes++}__`;
+        const id2 = name ? borrowed ? scopedId(frameId, name) : qnameOf(member) || scopedId(frameId, name) : `${frameId}::__stv_${member.$type}_${anonymousNodes++}__`;
         if (nodes.some((n2) => n2.id === id2) || frames.some((f) => f.id === id2))
           continue;
         if (name) {
@@ -167866,7 +167871,9 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
           if (!byName.has(name))
             byName.set(name, id2);
         }
-        machineNodeIds.set(member, id2);
+        const frameNodes = machineNodesByFrame.get(frameId) ?? /* @__PURE__ */ new Map();
+        frameNodes.set(member, id2);
+        machineNodesByFrame.set(frameId, frameNodes);
         machineNodeMembers.push({ member, id: id2 });
         nodes.push({
           id: id2,
@@ -167882,17 +167889,28 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
     };
     const edges = [];
     let e = 0;
+    const finalIn = (frameId) => {
+      const own = frameId && frameId !== anchorFrameId;
+      const id2 = own ? `__final__${frameId}` : "__final__";
+      if (!nodes.some((n2) => n2.id === id2)) {
+        nodes.push({
+          id: id2,
+          name: "",
+          keyword: "final",
+          isDef: false,
+          shape: "final",
+          frame: own ? frameId : anchorFrameId
+        });
+      }
+      return id2;
+    };
     const resolveState = (nm) => {
       if (!nm)
         return void 0;
       if (byName.has(nm))
         return byName.get(nm);
-      if (nm === "done") {
-        if (!nodes.some((n2) => n2.shape === "final")) {
-          nodes.push({ id: "__final__", name: "", keyword: "final", isDef: false, shape: "final", frame: anchorFrameId });
-        }
-        return "__final__";
-      }
+      if (nm === "done")
+        return finalIn(anchorFrameId);
       return void 0;
     };
     const drawnEdges = /* @__PURE__ */ new Set();
@@ -167929,15 +167947,14 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
         return void 0;
       const short = endpointName(path10);
       const local = namesByFrame.get(frameId ?? "");
-      return (short ? local?.get(short) : void 0) ?? resolveState(path10) ?? resolveState(short) ?? (short === "start" ? initialId : void 0);
+      const known2 = short ? local?.get(short) : void 0;
+      if (known2)
+        return known2;
+      if (short === "done")
+        return finalIn(frameId);
+      return resolveState(path10) ?? resolveState(short) ?? (short === "start" ? initialId : void 0);
     };
     const transitionScope = [anchor, ...definitionOf(anchor) ? [definitionOf(anchor)] : []];
-    for (const t of transitionScope.flatMap((holder) => [...ast_utils_exports.streamAllContents(holder)])) {
-      if (t.$type !== "TransitionDecl")
-        continue;
-      const tn = t;
-      link(resolveState(tn.from), resolveState(tn.to), this.transitionLabel(t), t);
-    }
     const designatedInitial = (owner, frameId) => {
       const members = owner.members;
       if (!Array.isArray(members))
@@ -167960,7 +167977,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
         const then = members[i + 1];
         if (then?.$type !== "ThenActionMember" || typeof then.target !== "string")
           continue;
-        const target = resolveState(lastSeg(then.target));
+        const target = resolveEndpoint(then.target, void 0, frameId);
         if (target) {
           registerDrawn(then);
           return target;
@@ -167968,35 +167985,66 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       }
       return void 0;
     };
-    const machineScope = (holder) => {
+    const machineScope = (holder, borrowed) => {
       const def = definitionOf(holder);
-      return def ? [holder, def] : [holder];
+      return def ? [{ holder, borrowed }, { holder: def, borrowed: true }] : [{ holder, borrowed }];
     };
     if (anchorFrameId) {
-      for (const holder of machineScope(anchor))
-        emitMachineNodes(holder, anchorFrameId);
+      for (const scope2 of machineScope(anchor, false)) {
+        emitMachineNodes(scope2.holder, anchorFrameId, scope2.borrowed);
+      }
     }
-    for (const { state, frameId } of compositeFrames) {
-      for (const holder of machineScope(state))
-        emitMachineNodes(holder, frameId);
+    for (const { state, frameId, borrowed } of compositeFrames) {
+      for (const scope2 of machineScope(state, borrowed)) {
+        emitMachineNodes(scope2.holder, frameId, scope2.borrowed);
+      }
     }
     const anchorDefinition = definitionOf(anchor);
-    const firstStateId = designatedInitial(anchor, anchorFrameId) ?? (anchorDefinition ? designatedInitial(anchorDefinition, anchorFrameId) : void 0) ?? (topStates.length ? byName.get(nameOf2(topStates[0])) : void 0);
+    const firstStateId = designatedInitial(anchor, anchorFrameId) ?? (anchorDefinition ? designatedInitial(anchorDefinition, anchorFrameId) : void 0) ?? (topStates.length ? namesIn(anchorFrameId).get(nameOf2(topStates[0].node)) ?? byName.get(nameOf2(topStates[0].node)) : void 0);
     if (firstStateId)
       link("__initial__", firstStateId, void 0, void 0);
     const compositeInitial = /* @__PURE__ */ new Map();
-    for (const { state, frameId } of compositeFrames) {
-      const target = designatedInitial(state, frameId);
+    for (const { state, frameId, borrowed } of compositeFrames) {
+      let target;
+      for (const scope2 of machineScope(state, borrowed)) {
+        target = designatedInitial(scope2.holder, frameId);
+        if (target)
+          break;
+      }
       if (!target)
         continue;
       const id2 = `__initial__${frameId}`;
       nodes.push({ id: id2, name: "", keyword: "initial", isDef: false, shape: "initial", frame: frameId });
-      compositeInitial.set(state, id2);
+      compositeInitial.set(frameId, id2);
       link(id2, target, void 0, void 0);
     }
+    const framedTransitions = /* @__PURE__ */ new Set();
+    const declaredTransitions = (holder, frameId) => {
+      for (const member of membersOf(holder)) {
+        if (member.$type !== "TransitionDecl")
+          continue;
+        framedTransitions.add(member);
+        const tn = member;
+        link(resolveEndpoint(tn.from, void 0, frameId), resolveEndpoint(tn.to, void 0, frameId), this.transitionLabel(member), member);
+      }
+    };
+    for (const scope2 of machineScope(anchor, false)) {
+      declaredTransitions(scope2.holder, anchorFrameId);
+    }
+    for (const { state, frameId, borrowed } of compositeFrames) {
+      for (const scope2 of machineScope(state, borrowed)) {
+        declaredTransitions(scope2.holder, frameId);
+      }
+    }
+    for (const t of transitionScope.flatMap((holder) => [...ast_utils_exports.streamAllContents(holder)])) {
+      if (t.$type !== "TransitionDecl" || framedTransitions.has(t))
+        continue;
+      const tn = t;
+      link(resolveState(tn.from), resolveState(tn.to), this.transitionLabel(t), t);
+    }
     const sequentialTransitions = (holder, initialId, frameId) => {
       let cursor;
-      const idOf = (member) => machineNodeIds.get(member) ?? idByState.get(member) ?? (nameOf2(member) ? resolveEndpoint(nameOf2(member), void 0, frameId) : void 0);
+      const idOf = (member) => machineNodeIdIn(frameId, member) ?? (nameOf2(member) ? resolveEndpoint(nameOf2(member), void 0, frameId) : void 0) ?? idByState.get(member);
       const endpoint = (path10) => resolveEndpoint(path10, initialId, frameId);
       for (const member of membersOf(holder)) {
         switch (member.$type) {
@@ -168011,7 +168059,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
               cursor = initialId;
               break;
             }
-            cursor = machineNodeIds.get(member) ?? cursor;
+            cursor = machineNodeIdIn(frameId, member) ?? cursor;
             break;
           }
           // OMG 8.2.3.18 names this edge `st-succession`, so the
@@ -168077,18 +168125,18 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
             break;
           }
           default: {
-            cursor = machineNodeIds.get(member) ?? cursor;
+            cursor = machineNodeIdIn(frameId, member) ?? cursor;
             break;
           }
         }
       }
     };
-    for (const holder of machineScope(anchor)) {
-      sequentialTransitions(holder, hostsStateMachine ? "__initial__" : void 0, anchorFrameId);
+    for (const scope2 of machineScope(anchor, false)) {
+      sequentialTransitions(scope2.holder, hostsStateMachine ? "__initial__" : void 0, anchorFrameId);
     }
-    for (const { state, frameId } of compositeFrames) {
-      for (const holder of machineScope(state)) {
-        sequentialTransitions(holder, compositeInitial.get(state), frameId);
+    for (const { state, frameId, borrowed } of compositeFrames) {
+      for (const scope2 of machineScope(state, borrowed)) {
+        sequentialTransitions(scope2.holder, compositeInitial.get(frameId), frameId);
       }
     }
     const exhibitorsByState = /* @__PURE__ */ new Map();
@@ -205126,7 +205174,7 @@ async function runExport(command) {
 }
 
 // src/main.ts
-var VERSION2 = true ? "0.27.0" : "dev";
+var VERSION2 = true ? "0.27.1" : "dev";
 function display(file) {
   const rel2 = path9.relative(process.cwd(), file);
   return rel2 && !rel2.startsWith("..") ? rel2.split(path9.sep).join("/") : file;