@likec4/language-server 1.15.1 → 1.17.0

package/dist/shared/{language-server.B8s2wfT_.cjs → language-server.N8HLDQqz.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(
@@ -1027,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: {
@@ -1036,9 +1063,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 +1155,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 +1273,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 +1449,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 +1539,8 @@ class DynamicViewComputeCtx {
     const {
       docUri: _docUri,
       // exclude docUri
-      rules,
+      rules: _rules,
+      // exclude rules
       steps: viewSteps,
       ...view
     } = this.view;
@@ -1510,6 +1560,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) {
@@ -1573,7 +1624,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: {
@@ -1663,7 +1720,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.j-ShR6as.d.ts → language-server.PEjk7U9s.d.ts}

@@ -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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.15.1",
+  "version": "1.17.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -112,8 +112,8 @@
   },
   "dependencies": {
     "@dagrejs/dagre": "^1.1.4",
-    "@likec4/core": "1.15.1",
-    "@likec4/log": "1.15.1",
+    "@likec4/core": "1.17.0",
+    "@likec4/log": "1.17.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
@@ -133,12 +133,12 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.15.1",
-    "@likec4/tsconfig": "1.15.1",
+    "@likec4/icons": "1.17.0",
+    "@likec4/tsconfig": "1.17.0",
     "@types/node": "^20.16.14",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
-    "@vitest/coverage-v8": "^2.1.3",
+    "@vitest/coverage-v8": "^2.1.5",
     "execa": "^9.3.1",
     "langium-cli": "3.2.0",
     "npm-run-all2": "^6.2.6",
@@ -146,7 +146,7 @@
     "turbo": "^2.2.3",
     "typescript": "^5.6.3",
     "unbuild": "^3.0.0-rc.11",
-    "vitest": "^2.1.3"
+    "vitest": "^2.1.5"
   },
   "packageManager": "yarn@4.5.1"
 }

package/src/LikeC4FileSystem.ts

@@ -0,0 +1,36 @@
+import { type FileSystemNode, URI, UriUtils } from 'langium'
+import { NodeFileSystemProvider } from 'langium/node'
+import { lstatSync, readlinkSync } from 'node:fs'
+import { readdir } from 'node:fs/promises'
+import { dirname, resolve } from 'node:path'
+
+export const LikeC4FileSystem = {
+  fileSystemProvider: () => new SymLinkTraversingFileSystemProvider()
+}
+
+/**
+ * A file system provider that follows symbolic links.
+ * @see https://github.com/likec4/likec4/pull/1213
+ */
+class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
+  override async readDirectory(folderPath: URI): Promise<FileSystemNode[]> {
+    const dirents = await readdir(folderPath.fsPath, { withFileTypes: true })
+    return dirents.map(dirent => (this.followUri(UriUtils.joinPath(folderPath, dirent.name))))
+  }
+
+  followUri(uri: URI): FileSystemNode {
+    const directoryPath = dirname(uri.fsPath)
+    const stat = lstatSync(uri.fsPath)
+    if (stat.isSymbolicLink()) {
+      const resolved_link = readlinkSync(uri.fsPath)
+      const linked_path = resolve(directoryPath, resolved_link)
+      return this.followUri(URI.file(linked_path))
+    } else {
+      return {
+        isFile: stat.isFile(),
+        isDirectory: stat.isDirectory(),
+        uri
+      }
+    }
+  }
+}

package/src/Rpc.ts

@@ -43,8 +43,8 @@ export class Rpc implements Disposable {
       },
       {
         timing: 'both',
-        waitMs: 300,
-        maxWaitMs: 600
+        waitMs: 250,
+        maxWaitMs: 500
       }
     )
 

package/src/ast.ts

@@ -93,9 +93,13 @@ export interface ParsedAstRelation {
   metadata?: { [key: string]: string }
 }
 
-export interface ParsedAstGlobals {
-  styles: Record<c4.GlobalStyleID, c4.NonEmptyArray<c4.ViewRuleStyle>>
-}
+// export interface ParsedAstGlobals {
+//   predicates: Record<c4.GlobalElRelID, c4.NonEmptyArray<c4.ViewRulePredicate>>
+//   dynamicPredicates: Record<c4.GlobalElRelID, c4.NonEmptyArray<c4.DynamicViewIncludeRule>>
+//   styles: Record<c4.GlobalStyleID, c4.NonEmptyArray<c4.ViewRuleStyle>>
+// }
+// Alias for refactoring
+export type ParsedAstGlobals = c4.ModelGlobals
 
 export interface ParsedAstElementView {
   __: 'element'
@@ -196,6 +200,8 @@ export function cleanParsedModel(doc: LikeC4LangiumDocument) {
     c4Elements: [],
     c4Relations: [],
     c4Globals: {
+      predicates: {},
+      dynamicPredicates: {},
       styles: {}
     },
     c4Views: []
@@ -235,6 +241,8 @@ function validatableAstNodeGuards<const Predicates extends Guard<AstNode>[]>(
 }
 const isValidatableAstNode = validatableAstNodeGuards([
   ast.isGlobals,
+  ast.isGlobalPredicateGroup,
+  ast.isGlobalDynamicPredicateGroup,
   ast.isGlobalStyle,
   ast.isGlobalStyleGroup,
   ast.isDynamicViewPredicateIterator,