@likec4/language-server 1.16.0 → 1.17.1

package/dist/shared/{language-server.Bd3NZ8uH.cjs → language-server.D2QdbOJO.cjs}

@@ -1048,7 +1048,13 @@ class ComputeCtx {
         ...autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep },
         ...autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }
       },
-      nodes: remeda.map(nodes, remeda.omit(["notation"])),
+      nodes: remeda.map(nodes, (n) => {
+        delete n.notation;
+        if (n.icon === "none") {
+          delete n.icon;
+        }
+        return n;
+      }),
       edges: applyCustomRelationProperties(rules, nodes, sortedEdges),
       ...elementNotations.length > 0 && {
         notation: {
@@ -1514,7 +1520,12 @@ class DynamicViewComputeCtx {
       title,
       relations,
       tags,
-      navigateTo: derivedNavigateTo
+      navigateTo: derivedNavigateTo,
+      head,
+      tail,
+      color,
+      line,
+      notation
     } = this.findRelations(source, target);
     const navigateTo = remeda.isTruthy(stepNavigateTo) && stepNavigateTo !== this.view.id ? stepNavigateTo : derivedNavigateTo;
     this.steps.push({
@@ -1526,7 +1537,12 @@ class DynamicViewComputeCtx {
       relations: relations ?? [],
       isBackward: isBackward ?? false,
       ...navigateTo ? { navigateTo } : {},
-      ...tags ? { tags } : {}
+      ...tags ? { tags } : {},
+      ...head ? { head } : {},
+      ...tail ? { tail } : {},
+      ...color ? { color } : {},
+      ...line ? { line } : {},
+      ...notation ? { notation } : {}
     });
   }
   compute() {
@@ -1618,7 +1634,13 @@ class DynamicViewComputeCtx {
         ...autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep },
         ...autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }
       },
-      nodes: remeda.map(nodes, remeda.omit(["notation"])),
+      nodes: remeda.map(nodes, (n) => {
+        delete n.notation;
+        if (n.icon === "none") {
+          delete n.icon;
+        }
+        return n;
+      }),
       edges,
       ...elementNotations.length > 0 && {
         notation: {
@@ -1634,7 +1656,12 @@ class DynamicViewComputeCtx {
         title: null,
         tags: null,
         relations: null,
-        navigateTo: null
+        navigateTo: null,
+        tail: null,
+        head: null,
+        color: null,
+        line: null,
+        notation: null
       };
     }
     const alltags = remeda.pipe(
@@ -1646,13 +1673,6 @@ class DynamicViewComputeCtx {
     const tags = remeda.hasAtLeast(alltags, 1) ? alltags : null;
     const relations = remeda.hasAtLeast(relationships, 1) ? remeda.map(relationships, (r) => r.id) : null;
     const relation = remeda.only(relationships) || relationships.find((r) => r.source === source.id && r.target === target.id);
-    const title = remeda.isTruthy(relation?.title) ? relation.title : remeda.pipe(
-      relationships,
-      remeda.map((r) => r.title),
-      remeda.filter(remeda.isTruthy),
-      remeda.unique(),
-      remeda.only()
-    );
     const navigateTo = !!relation?.navigateTo && relation.navigateTo !== this.view.id ? relation.navigateTo : remeda.pipe(
       relationships,
       remeda.map((r) => r.navigateTo),
@@ -1661,11 +1681,31 @@ class DynamicViewComputeCtx {
       remeda.unique(),
       remeda.only()
     );
+    const commonProperties = relationships.reduce((acc, r) => {
+      remeda.isTruthy(r.title) && acc.title.push(r.title);
+      remeda.isTruthy(r.tail) && acc.tail.push(r.tail);
+      remeda.isTruthy(r.head) && acc.head.push(r.head);
+      remeda.isTruthy(r.color) && acc.color.push(r.color);
+      remeda.isTruthy(r.line) && acc.line.push(r.line);
+      return acc;
+    }, {
+      title: [],
+      tail: [],
+      head: [],
+      color: [],
+      line: [],
+      notation: []
+    });
     return {
-      title: title ?? null,
       tags,
       relations,
-      navigateTo: navigateTo ?? null
+      navigateTo: navigateTo ?? null,
+      title: remeda.pipe(commonProperties.title, remeda.unique(), remeda.only()) ?? null,
+      tail: remeda.pipe(commonProperties.tail, remeda.unique(), remeda.only()) ?? null,
+      head: remeda.pipe(commonProperties.head, remeda.unique(), remeda.only()) ?? null,
+      color: remeda.pipe(commonProperties.color, remeda.unique(), remeda.only()) ?? null,
+      line: remeda.pipe(commonProperties.line, remeda.unique(), remeda.only()) ?? null,
+      notation: remeda.pipe(commonProperties.notation, remeda.unique(), remeda.only()) ?? null
     };
   }
 }

package/dist/shared/{language-server.C5gxpVUH.mjs → language-server.DGrBGmsd.mjs}

@@ -1,5 +1,5 @@
 import { isViewRuleGlobalPredicateRef, isViewRuleGlobalStyle, Expr, whereOperatorAsPredicate, parentFqn, nonexhaustive, ComputedNode, isViewRuleGroup, isViewRulePredicate, isViewRuleStyle, nonNullable, ElementKind, compareByFqnHierarchically, DefaultThemeColor, DefaultElementShape, compareRelations, invariant, compareNatural, hasAtLeast, isAncestor, isScopedElementView, isViewRuleAutoLayout, commonAncestor, commonHead, StepEdgeId, isDynamicViewParallelSteps, isDynamicViewIncludeRule, DefaultRelationshipColor, DefaultLineStyle, DefaultArrowType, ancestorsFqn, isSameHierarchy } from '@likec4/core';
-import { isNullish, pipe, map, pick, mapToObj, isTruthy, omitBy, isEmpty, filter, isNot, anyPass, forEach, isDefined, groupBy, prop, mapValues, piped, unique, entries, flatMap, sortBy, sort, tap, difference, allPass, concat, omit, hasAtLeast as hasAtLeast$1, only, reduce, last, reverse, isNonNull, first, isString, isArray } from 'remeda';
+import { isNullish, pipe, map, pick, mapToObj, isTruthy, omitBy, isEmpty, filter, isNot, anyPass, forEach, isDefined, groupBy, prop, mapValues, piped, unique, entries, flatMap, sortBy, sort, tap, difference, allPass, concat, hasAtLeast as hasAtLeast$1, only, reduce, last, reverse, isNonNull, first, isString, isArray } from 'remeda';
 import dagre from '@dagrejs/dagre';
 import { logger } from '@likec4/log';
 import objectHash from 'object-hash';
@@ -1041,7 +1041,13 @@ class ComputeCtx {
         ...autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep },
         ...autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }
       },
-      nodes: map(nodes, omit(["notation"])),
+      nodes: map(nodes, (n) => {
+        delete n.notation;
+        if (n.icon === "none") {
+          delete n.icon;
+        }
+        return n;
+      }),
       edges: applyCustomRelationProperties(rules, nodes, sortedEdges),
       ...elementNotations.length > 0 && {
         notation: {
@@ -1507,7 +1513,12 @@ class DynamicViewComputeCtx {
       title,
       relations,
       tags,
-      navigateTo: derivedNavigateTo
+      navigateTo: derivedNavigateTo,
+      head,
+      tail,
+      color,
+      line,
+      notation
     } = this.findRelations(source, target);
     const navigateTo = isTruthy(stepNavigateTo) && stepNavigateTo !== this.view.id ? stepNavigateTo : derivedNavigateTo;
     this.steps.push({
@@ -1519,7 +1530,12 @@ class DynamicViewComputeCtx {
       relations: relations ?? [],
       isBackward: isBackward ?? false,
       ...navigateTo ? { navigateTo } : {},
-      ...tags ? { tags } : {}
+      ...tags ? { tags } : {},
+      ...head ? { head } : {},
+      ...tail ? { tail } : {},
+      ...color ? { color } : {},
+      ...line ? { line } : {},
+      ...notation ? { notation } : {}
     });
   }
   compute() {
@@ -1611,7 +1627,13 @@ class DynamicViewComputeCtx {
         ...autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep },
         ...autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }
       },
-      nodes: map(nodes, omit(["notation"])),
+      nodes: map(nodes, (n) => {
+        delete n.notation;
+        if (n.icon === "none") {
+          delete n.icon;
+        }
+        return n;
+      }),
       edges,
       ...elementNotations.length > 0 && {
         notation: {
@@ -1627,7 +1649,12 @@ class DynamicViewComputeCtx {
         title: null,
         tags: null,
         relations: null,
-        navigateTo: null
+        navigateTo: null,
+        tail: null,
+        head: null,
+        color: null,
+        line: null,
+        notation: null
       };
     }
     const alltags = pipe(
@@ -1639,13 +1666,6 @@ class DynamicViewComputeCtx {
     const tags = hasAtLeast$1(alltags, 1) ? alltags : null;
     const relations = hasAtLeast$1(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),
@@ -1654,11 +1674,31 @@ class DynamicViewComputeCtx {
       unique(),
       only()
     );
+    const commonProperties = relationships.reduce((acc, r) => {
+      isTruthy(r.title) && acc.title.push(r.title);
+      isTruthy(r.tail) && acc.tail.push(r.tail);
+      isTruthy(r.head) && acc.head.push(r.head);
+      isTruthy(r.color) && acc.color.push(r.color);
+      isTruthy(r.line) && acc.line.push(r.line);
+      return acc;
+    }, {
+      title: [],
+      tail: [],
+      head: [],
+      color: [],
+      line: [],
+      notation: []
+    });
     return {
-      title: title ?? null,
       tags,
       relations,
-      navigateTo: navigateTo ?? null
+      navigateTo: navigateTo ?? null,
+      title: pipe(commonProperties.title, unique(), only()) ?? null,
+      tail: pipe(commonProperties.tail, unique(), only()) ?? null,
+      head: pipe(commonProperties.head, unique(), only()) ?? null,
+      color: pipe(commonProperties.color, unique(), only()) ?? null,
+      line: pipe(commonProperties.line, unique(), only()) ?? null,
+      notation: pipe(commonProperties.notation, unique(), only()) ?? null
     };
   }
 }