@likec4/language-server 1.15.1 → 1.17.0

package/dist/shared/{language-server.BT4WTbFI.mjs → language-server.BXFhlTPo.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, 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(
@@ -1020,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: {
@@ -1029,9 +1056,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 +1148,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 +1266,6 @@ class ComputeCtx {
       }),
       filter(isNonNull)
     );
-    if (excludedImplicits.size === 0) {
-      return;
-    }
     this.ctxEdges = ctxEdges;
     const remaining = this.includedElements;
     if (remaining.size === 0) {
@@ -1406,6 +1442,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 +1532,8 @@ class DynamicViewComputeCtx {
     const {
       docUri: _docUri,
       // exclude docUri
-      rules,
+      rules: _rules,
+      // exclude rules
       steps: viewSteps,
       ...view
     } = this.view;
@@ -1503,6 +1553,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) {
@@ -1566,7 +1617,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: {
@@ -1656,7 +1713,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.DfMwkd2l.d.mts → language-server.BgDKnNok.d.mts}

@@ -47,7 +47,7 @@ type ArrowType = 'crow' | 'diamond' | 'dot' | 'none' | 'normal' | 'odiamond' | '
 type BorderStyleValue = 'none' | LineOptions;
 type CustomColorId = 'element' | 'model' | ArrowType | ElementShape | LineOptions | string;
 type CustomColorValue = string;
-type DynamicViewRule = DynamicViewIncludePredicate | ViewRuleAutoLayout | ViewRuleStyleOrGlobalRef;
+type DynamicViewRule = DynamicViewGlobalPredicateRef | DynamicViewIncludePredicate | ViewRuleAutoLayout | ViewRuleStyleOrGlobalRef;
 declare const DynamicViewRule = "DynamicViewRule";
 declare function isDynamicViewRule(item: unknown): item is DynamicViewRule;
 type ElementExpression = ElementDescedantsExpression | ElementKindExpression | ElementRef | ElementTagExpression | ExpandElementExpression | WildcardExpression;
@@ -94,7 +94,7 @@ type ViewLayoutDirection = 'BottomTop' | 'LeftRight' | 'RightLeft' | 'TopBottom'
 type ViewProperty = LinkProperty | ViewStringProperty;
 declare const ViewProperty = "ViewProperty";
 declare function isViewProperty(item: unknown): item is ViewProperty;
-type ViewRule = ViewRuleAutoLayout | ViewRuleGroup | ViewRulePredicate | ViewRuleStyleOrGlobalRef;
+type ViewRule = ViewRuleAutoLayout | ViewRuleGlobalPredicateRef | ViewRuleGroup | ViewRulePredicate | ViewRuleStyleOrGlobalRef;
 declare const ViewRule = "ViewRule";
 declare function isViewRule(item: unknown): item is ViewRule;
 type ViewRulePredicate = ExcludePredicate | IncludePredicate;
@@ -179,8 +179,14 @@ interface DynamicViewBody extends AstNode {
 }
 declare const DynamicViewBody = "DynamicViewBody";
 declare function isDynamicViewBody(item: unknown): item is DynamicViewBody;
-interface DynamicViewIncludePredicate extends AstNode {
+interface DynamicViewGlobalPredicateRef extends AstNode {
     readonly $container: DynamicViewBody;
+    readonly $type: 'DynamicViewGlobalPredicateRef';
+    predicate: Reference<GlobalDynamicPredicateGroup>;
+}
+declare const DynamicViewGlobalPredicateRef = "DynamicViewGlobalPredicateRef";
+interface DynamicViewIncludePredicate extends AstNode {
+    readonly $container: DynamicViewBody | GlobalDynamicPredicateGroup;
     readonly $type: 'DynamicViewIncludePredicate';
     predicates: DynamicViewPredicateIterator;
 }
@@ -331,7 +337,7 @@ interface ElementViewRef extends AstNode {
 }
 declare const ElementViewRef = "ElementViewRef";
 interface ExcludePredicate extends AstNode {
-    readonly $container: ElementViewBody | ViewRuleGroup;
+    readonly $container: ElementViewBody | GlobalPredicateGroup | ViewRuleGroup;
     readonly $type: 'ExcludePredicate';
     predicates: Predicates;
 }
@@ -364,10 +370,27 @@ interface FqnElementRef extends AstNode {
     parent?: FqnElementRef;
 }
 declare const FqnElementRef = "FqnElementRef";
+interface GlobalDynamicPredicateGroup extends AstNode {
+    readonly $container: Globals;
+    readonly $type: 'GlobalDynamicPredicateGroup';
+    name: string;
+    predicates: Array<DynamicViewIncludePredicate>;
+}
+declare const GlobalDynamicPredicateGroup = "GlobalDynamicPredicateGroup";
+declare function isGlobalDynamicPredicateGroup(item: unknown): item is GlobalDynamicPredicateGroup;
+interface GlobalPredicateGroup extends AstNode {
+    readonly $container: Globals;
+    readonly $type: 'GlobalPredicateGroup';
+    name: string;
+    predicates: Array<ViewRulePredicate>;
+}
+declare const GlobalPredicateGroup = "GlobalPredicateGroup";
+declare function isGlobalPredicateGroup(item: unknown): item is GlobalPredicateGroup;
 interface Globals extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'Globals';
     name: 'global';
+    predicates: Array<GlobalDynamicPredicateGroup | GlobalPredicateGroup>;
     styles: Array<GlobalStyle | GlobalStyleGroup>;
 }
 declare const Globals = "Globals";
@@ -400,11 +423,11 @@ interface IconProperty extends AstNode {
     readonly $type: 'IconProperty';
     key: 'icon';
     libicon?: Reference<LibIcon>;
-    value?: Uri;
+    value?: 'none' | Uri;
 }
 declare const IconProperty = "IconProperty";
 interface IncludePredicate extends AstNode {
-    readonly $container: ElementViewBody | ViewRuleGroup;
+    readonly $container: ElementViewBody | GlobalPredicateGroup | ViewRuleGroup;
     readonly $type: 'IncludePredicate';
     predicates: Predicates;
 }
@@ -684,6 +707,12 @@ interface ViewRuleAutoLayout extends AstNode {
     rankSep?: number;
 }
 declare const ViewRuleAutoLayout = "ViewRuleAutoLayout";
+interface ViewRuleGlobalPredicateRef extends AstNode {
+    readonly $container: ElementViewBody;
+    readonly $type: 'ViewRuleGlobalPredicateRef';
+    predicate: Reference<GlobalPredicateGroup>;
+}
+declare const ViewRuleGlobalPredicateRef = "ViewRuleGlobalPredicateRef";
 interface ViewRuleGlobalStyle extends AstNode {
     readonly $container: DynamicViewBody | ElementViewBody | ModelViews;
     readonly $type: 'ViewRuleGlobalStyle';
@@ -780,6 +809,7 @@ type LikeC4AstType = {
     DirectedRelationExpression: DirectedRelationExpression;
     DynamicView: DynamicView;
     DynamicViewBody: DynamicViewBody;
+    DynamicViewGlobalPredicateRef: DynamicViewGlobalPredicateRef;
     DynamicViewIncludePredicate: DynamicViewIncludePredicate;
     DynamicViewParallelSteps: DynamicViewParallelSteps;
     DynamicViewPredicateIterator: DynamicViewPredicateIterator;
@@ -810,6 +840,8 @@ type LikeC4AstType = {
     ExtendElement: ExtendElement;
     ExtendElementBody: ExtendElementBody;
     FqnElementRef: FqnElementRef;
+    GlobalDynamicPredicateGroup: GlobalDynamicPredicateGroup;
+    GlobalPredicateGroup: GlobalPredicateGroup;
     GlobalStyle: GlobalStyle;
     GlobalStyleGroup: GlobalStyleGroup;
     GlobalStyleId: GlobalStyleId;
@@ -865,6 +897,7 @@ type LikeC4AstType = {
     ViewRef: ViewRef;
     ViewRule: ViewRule;
     ViewRuleAutoLayout: ViewRuleAutoLayout;
+    ViewRuleGlobalPredicateRef: ViewRuleGlobalPredicateRef;
     ViewRuleGlobalStyle: ViewRuleGlobalStyle;
     ViewRuleGroup: ViewRuleGroup;
     ViewRulePredicate: ViewRulePredicate;
@@ -960,9 +993,7 @@ interface ParsedAstRelation {
         [key: string]: string;
     };
 }
-interface ParsedAstGlobals {
-    styles: Record<c4.GlobalStyleID, c4.NonEmptyArray<c4.ViewRuleStyle>>;
-}
+type ParsedAstGlobals = c4.ModelGlobals;
 interface ParsedAstElementView {
     __: 'element';
     id: c4.ViewID;
@@ -1015,7 +1046,7 @@ interface ParsedLikeC4LangiumDocument extends Omit<LangiumDocument<LikeC4Grammar
 }
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isLikeC4View | typeof isRelation | typeof isExtendElement | typeof isElement | typeof isGlobals | typeof isGlobalStyle | typeof isGlobalStyleGroup | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
+declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isLikeC4View | typeof isRelation | typeof isExtendElement | typeof isElement | typeof isGlobals | typeof isGlobalPredicateGroup | typeof isGlobalDynamicPredicateGroup | typeof isGlobalStyle | typeof isGlobalStyleGroup | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;
@@ -1135,8 +1166,10 @@ declare class LikeC4ModelParser {
     private parseElement;
     private parseRelation;
     private parseGlobal;
+    private parseAndStoreGlobalPredicateGroupOrDynamic;
+    private parseGlobalPredicateGroup;
+    private parseGlobalDynamicPredicateGroup;
     private parseGlobalStyleOrGroup;
-    private parseGlobalStyle;
     private parseViews;
     private parseViewRulePredicate;
     private parsePredicate;
@@ -1150,6 +1183,7 @@ declare class LikeC4ModelParser {
     private parseRelationPredicateWith;
     private parseRelationExpr;
     private parseViewRule;
+    private parseViewRuleGlobalPredicateRef;
     private parseViewRuleStyleOrGlobalRef;
     private parseViewRuleStyle;
     private parseViewRuleGroup;