@likec4/language-server 1.10.0 → 1.10.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.JWkqVjGv.cjs');
+const module$1 = require('./shared/language-server.Bfc-5M8A.cjs');
 
 function startLanguageServer() {
   const messageReader = new browser.BrowserMessageReader(self);

package/dist/browser.d.cts

@@ -1,18 +1,17 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.CjFzaJwI.cjs';
-import * as vscode_languageserver_browser from 'vscode-languageserver/browser';
+import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.BGy3FJPJ.cjs';
+import * as vscode_languageserver from 'vscode-languageserver';
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver/browser';
 import '@likec4/core';
 import 'langium';
 import 'type-fest';
 import 'vscode-languageserver-types';
 import 'langium/lsp';
-import 'vscode-languageserver';
 import './protocol.cjs';
 import 'vscode-jsonrpc';
 import 'vscode-uri';
 
 declare function startLanguageServer(): {
-    connection: vscode_languageserver_browser.Connection;
+    connection: vscode_languageserver.Connection;
     messageReader: BrowserMessageReader;
     messageWriter: BrowserMessageWriter;
     shared: LikeC4SharedServices;

package/dist/browser.d.mts

@@ -1,18 +1,17 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.D-84I33F.mjs';
-import * as vscode_languageserver_browser from 'vscode-languageserver/browser';
+import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.DEK39RmI.mjs';
+import * as vscode_languageserver from 'vscode-languageserver';
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver/browser';
 import '@likec4/core';
 import 'langium';
 import 'type-fest';
 import 'vscode-languageserver-types';
 import 'langium/lsp';
-import 'vscode-languageserver';
 import './protocol.mjs';
 import 'vscode-jsonrpc';
 import 'vscode-uri';
 
 declare function startLanguageServer(): {
-    connection: vscode_languageserver_browser.Connection;
+    connection: vscode_languageserver.Connection;
     messageReader: BrowserMessageReader;
     messageWriter: BrowserMessageWriter;
     shared: LikeC4SharedServices;

package/dist/browser.d.ts

@@ -1,18 +1,17 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.CtKHXJDD.js';
-import * as vscode_languageserver_browser from 'vscode-languageserver/browser';
+import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.CnVuAxDh.js';
+import * as vscode_languageserver from 'vscode-languageserver';
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver/browser';
 import '@likec4/core';
 import 'langium';
 import 'type-fest';
 import 'vscode-languageserver-types';
 import 'langium/lsp';
-import 'vscode-languageserver';
 import './protocol.js';
 import 'vscode-jsonrpc';
 import 'vscode-uri';
 
 declare function startLanguageServer(): {
-    connection: vscode_languageserver_browser.Connection;
+    connection: vscode_languageserver.Connection;
     messageReader: BrowserMessageReader;
     messageWriter: BrowserMessageWriter;
     shared: LikeC4SharedServices;

package/dist/browser.mjs

@@ -1,6 +1,6 @@
 import { startLanguageServer as startLanguageServer$1 } from 'langium/lsp';
 import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser';
-import { a as createLanguageServices } from './shared/language-server.DBJJUUgF.mjs';
+import { a as createLanguageServices } from './shared/language-server.BFBeyvV8.mjs';
 
 function startLanguageServer() {
   const messageReader = new BrowserMessageReader(self);

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const module$1 = require('./shared/language-server.JWkqVjGv.cjs');
+const module$1 = require('./shared/language-server.Bfc-5M8A.cjs');
 
 
 

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { LogLevels } from '@likec4/log';
-import { L as LikeC4LangiumDocument, a as LikeC4Services } from './shared/language-server.CjFzaJwI.cjs';
-export { e as FqnIndex, F as FqnIndexEntry, I as IsValidFn, k as LanguageServicesContext, j as LikeC4AddedServices, f as LikeC4ModelBuilder, g as LikeC4ModelLocator, h as LikeC4ModelParser, d as LikeC4Module, i as LikeC4SharedServices, M as ModelParsedListener, c as createCustomLanguageServices, b as createLanguageServices, l as createSharedServices } from './shared/language-server.CjFzaJwI.cjs';
+import { L as LikeC4LangiumDocument, a as LikeC4Services } from './shared/language-server.BGy3FJPJ.cjs';
+export { e as FqnIndex, F as FqnIndexEntry, I as IsValidFn, k as LanguageServicesContext, j as LikeC4AddedServices, f as LikeC4ModelBuilder, g as LikeC4ModelLocator, h as LikeC4ModelParser, d as LikeC4Module, i as LikeC4SharedServices, M as ModelParsedListener, c as createCustomLanguageServices, b as createLanguageServices, l as createSharedServices } from './shared/language-server.BGy3FJPJ.cjs';
 import '@likec4/core';
 import 'langium';
 import 'type-fest';

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { LogLevels } from '@likec4/log';
-import { L as LikeC4LangiumDocument, a as LikeC4Services } from './shared/language-server.D-84I33F.mjs';
-export { e as FqnIndex, F as FqnIndexEntry, I as IsValidFn, k as LanguageServicesContext, j as LikeC4AddedServices, f as LikeC4ModelBuilder, g as LikeC4ModelLocator, h as LikeC4ModelParser, d as LikeC4Module, i as LikeC4SharedServices, M as ModelParsedListener, c as createCustomLanguageServices, b as createLanguageServices, l as createSharedServices } from './shared/language-server.D-84I33F.mjs';
+import { L as LikeC4LangiumDocument, a as LikeC4Services } from './shared/language-server.DEK39RmI.mjs';
+export { e as FqnIndex, F as FqnIndexEntry, I as IsValidFn, k as LanguageServicesContext, j as LikeC4AddedServices, f as LikeC4ModelBuilder, g as LikeC4ModelLocator, h as LikeC4ModelParser, d as LikeC4Module, i as LikeC4SharedServices, M as ModelParsedListener, c as createCustomLanguageServices, b as createLanguageServices, l as createSharedServices } from './shared/language-server.DEK39RmI.mjs';
 import '@likec4/core';
 import 'langium';
 import 'type-fest';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { LogLevels } from '@likec4/log';
-import { L as LikeC4LangiumDocument, a as LikeC4Services } from './shared/language-server.CtKHXJDD.js';
-export { e as FqnIndex, F as FqnIndexEntry, I as IsValidFn, k as LanguageServicesContext, j as LikeC4AddedServices, f as LikeC4ModelBuilder, g as LikeC4ModelLocator, h as LikeC4ModelParser, d as LikeC4Module, i as LikeC4SharedServices, M as ModelParsedListener, c as createCustomLanguageServices, b as createLanguageServices, l as createSharedServices } from './shared/language-server.CtKHXJDD.js';
+import { L as LikeC4LangiumDocument, a as LikeC4Services } from './shared/language-server.CnVuAxDh.js';
+export { e as FqnIndex, F as FqnIndexEntry, I as IsValidFn, k as LanguageServicesContext, j as LikeC4AddedServices, f as LikeC4ModelBuilder, g as LikeC4ModelLocator, h as LikeC4ModelParser, d as LikeC4Module, i as LikeC4SharedServices, M as ModelParsedListener, c as createCustomLanguageServices, b as createLanguageServices, l as createSharedServices } from './shared/language-server.CnVuAxDh.js';
 import '@likec4/core';
 import 'langium';
 import 'type-fest';

package/dist/index.mjs

@@ -1 +1 @@
-export { L as LikeC4Module, c as createCustomLanguageServices, a as createLanguageServices, s as setLogLevel } from './shared/language-server.DBJJUUgF.mjs';
+export { L as LikeC4Module, c as createCustomLanguageServices, a as createLanguageServices, s as setLogLevel } from './shared/language-server.BFBeyvV8.mjs';

package/dist/model-graph/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const LikeC4ModelGraph = require('../shared/language-server.DwyCJvXm.cjs');
+const LikeC4ModelGraph = require('../shared/language-server.DJhoJBWh.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.DtBRb9os.mjs';
+export { L as LikeC4ModelGraph, b as computeDynamicView, c as computeElementView, a as computeView } from '../shared/language-server.CbqwHp7Q.mjs';

package/dist/node.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.JWkqVjGv.cjs');
+const module$1 = require('./shared/language-server.Bfc-5M8A.cjs');
 
 function startLanguageServer() {
   const connection = node.createConnection(node.ProposedFeatures.all);

package/dist/node.d.cts

@@ -1,18 +1,17 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.CjFzaJwI.cjs';
+import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.BGy3FJPJ.cjs';
 import * as vscode_languageserver_lib_common_inlineCompletion_proposed from 'vscode-languageserver/lib/common/inlineCompletion.proposed';
-import * as vscode_languageserver_node from 'vscode-languageserver/node';
+import * as vscode_languageserver from 'vscode-languageserver';
 import '@likec4/core';
 import 'langium';
 import 'type-fest';
 import 'vscode-languageserver-types';
 import 'langium/lsp';
-import 'vscode-languageserver';
 import './protocol.cjs';
 import 'vscode-jsonrpc';
 import 'vscode-uri';
 
 declare function startLanguageServer(): {
-    connection: vscode_languageserver_node._Connection<vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver_node._>;
+    connection: vscode_languageserver._Connection<vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver._>;
     shared: LikeC4SharedServices;
     likec4: LikeC4Services;
 };

package/dist/node.d.mts

@@ -1,18 +1,17 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.D-84I33F.mjs';
+import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.DEK39RmI.mjs';
 import * as vscode_languageserver_lib_common_inlineCompletion_proposed from 'vscode-languageserver/lib/common/inlineCompletion.proposed';
-import * as vscode_languageserver_node from 'vscode-languageserver/node';
+import * as vscode_languageserver from 'vscode-languageserver';
 import '@likec4/core';
 import 'langium';
 import 'type-fest';
 import 'vscode-languageserver-types';
 import 'langium/lsp';
-import 'vscode-languageserver';
 import './protocol.mjs';
 import 'vscode-jsonrpc';
 import 'vscode-uri';
 
 declare function startLanguageServer(): {
-    connection: vscode_languageserver_node._Connection<vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver_node._>;
+    connection: vscode_languageserver._Connection<vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver._>;
     shared: LikeC4SharedServices;
     likec4: LikeC4Services;
 };

package/dist/node.d.ts

@@ -1,18 +1,17 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.CtKHXJDD.js';
+import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.CnVuAxDh.js';
 import * as vscode_languageserver_lib_common_inlineCompletion_proposed from 'vscode-languageserver/lib/common/inlineCompletion.proposed';
-import * as vscode_languageserver_node from 'vscode-languageserver/node';
+import * as vscode_languageserver from 'vscode-languageserver';
 import '@likec4/core';
 import 'langium';
 import 'type-fest';
 import 'vscode-languageserver-types';
 import 'langium/lsp';
-import 'vscode-languageserver';
 import './protocol.js';
 import 'vscode-jsonrpc';
 import 'vscode-uri';
 
 declare function startLanguageServer(): {
-    connection: vscode_languageserver_node._Connection<vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver_node._>;
+    connection: vscode_languageserver._Connection<vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver._>;
     shared: LikeC4SharedServices;
     likec4: LikeC4Services;
 };

package/dist/node.mjs

@@ -1,7 +1,7 @@
 import { startLanguageServer as startLanguageServer$1 } from 'langium/lsp';
 import { NodeFileSystem } from 'langium/node';
 import { createConnection, ProposedFeatures } from 'vscode-languageserver/node';
-import { a as createLanguageServices } from './shared/language-server.DBJJUUgF.mjs';
+import { a as createLanguageServices } from './shared/language-server.BFBeyvV8.mjs';
 
 function startLanguageServer() {
   const connection = createConnection(ProposedFeatures.all);

package/dist/shared/{language-server.DBJJUUgF.mjs → language-server.BFBeyvV8.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 { i as isAcyclic, f as findCycles, p as postorder, L as LikeC4ModelGraph, a as computeView, b as computeDynamicView } from './language-server.DtBRb9os.mjs';
+import { i as isAcyclic, f as findCycles, p as postorder, L as LikeC4ModelGraph, a as computeView, b as computeDynamicView } from './language-server.CbqwHp7Q.mjs';
 import { hasProtocol, hasLeadingSlash, isRelative, withoutLeadingSlash, withoutBase, parsePath } from 'ufo';
 import { Graph } from '@dagrejs/graphlib';
 import { DocumentHighlight, DocumentHighlightKind } from 'vscode-languageserver';
@@ -5450,7 +5450,8 @@ class LikeC4Formatter extends AbstractFormatter {
   }
   formatRelation(node) {
     this.on(node, isRelation, (n, f) => {
-      f.property("source").append(FormattingOptions.oneSpace);
+      const sourceNodes = n?.source?.$cstNode ? [n?.source?.$cstNode] : [];
+      f.cst(sourceNodes).append(FormattingOptions.oneSpace);
       f.keywords("]->").prepend(FormattingOptions.noSpace);
       f.keywords("-[").append(FormattingOptions.noSpace);
       f.properties("target", "title", "technology", "tags").prepend(FormattingOptions.oneSpace);
@@ -5468,7 +5469,7 @@ class LikeC4Formatter extends AbstractFormatter {
       f.keywords("-[").append(FormattingOptions.noSpace);
     });
     this.on(node, isIncomingRelationExpression)?.keywords("->").append(FormattingOptions.oneSpace);
-    this.on(node, isInOutRelationExpression)?.property("inout").append(FormattingOptions.oneSpace);
+    this.on(node, isInOutRelationExpression)?.keyword("->").prepend(FormattingOptions.oneSpace);
   }
   removeIndentFromTopLevelStatements(node) {
     if (isModel(node) || isSpecificationRule(node) || isModelViews(node) || isLikeC4Lib(node)) {

package/dist/shared/{language-server.CjFzaJwI.d.cts → language-server.BGy3FJPJ.d.cts}

@@ -9,7 +9,7 @@ import { ChangeViewRequestParams } from '../protocol.cjs';
 import { URI } from 'vscode-uri';
 
 /******************************************************************************
- * This file was generated by langium-cli 3.1.1.
+ * This file was generated by langium-cli 3.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
@@ -923,7 +923,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 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 isRelation | typeof isExtendElement | typeof isElement | typeof isLikeC4View | 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;

package/dist/shared/{language-server.JWkqVjGv.cjs → language-server.Bfc-5M8A.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.DwyCJvXm.cjs');
+const LikeC4ModelGraph = require('./language-server.DJhoJBWh.cjs');
 const ufo = require('ufo');
 const graphlib = require('@dagrejs/graphlib');
 const vscodeLanguageserver = require('vscode-languageserver');
@@ -5458,7 +5458,8 @@ class LikeC4Formatter extends lsp.AbstractFormatter {
   }
   formatRelation(node) {
     this.on(node, isRelation, (n, f) => {
-      f.property("source").append(FormattingOptions.oneSpace);
+      const sourceNodes = n?.source?.$cstNode ? [n?.source?.$cstNode] : [];
+      f.cst(sourceNodes).append(FormattingOptions.oneSpace);
       f.keywords("]->").prepend(FormattingOptions.noSpace);
       f.keywords("-[").append(FormattingOptions.noSpace);
       f.properties("target", "title", "technology", "tags").prepend(FormattingOptions.oneSpace);
@@ -5476,7 +5477,7 @@ class LikeC4Formatter extends lsp.AbstractFormatter {
       f.keywords("-[").append(FormattingOptions.noSpace);
     });
     this.on(node, isIncomingRelationExpression)?.keywords("->").append(FormattingOptions.oneSpace);
-    this.on(node, isInOutRelationExpression)?.property("inout").append(FormattingOptions.oneSpace);
+    this.on(node, isInOutRelationExpression)?.keyword("->").prepend(FormattingOptions.oneSpace);
   }
   removeIndentFromTopLevelStatements(node) {
     if (isModel(node) || isSpecificationRule(node) || isModelViews(node) || isLikeC4Lib(node)) {

package/dist/shared/{language-server.DtBRb9os.mjs → language-server.CbqwHp7Q.mjs}

@@ -1,5 +1,5 @@
-import { Expr, whereOperatorAsPredicate, parentFqn, nonexhaustive, isViewRuleStyle, compareByFqnHierarchically, DefaultThemeColor, DefaultElementShape, compareRelations, invariant, nonNullable, isAncestor, isViewRulePredicate, ancestorsFqn, isViewRuleAutoLayout, isScopedElementView, commonAncestor, StepEdgeId, isDynamicViewParallelSteps, isDynamicViewIncludeRule, DefaultRelationshipColor, DefaultLineStyle, DefaultArrowType, isSameHierarchy } from '@likec4/core';
-import { pipe, map, pick, mapToObj, isTruthy, isNullish, omitBy, isEmpty, filter, anyPass, isDefined, groupBy, prop, mapValues, piped, unique, entries, flatMap, sortBy, sort, difference, allPass, omit, hasAtLeast, reduce, only, isNonNull, isString, isArray } from 'remeda';
+import { Expr, whereOperatorAsPredicate, parentFqn, nonexhaustive, isViewRuleStyle, compareByFqnHierarchically, DefaultThemeColor, DefaultElementShape, compareRelations, invariant, nonNullable, compareNatural, hasAtLeast, isAncestor, isViewRulePredicate, ancestorsFqn, isViewRuleAutoLayout, isScopedElementView, commonAncestor, StepEdgeId, isDynamicViewParallelSteps, isDynamicViewIncludeRule, DefaultRelationshipColor, DefaultLineStyle, DefaultArrowType, isSameHierarchy } from '@likec4/core';
+import { pipe, map, pick, mapToObj, isTruthy, isNullish, omitBy, isEmpty, filter, anyPass, isDefined, groupBy, prop, mapValues, piped, unique, entries, flatMap, sortBy, sort, difference, allPass, omit, hasAtLeast as hasAtLeast$1, only, reduce, isNonNull, isString, isArray } from 'remeda';
 import graphlib, { Graph } from '@dagrejs/graphlib';
 import objectHash from 'object-hash';
 
@@ -366,6 +366,16 @@ function sortNodes({
   return sorted;
 }
 
+function uniqueTags(elements) {
+  const tags = pipe(
+    elements,
+    flatMap((e) => e.tags ?? []),
+    unique(),
+    sort(compareNatural)
+  );
+  return hasAtLeast(tags, 1) ? tags : null;
+}
+
 const NoFilter = () => true;
 const Identity = (x) => x;
 const filterBy = (pred) => pred === NoFilter ? Identity : filter(pred);
@@ -865,7 +875,7 @@ class ComputeCtx {
   }
   computeEdges() {
     return this.ctxEdges.map((e) => {
-      invariant(hasAtLeast(e.relations, 1), "Edge must have at least one relation");
+      invariant(hasAtLeast$1(e.relations, 1), "Edge must have at least one relation");
       const relations = sort(e.relations, compareRelations);
       const source = e.source.id;
       const target = e.target.id;
@@ -878,7 +888,11 @@ class ComputeCtx {
         relations: relations.map((r) => r.id)
       };
       let relation;
-      relation = relations.length === 1 ? relations[0] : relations.find((r) => r.source === source && r.target === target);
+      relation = only(relations) ?? pipe(
+        relations,
+        filter((r) => r.source === source && r.target === target),
+        only()
+      );
       if (!relation) {
         const allprops = pipe(
           relations,
@@ -935,7 +949,7 @@ class ComputeCtx {
           navigateTo: only(allprops.navigateTo)
         };
       }
-      const tags = unique(flatMap(relations, (r) => r.tags ?? []));
+      const tags = uniqueTags(relations);
       return Object.assign(
         edge,
         this.getEdgeLabel(relation),
@@ -947,7 +961,7 @@ class ComputeCtx {
         relation.head && { head: relation.head },
         relation.tail && { tail: relation.tail },
         relation.navigateTo && { navigateTo: relation.navigateTo },
-        hasAtLeast(tags, 1) && { tags }
+        tags && { tags }
       );
     });
   }
@@ -969,7 +983,7 @@ class ComputeCtx {
   }
   addEdges(edges) {
     for (const e of edges) {
-      if (!hasAtLeast(e.relations, 1)) {
+      if (!hasAtLeast$1(e.relations, 1)) {
         continue;
       }
       const existing = this.ctxEdges.find(
@@ -1357,8 +1371,8 @@ class DynamicViewComputeCtx {
       filter(isTruthy),
       unique()
     );
-    const tags = hasAtLeast(alltags, 1) ? alltags : null;
-    const relations = hasAtLeast(relationships, 1) ? map(relationships, (r) => r.id) : null;
+    const tags = hasAtLeast$1(alltags, 1) ? alltags : null;
+    const relations = hasAtLeast$1(relationships, 1) ? map(relationships, (r) => r.id) : null;
     const relation = only(relationships) || relationships.find((r) => r.source === source.id && r.target === target.id);
     const title = isTruthy(relation?.title) ? relation.title : pipe(
       relationships,

package/dist/shared/{language-server.CtKHXJDD.d.ts → language-server.CnVuAxDh.d.ts}

@@ -9,7 +9,7 @@ import { ChangeViewRequestParams } from '../protocol.js';
 import { URI } from 'vscode-uri';
 
 /******************************************************************************
- * This file was generated by langium-cli 3.1.1.
+ * This file was generated by langium-cli 3.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
@@ -923,7 +923,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 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 isRelation | typeof isExtendElement | typeof isElement | typeof isLikeC4View | 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;

package/dist/shared/{language-server.D-84I33F.d.mts → language-server.DEK39RmI.d.mts}

@@ -9,7 +9,7 @@ import { ChangeViewRequestParams } from '../protocol.mjs';
 import { URI } from 'vscode-uri';
 
 /******************************************************************************
- * This file was generated by langium-cli 3.1.1.
+ * This file was generated by langium-cli 3.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
@@ -923,7 +923,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 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 isRelation | typeof isExtendElement | typeof isElement | typeof isLikeC4View | 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;

package/dist/shared/{language-server.DwyCJvXm.cjs → language-server.DJhoJBWh.cjs}

@@ -373,6 +373,16 @@ function sortNodes({
   return sorted;
 }
 
+function uniqueTags(elements) {
+  const tags = remeda.pipe(
+    elements,
+    remeda.flatMap((e) => e.tags ?? []),
+    remeda.unique(),
+    remeda.sort(core.compareNatural)
+  );
+  return core.hasAtLeast(tags, 1) ? tags : null;
+}
+
 const NoFilter = () => true;
 const Identity = (x) => x;
 const filterBy = (pred) => pred === NoFilter ? Identity : remeda.filter(pred);
@@ -885,7 +895,11 @@ class ComputeCtx {
         relations: relations.map((r) => r.id)
       };
       let relation;
-      relation = relations.length === 1 ? relations[0] : relations.find((r) => r.source === source && r.target === target);
+      relation = remeda.only(relations) ?? remeda.pipe(
+        relations,
+        remeda.filter((r) => r.source === source && r.target === target),
+        remeda.only()
+      );
       if (!relation) {
         const allprops = remeda.pipe(
           relations,
@@ -942,7 +956,7 @@ class ComputeCtx {
           navigateTo: remeda.only(allprops.navigateTo)
         };
       }
-      const tags = remeda.unique(remeda.flatMap(relations, (r) => r.tags ?? []));
+      const tags = uniqueTags(relations);
       return Object.assign(
         edge,
         this.getEdgeLabel(relation),
@@ -954,7 +968,7 @@ class ComputeCtx {
         relation.head && { head: relation.head },
         relation.tail && { tail: relation.tail },
         relation.navigateTo && { navigateTo: relation.navigateTo },
-        remeda.hasAtLeast(tags, 1) && { tags }
+        tags && { tags }
       );
     });
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -108,20 +108,20 @@
   },
   "dependencies": {
     "@dagrejs/graphlib": "^2.2.4",
-    "@likec4/core": "1.10.0",
-    "@likec4/log": "1.10.0",
+    "@likec4/core": "1.10.1",
+    "@likec4/log": "1.10.1",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
-    "langium": "3.1.3",
+    "langium": "3.2.0",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
     "remeda": "^2.11.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
-    "type-fest": "^4.26.0",
+    "type-fest": "^4.26.1",
     "ufo": "^1.5.4",
     "vscode-jsonrpc": "8.2.0",
     "vscode-languageserver": "9.0.1",
@@ -129,19 +129,20 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.10.0",
-    "@likec4/tsconfig": "1.10.0",
+    "@likec4/icons": "1.10.1",
+    "@likec4/tsconfig": "1.10.1",
     "@types/node": "^20.16.1",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
+    "@vitest/coverage-v8": "^2.1.0",
     "execa": "^9.3.1",
-    "langium-cli": "3.1.1",
+    "langium-cli": "3.2.0",
     "npm-run-all2": "^6.2.2",
     "tsx": "~4.9.3",
     "turbo": "^2.1.1",
-    "typescript": "^5.5.4",
+    "typescript": "^5.6.2",
     "unbuild": "^3.0.0-rc.7",
-    "vitest": "~2.0.5"
+    "vitest": "^2.1.0"
   },
-  "packageManager": "yarn@4.3.1"
+  "packageManager": "yarn@4.4.1"
 }

package/src/formatting/LikeC4Formatter.ts

@@ -46,7 +46,9 @@ export class LikeC4Formatter extends AbstractFormatter {
 
   protected formatRelation(node: AstNode) {
     this.on(node, ast.isRelation, (n, f) => {
-      f.property('source').append(FormattingOptions.oneSpace)
+      const sourceNodes = n?.source?.$cstNode ? [n?.source?.$cstNode] : []
+
+      f.cst(sourceNodes).append(FormattingOptions.oneSpace)
       f.keywords(']->').prepend(FormattingOptions.noSpace)
       f.keywords('-[').append(FormattingOptions.noSpace)
 
@@ -73,7 +75,7 @@ export class LikeC4Formatter extends AbstractFormatter {
       ?.keywords('->').append(FormattingOptions.oneSpace)
 
     this.on(node, ast.isInOutRelationExpression)
-      ?.property('inout').append(FormattingOptions.oneSpace)
+      ?.keyword('->').prepend(FormattingOptions.oneSpace)
   }
 
   protected removeIndentFromTopLevelStatements(node: AstNode) {

package/src/generated/ast.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 3.1.1.
+ * This file was generated by langium-cli 3.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
@@ -28,6 +28,104 @@ export const LikeC4Terminals = {
     Hex: /[a-zA-Z0-9]+/,
 };
 
+export type LikeC4TerminalNames = keyof typeof LikeC4Terminals;
+
+export type LikeC4KeywordNames = 
+    | "("
+    | ")"
+    | "*"
+    | ","
+    | "->"
+    | "-["
+    | ":"
+    | ";"
+    | "<-"
+    | "<->"
+    | "BottomTop"
+    | "LeftRight"
+    | "RightLeft"
+    | "TopBottom"
+    | "]->"
+    | "amber"
+    | "and"
+    | "autoLayout"
+    | "blue"
+    | "border"
+    | "browser"
+    | "color"
+    | "crow"
+    | "cylinder"
+    | "dashed"
+    | "description"
+    | "diamond"
+    | "dot"
+    | "dotted"
+    | "dynamic"
+    | "element"
+    | "element.kind"
+    | "element.tag"
+    | "exclude"
+    | "extend"
+    | "extends"
+    | "gray"
+    | "green"
+    | "head"
+    | "icon"
+    | "icons"
+    | "include"
+    | "indigo"
+    | "is"
+    | "kind"
+    | "likec4lib"
+    | "line"
+    | "link"
+    | "metadata"
+    | "mobile"
+    | "model"
+    | "muted"
+    | "navigateTo"
+    | "none"
+    | "normal"
+    | "not"
+    | "notation"
+    | "notes"
+    | "odiamond"
+    | "odot"
+    | "of"
+    | "onormal"
+    | "opacity"
+    | "open"
+    | "or"
+    | "par"
+    | "parallel"
+    | "person"
+    | "primary"
+    | "queue"
+    | "rectangle"
+    | "red"
+    | "relationship"
+    | "secondary"
+    | "shape"
+    | "sky"
+    | "slate"
+    | "solid"
+    | "specification"
+    | "storage"
+    | "style"
+    | "tag"
+    | "tail"
+    | "technology"
+    | "title"
+    | "vee"
+    | "view"
+    | "views"
+    | "where"
+    | "with"
+    | "{"
+    | "}";
+
+export type LikeC4TokenNames = LikeC4TerminalNames | LikeC4KeywordNames;
+
 export type ArrowType = 'crow' | 'diamond' | 'dot' | 'none' | 'normal' | 'odiamond' | 'odot' | 'onormal' | 'open' | 'vee';
 
 export function isArrowType(item: unknown): item is ArrowType {

package/src/generated/grammar.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 3.1.1.
+ * This file was generated by langium-cli 3.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

package/src/generated/module.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 3.1.1.
+ * This file was generated by langium-cli 3.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

package/src/lsp/CompletionProvider.ts

@@ -1,7 +1,7 @@
 import { type CompletionProviderOptions, DefaultCompletionProvider } from 'langium/lsp'
 
 export class LikeC4CompletionProvider extends DefaultCompletionProvider {
-  readonly completionOptions = {
+  override readonly completionOptions = {
     triggerCharacters: ['.']
   } satisfies CompletionProviderOptions
 }

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

@@ -30,7 +30,7 @@ import {
   parentFqn,
   whereOperatorAsPredicate
 } from '@likec4/core'
-import { filter, flatMap, hasAtLeast, isNonNull, isTruthy, map, omit, only, pipe, reduce, sort, unique } from 'remeda'
+import { filter, hasAtLeast, isNonNull, isTruthy, map, omit, only, pipe, reduce, sort, unique } from 'remeda'
 import { calcViewLayoutHash } from '../../view-utils/view-hash'
 import type { LikeC4ModelGraph } from '../LikeC4ModelGraph'
 import { applyCustomElementProperties } from '../utils/applyCustomElementProperties'
@@ -39,6 +39,7 @@ import { applyViewRuleStyles } from '../utils/applyViewRuleStyles'
 import { buildComputeNodes } from '../utils/buildComputeNodes'
 import { buildElementNotations } from '../utils/buildElementNotations'
 import { sortNodes } from '../utils/sortNodes'
+import { uniqueTags } from '../utils/uniqueTags'
 import {
   type ElementPredicateFn,
   excludeElementKindOrTag,
@@ -218,7 +219,11 @@ export class ComputeCtx {
         tags?: NonEmptyArray<Tag>
         navigateTo?: ViewID | undefined
       } | undefined
-      relation = relations.length === 1 ? relations[0] : relations.find(r => r.source === source && r.target === target)
+      relation = only(relations) ?? pipe(
+        relations,
+        filter(r => r.source === source && r.target === target),
+        only()
+      )
 
       // This edge represents mutliple relations
       // We use label if only it is the same for all relations
@@ -279,7 +284,7 @@ export class ComputeCtx {
         }
       }
 
-      const tags = unique(flatMap(relations, r => r.tags ?? []))
+      const tags = uniqueTags(relations)
 
       return Object.assign(
         edge,
@@ -292,7 +297,7 @@ export class ComputeCtx {
         relation.head && { head: relation.head },
         relation.tail && { tail: relation.tail },
         relation.navigateTo && { navigateTo: relation.navigateTo },
-        hasAtLeast(tags, 1) && { tags }
+        tags && { tags }
       )
     })
   }

package/src/model-graph/utils/uniqueTags.test.ts

@@ -0,0 +1,42 @@
+import { compareNatural } from '@likec4/core'
+import { describe, expect, it } from 'vitest'
+import { uniqueTags } from './uniqueTags'
+
+describe('uniqueTags function', () => {
+  it('returns unique tags from an array of elements', () => {
+    const input = [
+      { tags: ['tag1', 'tag2', 'tag3'] },
+      { tags: ['tag2', 'tag3', 'tag4'] },
+      { tags: ['tag3', 'tag4', 'tag5'] }
+    ] as const
+    const result = uniqueTags(input)
+    expect(result).toEqual(['tag1', 'tag2', 'tag3', 'tag4', 'tag5'])
+  })
+
+  it('should return unique tags naturally sorted', () => {
+    const input = [
+      { tags: ['tag1', 'tag20', 'tag30'] },
+      { tags: ['tag2', 'tag23', 'tag34'] },
+      { tags: ['tag3'] }
+    ] as const
+    const result = uniqueTags(input)
+    expect(result).toEqual([
+      'tag1',
+      'tag2',
+      'tag3',
+      'tag20',
+      'tag23',
+      'tag30',
+      'tag34'
+    ].sort(compareNatural))
+  })
+
+  it('returns null if the tags array is null', () => {
+    const input = [
+      { tags: null },
+      {}
+    ]
+    const result = uniqueTags(input)
+    expect(result).toBeNull()
+  })
+})

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

@@ -0,0 +1,19 @@
+import { compareNatural, hasAtLeast, type NonEmptyReadonlyArray, type Tag } from '@likec4/core'
+import { flatMap, pipe, sort, unique } from 'remeda'
+import type { LiteralUnion } from 'type-fest'
+
+/**
+ * Extracts unique tags from an array of elements.
+ * and sort in natural order; returns null if no tags are present.
+ */
+export function uniqueTags<T extends { tags?: NonEmptyReadonlyArray<LiteralUnion<Tag, string>> | null }>(
+  elements: ReadonlyArray<T>
+) {
+  const tags = pipe(
+    elements,
+    flatMap(e => e.tags ?? []),
+    unique(),
+    sort(compareNatural)
+  )
+  return hasAtLeast(tags, 1) ? tags : null
+}