@likec4/language-server 1.15.0 → 1.15.1

package/dist/browser.cjs

@@ -2,7 +2,7 @@
 
 const lsp = require('langium/lsp');
 const browser = require('vscode-languageserver/browser');
-const module$1 = require('./shared/language-server.BUtiWTKg.cjs');
+const module$1 = require('./shared/language-server.DfjkvknB.cjs');
 
 function startLanguageServer() {
   const messageReader = new browser.BrowserMessageReader(self);

package/dist/browser.mjs

@@ -1,7 +1,7 @@
 import { startLanguageServer as startLanguageServer$1 } from 'langium/lsp';
 import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser';
-import { c as createLanguageServices } from './shared/language-server.zY53FGJE.mjs';
-export { L as LikeC4Module, a as createCustomLanguageServices, s as setLogLevel } from './shared/language-server.zY53FGJE.mjs';
+import { c as createLanguageServices } from './shared/language-server.BuChFlda.mjs';
+export { L as LikeC4Module, a as createCustomLanguageServices, s as setLogLevel } from './shared/language-server.BuChFlda.mjs';
 
 function startLanguageServer() {
   const messageReader = new BrowserMessageReader(self);

package/dist/index.cjs

@@ -3,7 +3,7 @@
 const lsp = require('langium/lsp');
 const node$1 = require('langium/node');
 const node = require('vscode-languageserver/node');
-const module$1 = require('./shared/language-server.BUtiWTKg.cjs');
+const module$1 = require('./shared/language-server.DfjkvknB.cjs');
 
 function startLanguageServer() {
   const connection = node.createConnection(node.ProposedFeatures.all);

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { startLanguageServer as startLanguageServer$1 } from 'langium/lsp';
 import { NodeFileSystem } from 'langium/node';
 import { createConnection, ProposedFeatures } from 'vscode-languageserver/node';
-import { c as createLanguageServices } from './shared/language-server.zY53FGJE.mjs';
-export { L as LikeC4Module, a as createCustomLanguageServices, l as lspLogger, s as setLogLevel } from './shared/language-server.zY53FGJE.mjs';
+import { c as createLanguageServices } from './shared/language-server.BuChFlda.mjs';
+export { L as LikeC4Module, a as createCustomLanguageServices, l as lspLogger, s as setLogLevel } from './shared/language-server.BuChFlda.mjs';
 
 function startLanguageServer() {
   const connection = createConnection(ProposedFeatures.all);

package/dist/model-graph/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const LikeC4ModelGraph = require('../shared/language-server.80ITEDo5.cjs');
+const LikeC4ModelGraph = require('../shared/language-server.B8s2wfT_.cjs');
 
 
 

package/dist/model-graph/index.mjs

@@ -1 +1 @@
-export { L as LikeC4ModelGraph, b as computeDynamicView, c as computeElementView, a as computeView } from '../shared/language-server.DXC9g4_f.mjs';
+export { L as LikeC4ModelGraph, b as computeDynamicView, c as computeElementView, a as computeView } from '../shared/language-server.BT4WTbFI.mjs';

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

@@ -121,7 +121,9 @@ function applyCustomElementProperties(_rules, _nodes) {
 function relationExpressionToPredicates(expr) {
   switch (true) {
     case core.Expr.isRelationWhere(expr):
-      return relationExpressionToPredicates(expr.where.expr);
+      const predicate = relationExpressionToPredicates(expr.where.expr);
+      const where = core.whereOperatorAsPredicate(expr.where.condition);
+      return (e) => predicate(e) && where(e);
     case core.Expr.isRelation(expr): {
       const isSource = elementExprToPredicate(expr.source);
       const isTarget = elementExprToPredicate(expr.target);
@@ -145,6 +147,7 @@ function relationExpressionToPredicates(expr) {
       core.nonexhaustive(expr);
   }
 }
+
 function applyCustomRelationProperties(_rules, nodes, _edges) {
   const rules = _rules.flatMap(flattenGroupRules(core.Expr.isCustomRelationExpr));
   const edges = Array.from(_edges);
@@ -162,12 +165,12 @@ function applyCustomRelationProperties(_rules, nodes, _edges) {
       if (!source || !target) {
         return;
       }
-      if (satisfies({ source, target })) {
+      if (satisfies({ source, target, ...remeda.pick(edge, ["kind", "tags"]) })) {
         edges[i] = {
           ...edge,
+          ...props,
           label: title ?? edge.label,
-          isCustomized: true,
-          ...props
+          isCustomized: true
         };
       }
     });

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

@@ -114,7 +114,9 @@ function applyCustomElementProperties(_rules, _nodes) {
 function relationExpressionToPredicates(expr) {
   switch (true) {
     case Expr.isRelationWhere(expr):
-      return relationExpressionToPredicates(expr.where.expr);
+      const predicate = relationExpressionToPredicates(expr.where.expr);
+      const where = whereOperatorAsPredicate(expr.where.condition);
+      return (e) => predicate(e) && where(e);
     case Expr.isRelation(expr): {
       const isSource = elementExprToPredicate(expr.source);
       const isTarget = elementExprToPredicate(expr.target);
@@ -138,6 +140,7 @@ function relationExpressionToPredicates(expr) {
       nonexhaustive(expr);
   }
 }
+
 function applyCustomRelationProperties(_rules, nodes, _edges) {
   const rules = _rules.flatMap(flattenGroupRules(Expr.isCustomRelationExpr));
   const edges = Array.from(_edges);
@@ -155,12 +158,12 @@ function applyCustomRelationProperties(_rules, nodes, _edges) {
       if (!source || !target) {
         return;
       }
-      if (satisfies({ source, target })) {
+      if (satisfies({ source, target, ...pick(edge, ["kind", "tags"]) })) {
         edges[i] = {
           ...edge,
+          ...props,
           label: title ?? edge.label,
-          isCustomized: true,
-          ...props
+          isCustomized: true
         };
       }
     });

package/dist/shared/{language-server.zY53FGJE.mjs → language-server.BuChFlda.mjs}

@@ -13,7 +13,7 @@ import { URI as URI$1 } from 'vscode-uri';
 import stripIndent from 'strip-indent';
 import hash from 'string-hash';
 import { deepEqual } from 'fast-equals';
-import { G as Graph, i as isAcyclic, f as findCycles, p as postorder, L as LikeC4ModelGraph, a as computeView, b as computeDynamicView } from './language-server.DXC9g4_f.mjs';
+import { G as Graph, i as isAcyclic, f as findCycles, p as postorder, L as LikeC4ModelGraph, a as computeView, b as computeDynamicView } from './language-server.BT4WTbFI.mjs';
 import { hasProtocol, hasLeadingSlash, isRelative, withoutLeadingSlash, withoutBase, parsePath } from 'ufo';
 import { DocumentHighlight, DocumentHighlightKind } from 'vscode-languageserver';
 
@@ -2410,7 +2410,7 @@ class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
           SemanticTokenModifiers.readonly
         ]
       });
-      return;
+      return "prune";
     }
     if (isWhereRelationKind(node) && isTruthy(node.value)) {
       acceptor({
@@ -2439,6 +2439,7 @@ class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         type: SemanticTokenTypes.type,
         modifier: [SemanticTokenModifiers.definition]
       });
+      return "prune";
     }
     if (isElementTagExpression(node) && isTruthy(node.tag)) {
       acceptor({
@@ -2447,6 +2448,7 @@ class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         type: SemanticTokenTypes.type,
         modifier: [SemanticTokenModifiers.definition]
       });
+      return "prune";
     }
     if (isElementRef(node) || isFqnElementRef(node)) {
       acceptor({
@@ -3139,17 +3141,22 @@ function buildModel(services, docs) {
       const links = unresolvedLinks ? resolveLinks(doc, unresolvedLinks) : null;
       return {
         ...model,
+        customColorDefinitions,
         tags,
         links,
         docUri,
         description,
         title,
-        id,
-        customColorDefinitions
+        id
       };
     };
   }
-  const parsedViews = docs.flatMap((d) => map(d.c4Views, toC4View(d)));
+  const parsedViews = pipe(
+    docs,
+    flatMap((d) => map(d.c4Views, toC4View(d))),
+    // Resolve relative paths and sort by
+    resolveRelativePaths
+  );
   if (!parsedViews.some((v) => v.id === "index")) {
     parsedViews.unshift({
       __: "element",
@@ -3172,7 +3179,6 @@ function buildModel(services, docs) {
   }
   const views = pipe(
     parsedViews,
-    resolveRelativePaths,
     indexBy(prop("id")),
     resolveRulesExtendedViews
   );
@@ -3235,7 +3241,7 @@ class LikeC4ModelBuilder {
         logger.debug("[ModelBuilder] No documents to build model from");
         return null;
       }
-      logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)`);
+      logger.debug(`[ModelBuilder] buildModel (${docs.length} docs)`);
       return buildModel(this.services, docs);
     });
   }
@@ -3264,7 +3270,8 @@ class LikeC4ModelBuilder {
       const index = new LikeC4ModelGraph(model);
       const allViews = [];
       for (const view of values(model.views)) {
-        const result = isElementView$1(view) ? computeView(view, index) : computeDynamicView(view, index);
+        const resolvedView = resolveGlobalRules(view, model.globals.styles);
+        const result = isElementView$1(resolvedView) ? computeView(resolvedView, index) : computeDynamicView(resolvedView, index);
         if (!result.isSuccess) {
           logWarnError(result.error);
           continue;
@@ -5822,16 +5829,19 @@ class LikeC4Formatter extends AbstractFormatter {
     this.removeIndentFromTopLevelStatements(node);
     this.indentContentInBraces(node);
     this.formatSpecificationRule(node);
+    this.formatGlobals(node);
     this.formatElementDeclaration(node);
     this.formatRelation(node);
+    this.formatMetadataProperty(node);
     this.formatView(node);
-    this.formatViewRuleStyle(node);
+    this.formatViewRuleGroup(node);
+    this.formatViewRuleGlobalStyle(node);
     this.formatIncludeExcludeExpressions(node);
     this.formatWhereExpression(node);
+    this.formatAutolayoutProperty(node);
     this.formatWithPredicate(node);
+    this.formatViewRuleStyle(node);
     this.formatLeafProperty(node);
-    this.formatMetadataProperty(node);
-    this.formatAutolayoutProperty(node);
     this.formatLinkProperty(node);
     this.formatNavigateToProperty(node);
     this.formatTags(node);
@@ -5868,13 +5878,13 @@ class LikeC4Formatter extends AbstractFormatter {
     this.on(node, isInOutRelationExpression)?.keyword("->").prepend(FormattingOptions.oneSpace);
   }
   removeIndentFromTopLevelStatements(node) {
-    if (isModel(node) || isSpecificationRule(node) || isModelViews(node) || isLikeC4Lib(node)) {
+    if (isModel(node) || isSpecificationRule(node) || isModelViews(node) || isLikeC4Lib(node) || isGlobals(node)) {
       const formatter = this.getNodeFormatter(node);
-      formatter.keywords("specification", "model", "views", "likec4lib").prepend(FormattingOptions.noIndent);
+      formatter.keywords("specification", "model", "views", "likec4lib", "global").prepend(FormattingOptions.noIndent);
     }
   }
   indentContentInBraces(node) {
-    if (isLikeC4Lib(node) || isSpecificationRule(node) || isSpecificationElementKind(node) || isSpecificationRelationshipKind(node) || isModel(node) || isElementBody(node) || isExtendElementBody(node) || isRelationBody(node) || isRelationStyleProperty(node) || isMetadataBody(node) || isModelViews(node) || isElementViewBody(node) || isDynamicViewBody(node) || isViewRuleStyle(node) || isCustomElementProperties(node) || isCustomRelationProperties(node) || isElementStyleProperty(node) || isDynamicViewParallelSteps(node)) {
+    if (isLikeC4Lib(node) || isSpecificationRule(node) || isSpecificationElementKind(node) || isSpecificationRelationshipKind(node) || isGlobals(node) || isGlobalStyle(node) || isGlobalStyleGroup(node) || isModel(node) || isElementBody(node) || isExtendElementBody(node) || isRelationBody(node) || isRelationStyleProperty(node) || isMetadataBody(node) || isModelViews(node) || isElementViewBody(node) || isDynamicViewBody(node) || isViewRuleStyle(node) || isViewRuleGroup(node) || isCustomElementProperties(node) || isCustomRelationProperties(node) || isElementStyleProperty(node) || isDynamicViewParallelSteps(node)) {
       const formatter = this.getNodeFormatter(node);
       const openBrace = formatter.keywords("{");
       const closeBrace = formatter.keywords("}");
@@ -5968,6 +5978,15 @@ class LikeC4Formatter extends AbstractFormatter {
       f.properties("props").prepend(FormattingOptions.oneSpace);
     });
   }
+  formatGlobals(node) {
+    this.on(node, isGlobalStyle, (n, f) => {
+      f.keyword("style").append(FormattingOptions.oneSpace);
+      f.property("id").append(FormattingOptions.oneSpace);
+    });
+    this.on(node, isGlobalStyleGroup, (n, f) => {
+      f.keyword("styleGroup").append(FormattingOptions.oneSpace);
+    });
+  }
   formatSpecificationRule(node) {
     if (isSpecificationElementKind(node) || isSpecificationRelationshipKind(node) || isSpecificationTag(node)) {
       const formatter = this.getNodeFormatter(node);
@@ -5985,6 +6004,16 @@ class LikeC4Formatter extends AbstractFormatter {
       formatter.keyword("with").prepend(FormattingOptions.oneSpace);
     }
   }
+  formatViewRuleGlobalStyle(node) {
+    this.on(node, isViewRuleGlobalStyle, (n, f) => {
+      f.keywords("global", "style").append(FormattingOptions.oneSpace);
+    });
+  }
+  formatViewRuleGroup(node) {
+    this.on(node, isViewRuleGroup, (n, f) => {
+      f.keyword("group").append(FormattingOptions.oneSpace);
+    });
+  }
   formatViewRuleStyle(node) {
     this.on(node, isViewRuleStyle)?.keyword("style").append(FormattingOptions.oneSpace);
     this.on(node, isElementExpressionsIterator)?.keyword(",").prepend(FormattingOptions.noSpace).append(FormattingOptions.oneSpace);

package/dist/shared/{language-server.BUtiWTKg.cjs → language-server.DfjkvknB.cjs}

@@ -15,7 +15,7 @@ const vscodeUri = require('vscode-uri');
 const stripIndent = require('strip-indent');
 const hash = require('string-hash');
 const fastEquals = require('fast-equals');
-const LikeC4ModelGraph = require('./language-server.80ITEDo5.cjs');
+const LikeC4ModelGraph = require('./language-server.B8s2wfT_.cjs');
 const ufo = require('ufo');
 const vscodeLanguageserver = require('vscode-languageserver');
 
@@ -2418,7 +2418,7 @@ class LikeC4SemanticTokenProvider extends lsp.AbstractSemanticTokenProvider {
           vscodeLanguageserverTypes.SemanticTokenModifiers.readonly
         ]
       });
-      return;
+      return "prune";
     }
     if (isWhereRelationKind(node) && remeda.isTruthy(node.value)) {
       acceptor({
@@ -2447,6 +2447,7 @@ class LikeC4SemanticTokenProvider extends lsp.AbstractSemanticTokenProvider {
         type: vscodeLanguageserverTypes.SemanticTokenTypes.type,
         modifier: [vscodeLanguageserverTypes.SemanticTokenModifiers.definition]
       });
+      return "prune";
     }
     if (isElementTagExpression(node) && remeda.isTruthy(node.tag)) {
       acceptor({
@@ -2455,6 +2456,7 @@ class LikeC4SemanticTokenProvider extends lsp.AbstractSemanticTokenProvider {
         type: vscodeLanguageserverTypes.SemanticTokenTypes.type,
         modifier: [vscodeLanguageserverTypes.SemanticTokenModifiers.definition]
       });
+      return "prune";
     }
     if (isElementRef(node) || isFqnElementRef(node)) {
       acceptor({
@@ -3147,17 +3149,22 @@ function buildModel(services, docs) {
       const links = unresolvedLinks ? resolveLinks(doc, unresolvedLinks) : null;
       return {
         ...model,
+        customColorDefinitions,
         tags,
         links,
         docUri,
         description,
         title,
-        id,
-        customColorDefinitions
+        id
       };
     };
   }
-  const parsedViews = docs.flatMap((d) => remeda.map(d.c4Views, toC4View(d)));
+  const parsedViews = remeda.pipe(
+    docs,
+    remeda.flatMap((d) => remeda.map(d.c4Views, toC4View(d))),
+    // Resolve relative paths and sort by
+    resolveRelativePaths
+  );
   if (!parsedViews.some((v) => v.id === "index")) {
     parsedViews.unshift({
       __: "element",
@@ -3180,7 +3187,6 @@ function buildModel(services, docs) {
   }
   const views = remeda.pipe(
     parsedViews,
-    resolveRelativePaths,
     remeda.indexBy(remeda.prop("id")),
     resolveRulesExtendedViews
   );
@@ -3243,7 +3249,7 @@ class LikeC4ModelBuilder {
         logger.debug("[ModelBuilder] No documents to build model from");
         return null;
       }
-      logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)`);
+      logger.debug(`[ModelBuilder] buildModel (${docs.length} docs)`);
       return buildModel(this.services, docs);
     });
   }
@@ -3272,7 +3278,8 @@ class LikeC4ModelBuilder {
       const index = new LikeC4ModelGraph.LikeC4ModelGraph(model);
       const allViews = [];
       for (const view of remeda.values(model.views)) {
-        const result = core.isElementView(view) ? LikeC4ModelGraph.computeView(view, index) : LikeC4ModelGraph.computeDynamicView(view, index);
+        const resolvedView = resolveGlobalRules(view, model.globals.styles);
+        const result = core.isElementView(resolvedView) ? LikeC4ModelGraph.computeView(resolvedView, index) : LikeC4ModelGraph.computeDynamicView(resolvedView, index);
         if (!result.isSuccess) {
           logWarnError(result.error);
           continue;
@@ -5830,16 +5837,19 @@ class LikeC4Formatter extends lsp.AbstractFormatter {
     this.removeIndentFromTopLevelStatements(node);
     this.indentContentInBraces(node);
     this.formatSpecificationRule(node);
+    this.formatGlobals(node);
     this.formatElementDeclaration(node);
     this.formatRelation(node);
+    this.formatMetadataProperty(node);
     this.formatView(node);
-    this.formatViewRuleStyle(node);
+    this.formatViewRuleGroup(node);
+    this.formatViewRuleGlobalStyle(node);
     this.formatIncludeExcludeExpressions(node);
     this.formatWhereExpression(node);
+    this.formatAutolayoutProperty(node);
     this.formatWithPredicate(node);
+    this.formatViewRuleStyle(node);
     this.formatLeafProperty(node);
-    this.formatMetadataProperty(node);
-    this.formatAutolayoutProperty(node);
     this.formatLinkProperty(node);
     this.formatNavigateToProperty(node);
     this.formatTags(node);
@@ -5876,13 +5886,13 @@ class LikeC4Formatter extends lsp.AbstractFormatter {
     this.on(node, isInOutRelationExpression)?.keyword("->").prepend(FormattingOptions.oneSpace);
   }
   removeIndentFromTopLevelStatements(node) {
-    if (isModel(node) || isSpecificationRule(node) || isModelViews(node) || isLikeC4Lib(node)) {
+    if (isModel(node) || isSpecificationRule(node) || isModelViews(node) || isLikeC4Lib(node) || isGlobals(node)) {
       const formatter = this.getNodeFormatter(node);
-      formatter.keywords("specification", "model", "views", "likec4lib").prepend(FormattingOptions.noIndent);
+      formatter.keywords("specification", "model", "views", "likec4lib", "global").prepend(FormattingOptions.noIndent);
     }
   }
   indentContentInBraces(node) {
-    if (isLikeC4Lib(node) || isSpecificationRule(node) || isSpecificationElementKind(node) || isSpecificationRelationshipKind(node) || isModel(node) || isElementBody(node) || isExtendElementBody(node) || isRelationBody(node) || isRelationStyleProperty(node) || isMetadataBody(node) || isModelViews(node) || isElementViewBody(node) || isDynamicViewBody(node) || isViewRuleStyle(node) || isCustomElementProperties(node) || isCustomRelationProperties(node) || isElementStyleProperty(node) || isDynamicViewParallelSteps(node)) {
+    if (isLikeC4Lib(node) || isSpecificationRule(node) || isSpecificationElementKind(node) || isSpecificationRelationshipKind(node) || isGlobals(node) || isGlobalStyle(node) || isGlobalStyleGroup(node) || isModel(node) || isElementBody(node) || isExtendElementBody(node) || isRelationBody(node) || isRelationStyleProperty(node) || isMetadataBody(node) || isModelViews(node) || isElementViewBody(node) || isDynamicViewBody(node) || isViewRuleStyle(node) || isViewRuleGroup(node) || isCustomElementProperties(node) || isCustomRelationProperties(node) || isElementStyleProperty(node) || isDynamicViewParallelSteps(node)) {
       const formatter = this.getNodeFormatter(node);
       const openBrace = formatter.keywords("{");
       const closeBrace = formatter.keywords("}");
@@ -5976,6 +5986,15 @@ class LikeC4Formatter extends lsp.AbstractFormatter {
       f.properties("props").prepend(FormattingOptions.oneSpace);
     });
   }
+  formatGlobals(node) {
+    this.on(node, isGlobalStyle, (n, f) => {
+      f.keyword("style").append(FormattingOptions.oneSpace);
+      f.property("id").append(FormattingOptions.oneSpace);
+    });
+    this.on(node, isGlobalStyleGroup, (n, f) => {
+      f.keyword("styleGroup").append(FormattingOptions.oneSpace);
+    });
+  }
   formatSpecificationRule(node) {
     if (isSpecificationElementKind(node) || isSpecificationRelationshipKind(node) || isSpecificationTag(node)) {
       const formatter = this.getNodeFormatter(node);
@@ -5993,6 +6012,16 @@ class LikeC4Formatter extends lsp.AbstractFormatter {
       formatter.keyword("with").prepend(FormattingOptions.oneSpace);
     }
   }
+  formatViewRuleGlobalStyle(node) {
+    this.on(node, isViewRuleGlobalStyle, (n, f) => {
+      f.keywords("global", "style").append(FormattingOptions.oneSpace);
+    });
+  }
+  formatViewRuleGroup(node) {
+    this.on(node, isViewRuleGroup, (n, f) => {
+      f.keyword("group").append(FormattingOptions.oneSpace);
+    });
+  }
   formatViewRuleStyle(node) {
     this.on(node, isViewRuleStyle)?.keyword("style").append(FormattingOptions.oneSpace);
     this.on(node, isElementExpressionsIterator)?.keyword(",").prepend(FormattingOptions.noSpace).append(FormattingOptions.oneSpace);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "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.0",
-    "@likec4/log": "1.15.0",
+    "@likec4/core": "1.15.1",
+    "@likec4/log": "1.15.1",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
@@ -122,7 +122,7 @@
     "langium": "3.2.0",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
-    "remeda": "^2.15.0",
+    "remeda": "^2.16.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
     "type-fest": "4.26.1",
@@ -133,8 +133,8 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.15.0",
-    "@likec4/tsconfig": "1.15.0",
+    "@likec4/icons": "1.15.1",
+    "@likec4/tsconfig": "1.15.1",
     "@types/node": "^20.16.14",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",

package/src/formatting/LikeC4Formatter.ts

@@ -17,17 +17,29 @@ export class LikeC4Formatter extends AbstractFormatter {
     this.removeIndentFromTopLevelStatements(node)
     this.indentContentInBraces(node)
 
+    // Specification
     this.formatSpecificationRule(node)
+    
+    // Globals
+    this.formatGlobals(node)
+
+    // Models
     this.formatElementDeclaration(node)
     this.formatRelation(node)
+    this.formatMetadataProperty(node)
+    
+    // Views
     this.formatView(node)
-    this.formatViewRuleStyle(node)
+    this.formatViewRuleGroup(node)
+    this.formatViewRuleGlobalStyle(node)
     this.formatIncludeExcludeExpressions(node)
     this.formatWhereExpression(node)
+    this.formatAutolayoutProperty(node)
     this.formatWithPredicate(node)
+    
+    // Common
+    this.formatViewRuleStyle(node)
     this.formatLeafProperty(node)
-    this.formatMetadataProperty(node)
-    this.formatAutolayoutProperty(node)
     this.formatLinkProperty(node)
     this.formatNavigateToProperty(node)
     this.formatTags(node)
@@ -92,9 +104,10 @@ export class LikeC4Formatter extends AbstractFormatter {
       || ast.isSpecificationRule(node)
       || ast.isModelViews(node)
       || ast.isLikeC4Lib(node)
+      || ast.isGlobals(node)
     ) {
       const formatter = this.getNodeFormatter(node)
-      formatter.keywords('specification', 'model', 'views', 'likec4lib')
+      formatter.keywords('specification', 'model', 'views', 'likec4lib', 'global')
         .prepend(FormattingOptions.noIndent)
     }
   }
@@ -105,6 +118,9 @@ export class LikeC4Formatter extends AbstractFormatter {
       || ast.isSpecificationRule(node)
       || ast.isSpecificationElementKind(node)
       || ast.isSpecificationRelationshipKind(node)
+      || ast.isGlobals(node)
+      || ast.isGlobalStyle(node)
+      || ast.isGlobalStyleGroup(node)
       || ast.isModel(node)
       || ast.isElementBody(node)
       || ast.isExtendElementBody(node)
@@ -115,6 +131,7 @@ export class LikeC4Formatter extends AbstractFormatter {
       || ast.isElementViewBody(node)
       || ast.isDynamicViewBody(node)
       || ast.isViewRuleStyle(node)
+      || ast.isViewRuleGroup(node)
       || ast.isCustomElementProperties(node)
       || ast.isCustomRelationProperties(node)
       || ast.isElementStyleProperty(node)
@@ -270,6 +287,17 @@ export class LikeC4Formatter extends AbstractFormatter {
     })
   }
 
+  protected formatGlobals(node: AstNode) {
+    this.on(node, ast.isGlobalStyle, (n, f) => {
+      f.keyword('style').append(FormattingOptions.oneSpace)
+      f.property('id').append(FormattingOptions.oneSpace)
+    })
+
+    this.on(node, ast.isGlobalStyleGroup, (n, f) => {
+      f.keyword('styleGroup').append(FormattingOptions.oneSpace)
+    })
+  }
+
   protected formatSpecificationRule(node: AstNode) {
     if (
       ast.isSpecificationElementKind(node)
@@ -300,6 +328,18 @@ export class LikeC4Formatter extends AbstractFormatter {
     }
   }
 
+  protected formatViewRuleGlobalStyle(node: AstNode) {
+    this.on(node, ast.isViewRuleGlobalStyle, (n, f) => {
+      f.keywords('global', 'style').append(FormattingOptions.oneSpace)
+    })
+  }
+
+  protected formatViewRuleGroup(node: AstNode) {
+    this.on(node, ast.isViewRuleGroup, (n, f) => {
+      f.keyword('group').append(FormattingOptions.oneSpace)
+    })
+  }
+
   protected formatViewRuleStyle(node: AstNode) {
     this.on(node, ast.isViewRuleStyle)
       ?.keyword('style').append(FormattingOptions.oneSpace)

package/src/lsp/SemanticTokenProvider.ts

@@ -68,7 +68,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
           SemanticTokenModifiers.readonly
         ]
       })
-      return
+      return 'prune'
     }
     if (ast.isWhereRelationKind(node) && isTruthy(node.value)) {
       acceptor({
@@ -97,6 +97,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         type: SemanticTokenTypes.type,
         modifier: [SemanticTokenModifiers.definition]
       })
+      return 'prune'
     }
     if (ast.isElementTagExpression(node) && isTruthy(node.tag)) {
       acceptor({
@@ -105,6 +106,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         type: SemanticTokenTypes.type,
         modifier: [SemanticTokenModifiers.definition]
       })
+      return 'prune'
     }
     if (ast.isElementRef(node) || ast.isFqnElementRef(node)) {
       acceptor({

package/src/model/model-builder.ts

@@ -255,18 +255,23 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
 
       return {
         ...model,
+        customColorDefinitions,
         tags,
         links,
         docUri,
         description,
         title,
-        id,
-        customColorDefinitions
+        id
       }
     }
   }
 
-  const parsedViews = docs.flatMap(d => map(d.c4Views, toC4View(d)))
+  const parsedViews = pipe(
+    docs,
+    flatMap(d => map(d.c4Views, toC4View(d))),
+    // Resolve relative paths and sort by
+    resolveRelativePaths
+  )
   // Add index view if not present
   if (!parsedViews.some(v => v.id === 'index')) {
     parsedViews.unshift({
@@ -291,7 +296,6 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
 
   const views = pipe(
     parsedViews,
-    resolveRelativePaths,
     indexBy(prop('id')),
     resolveRulesExtendedViews
   )
@@ -362,7 +366,7 @@ export class LikeC4ModelBuilder {
         logger.debug('[ModelBuilder] No documents to build model from')
         return null
       }
-      logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)`)
+      logger.debug(`[ModelBuilder] buildModel (${docs.length} docs)`)
       return buildModel(this.services, docs)
     })
   }
@@ -395,7 +399,10 @@ export class LikeC4ModelBuilder {
 
       const allViews = [] as c4.ComputedView[]
       for (const view of values(model.views)) {
-        const result = isElementView(view) ? computeView(view, index) : computeDynamicView(view, index)
+        const resolvedView = resolveGlobalRules(view, model.globals.styles)
+        const result = isElementView(resolvedView)
+          ? computeView(resolvedView, index)
+          : computeDynamicView(resolvedView, index)
         if (!result.isSuccess) {
           logWarnError(result.error)
           continue

package/src/model-graph/compute-view/__test__/fixture.ts

@@ -11,12 +11,16 @@ import {
   type ElementWhereExpr,
   type Expression as C4Expression,
   type Fqn,
+  type IncomingExpr as C4IncomingExpr,
+  type InOutExpr as C4InOutExpr,
   isElementRef,
   isElementWhere,
   isRelationExpression,
   isRelationWhere,
   type NonEmptyArray,
+  type OutgoingExpr as C4OutgoingExpr,
   type Relation,
+  type RelationExpr as C4RelationExpr,
   type RelationID,
   type RelationshipArrowType,
   type RelationshipLineType,
@@ -414,6 +418,49 @@ export function $where(
   }
 }
 
+export function $inout(
+  expr: InOutExpr | C4ElementExpression
+): C4InOutExpr {
+  const innerExpression = !isString(expr)
+    ? expr as C4Expression
+    : $expr(expr.replace(/->/g, '').trim() as ElementRefExpr) as any
+
+  return { inout: innerExpression }
+}
+
+export function $incoming(
+  expr: IncomingExpr | C4ElementExpression
+): C4IncomingExpr {
+  const innerExpression = !isString(expr)
+    ? expr as C4Expression
+    : $expr(expr.replace('-> ', '') as ElementRefExpr) as any
+
+  return { incoming: innerExpression }
+}
+
+export function $outgoing(
+  expr: OutgoingExpr | C4ElementExpression
+): C4OutgoingExpr {
+  const innerExpression = !isString(expr)
+    ? expr as C4Expression
+    : $expr(expr.replace(' ->', '') as ElementRefExpr) as any
+
+  return { outgoing: innerExpression }
+}
+
+export function $relation(
+  expr: RelationExpr
+): C4RelationExpr {
+  const [source, target] = expr.split(/ -> | <-> /)
+  const isBidirectional = expr.includes(' <-> ')
+
+  return {
+    source: $expr(source as ElementRefExpr) as any,
+    target: $expr(target as ElementRefExpr) as any,
+    ...(isBidirectional && { isBidirectional })
+  }
+}
+
 export function $expr(expr: Expression | C4Expression): C4Expression {
   if (!isString(expr)) {
     return expr as C4Expression
@@ -422,34 +469,13 @@ export function $expr(expr: Expression | C4Expression): C4Expression {
     return { wildcard: true }
   }
   if (expr.startsWith('->')) {
-    if (expr.endsWith('->')) {
-      return {
-        inout: $expr(expr.replace(/->/g, '').trim() as ElementRefExpr) as any
-      }
-    }
-    return {
-      incoming: $expr(expr.replace('-> ', '') as ElementRefExpr) as any
-    }
+    return expr.endsWith('->') ? $inout(expr as InOutExpr) : $incoming(expr as IncomingExpr)
   }
   if (expr.endsWith(' ->')) {
-    return {
-      outgoing: $expr(expr.replace(' ->', '') as ElementRefExpr) as any
-    }
-  }
-  if (expr.includes(' <-> ')) {
-    const [source, target] = expr.split(' <-> ')
-    return {
-      source: $expr(source as ElementRefExpr) as any,
-      target: $expr(target as ElementRefExpr) as any,
-      isBidirectional: true
-    }
+    return $outgoing(expr as OutgoingExpr)
   }
-  if (expr.includes(' -> ')) {
-    const [source, target] = expr.split(' -> ')
-    return {
-      source: $expr(source as ElementRefExpr) as any,
-      target: $expr(target as ElementRefExpr) as any
-    }
+  if (expr.includes(' -> ') || expr.includes(' <-> ')) {
+    return $relation(expr as RelationExpr)
   }
   if (expr.endsWith('._')) {
     return {

package/src/model-graph/utils/applyCustomRelationProperties.ts

@@ -1,39 +1,8 @@
-import type { ComputedEdge, ComputedNode, Element, ViewRule } from '@likec4/core'
-import { Expr, nonexhaustive } from '@likec4/core'
-import { isNullish, omitBy } from 'remeda'
+import type { ComputedEdge, ComputedNode, ViewRule } from '@likec4/core'
+import { Expr } from '@likec4/core'
+import { isNullish, omitBy, pick } from 'remeda'
 import { flattenGroupRules } from './applyCustomElementProperties'
-import { elementExprToPredicate } from './elementExpressionToPredicate'
-
-function relationExpressionToPredicates(
-  expr: Expr.RelationExpression | Expr.RelationWhereExpr
-): (edge: { source: Element; target: Element }) => boolean {
-  switch (true) {
-    case Expr.isRelationWhere(expr):
-      return relationExpressionToPredicates(expr.where.expr)
-    case Expr.isRelation(expr): {
-      const isSource = elementExprToPredicate(expr.source)
-      const isTarget = elementExprToPredicate(expr.target)
-      return edge => {
-        return (isSource(edge.source) && isTarget(edge.target))
-          || (!!expr.isBidirectional && isSource(edge.target) && isTarget(edge.source))
-      }
-    }
-    case Expr.isInOut(expr): {
-      const isInOut = elementExprToPredicate(expr.inout)
-      return edge => isInOut(edge.source) || isInOut(edge.target)
-    }
-    case Expr.isIncoming(expr): {
-      const isTarget = elementExprToPredicate(expr.incoming)
-      return edge => isTarget(edge.target)
-    }
-    case Expr.isOutgoing(expr): {
-      const isSource = elementExprToPredicate(expr.outgoing)
-      return edge => isSource(edge.source)
-    }
-    default:
-      nonexhaustive(expr)
-  }
-}
+import { relationExpressionToPredicates } from './relationExpressionToPredicates'
 
 export function applyCustomRelationProperties(
   _rules: ViewRule[],
@@ -58,12 +27,12 @@ export function applyCustomRelationProperties(
       if (!source || !target) {
         return
       }
-      if (satisfies({ source, target })) {
+      if (satisfies({ source, target, ...pick(edge, ['kind', 'tags']) })) {
         edges[i] = {
           ...edge,
+          ...props,
           label: title ?? edge.label,
-          isCustomized: true,
-          ...props
+          isCustomized: true
         }
       }
     })

package/src/model-graph/utils/relationExpressionToPredicates.ts

@@ -0,0 +1,43 @@
+import type { Element, Relation } from '@likec4/core'
+import { Expr, nonexhaustive, whereOperatorAsPredicate } from '@likec4/core'
+import { elementExprToPredicate } from './elementExpressionToPredicate'
+
+type Predicate<T> = (x: T) => boolean
+export type FilterableEdge = Pick<Relation, 'kind' | 'tags'> & {
+  source: Element
+  target: Element
+}
+
+export function relationExpressionToPredicates<T extends FilterableEdge>(
+  expr: Expr.RelationExpression | Expr.RelationWhereExpr
+): Predicate<T> {
+  switch (true) {
+    case Expr.isRelationWhere(expr):
+      const predicate = relationExpressionToPredicates(expr.where.expr)
+      const where = whereOperatorAsPredicate(expr.where.condition)
+
+      return e => predicate(e) && where(e)
+    case Expr.isRelation(expr): {
+      const isSource = elementExprToPredicate(expr.source)
+      const isTarget = elementExprToPredicate(expr.target)
+      return edge => {
+        return (isSource(edge.source) && isTarget(edge.target))
+          || (!!expr.isBidirectional && isSource(edge.target) && isTarget(edge.source))
+      }
+    }
+    case Expr.isInOut(expr): {
+      const isInOut = elementExprToPredicate(expr.inout)
+      return edge => isInOut(edge.source) || isInOut(edge.target)
+    }
+    case Expr.isIncoming(expr): {
+      const isTarget = elementExprToPredicate(expr.incoming)
+      return edge => isTarget(edge.target)
+    }
+    case Expr.isOutgoing(expr): {
+      const isSource = elementExprToPredicate(expr.outgoing)
+      return edge => isSource(edge.source)
+    }
+    default:
+      nonexhaustive(expr)
+  }
+}