@likec4/language-server 1.9.0 → 1.10.0

package/dist/shared/{language-server.CCB4ESN5.mjs → language-server.DtBRb9os.mjs}

@@ -1,5 +1,5 @@
-import { Expr, whereOperatorAsPredicate, parentFqn, nonexhaustive, isViewRuleStyle, compareByFqnHierarchically, DefaultThemeColor, DefaultElementShape, compareRelations, invariant, nonNullable, isAncestor, isViewRulePredicate, ancestorsFqn, isViewRuleAutoLayout, isScopedElementView, commonAncestor, isDynamicViewIncludeRule, StepEdgeId, DefaultRelationshipColor, DefaultLineStyle, DefaultArrowType, isSameHierarchy } from '@likec4/core';
-import { pipe, map, pick, mapToObj, isTruthy, isNullish, omitBy, isEmpty, filter, anyPass, isDefined, groupBy, prop, mapValues, piped, unique, entries, flatMap, sortBy, sort, difference, allPass, omit, hasAtLeast, first, isString, isArray } from 'remeda';
+import { Expr, whereOperatorAsPredicate, parentFqn, nonexhaustive, isViewRuleStyle, compareByFqnHierarchically, DefaultThemeColor, DefaultElementShape, compareRelations, invariant, nonNullable, isAncestor, isViewRulePredicate, ancestorsFqn, isViewRuleAutoLayout, isScopedElementView, commonAncestor, StepEdgeId, isDynamicViewParallelSteps, isDynamicViewIncludeRule, DefaultRelationshipColor, DefaultLineStyle, DefaultArrowType, isSameHierarchy } from '@likec4/core';
+import { pipe, map, pick, mapToObj, isTruthy, isNullish, omitBy, isEmpty, filter, anyPass, isDefined, groupBy, prop, mapValues, piped, unique, entries, flatMap, sortBy, sort, difference, allPass, omit, hasAtLeast, reduce, only, isNonNull, isString, isArray } from 'remeda';
 import graphlib, { Graph } from '@dagrejs/graphlib';
 import objectHash from 'object-hash';
 
