sysml-diagram 0.21.1 → 0.22.0

package/out/main.js

@@ -162363,10 +162363,7 @@ function boundText(b) {
     return String(b.intVal);
   return b.bound;
 }
-function multText(node) {
-  if (!node)
-    return void 0;
-  const m = node.multiplicity;
+function multiplicityText(m) {
   if (!m)
     return void 0;
   const lo = boundText(m.lower);
@@ -162375,6 +162372,11 @@ function multText(node) {
     return void 0;
   return hi == null || hi === lo ? `[${lo}]` : `[${lo}..${hi}]`;
 }
+function multText(node) {
+  if (!node)
+    return void 0;
+  return multiplicityText(node.multiplicity);
+}
 var typeText = (node) => node.typing?.type?.$refText || void 0;
 var isConjugated = (node) => node.typing?.conjugate === true;
 var isAbstract = (node) => Array.isArray(node.modifiers) && node.modifiers.includes("abstract");
@@ -162505,6 +162507,18 @@ var modifiersOf = (node) => {
   const mods = node.modifiers;
   return Array.isArray(mods) ? mods : [];
 };
+var ANONYMOUS_INTERFACE_NAME = "(anonymous)";
+var isEndMember = (node) => node.$type === "EndDecl" || modifiersOf(node).includes("end");
+function endRowText(node) {
+  const end = node;
+  const name = nameOf2(node) ?? end.innerName;
+  const type = typeText(node) ?? end.innerTyping?.type?.$refText;
+  const mult = multText(node) ?? multiplicityText(end.innerMultiplicity) ?? multiplicityText(end.endMultiplicity);
+  const head2 = `${name ?? ""}${type ? `${name ? " " : ""}: ${type}` : ""}`.trim();
+  if (!head2)
+    return void 0;
+  return `${head2}${mult ? ` ${mult}` : ""}`;
+}
 var portionKindOf = (node) => modifiersOf(node).find((m) => m === "timeslice" || m === "snapshot");
 var isIndividualOccurrence = (node) => modifiersOf(node).includes("individual");
 var isOccurrenceModified = (node) => portionKindOf(node) !== void 0 || isIndividualOccurrence(node);
@@ -163088,7 +163102,10 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
   // and the feature it redefines. The latter can contribute its own body and its
   // type's complete inventory, so following only typing definitions turns an
   // anonymous `part :>> inheritedPart` into an empty leaf.
-  inheritedFeatureOwnersOf(node, index2) {
+  inheritedFeatureOwnersOf(node, index2, resolving = /* @__PURE__ */ new Set()) {
+    if (resolving.has(node))
+      return [];
+    resolving.add(node);
     const chain = [];
     const seen = /* @__PURE__ */ new Set([node]);
     const queue = [];
@@ -163101,22 +163118,26 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
     };
     const addTargets = (owner) => {
       for (const target of featureInheritanceTargets(owner)) {
-        add(this.resolveFeatureInheritanceTarget(owner, target, index2));
+        add(this.resolveFeatureInheritanceTarget(owner, target, index2, resolving));
       }
     };
-    if (node.isDef === true)
-      addTargets(node);
-    else {
-      add(this.resolveType(node, index2));
-      addTargets(node);
-    }
-    while (queue.length > 0) {
-      const owner = queue.shift();
-      if (owner.isDef !== true)
-        add(this.resolveType(owner, index2));
-      addTargets(owner);
+    try {
+      if (node.isDef === true)
+        addTargets(node);
+      else {
+        add(this.resolveType(node, index2));
+        addTargets(node);
+      }
+      while (queue.length > 0) {
+        const owner = queue.shift();
+        if (owner.isDef !== true)
+          add(this.resolveType(owner, index2));
+        addTargets(owner);
+      }
+      return chain;
+    } finally {
+      resolving.delete(node);
     }
-    return chain;
   }
   /** Declaration that an anonymous local redefinition specializes. Direct edits
    * in definition-sync mode address this feature, while child insertion still
@@ -163131,7 +163152,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
    * names a sibling supplied by the containing usage or one of its types. A
    * global simple-name lookup can select the redeclaration itself or an
    * unrelated namesake, so the containing feature inventory is checked first. */
-  resolveFeatureInheritanceTarget(owner, target, index2) {
+  resolveFeatureInheritanceTarget(owner, target, index2, resolving) {
     const path10 = this.resolvedFeatureInheritancePath(owner, target);
     if (path10.qualified) {
       return path10.target === owner ? void 0 : path10.target;
@@ -163140,7 +163161,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       const wanted = lastSeg(target);
       const container = owner.$container;
       if (container) {
-        for (const source of [container, ...this.inheritedFeatureOwnersOf(container, index2)]) {
+        for (const source of [container, ...this.inheritedFeatureOwnersOf(container, index2, resolving)]) {
           const inherited = membersOf(source).find((member) => member !== owner && effectiveNameOf(member) === wanted);
           if (inherited)
             return inherited;
@@ -163697,7 +163718,8 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
     const all = [...ast_utils_exports.streamAllContents(scope)];
     const defNodes = all.filter((n2) => isDefinitionNode(n2) && nameOf2(n2));
     const packageOverview = isPackage(ctx.anchor) || isDocument(ctx.anchor);
-    const hasOwnedMemberNode = all.some((n2) => isPackage(n2) && !!nameOf2(n2) || isDefinitionNode(n2) && !!nameOf2(n2) || this.isViewlessUsage(n2) && this.isDirectPackageMember(n2) || isPartDecl(n2) && n2.isDef !== true && !!nameOf2(n2) && this.isDirectPackageMember(n2));
+    const isPackageInterfaceUsage = (n2) => isInterfaceDecl(n2) && n2.isDef !== true && !!nameOf2(n2) && this.isDirectPackageMember(n2);
+    const hasOwnedMemberNode = all.some((n2) => isPackage(n2) && !!nameOf2(n2) || isDefinitionNode(n2) && !!nameOf2(n2) || this.isViewlessUsage(n2) && this.isDirectPackageMember(n2) || isPackageInterfaceUsage(n2) || isPartDecl(n2) && n2.isDef !== true && !!nameOf2(n2) && this.isDirectPackageMember(n2));
     const packageNodes = [
       ...packageOverview && hasOwnedMemberNode && isPackage(scope) && nameOf2(scope) ? [scope] : [],
       ...all.filter((p) => isPackage(p) && nameOf2(p))
@@ -163755,7 +163777,12 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
         meta: { gvPackageMember: true }
       });
     }
-    const packageUsageNodes = [...viewlessUsageNodes, ...packagePartUsageNodes];
+    const packageInterfaceUsageNodes = all.filter(isPackageInterfaceUsage);
+    for (const u of packageInterfaceUsageNodes) {
+      const def = this.resolveType(u, index2);
+      pushNode(u, "box", false, { type: def && ids.has(def) ? void 0 : typeText(u) });
+    }
+    const packageUsageNodes = [...viewlessUsageNodes, ...packagePartUsageNodes, ...packageInterfaceUsageNodes];
     for (const p of packageNodes) {
       const pn = p;
       pushNode(p, "package", false, {
@@ -164820,25 +164847,59 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       } else if (isInterfaceDecl(m) && m.isDef !== true) {
         const clause = m.connect;
         if (clause) {
-          const from = resolveEnd(this.connectorEndPath(clause.source) ?? "");
-          const to = resolveEnd(this.connectorEndPath(clause.target) ?? "");
-          if (from && to && supportsEndpoints("interface", [from, to])) {
-            const name = nameOf2(m);
-            const type = typeText(m);
-            const label = ["\xABinterface\xBB", nameOf2(m) ?? "", typeText(m) ? `: ${typeText(m)}` : ""].filter(Boolean).join(" ").trim();
+          const rawEnds = clause.ends?.length ? clause.ends : [clause.source, clause.target];
+          const resolvedEnds = rawEnds.map((end) => ({ id: resolveEnd(this.connectorEndPath(end) ?? ""), end })).filter((x) => !!x.id);
+          const name = nameOf2(m);
+          const type = typeText(m);
+          const label = ["\xABinterface\xBB", nameOf2(m) ?? "", typeText(m) ? `: ${typeText(m)}` : ""].filter(Boolean).join(" ").trim();
+          const docks = resolvedEnds.length === rawEnds.length && supportsEndpoints("interface", resolvedEnds.map(({ id: id2 }) => id2));
+          if (docks && resolvedEnds.length === 2) {
             edges.push({
               id: `e${eRef.n++}`,
-              from,
-              to,
+              from: resolvedEnds[0].id,
+              to: resolvedEnds[1].id,
               kind: "interface",
               name,
               type,
               isDef: false,
               label,
-              endLabelFrom: multText(clause.source),
-              endLabelTo: multText(clause.target),
+              endLabelFrom: multText(resolvedEnds[0].end),
+              endLabelTo: multText(resolvedEnds[1].end),
               ...relationshipFields(m)
             });
+          } else if (docks && resolvedEnds.length > 2) {
+            const dotId = `__nary_${eRef.n}__`;
+            nodes.push(dot(dotId, label, m));
+            for (const { id: endId, end } of resolvedEnds) {
+              edges.push({
+                id: `e${eRef.n++}`,
+                from: dotId,
+                to: endId,
+                kind: "interface",
+                name,
+                type,
+                isDef: false,
+                label,
+                endLabelTo: multText(end),
+                ...relationshipFields(m)
+              });
+            }
+          } else if (resolvedEnds.length < rawEnds.length) {
+            nodes.push({
+              id: `__interface_${eRef.n++}__`,
+              // The box carries its type in its own `type` field, so
+              // naming an anonymous usage after that type would read
+              // as `FuelInterface : FuelInterface`.
+              name: nameOf2(m) ?? ANONYMOUS_INTERFACE_NAME,
+              keyword: "interface",
+              isDef: false,
+              shape: "box",
+              type: typeText(m),
+              multiplicity: multText(m),
+              frame: frameId,
+              compartments: this.interfaceFallbackCompartments(m, uri, index2),
+              source: sourceOf2(m, uri)
+            });
           }
         }
       } else if (isConnectionDecl(m) && m.isDef !== true) {
@@ -168915,6 +168976,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
     } else if (subjectMandatory) {
       add("subject", [{ text: "\u26A0 none declared" }]);
     }
+    add("ends", members.filter(isEndMember).map((m) => item(m, endRowText(m) ?? statementText(m))));
     add("attributes", [
       ...usages(isAttributeDecl).map((a2) => item(a2)),
       ...inheritedRows((member) => isAttributeDecl(member) && isOrdinaryMember(member))
@@ -168924,6 +168986,7 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
       add("ports", usages(isPortDecl).map((m) => item(m)));
       add("parts", usages(isPartDecl).filter(notPortion).map((m) => item(m)));
     }
+    add("interfaces", members.filter((m) => isInterfaceDecl(m) && m.isDef !== true && isOrdinaryMember(m)).map((m) => item(m, this.interfaceRowText(m))));
     add("features", members.filter((m) => m.$type === "FeatureShorthand" || m.$type === "FeatureRedefinitionShorthand").filter(isOrdinaryMember).filter((m) => !isOccurrenceModified(m)).map((m) => item(m, canonicalFeatureText(m))));
     const undirected = (guard) => usages(guard);
     add("items", undirected(isItemDecl).filter(notPortion).map((m) => item(m)));
@@ -169019,6 +169082,44 @@ var SysmlDiagramModelProvider = class _SysmlDiagramModelProvider {
     add("satisfies", members.filter((m) => m.$type === "SatisfyStmt").map((m) => item(m, String(m.target ?? ""))));
     return out.length ? out : void 0;
   }
+  // REQ-195 — Interface and binding guidance (`interfaces` row text)
+  // issue #110 — the textual row (and node label) of an interface usage:
+  // `name : Type connect a.p to b.q`. The connect ends are kept because this
+  // row is the depiction a reader falls back to when the edge is not drawn, and
+  // without them an anonymous typed usage would read as its type alone. The two
+  // keyword-less shorthands (`interface a.p to b.q;` and an n-ary
+  // `connect (a, b, c)`) are spelled the same way.
+  interfaceRowText(node) {
+    const n2 = node;
+    const type = typeText(node);
+    const mult = multText(node);
+    const name = nameOf2(node) ?? ANONYMOUS_INTERFACE_NAME;
+    const head2 = `${name}${type ? ` : ${type}` : ""}${mult ? ` ${mult}` : ""}`;
+    const clause = n2.connect;
+    const ends = clause?.ends?.length ? `connect (${clause.ends.map((end) => this.connectorEndPath(end) ?? "?").join(", ")})` : clause ? `connect ${this.connectorEndPath(clause.source) ?? "?"} to ${this.connectorEndPath(clause.target) ?? "?"}` : n2.target !== void 0 ? `${[nameOf2(node) ?? "", ...n2.srcSegs ?? []].filter(Boolean).join(".")} to ${this.featurePath(n2.target) ?? "?"}` : void 0;
+    if (ends && !clause)
+      return ends;
+    return [head2, ends].filter(Boolean).join(" ");
+  }
+  // REQ-195 — Interface and binding guidance (usage-node fallback body)
+  // issue #110 — the body of the `«interface»` usage node the IV draws when the
+  // connect ends do not dock on the canvas. The written end paths ARE the
+  // information the missing edge would have carried, so they read as the node's
+  // `ends` compartment (OMG SysML 8.2.3.14), after any end members it declares.
+  interfaceFallbackCompartments(node, uri, index2) {
+    const clause = node.connect;
+    const paths = clause?.ends?.length ? clause.ends.map((end) => this.connectorEndPath(end) ?? "?") : clause ? [this.connectorEndPath(clause.source) ?? "?", this.connectorEndPath(clause.target) ?? "?"] : [];
+    const compartments = [...this.compartmentsFor(node, uri, index2) ?? []];
+    if (!paths.length)
+      return compartments.length ? compartments : void 0;
+    const items = paths.map((text) => ({ text }));
+    const existing = compartments.find((compartment) => compartment.title === "ends");
+    if (existing)
+      existing.items = [...existing.items, ...items];
+    else
+      compartments.push({ title: "ends", items });
+    return compartments;
+  }
   refText(v) {
     if (typeof v === "string")
       return v;
@@ -202278,7 +202379,7 @@ async function runExport(command) {
 }
 
 // src/main.ts
-var VERSION2 = true ? "0.21.1" : "dev";
+var VERSION2 = true ? "0.22.0" : "dev";
 function display(file) {
   const rel2 = path9.relative(process.cwd(), file);
   return rel2 && !rel2.startsWith("..") ? rel2.split(path9.sep).join("/") : file;