sysml-diagram 0.18.0 → 0.19.0

package/out/main.js

@@ -162237,6 +162237,7 @@ var redefinedNameOf = (node) => {
   }
   return void 0;
 };
+var effectiveNameOf = (node) => nameOf2(node) ?? redefinedNameOf(node);
 var portionLabelOf = (node) => nameOf2(node) ?? (isOccurrenceModified(node) ? redefinedNameOf(node) : void 0);
 function diagramNodeId(node) {
   const name = nameOf2(node);
@@ -162457,6 +162458,60 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       return void 0;
     return index2.get(t) ?? index2.get(lastSeg(t));
   }
+  // REQ-192/REQ-193, issue #233 — the types a node inherits members FROM, nearest
+  // first. A USAGE inherits from its typing definition (`part p : Base`) and from
+  // everything that definition specializes; a DEFINITION inherits from the
+  // definitions IT specializes (`part def Custom :> Base`). resolveType only ever
+  // walked the usage's `typing` relationship, so a part def that specialized
+  // another part def rendered only the members it redeclared — the inherited ones
+  // were never folded in, because the specialization chain was not walked for
+  // definitions at all. Breadth-first, so a nearer supertype shadows a farther one, and the
+  // `seen` set terminates it: every node is visited at most once and a document
+  // holds finitely many, so a cyclic hierarchy stops without a depth cap — and a
+  // cap is what silently dropped the far end of a legitimately deep chain
+  // (PR #239 review), against REQ-192's own "to any depth" wording.
+  inheritedTypesOf(node, index2) {
+    const root4 = node.isDef === true ? node : this.resolveType(node, index2);
+    if (!root4)
+      return [];
+    const chain = root4 === node ? [] : [root4];
+    const seen = /* @__PURE__ */ new Set([node, root4]);
+    let frontier = [root4];
+    while (frontier.length > 0) {
+      const next = [];
+      for (const cur of frontier) {
+        for (const target of specializationTargets(cur)) {
+          const superType = this.resolveSpecializationTarget(cur, target, index2);
+          if (!superType || seen.has(superType))
+            continue;
+          seen.add(superType);
+          chain.push(superType);
+          next.push(superType);
+        }
+      }
+      frontier = next;
+    }
+    return chain;
+  }
+  // issue #233 (PR #239 review) — one supertype path, resolved. A specialization
+  // target is path TEXT in this grammar, not a cross-reference, so there is no
+  // linked node to prefer the way `resolveType` prefers `typing.type.ref`; the
+  // name has to be looked up. The active document's index answers the ordinary
+  // case, but `resolveType` legitimately returns a definition from ANOTHER
+  // document (an imported or library `part def Custom :> Base`), and that
+  // document's supertypes are not in the active map at all — so the chain used to
+  // stop dead at the first foreign definition, dropping everything `Base`
+  // contributes. The declaring document's own index is consulted second: it is
+  // the namespace the path was written in, and `perParse` caches it per document
+  // exactly as it caches the active one, so this stays one lookup, not a
+  // workspace scan.
+  resolveSpecializationTarget(owner, target, index2) {
+    const local = index2.get(target) ?? index2.get(lastSeg(target));
+    if (local)
+      return local;
+    const declaring = this.localIndex(this.documentRootOf(owner));
+    return declaring === index2 ? void 0 : declaring.get(target) ?? declaring.get(lastSeg(target));
+  }
   findAnchor(root4, rootSymbol, kind, index2) {
     const all = this.rootContents(root4);
     if (kind === "bv" && !rootSymbol) {
@@ -162813,7 +162868,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       }
       case "iv":
         if (isPartDecl(node)) {
-          return this.nestedUsages(node, isPartDecl).some((n2) => nameOf2(n2) !== void 0) || this.hasRenderablePorts(node, index2);
+          return this.hasNestedPartUsages(node, index2) || this.hasRenderablePorts(node, index2);
         }
         return (isPackage(node) || isDocument(node)) && this.nestedUsages(node, isPartDecl).some((n2) => nameOf2(n2) !== void 0);
       case "afv": {
@@ -162867,11 +162922,15 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
     return this.collectGeometry(node, index2).length > 0;
   }
   hasRenderablePorts(node, index2) {
-    const hasOwnPort = membersOf(node).some((m) => isPortDecl(m) && m.isDef !== true);
-    if (hasOwnPort)
-      return true;
-    const typeDef = this.resolveType(node, index2);
-    return !!typeDef && membersOf(typeDef).some((m) => isPortDecl(m) && m.isDef !== true);
+    return [node, ...this.inheritedTypesOf(node, index2)].some((source) => membersOf(source).some((m) => isPortDecl(m) && m.isDef !== true));
+  }
+  // REQ-192, issue #233 — the named part usages a part shows when expanded: its
+  // own and the ones it inherits, through its typing definition or a `:>`
+  // specialization.
+  // The predicate form of `childUsagesOf`, so an anchor that only INHERITS
+  // internals is recognised as having them.
+  hasNestedPartUsages(node, index2) {
+    return [node, ...this.inheritedTypesOf(node, index2)].some((source) => this.nestedUsages(source, isPartDecl).some((n2) => nameOf2(n2) !== void 0));
   }
   nestedUsages(node, guard) {
     return membersOf(node).filter((m) => guard(m) && m.isDef !== true);
@@ -163524,23 +163583,27 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       return id2;
     };
     const childUsagesOf = (part) => {
-      const textual = this.nestedUsages(part, isPartDecl);
-      const def = part.isDef === true ? void 0 : this.resolveType(part, index2);
-      if (!def)
-        return textual;
-      const have = new Set(textual.map((u) => nameOf2(u)).filter((x) => !!x));
-      return [...textual, ...this.nestedUsages(def, isPartDecl).filter((u) => !have.has(nameOf2(u)))];
-    };
-    const connectMembersOf = (part) => {
-      const own = membersOf(part);
-      const def = part.isDef === true ? void 0 : this.resolveType(part, index2);
-      return def ? [...own, ...membersOf(def)] : own;
+      const out = this.nestedUsages(part, isPartDecl);
+      const have = new Set(out.map(effectiveNameOf).filter((x) => !!x));
+      for (const source of this.inheritedTypesOf(part, index2)) {
+        for (const usage of this.nestedUsages(source, isPartDecl)) {
+          const nm = effectiveNameOf(usage);
+          if (nm !== void 0) {
+            if (have.has(nm))
+              continue;
+            have.add(nm);
+          }
+          out.push(usage);
+        }
+      }
+      return out;
     };
+    const effectiveMembersOf = (part) => [part, ...this.inheritedTypesOf(part, index2)].flatMap((source) => membersOf(source));
     const childResolver = (childInfos, self2) => {
       const localPort = /* @__PURE__ */ new Map();
       const localNode = /* @__PURE__ */ new Map();
       const addPorts = (usage, id2, bare) => {
-        const nm = nameOf2(usage);
+        const nm = effectiveNameOf(usage);
         if (!nm)
           return;
         localNode.set(nm, id2);
@@ -163592,7 +163655,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       const editMeta = ivEditMeta(part, instanceId, typeDef, localUsage, localPath, uri);
       const children2 = depth < 8 && !(typeQ !== void 0 && seenTypes.has(typeQ)) ? childUsagesOf(part) : [];
       const performLabelOf = (m) => [nameOf2(m), ...m.chainSegs ?? []].filter((segment) => !!segment).at(-1) ?? "perform";
-      const performedActions = depth < 8 && !(typeQ !== void 0 && seenTypes.has(typeQ)) ? [...membersOf(part), ...typeDef ? membersOf(typeDef) : []].filter((m) => m.$type === "PerformStmt" && !!nameOf2(m)).filter((m, i, list) => list.findIndex((o) => performLabelOf(o) === performLabelOf(m)) === i) : [];
+      const performedActions = depth < 8 && !(typeQ !== void 0 && seenTypes.has(typeQ)) ? effectiveMembersOf(part).filter((m) => m.$type === "PerformStmt" && !!nameOf2(m)).filter((m, i, list) => list.findIndex((o) => performLabelOf(o) === performLabelOf(m)) === i) : [];
       const emitOwnedActions = (frameOf) => {
         for (const act of performedActions) {
           const actId = `${frameOf}::${performLabelOf(act)}`;
@@ -163614,7 +163677,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       if (children2.length > 0 || performedActions.length > 0) {
         frames.push({
           id: instanceId,
-          label: nameOf2(part) ?? lastSeg(instanceId),
+          label: effectiveNameOf(part) ?? lastSeg(instanceId),
           keyword: keywordFor(part),
           parent: parentFrame,
           // REQ-363 — same presentation data container parts that leaf part
@@ -163628,16 +163691,16 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
           meta: editMeta
         });
         const nextSeen = typeQ ? /* @__PURE__ */ new Set([...seenTypes, typeQ]) : seenTypes;
-        const childInfos = children2.map((cu) => ({ usage: cu, id: `${instanceId}::${nameOf2(cu)}` }));
+        const childInfos = children2.map((cu) => ({ usage: cu, id: `${instanceId}::${effectiveNameOf(cu) ?? lastSeg(qnameOf(cu) || "")}` }));
         for (const { usage, id: id2 } of childInfos) {
-          renderInstance(usage, id2, instanceId, nextSeen, depth + 1, localUsage, [...localPath, nameOf2(usage) ?? lastSeg(id2)]);
+          renderInstance(usage, id2, instanceId, nextSeen, depth + 1, localUsage, [...localPath, effectiveNameOf(usage) ?? lastSeg(id2)]);
         }
         emitOwnedActions(instanceId);
-        this.emitInterconnectEdges(connectMembersOf(part), childResolver(childInfos, { usage: part, id: instanceId }), children2, index2, uri, nodes, edges, eRef, instanceId);
+        this.emitInterconnectEdges(effectiveMembersOf(part), childResolver(childInfos, { usage: part, id: instanceId }), children2, index2, uri, nodes, edges, eRef, instanceId);
       } else {
         nodes.push({
           id: instanceId,
-          name: nameOf2(part) ?? lastSeg(instanceId),
+          name: effectiveNameOf(part) ?? lastSeg(instanceId),
           keyword: keywordFor(part),
           isDef: part.isDef === true,
           shape: "box",
@@ -163927,7 +163990,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
     const all = [...ast_utils_exports.streamAllContents(scope)];
     const isUsagePart = (n2) => isPartDecl(n2) && n2.isDef !== true && nameOf2(n2) !== void 0;
     const isDefPart = (n2) => isPartDecl(n2) && n2.isDef === true && nameOf2(n2) !== void 0;
-    const hasInternalParts = (d) => this.nestedUsages(d, isPartDecl).length > 0;
+    const hasInternalParts = (d) => [d, ...this.inheritedTypesOf(d, index2)].some((source) => this.nestedUsages(source, isPartDecl).length > 0);
     const insideAPart = (n2) => {
       let c = n2.$container;
       while (c && c !== scope) {
@@ -166916,9 +166979,9 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
     const ports = [];
     const map3 = /* @__PURE__ */ new Map();
     const visibleNames = /* @__PURE__ */ new Set();
-    const usageName = nameOf2(node);
+    const usageName = effectiveNameOf(node);
     const makePort = (portNode, inheritedFromType, parentPortId, parentPath) => {
-      const pn = nameOf2(portNode);
+      const pn = effectiveNameOf(portNode);
       if (!pn)
         return void 0;
       const portId = parentPortId ? `${parentPortId}.${pn}` : `${ownerId}.${pn}`;
@@ -166984,7 +167047,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       for (const { member, inherited } of nestedSources) {
         if (!isPortDecl(member) || member.isDef === true)
           continue;
-        const nn = nameOf2(member);
+        const nn = effectiveNameOf(member);
         if (!nn || nestedSeen.has(nn))
           continue;
         nestedSeen.add(nn);
@@ -166996,7 +167059,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       }
     };
     const addPort = (portNode, inheritedFromType) => {
-      const pn = nameOf2(portNode);
+      const pn = effectiveNameOf(portNode);
       if (!pn || visibleNames.has(pn))
         return;
       visibleNames.add(pn);
@@ -167009,9 +167072,8 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
     for (const m of membersOf(node))
       if (isPortDecl(m) && m.isDef !== true)
         addPort(m, false);
-    const typeDef = this.resolveType(node, index2);
-    if (typeDef) {
-      for (const m of membersOf(typeDef))
+    for (const inherited of this.inheritedTypesOf(node, index2)) {
+      for (const m of membersOf(inherited))
         if (isPortDecl(m) && m.isDef !== true)
           addPort(m, true);
     }
@@ -198291,7 +198353,7 @@ async function runExport(command) {
 }
 
 // src/main.ts
-var VERSION2 = true ? "0.18.0" : "dev";
+var VERSION2 = true ? "0.19.0" : "dev";
 function display(file) {
   const rel2 = path9.relative(process.cwd(), file);
   return rel2 && !rel2.startsWith("..") ? rel2.split(path9.sep).join("/") : file;