@likec4/language-server 1.20.0 → 1.20.2

package/dist/lsp/CompletionProvider.js

@@ -5,6 +5,14 @@ import {
 import { anyPass } from "remeda";
 import { CompletionItemKind, InsertTextFormat } from "vscode-languageserver-types";
 import { ast } from "../ast.js";
+const STYLE_FIELDS = [
+  "color",
+  "shape",
+  "icon",
+  "border",
+  "opacity",
+  "multiple"
+].join(",");
 export class LikeC4CompletionProvider extends DefaultCompletionProvider {
   completionOptions = {
     triggerCharacters: ["."]
@@ -83,7 +91,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
           kind: CompletionItemKind.Module,
           insertTextFormat: InsertTextFormat.Snippet,
           insertText: `${keyword.value} \${1:name} \${2:*} {
-	\${3|color,shape,border,opacity,icon|} $0
+	\${3|${STYLE_FIELDS}|} $0
 }`
         });
       }
@@ -94,7 +102,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
           kind: CompletionItemKind.Module,
           insertTextFormat: InsertTextFormat.Snippet,
           insertText: `${keyword.value} \${1:*} {
-	\${2|color,shape,border,opacity,icon|} $0
+	\${2|${STYLE_FIELDS}|} $0
 }`
         });
       }
@@ -104,7 +112,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
         kind: CompletionItemKind.Module,
         insertTextFormat: InsertTextFormat.Snippet,
         insertText: `${keyword.value} {
-	\${1|color,shape,border,opacity,icon|} $0
+	\${1|${STYLE_FIELDS}|} $0
 }`
       });
     }

package/dist/model/deployments-index.d.ts

@@ -1,5 +1,5 @@
 import type { Fqn } from '@likec4/core';
-import type { LangiumDocuments, Stream } from 'langium';
+import type { DocumentCache, LangiumDocuments, Stream } from 'langium';
 import { MultiMap } from 'langium';
 import { type DeploymentAstNodeDescription, type LikeC4LangiumDocument, ast } from '../ast';
 import type { LikeC4Services } from '../module';