@@ -288,8 +288,8 @@ function buildElementNotations(nodes) {
       }))
     ),
     sortBy(
-      prop("title"),
       prop("shape"),
+      prop("title"),
       [
         (n) => n.kinds.length,
         "desc"
@@ -614,13 +614,11 @@ const filterEdges = (edges, where) => {
   );
 };
 const filterRelations = (edges, where) => {
-  if (!where) {
-    return edges.flatMap((e) => e.relations);
-  }
   return pipe(
     edges,
     flatMap((e) => e.relations),
-    filter(where)
+    where ? filter(where) : Identity,
+    unique()
   );
 };
 function includeIncomingExpr(expr, where) {
@@ -868,7 +866,7 @@ class ComputeCtx {
   computeEdges() {
     return this.ctxEdges.map((e) => {
       invariant(hasAtLeast(e.relations, 1), "Edge must have at least one relation");
-      const relations = e.relations.toSorted(compareRelations);
+      const relations = sort(e.relations, compareRelations);
       const source = e.source.id;
       const target = e.target.id;
       const edge = {
@@ -880,48 +878,62 @@ class ComputeCtx {
         relations: relations.map((r) => r.id)
       };
       let relation;
-      if (relations.length === 1) {
-        relation = relations[0];
-      } else {
-        relation = relations.find((r) => r.source === source && r.target === target);
-      }
+      relation = relations.length === 1 ? relations[0] : relations.find((r) => r.source === source && r.target === target);
       if (!relation) {
-        relation = relations.reduce((acc, r) => {
-          if (r.color && acc.color !== r.color) {
-            acc.color = void 0;
-          }
-          if (r.kind && acc.kind !== r.kind) {
-            acc.kind = void 0;
-          }
-          if (r.head && acc.head !== r.head) {
-            acc.head = void 0;
-          }
-          if (r.tail && acc.tail !== r.tail) {
-            acc.tail = void 0;
-          }
-          if (r.line && acc.line !== r.line) {
-            acc.line = void 0;
-          }
-          if (r.description && acc.description !== r.description) {
-            acc.description = void 0;
-          }
-          if (r.technology && acc.technology !== r.technology) {
-            acc.technology = void 0;
-          }
-          if (isTruthy(r.title) && acc.title !== r.title) {
-            acc.title = "[...]";
-          }
-          return acc;
-        }, {
-          title: first(flatMap(relations, (r) => isTruthy(r.title) ? r.title : [])) ?? "[...]",
-          description: first(flatMap(relations, (r) => isTruthy(r.description) ? r.description : [])),
-          technology: first(flatMap(relations, (r) => isTruthy(r.technology) ? r.technology : [])),
-          kind: first(flatMap(relations, (r) => isTruthy(r.kind) ? r.kind : [])),
-          head: first(flatMap(relations, (r) => isTruthy(r.head) ? r.head : [])),
-          tail: first(flatMap(relations, (r) => isTruthy(r.tail) ? r.tail : [])),
-          color: first(flatMap(relations, (r) => isTruthy(r.color) ? r.color : [])),
-          line: first(flatMap(relations, (r) => isTruthy(r.line) ? r.line : []))
-        });
+        const allprops = pipe(
+          relations,
+          reduce((acc, r) => {
+            if (isTruthy(r.title) && !acc.title.includes(r.title)) {
+              acc.title.push(r.title);
+            }
+            if (isTruthy(r.description) && !acc.description.includes(r.description)) {
+              acc.description.push(r.description);
+            }
+            if (isTruthy(r.technology) && !acc.technology.includes(r.technology)) {
+              acc.technology.push(r.technology);
+            }
+            if (isTruthy(r.kind) && !acc.kind.includes(r.kind)) {
+              acc.kind.push(r.kind);
+            }
+            if (isTruthy(r.color) && !acc.color.includes(r.color)) {
+              acc.color.push(r.color);
+            }
+            if (isTruthy(r.line) && !acc.line.includes(r.line)) {
+              acc.line.push(r.line);
+            }
+            if (isTruthy(r.head) && !acc.head.includes(r.head)) {
+              acc.head.push(r.head);
+            }
+            if (isTruthy(r.tail) && !acc.tail.includes(r.tail)) {
+              acc.tail.push(r.tail);
+            }
+            if (isTruthy(r.navigateTo) && !acc.navigateTo.includes(r.navigateTo)) {
+              acc.navigateTo.push(r.navigateTo);
+            }
+            return acc;
+          }, {
+            title: [],
+            description: [],
+            technology: [],
+            kind: [],
+            head: [],
+            tail: [],
+            color: [],
+            line: [],
+            navigateTo: []
+          })
+        );
+        relation = {
+          title: only(allprops.title) ?? "[...]",
+          description: only(allprops.description),
+          technology: only(allprops.technology),
+          kind: only(allprops.kind),
+          head: only(allprops.head),
+          tail: only(allprops.tail),
+          color: only(allprops.color),
+          line: only(allprops.line),
+          navigateTo: only(allprops.navigateTo)
+        };
       }
       const tags = unique(flatMap(relations, (r) => r.tags ?? []));
       return Object.assign(
@@ -934,6 +946,7 @@ class ComputeCtx {
         relation.line && { line: relation.line },
         relation.head && { head: relation.head },
         relation.tail && { tail: relation.tail },
+        relation.navigateTo && { navigateTo: relation.navigateTo },
         hasAtLeast(tags, 1) && { tags }
       );
     });
@@ -995,28 +1008,39 @@ class ComputeCtx {
       this.implicits.delete(el);
     }
   }
-  excludeImplicit(...excludes) {
-    for (const el of excludes) {
-      this.implicits.delete(el);
-    }
-  }
+  // protected excludeImplicit(...excludes: Element[]) {
+  //   for (const el of excludes) {
+  //     this.implicits.delete(el)
+  //   }
+  // }
   excludeRelation(...relations) {
+    if (relations.length === 0) {
+      return;
+    }
     const excludedImplicits = /* @__PURE__ */ new Set();
-    for (const relation of relations) {
-      let edge;
-      while (edge = this.ctxEdges.find((e) => e.relations.includes(relation))) {
-        if (edge.relations.length === 1) {
+    const ctxEdges = pipe(
+      this.ctxEdges,
+      map((edge) => {
+        const edgerelations = edge.relations.filter((r) => !relations.includes(r));
+        if (edgerelations.length === 0) {
           excludedImplicits.add(edge.source);
           excludedImplicits.add(edge.target);
-          this.ctxEdges.splice(this.ctxEdges.indexOf(edge), 1);
-          continue;
+          return null;
         }
-        edge.relations = edge.relations.filter((r) => r !== relation);
-      }
-    }
+        if (edgerelations.length !== edge.relations.length) {
+          return {
+            ...edge,
+            relations: edgerelations
+          };
+        }
+        return edge;
+      }),
+      filter(isNonNull)
+    );
     if (excludedImplicits.size === 0) {
       return;
     }
+    this.ctxEdges = ctxEdges;
     const remaining = this.includedElements;
     if (remaining.size === 0) {
       this.implicits.clear();
@@ -1160,7 +1184,7 @@ class ComputeCtx {
     if (isTruthy(relation.technology)) {
       labelParts.push(`[${relation.technology}]`);
     }
-    return labelParts.length > 0 && { label: labelParts.join("\n") };
+    return labelParts.length > 0 ? { label: labelParts.join("\n") } : {};
   }
 }
 
@@ -1193,6 +1217,38 @@ class DynamicViewComputeCtx {
   static compute(view, graph) {
     return new DynamicViewComputeCtx(view, graph).compute();
   }
+  addStep({
+    source: stepSource,
+    target: stepTarget,
+    title: stepTitle,
+    isBackward,
+    navigateTo: stepNavigateTo,
+    ...step
+  }, index, parent) {
+    const id = parent ? StepEdgeId(parent, index) : StepEdgeId(index);
+    const source = this.graph.element(stepSource);
+    const target = this.graph.element(stepTarget);
+    this.explicits.add(source);
+    this.explicits.add(target);
+    const {
+      title,
+      relations,
+      tags,
+      navigateTo: derivedNavigateTo
+    } = this.findRelations(source, target);
+    const navigateTo = isTruthy(stepNavigateTo) && stepNavigateTo !== this.view.id ? stepNavigateTo : derivedNavigateTo;
+    this.steps.push({
+      id,
+      ...step,
+      source,
+      target,
+      title: stepTitle ?? title,
+      relations: relations ?? [],
+      isBackward: isBackward ?? false,
+      ...navigateTo ? { navigateTo } : {},
+      ...tags ? { tags } : {}
+    });
+  }
   compute() {
     const {
       docUri: _docUri,
@@ -1201,27 +1257,21 @@ class DynamicViewComputeCtx {
       steps: viewSteps,
       ...view
     } = this.view;
-    for (let {
-      source: stepSource,
-      target: stepTarget,
-      title: stepTitle,
-      isBackward,
-      ...step
-    } of viewSteps) {
-      const source = this.graph.element(stepSource);
-      const target = this.graph.element(stepTarget);
-      this.explicits.add(source);
-      this.explicits.add(target);
-      const { title, relations, tags } = this.findRelations(source, target);
-      this.steps.push({
-        ...step,
-        source,
-        target,
-        title: isTruthy(stepTitle) ? stepTitle : title,
-        relations: relations ?? [],
-        isBackward: isBackward ?? false,
-        ...tags ? { tags } : {}
-      });
+    let stepNum = 1;
+    for (const step of viewSteps) {
+      if (isDynamicViewParallelSteps(step)) {
+        if (step.__parallel.length === 0) {
+          continue;
+        }
+        if (step.__parallel.length === 1) {
+          this.addStep(step.__parallel[0], stepNum);
+        } else {
+          step.__parallel.forEach((s, i) => this.addStep(s, i + 1, stepNum));
+        }
+      } else {
+        this.addStep(step, stepNum);
+      }
+      stepNum++;
     }
     for (const rule of rules) {
       if (isDynamicViewIncludeRule(rule)) {
@@ -1233,12 +1283,10 @@ class DynamicViewComputeCtx {
     }
     const elements = [...this.explicits];
     const nodesMap = buildComputeNodes(elements);
-    const edges = this.steps.map(({ source, target, relations, title, isBackward, ...step }, index) => {
+    const edges = this.steps.map(({ source, target, relations, title, isBackward, ...step }) => {
       const sourceNode = nonNullable(nodesMap.get(source.id), `Source node ${source.id} not found`);
       const targetNode = nonNullable(nodesMap.get(target.id), `Target node ${target.id} not found`);
-      const stepNum = index + 1;
       const edge = {
-        id: StepEdgeId(stepNum),
         parent: commonAncestor(source.id, target.id),
         source: source.id,
         target: target.id,
@@ -1295,41 +1343,43 @@ class DynamicViewComputeCtx {
   }
   findRelations(source, target) {
     const relationships = unique(this.graph.edgesBetween(source, target).flatMap((e) => e.relations));
-    const alltags = unique(relationships.flatMap((r) => r.tags ?? []));
-    const tags = hasAtLeast(alltags, 1) ? alltags : null;
-    const relations = hasAtLeast(relationships, 1) ? map(relationships, (r) => r.id) : null;
     if (relationships.length === 0) {
       return {
         title: null,
-        tags,
-        relations
-      };
-    }
-    let relation;
-    if (relationships.length === 1) {
-      relation = relationships[0];
-    } else {
-      relation = relationships.find((r) => r.source === source.id && r.target === target.id);
-    }
-    if (relation && isTruthy(relation.title)) {
-      return {
-        title: relation.title,
-        tags,
-        relations
-      };
-    }
-    const labels = unique(relationships.flatMap((r) => isTruthy(r.title) ? r.title : []));
-    if (labels.length === 1) {
-      return {
-        title: labels[0],
-        tags,
-        relations
+        tags: null,
+        relations: null,
+        navigateTo: null
       };
     }
+    const alltags = pipe(
+      relationships,
+      flatMap((r) => r.tags),
+      filter(isTruthy),
+      unique()
+    );
+    const tags = hasAtLeast(alltags, 1) ? alltags : null;
+    const relations = hasAtLeast(relationships, 1) ? map(relationships, (r) => r.id) : null;
+    const relation = only(relationships) || relationships.find((r) => r.source === source.id && r.target === target.id);
+    const title = isTruthy(relation?.title) ? relation.title : pipe(
+      relationships,
+      map((r) => r.title),
+      filter(isTruthy),
+      unique(),
+      only()
+    );
+    const navigateTo = !!relation?.navigateTo && relation.navigateTo !== this.view.id ? relation.navigateTo : pipe(
+      relationships,
+      map((r) => r.navigateTo),
+      filter(isTruthy),
+      filter((v) => v !== this.view.id),
+      unique(),
+      only()
+    );
     return {
-      title: null,
+      title: title ?? null,
       tags,
-      relations
+      relations,
+      navigateTo: navigateTo ?? null
     };
   }
 }