@likec4/language-server 1.15.1 → 1.16.0

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

@@ -3,6 +3,7 @@
 const core = require('@likec4/core');
 const remeda = require('remeda');
 const dagre = require('@dagrejs/dagre');
+const log = require('@likec4/log');
 const objectHash = require('object-hash');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -10,6 +11,51 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 const dagre__default = /*#__PURE__*/_interopDefaultCompat(dagre);
 const objectHash__default = /*#__PURE__*/_interopDefaultCompat(objectHash);
 
+function resolveGlobalRulesInElementView(view, globals) {
+  return view.rules.reduce((acc, rule) => {
+    if (core.isViewRuleGlobalPredicateRef(rule)) {
+      const globalPredicates = globals.predicates[rule.predicateId];
+      if (remeda.isNullish(globalPredicates)) {
+        log.logger.warn(`Global predicate not found: ${rule.predicateId}`);
+        return acc;
+      }
+      return acc.concat(globalPredicates);
+    }
+    if (core.isViewRuleGlobalStyle(rule)) {
+      const globalStyles = globals.styles[rule.styleId];
+      if (remeda.isNullish(globalStyles)) {
+        log.logger.warn(`Global style not found: ${rule.styleId}`);
+        return acc;
+      }
+      return acc.concat(globalStyles);
+    }
+    acc.push(rule);
+    return acc;
+  }, []);
+}
+function resolveGlobalRulesInDynamicView(view, globals) {
+  return view.rules.reduce((acc, rule) => {
+    if (core.isViewRuleGlobalPredicateRef(rule)) {
+      const globalPredicates = globals.dynamicPredicates[rule.predicateId];
+      if (remeda.isNullish(globalPredicates)) {
+        log.logger.warn(`Global predicate not found: ${rule.predicateId}`);
+        return acc;
+      }
+      return acc.concat(globalPredicates);
+    }
+    if (core.isViewRuleGlobalStyle(rule)) {
+      const globalStyles = globals.styles[rule.styleId];
+      if (remeda.isNullish(globalStyles)) {
+        log.logger.warn(`Global style not found: ${rule.styleId}`);
+        return acc;
+      }
+      return acc.concat(globalStyles);
+    }
+    acc.push(rule);
+    return acc;
+  }, []);
+}
+
 function calcViewLayoutHash(view) {
   const tohash = {
     id: view.id,
@@ -186,10 +232,6 @@ function applyViewRuleStyles(_rules, nodes) {
   for (const rule of rules) {
     const predicates = [];
     for (const target of rule.targets) {
-      if (core.Expr.isWildcard(target)) {
-        predicates.push(() => true);
-        break;
-      }
       predicates.push(elementExprToPredicate(target));
     }
     remeda.pipe(
@@ -929,6 +971,25 @@ class ComputeCtx {
   get activeGroup() {
     return this.activeGroupStack[0] ?? this.__rootGroup;
   }
+  get includedElements() {
+    return /* @__PURE__ */ new Set([
+      ...this.explicits,
+      ...this.ctxEdges.flatMap((e) => [e.source, e.target])
+    ]);
+  }
+  get resolvedElements() {
+    return /* @__PURE__ */ new Set([
+      ...this.explicits,
+      ...this.implicits,
+      ...this.ctxEdges.flatMap((e) => [e.source, e.target])
+    ]);
+  }
+  get edges() {
+    return this.ctxEdges;
+  }
+  get root() {
+    return core.isScopedElementView(this.view) ? this.view.viewOf : null;
+  }
   static elementView(view, graph) {
     return new ComputeCtx(view, graph).compute();
   }
@@ -937,9 +998,11 @@ class ComputeCtx {
     const {
       docUri: _docUri,
       // exclude docUri
-      rules,
+      rules: _rules,
+      // exclude rules
       ...view
     } = this.view;
+    const rules = resolveGlobalRulesInElementView(this.view, this.graph.globals);
     const viewPredicates = rules.filter(remeda.anyPass([core.isViewRulePredicate, core.isViewRuleGroup]));
     if (this.root && viewPredicates.length == 0) {
       this.addElement(this.graph.element(this.root));
@@ -951,51 +1014,9 @@ class ComputeCtx {
     }
     const elements = [...this.includedElements];
     const nodesMap = buildComputeNodes(elements, this.groups);
-    const ancestorsOf = (node) => {
-      const ancestors = [];
-      let parent = node.parent;
-      while (parent) {
-        const parentNode = nodesMap.get(parent);
-        if (!parentNode) {
-          break;
-        }
-        ancestors.push(parentNode);
-        parent = parentNode.parent;
-      }
-      return ancestors;
-    };
-    const edgesMap = /* @__PURE__ */ new Map();
     const edges = this.computeEdges();
-    for (const edge of edges) {
-      edgesMap.set(edge.id, edge);
-      const source = nodesMap.get(edge.source);
-      const target = nodesMap.get(edge.target);
-      core.invariant(source, `Source node ${edge.source} not found`);
-      core.invariant(target, `Target node ${edge.target} not found`);
-      const sourceAncestors = ancestorsOf(source);
-      const targetAncestors = ancestorsOf(target);
-      const edgeParent = remeda.last(
-        core.commonHead(
-          remeda.reverse(sourceAncestors),
-          remeda.reverse(targetAncestors)
-        )
-      );
-      edge.parent = edgeParent?.id ?? null;
-      source.outEdges.push(edge.id);
-      target.inEdges.push(edge.id);
-      for (const sourceAncestor of sourceAncestors) {
-        if (sourceAncestor === edgeParent) {
-          break;
-        }
-        sourceAncestor.outEdges.push(edge.id);
-      }
-      for (const targetAncestor of targetAncestors) {
-        if (targetAncestor === edgeParent) {
-          break;
-        }
-        targetAncestor.inEdges.push(edge.id);
-      }
-    }
+    const edgesMap = new Map(edges.map((edge) => [edge.id, edge]));
+    this.linkNodesAndEdges(nodesMap, edges);
     let initialSort = elements.map((e) => core.nonNullable(nodesMap.get(e.id), `Node ${e.id} not found in nodesMap`));
     if (this.groups.length > 0) {
       initialSort = remeda.concat(
@@ -1036,9 +1057,6 @@ class ComputeCtx {
       }
     });
   }
-  get root() {
-    return core.isScopedElementView(this.view) ? this.view.viewOf : null;
-  }
   computeEdges() {
     return this.ctxEdges.map((e) => {
       core.invariant(remeda.hasAtLeast(e.relations, 1), "Edge must have at least one relation");
@@ -1131,21 +1149,36 @@ class ComputeCtx {
       );
     });
   }
-  get includedElements() {
-    return /* @__PURE__ */ new Set([
-      ...this.explicits,
-      ...this.ctxEdges.flatMap((e) => [e.source, e.target])
-    ]);
-  }
-  get resolvedElements() {
-    return /* @__PURE__ */ new Set([
-      ...this.explicits,
-      ...this.implicits,
-      ...this.ctxEdges.flatMap((e) => [e.source, e.target])
-    ]);
-  }
-  get edges() {
-    return this.ctxEdges;
+  linkNodesAndEdges(nodesMap, edges) {
+    for (const edge of edges) {
+      const source = nodesMap.get(edge.source);
+      const target = nodesMap.get(edge.target);
+      core.invariant(source, `Source node ${edge.source} not found`);
+      core.invariant(target, `Target node ${edge.target} not found`);
+      const sourceAncestors = this.ancestorsOf(source, nodesMap);
+      const targetAncestors = this.ancestorsOf(target, nodesMap);
+      const edgeParent = remeda.last(
+        core.commonHead(
+          remeda.reverse(sourceAncestors),
+          remeda.reverse(targetAncestors)
+        )
+      );
+      edge.parent = edgeParent?.id ?? null;
+      source.outEdges.push(edge.id);
+      target.inEdges.push(edge.id);
+      for (const sourceAncestor of sourceAncestors) {
+        if (sourceAncestor === edgeParent) {
+          break;
+        }
+        sourceAncestor.outEdges.push(edge.id);
+      }
+      for (const targetAncestor of targetAncestors) {
+        if (targetAncestor === edgeParent) {
+          break;
+        }
+        targetAncestor.inEdges.push(edge.id);
+      }
+    }
   }
   addEdges(edges) {
     const added = [];
@@ -1234,9 +1267,6 @@ class ComputeCtx {
       }),
       remeda.filter(remeda.isNonNull)
     );
-    if (excludedImplicits.size === 0) {
-      return;
-    }
     this.ctxEdges = ctxEdges;
     const remaining = this.includedElements;
     if (remaining.size === 0) {
@@ -1413,6 +1443,19 @@ class ComputeCtx {
     }
     core.nonexhaustive(expr);
   }
+  ancestorsOf(node, nodesMap) {
+    const ancestors = [];
+    let parent = node.parent;
+    while (parent) {
+      const parentNode = nodesMap.get(parent);
+      if (!parentNode) {
+        break;
+      }
+      ancestors.push(parentNode);
+      parent = parentNode.parent;
+    }
+    return ancestors;
+  }
   getEdgeLabel(relation) {
     const labelParts = [];
     if (remeda.isTruthy(relation.title)) {
@@ -1490,7 +1533,8 @@ class DynamicViewComputeCtx {
     const {
       docUri: _docUri,
       // exclude docUri
-      rules,
+      rules: _rules,
+      // exclude rules
       steps: viewSteps,
       ...view
     } = this.view;
@@ -1510,6 +1554,7 @@ class DynamicViewComputeCtx {
       }
       stepNum++;
     }
+    const rules = resolveGlobalRulesInDynamicView(this.view, this.graph.globals);
     for (const rule of rules) {
       if (core.isDynamicViewIncludeRule(rule)) {
         for (const expr of rule.include) {
@@ -1663,7 +1708,13 @@ class LikeC4ModelGraph {
   // Relationships inside the element, among descendants
   #internal = new MapRelations();
   #cacheAscendingSiblings = /* @__PURE__ */ new Map();
-  constructor({ elements, relations }) {
+  globals;
+  constructor({ elements, relations, globals }) {
+    this.globals = globals ?? {
+      predicates: {},
+      dynamicPredicates: {},
+      styles: {}
+    };
     for (const el of Object.values(elements)) {
       this.addElement(el);
     }

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

@@ -1,8 +1,54 @@
-import { Expr, whereOperatorAsPredicate, parentFqn, nonexhaustive, ComputedNode, isViewRuleGroup, isViewRulePredicate, isViewRuleStyle, nonNullable, ElementKind, compareByFqnHierarchically, DefaultThemeColor, DefaultElementShape, compareRelations, invariant, compareNatural, hasAtLeast, isAncestor, commonHead, isViewRuleAutoLayout, isScopedElementView, commonAncestor, StepEdgeId, isDynamicViewParallelSteps, isDynamicViewIncludeRule, DefaultRelationshipColor, DefaultLineStyle, DefaultArrowType, ancestorsFqn, isSameHierarchy } from '@likec4/core';
-import { pipe, map, pick, mapToObj, isTruthy, isNullish, omitBy, isEmpty, filter, isNot, anyPass, forEach, isDefined, groupBy, prop, mapValues, piped, unique, entries, flatMap, sortBy, sort, tap, difference, allPass, last, reverse, concat, omit, hasAtLeast as hasAtLeast$1, only, reduce, isNonNull, first, isString, isArray } from 'remeda';
+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 dagre from '@dagrejs/dagre';
+import { logger } from '@likec4/log';
 import objectHash from 'object-hash';
 
+function resolveGlobalRulesInElementView(view, globals) {
+  return view.rules.reduce((acc, rule) => {
+    if (isViewRuleGlobalPredicateRef(rule)) {
+      const globalPredicates = globals.predicates[rule.predicateId];
+      if (isNullish(globalPredicates)) {
+        logger.warn(`Global predicate not found: ${rule.predicateId}`);
+        return acc;
+      }
+      return acc.concat(globalPredicates);
+    }
+    if (isViewRuleGlobalStyle(rule)) {
+      const globalStyles = globals.styles[rule.styleId];
+      if (isNullish(globalStyles)) {
+        logger.warn(`Global style not found: ${rule.styleId}`);
+        return acc;
+      }
+      return acc.concat(globalStyles);
+    }
+    acc.push(rule);
+    return acc;
+  }, []);
+}
+function resolveGlobalRulesInDynamicView(view, globals) {
+  return view.rules.reduce((acc, rule) => {
+    if (isViewRuleGlobalPredicateRef(rule)) {
+      const globalPredicates = globals.dynamicPredicates[rule.predicateId];
+      if (isNullish(globalPredicates)) {
+        logger.warn(`Global predicate not found: ${rule.predicateId}`);
+        return acc;
+      }
+      return acc.concat(globalPredicates);
+    }
+    if (isViewRuleGlobalStyle(rule)) {
+      const globalStyles = globals.styles[rule.styleId];
+      if (isNullish(globalStyles)) {
+        logger.warn(`Global style not found: ${rule.styleId}`);
+        return acc;
+      }
+      return acc.concat(globalStyles);
+    }
+    acc.push(rule);
+    return acc;
+  }, []);
+}
+
 function calcViewLayoutHash(view) {
   const tohash = {
     id: view.id,
@@ -179,10 +225,6 @@ function applyViewRuleStyles(_rules, nodes) {
   for (const rule of rules) {
     const predicates = [];
     for (const target of rule.targets) {
-      if (Expr.isWildcard(target)) {
-        predicates.push(() => true);
-        break;
-      }
       predicates.push(elementExprToPredicate(target));
     }
     pipe(
@@ -922,6 +964,25 @@ class ComputeCtx {
   get activeGroup() {
     return this.activeGroupStack[0] ?? this.__rootGroup;
   }
+  get includedElements() {
+    return /* @__PURE__ */ new Set([
+      ...this.explicits,
+      ...this.ctxEdges.flatMap((e) => [e.source, e.target])
+    ]);
+  }
+  get resolvedElements() {
+    return /* @__PURE__ */ new Set([
+      ...this.explicits,
+      ...this.implicits,
+      ...this.ctxEdges.flatMap((e) => [e.source, e.target])
+    ]);
+  }
+  get edges() {
+    return this.ctxEdges;
+  }
+  get root() {
+    return isScopedElementView(this.view) ? this.view.viewOf : null;
+  }
   static elementView(view, graph) {
     return new ComputeCtx(view, graph).compute();
   }
@@ -930,9 +991,11 @@ class ComputeCtx {
     const {
       docUri: _docUri,
       // exclude docUri
-      rules,
+      rules: _rules,
+      // exclude rules
       ...view
     } = this.view;
+    const rules = resolveGlobalRulesInElementView(this.view, this.graph.globals);
     const viewPredicates = rules.filter(anyPass([isViewRulePredicate, isViewRuleGroup]));
     if (this.root && viewPredicates.length == 0) {
       this.addElement(this.graph.element(this.root));
@@ -944,51 +1007,9 @@ class ComputeCtx {
     }
     const elements = [...this.includedElements];
     const nodesMap = buildComputeNodes(elements, this.groups);
-    const ancestorsOf = (node) => {
-      const ancestors = [];
-      let parent = node.parent;
-      while (parent) {
-        const parentNode = nodesMap.get(parent);
-        if (!parentNode) {
-          break;
-        }
-        ancestors.push(parentNode);
-        parent = parentNode.parent;
-      }
-      return ancestors;
-    };
-    const edgesMap = /* @__PURE__ */ new Map();
     const edges = this.computeEdges();
-    for (const edge of edges) {
-      edgesMap.set(edge.id, edge);
-      const source = nodesMap.get(edge.source);
-      const target = nodesMap.get(edge.target);
-      invariant(source, `Source node ${edge.source} not found`);
-      invariant(target, `Target node ${edge.target} not found`);
-      const sourceAncestors = ancestorsOf(source);
-      const targetAncestors = ancestorsOf(target);
-      const edgeParent = last(
-        commonHead(
-          reverse(sourceAncestors),
-          reverse(targetAncestors)
-        )
-      );
-      edge.parent = edgeParent?.id ?? null;
-      source.outEdges.push(edge.id);
-      target.inEdges.push(edge.id);
-      for (const sourceAncestor of sourceAncestors) {
-        if (sourceAncestor === edgeParent) {
-          break;
-        }
-        sourceAncestor.outEdges.push(edge.id);
-      }
-      for (const targetAncestor of targetAncestors) {
-        if (targetAncestor === edgeParent) {
-          break;
-        }
-        targetAncestor.inEdges.push(edge.id);
-      }
-    }
+    const edgesMap = new Map(edges.map((edge) => [edge.id, edge]));
+    this.linkNodesAndEdges(nodesMap, edges);
     let initialSort = elements.map((e) => nonNullable(nodesMap.get(e.id), `Node ${e.id} not found in nodesMap`));
     if (this.groups.length > 0) {
       initialSort = concat(
@@ -1029,9 +1050,6 @@ class ComputeCtx {
       }
     });
   }
-  get root() {
-    return isScopedElementView(this.view) ? this.view.viewOf : null;
-  }
   computeEdges() {
     return this.ctxEdges.map((e) => {
       invariant(hasAtLeast$1(e.relations, 1), "Edge must have at least one relation");
@@ -1124,21 +1142,36 @@ class ComputeCtx {
       );
     });
   }
-  get includedElements() {
-    return /* @__PURE__ */ new Set([
-      ...this.explicits,
-      ...this.ctxEdges.flatMap((e) => [e.source, e.target])
-    ]);
-  }
-  get resolvedElements() {
-    return /* @__PURE__ */ new Set([
-      ...this.explicits,
-      ...this.implicits,
-      ...this.ctxEdges.flatMap((e) => [e.source, e.target])
-    ]);
-  }
-  get edges() {
-    return this.ctxEdges;
+  linkNodesAndEdges(nodesMap, edges) {
+    for (const edge of edges) {
+      const source = nodesMap.get(edge.source);
+      const target = nodesMap.get(edge.target);
+      invariant(source, `Source node ${edge.source} not found`);
+      invariant(target, `Target node ${edge.target} not found`);
+      const sourceAncestors = this.ancestorsOf(source, nodesMap);
+      const targetAncestors = this.ancestorsOf(target, nodesMap);
+      const edgeParent = last(
+        commonHead(
+          reverse(sourceAncestors),
+          reverse(targetAncestors)
+        )
+      );
+      edge.parent = edgeParent?.id ?? null;
+      source.outEdges.push(edge.id);
+      target.inEdges.push(edge.id);
+      for (const sourceAncestor of sourceAncestors) {
+        if (sourceAncestor === edgeParent) {
+          break;
+        }
+        sourceAncestor.outEdges.push(edge.id);
+      }
+      for (const targetAncestor of targetAncestors) {
+        if (targetAncestor === edgeParent) {
+          break;
+        }
+        targetAncestor.inEdges.push(edge.id);
+      }
+    }
   }
   addEdges(edges) {
     const added = [];
@@ -1227,9 +1260,6 @@ class ComputeCtx {
       }),
       filter(isNonNull)
     );
-    if (excludedImplicits.size === 0) {
-      return;
-    }
     this.ctxEdges = ctxEdges;
     const remaining = this.includedElements;
     if (remaining.size === 0) {
@@ -1406,6 +1436,19 @@ class ComputeCtx {
     }
     nonexhaustive(expr);
   }
+  ancestorsOf(node, nodesMap) {
+    const ancestors = [];
+    let parent = node.parent;
+    while (parent) {
+      const parentNode = nodesMap.get(parent);
+      if (!parentNode) {
+        break;
+      }
+      ancestors.push(parentNode);
+      parent = parentNode.parent;
+    }
+    return ancestors;
+  }
   getEdgeLabel(relation) {
     const labelParts = [];
     if (isTruthy(relation.title)) {
@@ -1483,7 +1526,8 @@ class DynamicViewComputeCtx {
     const {
       docUri: _docUri,
       // exclude docUri
-      rules,
+      rules: _rules,
+      // exclude rules
       steps: viewSteps,
       ...view
     } = this.view;
@@ -1503,6 +1547,7 @@ class DynamicViewComputeCtx {
       }
       stepNum++;
     }
+    const rules = resolveGlobalRulesInDynamicView(this.view, this.graph.globals);
     for (const rule of rules) {
       if (isDynamicViewIncludeRule(rule)) {
         for (const expr of rule.include) {
@@ -1656,7 +1701,13 @@ class LikeC4ModelGraph {
   // Relationships inside the element, among descendants
   #internal = new MapRelations();
   #cacheAscendingSiblings = /* @__PURE__ */ new Map();
-  constructor({ elements, relations }) {
+  globals;
+  constructor({ elements, relations, globals }) {
+    this.globals = globals ?? {
+      predicates: {},
+      dynamicPredicates: {},
+      styles: {}
+    };
     for (const el of Object.values(elements)) {
       this.addElement(el);
     }