@likec4/language-server 1.30.0 → 1.32.0

package/dist/model/parser/DeploymentModelParser.js

@@ -156,11 +156,13 @@ export function DeploymentModelParser(B) {
     parseDeploymentRelation(astNode) {
       const isValid = this.isValid;
       const astPath = this.getAstNodePath(astNode);
-      const source = FqnRef.toDeploymentRef(this._resolveDeploymentRelationSource(astNode));
-      const target = FqnRef.toDeploymentRef(this.parseFqnRef(astNode.target));
+      const source = this._resolveDeploymentRelationSource(astNode);
+      invariant(FqnRef.isDeploymentRef(source), "Invalid source for deployment relation");
+      const target = this.parseFqnRef(astNode.target);
+      invariant(FqnRef.isDeploymentRef(target), "Invalid target for deployment relation");
       const tags = this.convertTags(astNode) ?? this.convertTags(astNode.body);
       const links = this.convertLinks(astNode.body);
-      const kind = astNode.kind?.ref?.name;
+      const kind = (astNode.kind ?? astNode.dotKind?.kind)?.ref?.name;
       const metadata = this.getMetadata(astNode.body?.props.find(ast.isMetadataProperty));
       const bodyProps = mapToObj(
         astNode.body?.props.filter(ast.isRelationStringProperty) ?? [],
@@ -180,8 +182,8 @@ export function DeploymentModelParser(B) {
       const id = stringHash(
         "deployment",
         astPath,
-        source.id,
-        target.id
+        source.deployment,
+        target.deployment
       );
       return {
         id,

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

@@ -1,4 +1,4 @@
-import type * as c4 from '@likec4/core';
+import * as c4 from '@likec4/core';
 import { type ParsedAstDeploymentView, ast } from '../../ast';
 import type { WithDeploymentModel } from './DeploymentModelParser';
 import type { WithExpressionV2 } from './FqnRefParser';
@@ -7,10 +7,10 @@ export declare function DeploymentViewParser<TBase extends WithExpressionV2 & Wi
     new (...args: any[]): {
         parseDeploymentView(astNode: ast.DeploymentView): ParsedAstDeploymentView;
         parseDeploymentViewRule(astRule: ast.DeploymentViewRule): c4.DeploymentViewRule;
-        parseDeploymentViewRulePredicate(astRule: ast.DeploymentViewRulePredicate): c4.DeploymentViewRulePredicate;
+        parseDeploymentViewRulePredicate(astRule: ast.DeploymentViewRulePredicate): c4.DeploymentViewPredicate;
         parseDeploymentViewRuleStyle(astRule: ast.DeploymentViewRuleStyle): c4.DeploymentViewRuleStyle;
         parseFqnRef(astNode: ast.FqnRef): c4.FqnRef;
-        parseExpressionV2(astNode: ast.ExpressionV2): c4.ExpressionV2;
+        parseExpressionV2(astNode: ast.ExpressionV2): c4.Expression;
         parseFqnExprOrWith(astNode: ast.FqnExprOrWith): c4.FqnExpr.Any;
         parseFqnExprWith(astNode: ast.FqnExprWith): c4.FqnExpr.Custom;
         parseFqnExprOrWhere(astNode: ast.FqnExprOrWhere): c4.FqnExpr.OrWhere;

package/dist/model/parser/DeploymentViewParser.js

@@ -1,3 +1,4 @@
+import * as c4 from "@likec4/core";
 import { invariant, isNonEmptyArray, nonexhaustive } from "@likec4/core";
 import { isNonNullish } from "remeda";
 import { ast, toAutoLayout, ViewOps } from "../../ast.js";
@@ -26,7 +27,7 @@ export function DeploymentViewParser(B) {
       ViewOps.writeId(astNode, id);
       const manualLayout = parseViewManualLayout(astNode);
       return {
-        __: "deployment",
+        [c4._type]: "deployment",
         id,
         astPath,
         title,

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

@@ -5,7 +5,7 @@ export type WithExpressionV2 = ReturnType<typeof ExpressionV2Parser>;
 export declare function ExpressionV2Parser<TBase extends Base>(B: TBase): {
     new (...args: any[]): {
         parseFqnRef(astNode: ast.FqnRef): c4.FqnRef;
-        parseExpressionV2(astNode: ast.ExpressionV2): c4.ExpressionV2;
+        parseExpressionV2(astNode: ast.ExpressionV2): c4.Expression;
         parseFqnExprOrWith(astNode: ast.FqnExprOrWith): c4.FqnExpr.Any;
         parseFqnExprWith(astNode: ast.FqnExprWith): c4.FqnExpr.Custom;
         parseFqnExprOrWhere(astNode: ast.FqnExprOrWhere): c4.FqnExpr.OrWhere;

package/dist/model/parser/FqnRefParser.js

@@ -197,11 +197,8 @@ export function ExpressionV2Parser(B) {
         };
       }
       if (ast.isElementTagExpression(astNode)) {
-        invariant(astNode.tag?.ref, "ElementTagExpr tag is not resolved: " + astNode.$cstNode?.text);
-        let elementTag = astNode.tag.$refText;
-        if (elementTag.startsWith("#")) {
-          elementTag = elementTag.slice(1);
-        }
+        invariant(astNode.tag.tag.ref, "ElementTagExpr tag is not resolved: " + astNode.$cstNode?.text);
+        let elementTag = astNode.tag.tag.$refText;
         return {
           elementTag,
           isEqual: astNode.isEqual

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

@@ -1,41 +1,40 @@
 import type * as c4 from '@likec4/core';
-import { ast, type ParsedAstGlobals } from '../../ast';
+import { type ParsedAstGlobals, ast } from '../../ast';
 import type { WithViewsParser } from './ViewsParser';
 export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase): {
     new (...args: any[]): {
         parseGlobals(): void;
         parseAndStoreGlobalPredicateGroupOrDynamic(astRule: ast.GlobalPredicateGroup | ast.GlobalDynamicPredicateGroup, id: c4.GlobalPredicateId, c4Globals: ParsedAstGlobals): void;
-        parseGlobalPredicateGroup(astRule: ast.GlobalPredicateGroup): c4.ViewRulePredicate[];
+        parseGlobalPredicateGroup(astRule: ast.GlobalPredicateGroup): c4.ElementViewPredicate[];
         parseGlobalDynamicPredicateGroup(astRule: ast.GlobalDynamicPredicateGroup): c4.DynamicViewIncludeRule[];
-        parseGlobalStyleOrGroup(astRule: ast.GlobalStyle | ast.GlobalStyleGroup): c4.ViewRuleStyle[];
+        parseGlobalStyleOrGroup(astRule: ast.GlobalStyle | ast.GlobalStyleGroup): c4.ElementViewRuleStyle[];
         parseViews(): void;
-        parseElementView(astNode: ast.ElementView, additionalStyles: c4.ViewRuleStyleOrGlobalRef[]): import("../../ast").ParsedAstElementView;
-        parseViewRule(astRule: ast.ViewRule): c4.ViewRule;
-        parseViewRulePredicate(astNode: ast.ViewRulePredicate): c4.ViewRulePredicate;
+        parseElementView(astNode: ast.ElementView, additionalStyles: any[]): import("../../ast").ParsedAstElementView;
+        parseElementViewRule(astRule: ast.ViewRule): c4.ElementViewRule;
+        parseViewRulePredicate(astNode: ast.ViewRulePredicate): c4.ElementViewPredicate;
         parseViewRuleGlobalPredicateRef(astRule: ast.ViewRuleGlobalPredicateRef | ast.DynamicViewGlobalPredicateRef): c4.ViewRuleGlobalPredicateRef;
-        parseViewRuleStyleOrGlobalRef(astRule: ast.ViewRuleStyleOrGlobalRef): c4.ViewRuleStyleOrGlobalRef;
-        parseViewRuleGroup(astNode: ast.ViewRuleGroup): c4.ViewRuleGroup;
-        parseViewRuleStyle(astRule: ast.ViewRuleStyle | ast.GlobalStyle): c4.ViewRuleStyle;
-        parseRuleStyle(styleProperties: ast.StyleProperty[], elementExpressionsIterator: ast.FqnExpressions, notationProperty?: ast.NotationProperty): c4.ViewRuleStyle;
+        parseViewRuleStyleOrGlobalRef(astRule: ast.ViewRuleStyleOrGlobalRef): any;
+        parseViewRuleGroup(astNode: ast.ViewRuleGroup): c4.ElementViewRuleGroup;
+        parseViewRuleStyle(astRule: ast.ViewRuleStyle | ast.GlobalStyle): c4.ElementViewRuleStyle;
         parseViewRuleGlobalStyle(astRule: ast.ViewRuleGlobalStyle): c4.ViewRuleGlobalStyle;
-        parseDynamicElementView(astNode: ast.DynamicView, additionalStyles: c4.ViewRuleStyleOrGlobalRef[]): import("../../ast").ParsedAstDynamicView;
+        parseDynamicElementView(astNode: ast.DynamicView, additionalStyles: any[]): import("../../ast").ParsedAstDynamicView;
         parseDynamicViewRule(astRule: ast.DynamicViewRule): c4.DynamicViewRule;
         parseDynamicViewIncludePredicate(astRule: ast.DynamicViewIncludePredicate): c4.DynamicViewIncludeRule;
         parseDynamicParallelSteps(node: ast.DynamicViewParallelSteps): c4.DynamicViewParallelSteps;
         parseDynamicStep(node: ast.DynamicViewStep): c4.DynamicViewStep;
-        parsePredicate(astNode: ast.ExpressionV2): c4.ModelLayer.Expression;
-        parseElementPredicate(astNode: ast.FqnExprOrWith): c4.ModelLayer.AnyFqnExpr;
-        parseElementPredicateOrWhere(astNode: ast.FqnExprOrWhere): c4.ModelLayer.FqnExprOrWhere;
-        parseElementExpression(astNode: ast.FqnExpr): c4.ModelLayer.FqnExpr;
-        parseElementPredicateWhere(astNode: ast.FqnExprWhere): c4.ModelLayer.FqnExpr.Where;
-        parseElementPredicateWith(astNode: ast.FqnExprWith): c4.ModelLayer.FqnExpr.Custom;
-        parseRelationPredicate(astNode: ast.RelationExprOrWith): c4.ModelLayer.AnyRelationExpr;
-        parseRelationPredicateOrWhere(astNode: ast.RelationExprOrWhere): c4.ModelLayer.RelationExprOrWhere;
-        parseRelationPredicateWhere(astNode: ast.RelationExprWhere): c4.ModelLayer.RelationExpr.Where;
-        parseRelationPredicateWith(astNode: ast.RelationExprWith): c4.ModelLayer.RelationExpr.Custom;
-        parseRelationExpression(astNode: ast.RelationExpr): c4.ModelLayer.RelationExpr;
+        parsePredicate(astNode: ast.ExpressionV2): c4.ModelExpression;
+        parseElementPredicate(astNode: ast.FqnExprOrWith): c4.ModelFqnExpr.Any;
+        parseElementPredicateOrWhere(astNode: ast.FqnExprOrWhere): c4.ModelFqnExpr.OrWhere;
+        parseElementExpression(astNode: ast.FqnExpr): c4.ModelFqnExpr;
+        parseElementPredicateWhere(astNode: ast.FqnExprWhere): c4.ModelFqnExpr.Where;
+        parseElementPredicateWith(astNode: ast.FqnExprWith): c4.ModelFqnExpr.Custom;
+        parseRelationPredicate(astNode: ast.RelationExprOrWith): c4.ModelRelationExpr.Any;
+        parseRelationPredicateOrWhere(astNode: ast.RelationExprOrWhere): c4.ModelRelationExpr.OrWhere;
+        parseRelationPredicateWhere(astNode: ast.RelationExprWhere): c4.ModelRelationExpr.Where;
+        parseRelationPredicateWith(astNode: ast.RelationExprWith): c4.ModelRelationExpr.Custom;
+        parseRelationExpression(astNode: ast.RelationExpr): c4.ModelRelationExpr;
         parseFqnRef(astNode: ast.FqnRef): c4.FqnRef;
-        parseExpressionV2(astNode: ast.ExpressionV2): c4.ExpressionV2;
+        parseExpressionV2(astNode: ast.ExpressionV2): c4.Expression;
         parseFqnExprOrWith(astNode: ast.FqnExprOrWith): c4.FqnExpr.Any;
         parseFqnExprWith(astNode: ast.FqnExprWith): c4.FqnExpr.Custom;
         parseFqnExprOrWhere(astNode: ast.FqnExprOrWhere): c4.FqnExpr.OrWhere;
@@ -74,7 +73,7 @@ export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase):
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
         parseDeploymentView(astNode: ast.DeploymentView): import("../../ast").ParsedAstDeploymentView;
         parseDeploymentViewRule(astRule: ast.DeploymentViewRule): c4.DeploymentViewRule;
-        parseDeploymentViewRulePredicate(astRule: ast.DeploymentViewRulePredicate): c4.DeploymentViewRulePredicate;
+        parseDeploymentViewRulePredicate(astRule: ast.DeploymentViewRulePredicate): c4.DeploymentViewPredicate;
         parseDeploymentViewRuleStyle(astRule: ast.DeploymentViewRuleStyle): c4.DeploymentViewRuleStyle;
         parseDeployment(): void;
         parseDeploymentNode(astNode: ast.DeploymentNode): import("../../ast").ParsedAstDeployment.Node;

package/dist/model/parser/GlobalsParser.js

@@ -1,5 +1,5 @@
 import { nonexhaustive } from "@likec4/core";
-import { isTruthy } from "remeda";
+import { hasAtLeast, isTruthy } from "remeda";
 import { ast } from "../../ast.js";
 import { logger, logWarnError } from "../../logger.js";
 export function GlobalsParser(B) {
@@ -36,7 +36,7 @@ export function GlobalsParser(B) {
             continue;
           }
           const styles2 = this.parseGlobalStyleOrGroup(style);
-          if (styles2.length > 0) {
+          if (hasAtLeast(styles2, 1)) {
             c4Globals.styles[globalStyleId] = styles2;
           }
         } catch (e) {
@@ -47,14 +47,14 @@ export function GlobalsParser(B) {
     parseAndStoreGlobalPredicateGroupOrDynamic(astRule, id, c4Globals) {
       if (ast.isGlobalPredicateGroup(astRule)) {
         const predicates = this.parseGlobalPredicateGroup(astRule);
-        if (predicates.length > 0) {
+        if (hasAtLeast(predicates, 1)) {
           c4Globals.predicates[id] = predicates;
         }
         return;
       }
       if (ast.isGlobalDynamicPredicateGroup(astRule)) {
         const predicates = this.parseGlobalDynamicPredicateGroup(astRule);
-        if (predicates.length > 0) {
+        if (hasAtLeast(predicates, 1)) {
           c4Globals.dynamicPredicates[id] = predicates;
         }
         return;

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

@@ -11,7 +11,7 @@ export declare function ModelParser<TBase extends WithExpressionV2>(B: TBase): {
         _resolveRelationSource(node: ast.Relation): FqnRef.ModelRef | FqnRef.ImportRef;
         parseRelation(astNode: ast.Relation): ParsedAstRelation;
         parseFqnRef(astNode: ast.FqnRef): c4.FqnRef;
-        parseExpressionV2(astNode: ast.ExpressionV2): c4.ExpressionV2;
+        parseExpressionV2(astNode: ast.ExpressionV2): c4.Expression;
         parseFqnExprOrWith(astNode: ast.FqnExprOrWith): c4.FqnExpr.Any;
         parseFqnExprWith(astNode: ast.FqnExprWith): c4.FqnExpr.Custom;
         parseFqnExprOrWhere(astNode: ast.FqnExprOrWhere): c4.FqnExpr.OrWhere;

package/dist/model/parser/ModelParser.js

@@ -137,7 +137,7 @@ ${error}`, {
       invariant(FqnRef.isModelRef(target) || FqnRef.isImportRef(target), "Target must be a model reference");
       const tags = this.parseTags(astNode) ?? this.parseTags(astNode.body);
       const links = this.parseLinks(astNode.body);
-      const kind = astNode.kind?.ref?.name;
+      const kind = (astNode.kind ?? astNode.dotKind?.kind)?.ref?.name;
       const metadata = this.getMetadata(astNode.body?.props.find(ast.isMetadataProperty));
       const astPath = this.getAstNodePath(astNode);
       const bodyProps = mapToObj(

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

@@ -4,19 +4,19 @@ import type { WithExpressionV2 } from './FqnRefParser';
 export type WithPredicates = ReturnType<typeof PredicatesParser>;
 export declare function PredicatesParser<TBase extends WithExpressionV2>(B: TBase): {
     new (...args: any[]): {
-        parsePredicate(astNode: ast.ExpressionV2): c4.ModelLayer.Expression;
-        parseElementPredicate(astNode: ast.FqnExprOrWith): c4.ModelLayer.AnyFqnExpr;
-        parseElementPredicateOrWhere(astNode: ast.FqnExprOrWhere): c4.ModelLayer.FqnExprOrWhere;
-        parseElementExpression(astNode: ast.FqnExpr): c4.ModelLayer.FqnExpr;
-        parseElementPredicateWhere(astNode: ast.FqnExprWhere): c4.ModelLayer.FqnExpr.Where;
-        parseElementPredicateWith(astNode: ast.FqnExprWith): c4.ModelLayer.FqnExpr.Custom;
-        parseRelationPredicate(astNode: ast.RelationExprOrWith): c4.ModelLayer.AnyRelationExpr;
-        parseRelationPredicateOrWhere(astNode: ast.RelationExprOrWhere): c4.ModelLayer.RelationExprOrWhere;
-        parseRelationPredicateWhere(astNode: ast.RelationExprWhere): c4.ModelLayer.RelationExpr.Where;
-        parseRelationPredicateWith(astNode: ast.RelationExprWith): c4.ModelLayer.RelationExpr.Custom;
-        parseRelationExpression(astNode: ast.RelationExpr): c4.ModelLayer.RelationExpr;
+        parsePredicate(astNode: ast.ExpressionV2): c4.ModelExpression;
+        parseElementPredicate(astNode: ast.FqnExprOrWith): c4.ModelFqnExpr.Any;
+        parseElementPredicateOrWhere(astNode: ast.FqnExprOrWhere): c4.ModelFqnExpr.OrWhere;
+        parseElementExpression(astNode: ast.FqnExpr): c4.ModelFqnExpr;
+        parseElementPredicateWhere(astNode: ast.FqnExprWhere): c4.ModelFqnExpr.Where;
+        parseElementPredicateWith(astNode: ast.FqnExprWith): c4.ModelFqnExpr.Custom;
+        parseRelationPredicate(astNode: ast.RelationExprOrWith): c4.ModelRelationExpr.Any;
+        parseRelationPredicateOrWhere(astNode: ast.RelationExprOrWhere): c4.ModelRelationExpr.OrWhere;
+        parseRelationPredicateWhere(astNode: ast.RelationExprWhere): c4.ModelRelationExpr.Where;
+        parseRelationPredicateWith(astNode: ast.RelationExprWith): c4.ModelRelationExpr.Custom;
+        parseRelationExpression(astNode: ast.RelationExpr): c4.ModelRelationExpr;
         parseFqnRef(astNode: ast.FqnRef): c4.FqnRef;
-        parseExpressionV2(astNode: ast.ExpressionV2): c4.ExpressionV2;
+        parseExpressionV2(astNode: ast.ExpressionV2): c4.Expression;
         parseFqnExprOrWith(astNode: ast.FqnExprOrWith): c4.FqnExpr.Any;
         parseFqnExprWith(astNode: ast.FqnExprWith): c4.FqnExpr.Custom;
         parseFqnExprOrWhere(astNode: ast.FqnExprOrWhere): c4.FqnExpr.OrWhere;

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

@@ -4,8 +4,11 @@ import { type Base } from './Base';
 export declare function SpecificationParser<TBase extends Base>(B: TBase): {
     new (...args: any[]): {
         parseSpecification(): void;
-        parseSpecificationDeploymentNodeKind({ kind, props }: ast.SpecificationDeploymentNodeKind): {
-            [key: c4.DeploymentNodeKind]: c4.DeploymentNodeKindSpecification;
+        parseElementSpecificationNode(specAst: ast.SpecificationElementKind): {
+            [key: c4.ElementKind]: c4.ElementSpecification;
+        };
+        parseElementSpecificationNode(specAst: ast.SpecificationDeploymentNodeKind): {
+            [key: c4.DeploymentKind]: c4.ElementSpecification;
         };
         isValid: import("../../validation").IsValidFn;
         readonly services: import("../..").LikeC4Services;

package/dist/model/parser/SpecificationParser.js

@@ -14,27 +14,16 @@ export function SpecificationParser(B) {
         c4Specification
       } = this.doc;
       const isValid = this.isValid;
-      const element_specs = specifications.flatMap((s) => s.elements.filter(this.isValid));
-      for (const { kind, props } of element_specs) {
+      for (const elementSpec of specifications.flatMap((s) => s.elements.filter(isValid))) {
         try {
-          const kindName = kind.name;
-          if (!isTruthy(kindName)) {
-            continue;
-          }
-          if (kindName in c4Specification.elements) {
-            logger.warn(`Element kind "${kindName}" is already defined`);
-            continue;
-          }
-          const style = this.parseElementStyle(props.find(ast.isElementStyleProperty));
-          const bodyProps = pipe(
-            props.filter(ast.isSpecificationElementStringProperty) ?? [],
-            filter((p) => this.isValid(p) && isNonNullish(p.value)),
-            mapToObj((p) => [p.key, removeIndent(p.value)])
-          );
-          c4Specification.elements[kindName] = {
-            ...bodyProps,
-            style
-          };
+          Object.assign(c4Specification.elements, this.parseElementSpecificationNode(elementSpec));
+        } catch (e) {
+          logWarnError(e);
+        }
+      }
+      for (const deploymentNodeSpec of specifications.flatMap((s) => s.deploymentNodes.filter(isValid))) {
+        try {
+          Object.assign(c4Specification.deployments, this.parseElementSpecificationNode(deploymentNodeSpec));
         } catch (e) {
           logWarnError(e);
         }
@@ -66,16 +55,12 @@ export function SpecificationParser(B) {
       const tags_specs = specifications.flatMap((s) => s.tags.filter(this.isValid));
       for (const tagSpec of tags_specs) {
         const tag = tagSpec.tag.name;
+        const astPath = this.getAstNodePath(tagSpec.tag);
         if (isTruthy(tag)) {
-          c4Specification.tags.add(tag);
-        }
-      }
-      const deploymentNodes_specs = specifications.flatMap((s) => s.deploymentNodes.filter(isValid));
-      for (const deploymentNode of deploymentNodes_specs) {
-        try {
-          Object.assign(c4Specification.deployments, this.parseSpecificationDeploymentNodeKind(deploymentNode));
-        } catch (e) {
-          logWarnError(e);
+          c4Specification.tags[tag] = {
+            astPath,
+            ...tagSpec.color ? { color: tagSpec.color } : {}
+          };
         }
       }
       const colors_specs = specifications.flatMap((s) => s.colors.filter(isValid));
@@ -94,11 +79,13 @@ export function SpecificationParser(B) {
         }
       }
     }
-    parseSpecificationDeploymentNodeKind({ kind, props }) {
+    parseElementSpecificationNode(specAst) {
+      const { kind, props } = specAst;
       const kindName = kind.name;
       if (!isTruthy(kindName)) {
         throw new Error("DeploymentNodeKind name is not resolved");
       }
+      const tags = this.parseTags(specAst);
       const style = this.parseElementStyle(props.find(ast.isElementStyleProperty));
       const bodyProps = pipe(
         props.filter(ast.isSpecificationElementStringProperty) ?? [],
@@ -108,6 +95,7 @@ export function SpecificationParser(B) {
       return {
         [kindName]: {
           ...bodyProps,
+          ...tags && { tags },
           style
         }
       };

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

@@ -1,39 +1,38 @@
-import type * as c4 from '@likec4/core';
+import * as c4 from '@likec4/core';
 import { type ParsedAstDynamicView, type ParsedAstElementView, ast } from '../../ast';
-import type { NotationProperty } from '../../generated/ast';
 import type { WithDeploymentView } from './DeploymentViewParser';
 import type { WithPredicates } from './PredicatesParser';
 export type WithViewsParser = ReturnType<typeof ViewsParser>;
+type ViewRuleStyleOrGlobalRef = c4.ElementViewRuleStyle | c4.ViewRuleGlobalStyle;
 export declare function ViewsParser<TBase extends WithPredicates & WithDeploymentView>(B: TBase): {
     new (...args: any[]): {
         parseViews(): void;
-        parseElementView(astNode: ast.ElementView, additionalStyles: c4.ViewRuleStyleOrGlobalRef[]): ParsedAstElementView;
-        parseViewRule(astRule: ast.ViewRule): c4.ViewRule;
-        parseViewRulePredicate(astNode: ast.ViewRulePredicate): c4.ViewRulePredicate;
+        parseElementView(astNode: ast.ElementView, additionalStyles: ViewRuleStyleOrGlobalRef[]): ParsedAstElementView;
+        parseElementViewRule(astRule: ast.ViewRule): c4.ElementViewRule;
+        parseViewRulePredicate(astNode: ast.ViewRulePredicate): c4.ElementViewPredicate;
         parseViewRuleGlobalPredicateRef(astRule: ast.ViewRuleGlobalPredicateRef | ast.DynamicViewGlobalPredicateRef): c4.ViewRuleGlobalPredicateRef;
-        parseViewRuleStyleOrGlobalRef(astRule: ast.ViewRuleStyleOrGlobalRef): c4.ViewRuleStyleOrGlobalRef;
-        parseViewRuleGroup(astNode: ast.ViewRuleGroup): c4.ViewRuleGroup;
-        parseViewRuleStyle(astRule: ast.ViewRuleStyle | ast.GlobalStyle): c4.ViewRuleStyle;
-        parseRuleStyle(styleProperties: ast.StyleProperty[], elementExpressionsIterator: ast.FqnExpressions, notationProperty?: NotationProperty): c4.ViewRuleStyle;
+        parseViewRuleStyleOrGlobalRef(astRule: ast.ViewRuleStyleOrGlobalRef): ViewRuleStyleOrGlobalRef;
+        parseViewRuleGroup(astNode: ast.ViewRuleGroup): c4.ElementViewRuleGroup;
+        parseViewRuleStyle(astRule: ast.ViewRuleStyle | ast.GlobalStyle): c4.ElementViewRuleStyle;
         parseViewRuleGlobalStyle(astRule: ast.ViewRuleGlobalStyle): c4.ViewRuleGlobalStyle;
-        parseDynamicElementView(astNode: ast.DynamicView, additionalStyles: c4.ViewRuleStyleOrGlobalRef[]): ParsedAstDynamicView;
+        parseDynamicElementView(astNode: ast.DynamicView, additionalStyles: ViewRuleStyleOrGlobalRef[]): ParsedAstDynamicView;
         parseDynamicViewRule(astRule: ast.DynamicViewRule): c4.DynamicViewRule;
         parseDynamicViewIncludePredicate(astRule: ast.DynamicViewIncludePredicate): c4.DynamicViewIncludeRule;
         parseDynamicParallelSteps(node: ast.DynamicViewParallelSteps): c4.DynamicViewParallelSteps;
         parseDynamicStep(node: ast.DynamicViewStep): c4.DynamicViewStep;
-        parsePredicate(astNode: ast.ExpressionV2): c4.ModelLayer.Expression;
-        parseElementPredicate(astNode: ast.FqnExprOrWith): c4.ModelLayer.AnyFqnExpr;
-        parseElementPredicateOrWhere(astNode: ast.FqnExprOrWhere): c4.ModelLayer.FqnExprOrWhere;
-        parseElementExpression(astNode: ast.FqnExpr): c4.ModelLayer.FqnExpr;
-        parseElementPredicateWhere(astNode: ast.FqnExprWhere): c4.ModelLayer.FqnExpr.Where;
-        parseElementPredicateWith(astNode: ast.FqnExprWith): c4.ModelLayer.FqnExpr.Custom;
-        parseRelationPredicate(astNode: ast.RelationExprOrWith): c4.ModelLayer.AnyRelationExpr;
-        parseRelationPredicateOrWhere(astNode: ast.RelationExprOrWhere): c4.ModelLayer.RelationExprOrWhere;
-        parseRelationPredicateWhere(astNode: ast.RelationExprWhere): c4.ModelLayer.RelationExpr.Where;
-        parseRelationPredicateWith(astNode: ast.RelationExprWith): c4.ModelLayer.RelationExpr.Custom;
-        parseRelationExpression(astNode: ast.RelationExpr): c4.ModelLayer.RelationExpr;
+        parsePredicate(astNode: ast.ExpressionV2): c4.ModelExpression;
+        parseElementPredicate(astNode: ast.FqnExprOrWith): c4.ModelFqnExpr.Any;
+        parseElementPredicateOrWhere(astNode: ast.FqnExprOrWhere): c4.ModelFqnExpr.OrWhere;
+        parseElementExpression(astNode: ast.FqnExpr): c4.ModelFqnExpr;
+        parseElementPredicateWhere(astNode: ast.FqnExprWhere): c4.ModelFqnExpr.Where;
+        parseElementPredicateWith(astNode: ast.FqnExprWith): c4.ModelFqnExpr.Custom;
+        parseRelationPredicate(astNode: ast.RelationExprOrWith): c4.ModelRelationExpr.Any;
+        parseRelationPredicateOrWhere(astNode: ast.RelationExprOrWhere): c4.ModelRelationExpr.OrWhere;
+        parseRelationPredicateWhere(astNode: ast.RelationExprWhere): c4.ModelRelationExpr.Where;
+        parseRelationPredicateWith(astNode: ast.RelationExprWith): c4.ModelRelationExpr.Custom;
+        parseRelationExpression(astNode: ast.RelationExpr): c4.ModelRelationExpr;
         parseFqnRef(astNode: ast.FqnRef): c4.FqnRef;
-        parseExpressionV2(astNode: ast.ExpressionV2): c4.ExpressionV2;
+        parseExpressionV2(astNode: ast.ExpressionV2): c4.Expression;
         parseFqnExprOrWith(astNode: ast.FqnExprOrWith): c4.FqnExpr.Any;
         parseFqnExprWith(astNode: ast.FqnExprWith): c4.FqnExpr.Custom;
         parseFqnExprOrWhere(astNode: ast.FqnExprOrWhere): c4.FqnExpr.OrWhere;
@@ -72,7 +71,7 @@ export declare function ViewsParser<TBase extends WithPredicates & WithDeploymen
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
         parseDeploymentView(astNode: ast.DeploymentView): import("../../ast").ParsedAstDeploymentView;
         parseDeploymentViewRule(astRule: ast.DeploymentViewRule): c4.DeploymentViewRule;
-        parseDeploymentViewRulePredicate(astRule: ast.DeploymentViewRulePredicate): c4.DeploymentViewRulePredicate;
+        parseDeploymentViewRulePredicate(astRule: ast.DeploymentViewRulePredicate): c4.DeploymentViewPredicate;
         parseDeploymentViewRuleStyle(astRule: ast.DeploymentViewRuleStyle): c4.DeploymentViewRuleStyle;
         parseDeployment(): void;
         parseDeploymentNode(astNode: ast.DeploymentNode): import("../../ast").ParsedAstDeployment.Node;
@@ -82,3 +81,4 @@ export declare function ViewsParser<TBase extends WithPredicates & WithDeploymen
         parseDeploymentRelation(astNode: ast.DeploymentRelation): import("../../ast").ParsedAstDeploymentRelation;
     };
 } & TBase;
+export {};

package/dist/model/parser/ViewsParser.js

@@ -1,4 +1,5 @@
-import { invariant, isNonEmptyArray, ModelLayer, nonexhaustive } from "@likec4/core";
+import * as c4 from "@likec4/core";
+import { invariant, isNonEmptyArray, nonexhaustive } from "@likec4/core";
 import { isArray, isDefined, isNonNullish, isTruthy } from "remeda";
 import {
   ast,
@@ -76,7 +77,7 @@ export function ViewsParser(B) {
       const links = this.convertLinks(body);
       const manualLayout = parseViewManualLayout(astNode);
       const view = {
-        __: "element",
+        [c4._type]: "element",
         id,
         astPath,
         title,
@@ -87,7 +88,7 @@ export function ViewsParser(B) {
           ...additionalStyles,
           ...body.rules.flatMap((n) => {
             try {
-              return this.isValid(n) ? this.parseViewRule(n) : [];
+              return this.isValid(n) ? this.parseElementViewRule(n) : [];
             } catch (e) {
               logWarnError(e);
               return [];
@@ -107,7 +108,7 @@ export function ViewsParser(B) {
       }
       return view;
     }
-    parseViewRule(astRule) {
+    parseElementViewRule(astRule) {
       if (ast.isViewRulePredicate(astRule)) {
         return this.parseViewRulePredicate(astRule);
       }
@@ -186,23 +187,15 @@ export function ViewsParser(B) {
       };
     }
     parseViewRuleStyle(astRule) {
-      const styleProps = astRule.props.filter(ast.isStyleProperty);
-      const targets = astRule.targets;
-      const notation = astRule.props.find(ast.isNotationProperty);
-      return this.parseRuleStyle(styleProps, targets, notation);
-    }
-    parseRuleStyle(styleProperties, elementExpressionsIterator, notationProperty) {
-      const styleProps = this.parseStyleProps(styleProperties);
-      const notation = removeIndent(notationProperty?.value);
-      const targets = this.parseFqnExpressions(elementExpressionsIterator).filter(
-        (e) => ModelLayer.Expression.isFqnExpr(e)
+      const targets = this.parseFqnExpressions(astRule.targets).filter(
+        (e) => c4.ModelExpression.isFqnExpr(e)
       );
+      const style = this.parseStyleProps(astRule.props.filter(ast.isStyleProperty));
+      const notation = removeIndent(astRule.props.find(ast.isNotationProperty)?.value);
       return {
         targets,
-        ...notation && { notation },
-        style: {
-          ...styleProps
-        }
+        style,
+        ...notation && { notation }
       };
     }
     parseViewRuleGlobalStyle(astRule) {
@@ -230,7 +223,7 @@ export function ViewsParser(B) {
       ViewOps.writeId(astNode, id);
       const manualLayout = parseViewManualLayout(astNode);
       return {
-        __: "dynamic",
+        [c4._type]: "dynamic",
         id,
         astPath,
         title,

package/dist/model-change/changeElementStyle.d.ts

@@ -1,4 +1,4 @@
-import { type Fqn, type NonEmptyArray, type ViewChange } from '@likec4/core';
+import { type DeploymentFqn, type Fqn, type NonEmptyArray, type ViewChange } from '@likec4/core';
 import { type Range, TextEdit } from 'vscode-languageserver-types';
 import { type ParsedAstView, type ParsedLikeC4LangiumDocument, ast } from '../ast';
 import type { LikeC4Services } from '../module';
@@ -6,7 +6,7 @@ type ChangeElementStyleArg = {
     view: ParsedAstView;
     doc: ParsedLikeC4LangiumDocument;
     viewAst: ast.LikeC4View;
-    targets: NonEmptyArray<Fqn>;
+    targets: NonEmptyArray<Fqn | DeploymentFqn>;
     style: ViewChange.ChangeElementStyle['style'];
 };
 export declare function changeElementStyle(services: LikeC4Services, { view, viewAst, targets, style, }: ChangeElementStyleArg): {

package/dist/model-change/changeElementStyle.js

@@ -1,4 +1,8 @@
-import { invariant, isAncestor } from "@likec4/core";
+import {
+  _type,
+  invariant,
+  isAncestor
+} from "@likec4/core";
 import { GrammarUtils } from "langium";
 import { entries, filter, findLast, isTruthy, last } from "remeda";
 import { TextEdit } from "vscode-languageserver-types";
@@ -43,7 +47,7 @@ export function changeElementStyle(services, {
     viewAst.body.rules,
     (r) => ast.isViewRuleStyle(r) || ast.isDeploymentViewRuleStyle(r)
   );
-  const viewOf = view.__ === "element" ? view.viewOf : null;
+  const viewOf = view[_type] === "element" ? view.viewOf ?? null : null;
   const existing = [];
   const insert = [];
   targets.forEach((target) => {

package/dist/module.d.ts

@@ -4,7 +4,7 @@ import { type DefaultSharedModuleContext, type LangiumServices, type LangiumShar
 import { LikeC4DocumentationProvider } from './documentation';
 import { type LikeC4LanguageServices } from './LikeC4LanguageServices';
 import { LikeC4CodeLensProvider, LikeC4CompletionProvider, LikeC4DocumentHighlightProvider, LikeC4DocumentLinkProvider, LikeC4DocumentSymbolProvider, LikeC4HoverProvider, LikeC4SemanticTokenProvider } from './lsp';
-import { type LikeC4MCPServer, LikeC4MCPServerFactory } from './mcp/LikeC4MCPServerFactory';
+import { type LikeC4MCPServer, type LikeC4MCPServerFactory } from './mcp/LikeC4MCPServerFactory';
 import { type LikeC4MCPTools } from './mcp/LikeC4MCPTools';
 import { type LikeC4ModelBuilder, DeploymentsIndex, FqnIndex, LikeC4ModelLocator, LikeC4ModelParser } from './model';
 import { LikeC4ModelChanges } from './model-change/ModelChanges';

package/dist/module.js

@@ -26,7 +26,10 @@ import {
   LikeC4HoverProvider,
   LikeC4SemanticTokenProvider
 } from "./lsp/index.js";
-import { LikeC4MCPServerFactory, NoopLikeC4MCPServer } from "./mcp/LikeC4MCPServerFactory.js";
+import {
+  NoopLikeC4MCPServer,
+  NoopLikeC4MCPServerFactory
+} from "./mcp/LikeC4MCPServerFactory.js";
 import { DefaultLikeC4MCPTools } from "./mcp/LikeC4MCPTools.js";
 import {
   DefaultLikeC4ModelBuilder,
@@ -79,7 +82,7 @@ export const LikeC4Module = {
   mcp: {
     Tools: bind(DefaultLikeC4MCPTools),
     Server: bind(NoopLikeC4MCPServer),
-    ServerFactory: bind(LikeC4MCPServerFactory)
+    ServerFactory: bind(NoopLikeC4MCPServerFactory)
   },
   likec4: {
     LanguageServices: bind(DefaultLikeC4LanguageServices),

package/dist/protocol.d.ts

@@ -1,6 +1,6 @@
-import type { ComputedLikeC4ModelData, ComputedView, DiagramView, Fqn, LayoutedLikeC4ModelData, NonEmptyArray, ProjectId, RelationId, ViewChange, ViewId } from '@likec4/core';
+import type { ComputedLikeC4ModelData, ComputedView, DeploymentFqn, DiagramView, Fqn, LayoutedLikeC4ModelData, NonEmptyArray, ProjectId, RelationId, ViewChange, ViewId } from '@likec4/core';
 import { NotificationType, RequestType, RequestType0 } from 'vscode-jsonrpc';
-import type { DiagnosticSeverity, DocumentUri, Location, Position } from 'vscode-languageserver-types';
+import type { DiagnosticSeverity, DocumentUri, Location, Position, Range } from 'vscode-languageserver-types';
 export declare namespace DidChangeModelNotification {
     const type: NotificationType<string>;
     type Type = typeof type;
@@ -143,7 +143,7 @@ export declare namespace Locate {
         projectId?: string | undefined;
         relation: RelationId;
     } | {
-        deployment: Fqn;
+        deployment: DeploymentFqn;
         projectId?: string | undefined;
         property?: string;
     } | {
@@ -186,3 +186,24 @@ export declare namespace FetchTelemetryMetrics {
     const req: RequestType0<Res, void>;
     type Req = typeof req;
 }
+/**
+ * Request to fetch all tags of a document
+ */
+export declare namespace GetDocumentTags {
+    type Params = {
+        documentUri: DocumentUri;
+    };
+    type Res = {
+        /**
+         * Used tags in the document
+         */
+        tags: Array<{
+            name: string;
+            range: Range;
+            color: string;
+            isSpecification?: boolean;
+        }>;
+    };
+    const req: RequestType<Params, Res, void>;
+    type Req = typeof req;
+}

package/dist/protocol.js

@@ -47,3 +47,7 @@ export var FetchTelemetryMetrics;
 ((FetchTelemetryMetrics2) => {
   FetchTelemetryMetrics2.req = new RequestType0("likec4/metrics");
 })(FetchTelemetryMetrics || (FetchTelemetryMetrics = {}));
+export var GetDocumentTags;
+((GetDocumentTags2) => {
+  GetDocumentTags2.req = new RequestType("likec4/document-tags");
+})(GetDocumentTags || (GetDocumentTags = {}));