@@ -8,6 +8,7 @@ export declare class DeploymentsIndex {
     private services;
     protected Names: LikeC4NameProvider;
     protected langiumDocuments: LangiumDocuments;
+    protected documentCache: DocumentCache<string, DocumentDeploymentsIndex>;
     constructor(services: LikeC4Services);
     private documents;
     get(document: LikeC4LangiumDocument): DocumentDeploymentsIndex;

package/dist/model/deployments-index.js

@@ -6,23 +6,16 @@ import {
   isLikeC4LangiumDocument
 } from "../ast.js";
 import { logWarnError } from "../logger.js";
-const DeploymentsIndexKey = Symbol.for("DeploymentsIndex");
 export class DeploymentsIndex {
   constructor(services) {
     this.services = services;
     this.Names = services.references.NameProvider;
     this.langiumDocuments = services.shared.workspace.LangiumDocuments;
-    services.shared.workspace.DocumentBuilder.onBuildPhase(
-      DocumentState.IndexedContent,
-      (docs, _cancelToken) => {
-        for (const doc of docs) {
-          delete doc[DeploymentsIndexKey];
-        }
-      }
-    );
+    this.documentCache = services.DocumentCache;
   }
   Names;
   langiumDocuments;
+  documentCache;
   documents() {
     return this.langiumDocuments.all.filter(
       (d) => isLikeC4LangiumDocument(d) && d.state >= DocumentState.IndexedContent
@@ -32,7 +25,7 @@ export class DeploymentsIndex {
     if (document.state < DocumentState.IndexedContent) {
       logWarnError(`Document ${document.uri.path} is not indexed`);
     }
-    return document[DeploymentsIndexKey] ??= this.createDocumentIndex(document);
+    return this.documentCache.get(document.uri, "DeploymentsIndex", () => this.createDocumentIndex(document));
   }
   /**
    * Nested elements (nodes/artifacts) of the node

package/dist/model/fqn-index.d.ts

@@ -2,6 +2,7 @@ import type { Fqn } from '@likec4/core';
 import type { AstNodeDescription, LangiumDocuments, Stream } from 'langium';
 import type { ast, FqnIndexedDocument } from '../ast';
 import type { LikeC4Services } from '../module';
+import { ADisposable } from '../utils';
 export interface FqnIndexEntry {
     fqn: Fqn;
     name: string;
@@ -9,7 +10,7 @@ export interface FqnIndexEntry {
     doc: FqnIndexedDocument;
     path: string;
 }
-export declare class FqnIndex {
+export declare class FqnIndex extends ADisposable {
     private services;
     protected langiumDocuments: LangiumDocuments;
     constructor(services: LikeC4Services);

package/dist/model/fqn-index.js

@@ -2,30 +2,37 @@ import { nameFromFqn, parentFqn } from "@likec4/core";
 import { DocumentState, DONE_RESULT, MultiMap, stream, StreamImpl } from "langium";
 import { ElementOps, isFqnIndexedDocument, isLikeC4LangiumDocument } from "../ast.js";
 import { logger, logWarnError } from "../logger.js";
+import { ADisposable } from "../utils/index.js";
 import { computeDocumentFqn } from "./fqn-computation.js";
-export class FqnIndex {
+export class FqnIndex extends ADisposable {
   constructor(services) {
+    super();
     this.services = services;
     this.langiumDocuments = services.shared.workspace.LangiumDocuments;
-    services.shared.workspace.DocumentBuilder.onBuildPhase(
-      DocumentState.IndexedContent,
-      async (docs, _cancelToken) => {
-        for (const doc of docs) {
-          if (isLikeC4LangiumDocument(doc)) {
-            delete doc.c4fqnIndex;
-            delete doc.c4Elements;
-            delete doc.c4Specification;
-            delete doc.c4Relations;
-            delete doc.c4Views;
-            try {
-              computeDocumentFqn(doc, services);
-            } catch (e) {
-              logWarnError(e);
+    this.onDispose(
+      services.shared.workspace.DocumentBuilder.onBuildPhase(
+        DocumentState.IndexedContent,
+        async (docs, _cancelToken) => {
+          for (const doc of docs) {
+            if (isLikeC4LangiumDocument(doc)) {
+              delete doc.c4fqnIndex;
+              delete doc.c4Elements;
+              delete doc.c4Specification;
+              delete doc.c4Relations;
+              delete doc.c4Deployments;
+              delete doc.c4DeploymentRelations;
+              delete doc.c4Globals;
+              delete doc.c4Views;
+              try {
+                computeDocumentFqn(doc, services);
+              } catch (e) {
+                logWarnError(e);
+              }
             }
           }
+          return await Promise.resolve();
         }
-        return await Promise.resolve();
-      }
+      )
     );
     logger.debug(`[FqnIndex] Created`);
   }

package/dist/model/model-builder.d.ts

@@ -3,8 +3,9 @@ import { type ViewId } from '@likec4/core';
 import type { Cancellation, URI } from 'langium';
 import { Disposable } from 'langium';
 import type { LikeC4Services } from '../module';
+import { ADisposable } from '../utils';
 type ModelParsedListener = (docs: URI[]) => void;
-export declare class LikeC4ModelBuilder {
+export declare class LikeC4ModelBuilder extends ADisposable {
     private services;
     private langiumDocuments;
     private listeners;

package/dist/model/model-builder.js

@@ -15,6 +15,7 @@ import {
   flatMap,
   groupBy,
   indexBy,
+  isBoolean,
   isDefined,
   isEmpty,
   isNonNullish,
@@ -24,7 +25,7 @@ import {
   map,
   mapToObj,
   mapValues,
-  pick,
+  omit,
   pipe,
   prop,
   reduce,
@@ -34,6 +35,7 @@ import {
 } from "remeda";
 import { isParsedLikeC4LangiumDocument } from "../ast.js";
 import { logger, logWarnError } from "../logger.js";
+import { ADisposable } from "../utils/index.js";
 import { assignNavigateTo, resolveRelativePaths } from "../view-utils/index.js";
 function buildModel(services, docs) {
   const c4Specification = {
@@ -94,7 +96,8 @@ function buildModel(services, docs) {
         shape,
         icon,
         opacity,
-        border
+        border,
+        multiple
       },
       id,
       kind,
@@ -116,6 +119,7 @@ function buildModel(services, docs) {
         opacity ??= __kind.style.opacity;
         border ??= __kind.style.border;
         technology ??= __kind.technology;
+        multiple ??= __kind.style.multiple;
         return {
           ...color && { color },
           ...shape && { shape },
@@ -124,6 +128,7 @@ function buildModel(services, docs) {
           ...__kind.notation && { notation: __kind.notation },
           style: {
             ...border && { border },
+            ...isBoolean(multiple) && { multiple },
             ...isNumber(opacity) && { opacity }
           },
           links,
@@ -403,33 +408,38 @@ function buildModel(services, docs) {
 }
 const CACHE_KEY_PARSED_MODEL = "ParsedLikeC4Model";
 const CACHE_KEY_COMPUTED_MODEL = "ComputedLikeC4Model";
-export class LikeC4ModelBuilder {
+export class LikeC4ModelBuilder extends ADisposable {
   constructor(services) {
+    super();
     this.services = services;
     this.langiumDocuments = services.shared.workspace.LangiumDocuments;
     const parser = services.likec4.ModelParser;
-    services.shared.workspace.DocumentBuilder.onUpdate((_changed, deleted) => {
-      if (deleted.length > 0) {
-        this.notifyListeners(deleted);
-      }
-    });
-    services.shared.workspace.DocumentBuilder.onBuildPhase(
-      DocumentState.Validated,
-      async (docs, _cancelToken) => {
-        let parsed = [];
-        try {
+    this.onDispose(
+      services.shared.workspace.DocumentBuilder.onUpdate((_changed, deleted) => {
+        if (deleted.length > 0) {
+          this.notifyListeners(deleted);
+        }
+      })
+    );
+    this.onDispose(
+      services.shared.workspace.DocumentBuilder.onBuildPhase(
+        DocumentState.Validated,
+        async (docs, _cancelToken) => {
+          let parsed = [];
           logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)`);
           for (const doc of docs) {
-            parsed.push(parser.parse(doc).uri);
+            try {
+              parsed.push(parser.parse(doc).uri);
+            } catch (e) {
+              logWarnError(e);
+            }
+          }
+          await interruptAndCheck(_cancelToken);
+          if (parsed.length > 0) {
+            this.notifyListeners(parsed);
           }
-        } catch (e) {
-          logWarnError(e);
-        }
-        if (parsed.length > 0) {
-          this.notifyListeners(parsed);
         }
-        return await Promise.resolve();
-      }
+      )
     );
     logger.debug(`[ModelBuilder] Created`);
   }
@@ -494,15 +504,7 @@ export class LikeC4ModelBuilder {
       });
       this.previousViews = { ...views };
       return {
-        ...structuredClone(
-          pick(model, [
-            "specification",
-            "elements",
-            "relations",
-            "globals",
-            "deployments"
-          ])
-        ),
+        ...omit(model, ["views"]),
         views
       };
     });

package/dist/model/model-parser.d.ts

@@ -1,5 +1,5 @@
 import { invariant } from '@likec4/core';
-import type { LangiumDocument } from 'langium';
+import { type LangiumDocument } from 'langium';
 import type { ParsedLikeC4LangiumDocument } from '../ast';
 import type { LikeC4Services } from '../module';
 import { BaseParser } from './parser/Base';

package/dist/model/model-parser.js

@@ -1,5 +1,5 @@
 import { invariant } from "@likec4/core";
-import DefaultWeakMap from "mnemonist/default-weak-map";
+import { DocumentCache, DocumentState } from "langium";
 import { pipe } from "remeda";
 import { isFqnIndexedDocument } from "../ast.js";
 import { BaseParser } from "./parser/Base.js";
@@ -27,10 +27,9 @@ export class DocumentParser extends DocumentParserFromMixins {
 export class LikeC4ModelParser {
   constructor(services) {
     this.services = services;
+    this.cachedParsers = new DocumentCache(services.shared, DocumentState.Validated);
   }
-  cachedParsers = new DefaultWeakMap(
-    (doc) => new DocumentParser(this.services, doc)
-  );
+  cachedParsers;
   parse(doc) {
     invariant(isFqnIndexedDocument(doc), `Not a FqnIndexedDocument: ${doc.uri.toString(true)}`);
     try {
@@ -54,7 +53,7 @@ export class LikeC4ModelParser {
         c4Views: []
       };
       doc = Object.assign(doc, props);
-      const parser = this.cachedParsers.get(doc);
+      const parser = this.forDocument(doc);
       parser.parseSpecification();
       parser.parseModel();
       parser.parseGlobals();
@@ -67,6 +66,10 @@ export class LikeC4ModelParser {
   }
   forDocument(doc) {
     invariant(isFqnIndexedDocument(doc), `Not a FqnIndexedDocument: ${doc.uri.toString(true)}`);
-    return this.cachedParsers.get(doc);
+    return this.cachedParsers.get(
+      doc.uri,
+      "DocumentParser",
+      () => new DocumentParser(this.services, doc)
+    );
   }
 }

package/dist/model/parser/PredicatesParser.js

@@ -1,5 +1,5 @@
 import { invariant, nonexhaustive } from "@likec4/core";
-import { isDefined, isTruthy } from "remeda";
+import { isBoolean, isDefined, isTruthy } from "remeda";
 import { ast, parseAstOpacityProperty, toColor } from "../../ast.js";
 import { logWarnError } from "../../logger.js";
 import { elementRef } from "../../utils/elementRef.js";
@@ -165,6 +165,12 @@ export function PredicatesParser(B) {
             }
             return acc;
           }
+          if (ast.isMultipleProperty(prop)) {
+            if (isBoolean(prop.value)) {
+              acc.custom[prop.key] = prop.value;
+            }
+            return acc;
+          }
           nonexhaustive(prop);
         },
         {

package/dist/utils/disposable.d.ts

@@ -0,0 +1,8 @@
+import { Disposable } from 'langium';
+export declare abstract class ADisposable implements Disposable {
+    protected toDispose: Disposable[];
+    protected isDisposed: boolean;
+    onDispose(...disposable: Disposable[]): void;
+    dispose(): void;
+    protected throwIfDisposed(): void;
+}

package/dist/utils/disposable.js

@@ -0,0 +1,25 @@
+import { logError } from "../logger.js";
+export class ADisposable {
+  toDispose = [];
+  isDisposed = false;
+  onDispose(...disposable) {
+    this.toDispose.push(...disposable);
+  }
+  dispose() {
+    this.throwIfDisposed();
+    this.isDisposed = true;
+    let item;
+    while (item = this.toDispose.pop()) {
+      try {
+        item.dispose();
+      } catch (e) {
+        logError(e);
+      }
+    }
+  }
+  throwIfDisposed() {
+    if (this.isDisposed) {
+      throw new Error("This has already been disposed");
+    }
+  }
+}

package/dist/utils/index.d.ts

@@ -1 +1,2 @@
+export * from './disposable';
 export * from './stringHash';

package/dist/utils/index.js

@@ -1 +1,2 @@
+export * from "./disposable.js";
 export * from "./stringHash.js";

package/dist/validation/_shared.js

@@ -9,13 +9,16 @@ export const RESERVED_WORDS = [
   "global"
 ];
 export function tryOrLog(fn) {
-  return async (node, accept, cancelToken) => {
+  return async function tryOrLogFn(node, accept, cancelToken) {
     try {
       const result = fn(node, accept, cancelToken);
       if (isPromise(result)) {
         await result;
       }
+      return;
     } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      accept("error", `Validation failed: ${message}`, { node });
       logWarnError(e);
     }
   };

package/dist/validation/index.d.ts

@@ -1,9 +1,9 @@
-import type { AstNode } from 'langium';
+import { type AstNode } from 'langium';
 import { type LikeC4LangiumDocument, ast } from '../ast';
 import type { LikeC4Services } from '../module';
 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 ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementDescedantsExpression | ast.ElementKindExpression | ast.ElementRef | ast.ElementTagExpression | ast.ExpandElementExpression | ast.WildcardExpression | ast.ElementPredicateWhere | ast.ElementPredicateWith | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.FqnRefExpr | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationPredicateWhereV2 | ast.Element | ast.ExtendElement | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.DirectedRelationExpression | ast.InOutRelationExpression | ast.IncomingRelationExpression | ast.OutgoingRelationExpression | ast.RelationPredicateWhere | ast.RelationPredicateWith | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.ViewStringProperty | ast.BorderProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ExcludePredicate | ast.IncludePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.Tags | ast.DeploymentRelation | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.DynamicViewPredicateIterator | ast.Relation | ast.SpecificationElementKind | ast.GlobalPredicateGroup | ast.Globals | ast.GlobalStyleGroup | ast.SpecificationRule | ast.SpecificationTag;
+declare const isValidatableAstNode: (n: AstNode) => n is ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementDescedantsExpression | ast.ElementKindExpression | ast.ElementRef | ast.ElementTagExpression | ast.ExpandElementExpression | ast.WildcardExpression | ast.ElementPredicateWhere | ast.ElementPredicateWith | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.FqnRefExpr | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationPredicateWhereV2 | ast.Element | ast.ExtendElement | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.DirectedRelationExpression | ast.InOutRelationExpression | ast.IncomingRelationExpression | ast.OutgoingRelationExpression | ast.RelationPredicateWhere | ast.RelationPredicateWith | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.ViewStringProperty | ast.BorderProperty | ast.MultipleProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ExcludePredicate | ast.IncludePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.Tags | ast.DeploymentRelation | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.DynamicViewPredicateIterator | ast.Relation | ast.SpecificationElementKind | ast.GlobalPredicateGroup | ast.Globals | ast.GlobalStyleGroup | ast.SpecificationRule | ast.SpecificationTag;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 export declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/dist/validation/index.js

@@ -1,3 +1,4 @@
+import { DocumentState } from "langium";
 import { isNullish } from "remeda";
 import { DiagnosticSeverity } from "vscode-languageserver-types";
 import { ast } from "../ast.js";
@@ -9,6 +10,7 @@ import { elementChecks } from "./element.js";
 import { iconPropertyRuleChecks, notesPropertyRuleChecks, opacityPropertyRuleChecks } from "./property-checks.js";
 import { relationBodyChecks, relationChecks } from "./relation.js";
 import {
+  deploymentNodeKindChecks,
   elementKindChecks,
   globalPredicateChecks,
   globalsChecks,
@@ -86,7 +88,7 @@ const findInvalidContainer = (node) => {
   return void 0;
 };
 export function checksFromDiagnostics(doc) {
-  const errors = doc.diagnostics?.filter((d) => d.severity === DiagnosticSeverity.Error) ?? [];
+  const errors = doc.state >= DocumentState.Validated ? doc.diagnostics?.filter((d) => d.severity === DiagnosticSeverity.Error) ?? [] : [];
   const invalidNodes = /* @__PURE__ */ new WeakSet();
   for (const { node } of errors) {
     if (isNullish(node) || invalidNodes.has(node)) {
@@ -109,6 +111,7 @@ export function registerValidationChecks(services) {
   const registry = services.validation.ValidationRegistry;
   registry.register({
     DeployedInstance: deployedInstanceChecks(services),
+    DeploymentNodeKind: deploymentNodeKindChecks(services),
     DeploymentNode: deploymentNodeChecks(services),
     DeploymentRelation: deploymentRelationChecks(services),
     FqnRefExpr: fqnRefExprChecks(services),

package/dist/validation/specification.d.ts

@@ -5,6 +5,7 @@ export declare const specificationRuleChecks: (_: LikeC4Services) => ValidationC
 export declare const modelRuleChecks: (_: LikeC4Services) => ValidationCheck<ast.Model>;
 export declare const globalsChecks: (_: LikeC4Services) => ValidationCheck<ast.Globals>;
 export declare const elementKindChecks: (services: LikeC4Services) => ValidationCheck<ast.ElementKind>;
+export declare const deploymentNodeKindChecks: (services: LikeC4Services) => ValidationCheck<ast.DeploymentNodeKind>;
 export declare const tagChecks: (services: LikeC4Services) => ValidationCheck<ast.Tag>;
 export declare const relationshipChecks: (services: LikeC4Services) => ValidationCheck<ast.RelationshipKind>;
 export declare const globalPredicateChecks: (services: LikeC4Services) => ValidationCheck<ast.GlobalPredicateGroup | ast.GlobalDynamicPredicateGroup>;

package/dist/validation/specification.js

@@ -61,6 +61,36 @@ export const elementKindChecks = (services) => {
     }
   });
 };
+export const deploymentNodeKindChecks = (services) => {
+  const index = services.shared.workspace.IndexManager;
+  return tryOrLog((node, accept) => {
+    if (RESERVED_WORDS.includes(node.name)) {
+      accept("error", `Reserved word: ${node.name}`, {
+        node,
+        property: "name"
+      });
+    }
+    const sameKind = index.allElements(ast.DeploymentNodeKind).filter((n) => n.name === node.name && n.node !== node).head();
+    if (sameKind) {
+      const isAnotherDoc = sameKind.documentUri !== AstUtils.getDocument(node).uri;
+      accept("error", `Duplicate deploymentNode kind '${node.name}'`, {
+        node,
+        property: "name",
+        ...isAnotherDoc && {
+          relatedInformation: [
+            {
+              location: {
+                range: sameKind.nameSegment.range,
+                uri: sameKind.documentUri.toString()
+              },
+              message: `conflicting definition`
+            }
+          ]
+        }
+      });
+    }
+  });
+};
 export const tagChecks = (services) => {
   const index = services.shared.workspace.IndexManager;
   return tryOrLog((node, accept) => {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.20.0",
+  "version": "1.20.2",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
   "files": [
+    "bin",
     "dist",
-    "contrib",
     "src",
     "!**/__mocks__/",
     "!**/__tests__/",
@@ -20,8 +20,15 @@
     "url": "git+https://github.com/likec4/likec4.git",
     "directory": "packages/language-server"
   },
+  "engines": {
+    "node": ">=20"
+  },
+  "engineStrict": true,
   "type": "module",
   "sideEffects": false,
+  "bin": {
+    "likec4-language-server": "./bin/likec4-language-server.mjs"
+  },
   "exports": {
     ".": {
       "sources": "./src/index.ts",
@@ -59,7 +66,8 @@
         "import": "./dist/protocol.js",
         "default": "./dist/protocol.js"
       }
-    }
+    },
+    "./bundled": "./dist/bundled.mjs"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
@@ -81,44 +89,42 @@
     "vitest:ui": "vitest --no-isolate --ui",
     "test:watch": "vitest"
   },
-  "dependencies": {
-    "@likec4/core": "1.20.0",
-    "@likec4/layouts": "1.20.0",
-    "@likec4/log": "1.20.0",
-    "@msgpack/msgpack": "^3.0.0-beta2",
+  "devDependencies": {
+    "@likec4/core": "1.20.2",
+    "@likec4/icons": "1.20.2",
+    "@likec4/layouts": "1.20.2",
+    "@likec4/log": "1.20.2",
+    "@likec4/tsconfig": "1.20.2",
+    "@msgpack/msgpack": "^3.0.0-beta3",
     "@smithy/util-base64": "^3.0.0",
-    "esm-env": "^1.2.1",
-    "fast-equals": "^5.0.1",
+    "@types/node": "^20.17.7",
+    "@types/which": "^3.0.4",
+    "@vitest/coverage-v8": "^2.1.8",
+    "esm-env": "^1.2.2",
+    "execa": "^9.3.1",
+    "fast-equals": "^5.2.2",
     "fdir": "^6.4.2",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
-    "langium": "3.3.0",
+    "langium": "3.3.1",
+    "langium-cli": "3.3.0",
+    "natural-compare-lite": "^1.4.0",
+    "npm-run-all2": "^7.0.1",
     "p-debounce": "^4.0.0",
     "remeda": "^2.19.0",
     "strip-indent": "^4.0.0",
+    "tsx": "~4.19.2",
+    "turbo": "^2.3.4",
     "type-fest": "4.28.1",
+    "typescript": "^5.7.3",
     "ufo": "^1.5.4",
+    "unbuild": "^3.3.1",
+    "vitest": "^2.1.8",
     "vscode-jsonrpc": "8.2.0",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-types": "3.17.5",
     "vscode-uri": "3.0.8",
     "which": "^4.0.0"
   },
-  "devDependencies": {
-    "@likec4/icons": "1.20.0",
-    "@likec4/tsconfig": "1.20.0",
-    "@types/node": "^20.17.7",
-    "@types/which": "^3.0.4",
-    "@vitest/coverage-v8": "^2.1.8",
-    "execa": "^9.3.1",
-    "langium-cli": "3.3.0",
-    "natural-compare-lite": "^1.4.0",
-    "npm-run-all2": "^7.0.1",
-    "tsx": "~4.19.2",
-    "turbo": "^2.3.3",
-    "typescript": "^5.7.3",
-    "unbuild": "^3.2.0",
-    "vitest": "^2.1.8"
-  },
   "packageManager": "yarn@4.6.0"
 }