@likec4/language-server 1.31.0 → 1.32.1

package/dist/model/parser/SpecificationParser.js

@@ -1,3 +1,4 @@
+import { nonNullable } from "@likec4/core/utils";
 import { filter, isNonNullish, isTruthy, mapToObj, pipe } from "remeda";
 import { ast, toRelationshipStyleExcludeDefaults } from "../../ast.js";
 import { logger, logWarnError } from "../../logger.js";
@@ -14,27 +15,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 +56,13 @@ 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);
+        const color = tagSpec.color && this.parseColorLiteral(tagSpec.color);
         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,
+            ...color ? { color } : {}
+          };
         }
       }
       const colors_specs = specifications.flatMap((s) => s.colors.filter(isValid));
@@ -87,18 +74,20 @@ export function SpecificationParser(B) {
             continue;
           }
           c4Specification.colors[colorName] = {
-            color
+            color: nonNullable(this.parseColorLiteral(color), `Color "${colorName}" is not valid: ${color}`)
           };
         } catch (e) {
           logWarnError(e);
         }
       }
     }
-    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 +97,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;
@@ -68,11 +67,12 @@ export declare function ViewsParser<TBase extends WithPredicates & WithDeploymen
         convertLinks(source?: ast.LinkProperty["$container"]): c4.Link[] | undefined;
         parseLinks(source?: ast.LinkProperty["$container"]): c4.Link[] | undefined;
         parseIconProperty(prop: ast.IconProperty | undefined): c4.IconUrl | undefined;
+        parseColorLiteral(astNode: ast.ColorLiteral): c4.ColorLiteral | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         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 +82,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 = {}));

package/dist/references/scope-computation.js

@@ -132,7 +132,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           case ast.isSpecificationTag(spec): {
             if (isTruthy(spec.tag.name)) {
               docExports.push(
-                this.descriptions.createDescription(spec.tag, "#" + spec.tag.name, document)
+                this.descriptions.createDescription(spec.tag, spec.tag.name, document)
               );
             }
             continue;
@@ -140,8 +140,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           case ast.isSpecificationRelationshipKind(spec): {
             if (isTruthy(spec.kind.name)) {
               docExports.push(
-                this.descriptions.createDescription(spec.kind, spec.kind.name, document),
-                this.descriptions.createDescription(spec.kind, "." + spec.kind.name, document)
+                this.descriptions.createDescription(spec.kind, spec.kind.name, document)
               );
             }
             continue;

package/dist/test/testServices.d.ts

@@ -1,3 +1,4 @@
+import type { ComputedLikeC4ModelData } from '@likec4/core';
 import type { LikeC4LangiumDocument } from '../ast';
 export declare function createTestServices(workspace?: string): {
     services: any;
@@ -19,6 +20,20 @@ export declare function createTestServices(workspace?: string): {
     resetState: () => Promise<void>;
     format: (input: string | LikeC4LangiumDocument, uri?: string) => Promise<any>;
 };
+/**
+ * @example
+ * ```ts
+ * const { projects } = await createMultiProjectTestServices({
+ *   project1: {
+ *     doc1: `...`,
+ *     doc2: `...`,
+ *   },
+ *   project2: {
+ *     doc1: `...`,
+ *   },
+ * })
+ * ```
+ */
 export declare function createMultiProjectTestServices<const Projects extends Record<string, Record<string, string>>>(data: Projects): Promise<{
     services: any;
     projects: { readonly [K in keyof Projects]: { readonly [L in keyof Projects[K]]: LikeC4LangiumDocument; }; };

package/dist/test/testServices.js

@@ -104,7 +104,7 @@ export function createTestServices(workspace = "file:///test/workspace") {
     }
     const likec4model = await modelBuilder.buildLikeC4Model();
     if (!likec4model) throw new Error("No model found");
-    return likec4model.$model;
+    return likec4model.$data;
   };
   const buildLikeC4Model = async () => {
     if (langiumDocuments.all.some((doc) => doc.state < DocumentState.Validated)) {

package/dist/validation/index.d.ts

@@ -3,7 +3,7 @@ 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.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.ElementKindExpression | ast.ElementTagExpression | ast.FqnRefExpr | ast.WildcardExpression | ast.FqnExprWhere | ast.FqnExprWith | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationExprWhere | ast.RelationExprWith | ast.Element | ast.ExtendDeployment | ast.ExtendElement | ast.Imported | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.PaddingSizeProperty | ast.ShapeSizeProperty | ast.TextSizeProperty | 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.ViewRulePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.ElementRef | ast.DeploymentRelation | ast.Tags | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.Relation | ast.SpecificationElementKind | ast.Globals | ast.GlobalPredicateGroup | ast.GlobalStyleGroup | ast.ImportsFromPoject | ast.SpecificationRule | ast.SpecificationTag;
+declare const isValidatableAstNode: (n: AstNode) => n is ast.HexColor | ast.RGBAColor | ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.ElementKindExpression | ast.ElementTagExpression | ast.FqnRefExpr | ast.WildcardExpression | ast.FqnExprWhere | ast.FqnExprWith | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationExprWhere | ast.RelationExprWith | ast.Element | ast.ExtendDeployment | ast.ExtendElement | ast.Imported | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.PaddingSizeProperty | ast.ShapeSizeProperty | ast.TextSizeProperty | 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.ViewRulePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.ElementRef | ast.DeploymentRelation | ast.Tags | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.Relation | ast.SpecificationElementKind | ast.Globals | ast.GlobalPredicateGroup | ast.GlobalStyleGroup | ast.SpecificationTag | ast.ImportsFromPoject | ast.SpecificationRule;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 export declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/dist/validation/index.js

@@ -13,7 +13,12 @@ import { dynamicViewStep } from "./dynamic-view-step.js";
 import { checkElement } from "./element.js";
 import { checkElementRef } from "./element-ref.js";
 import { checkImported, checkImportsFromPoject } from "./imports.js";
-import { iconPropertyRuleChecks, notesPropertyRuleChecks, opacityPropertyRuleChecks } from "./property-checks.js";
+import {
+  colorLiteralRuleChecks,
+  iconPropertyRuleChecks,
+  notesPropertyRuleChecks,
+  opacityPropertyRuleChecks
+} from "./property-checks.js";
 import { checkRelationBody, relationChecks } from "./relation.js";
 import {
   checkDeploymentNodeKind,
@@ -82,7 +87,8 @@ const isValidatableAstNode = validatableAstNodeGuards([
   ast.isSpecificationDeploymentNodeKind,
   ast.isSpecificationTag,
   ast.isSpecificationColor,
-  ast.isSpecificationRule
+  ast.isSpecificationRule,
+  ast.isColorLiteral
 ]);
 const findInvalidContainer = (node) => {
   let nd = node;
@@ -147,7 +153,8 @@ export function registerValidationChecks(services) {
     IncomingRelationExpr: checkIncomingRelationExpr(services),
     OutgoingRelationExpr: checkOutgoingRelationExpr(services),
     ImportsFromPoject: checkImportsFromPoject(services),
-    Imported: checkImported(services)
+    Imported: checkImported(services),
+    ColorLiteral: colorLiteralRuleChecks(services)
   });
   const connection = services.shared.lsp.Connection;
   if (connection) {

package/dist/validation/property-checks.d.ts

@@ -4,3 +4,4 @@ import type { LikeC4Services } from '../module';
 export declare const opacityPropertyRuleChecks: (_: LikeC4Services) => ValidationCheck<ast.OpacityProperty>;
 export declare const iconPropertyRuleChecks: (_: LikeC4Services) => ValidationCheck<ast.IconProperty>;
 export declare const notesPropertyRuleChecks: (_: LikeC4Services) => ValidationCheck<ast.NotesProperty>;
+export declare const colorLiteralRuleChecks: (_: LikeC4Services) => ValidationCheck<ast.ColorLiteral>;

package/dist/validation/property-checks.js

@@ -1,4 +1,6 @@
+import { nonexhaustive } from "@likec4/core";
 import { AstUtils } from "langium";
+import { isNumber, isString } from "remeda";
 import { ast } from "../ast.js";
 import { tryOrLog } from "./_shared.js";
 export const opacityPropertyRuleChecks = (_) => {
@@ -43,3 +45,63 @@ export const notesPropertyRuleChecks = (_) => {
     }
   };
 };
+export const colorLiteralRuleChecks = (_) => {
+  return (node, accept) => {
+    if (node.$type === "HexColor") {
+      if (node.hex === void 0) {
+        accept("error", `Invalid HEX`, {
+          node,
+          property: "hex"
+        });
+        return;
+      }
+      const length = isNumber(node.hex) ? node.hex.toString().length : node.hex.length;
+      if (length !== 6 && length !== 3 && length !== 8) {
+        accept("error", `Invalid value "${node.$cstNode?.text}", must be 3, 6 or 8 characters long`, {
+          node,
+          property: "hex"
+        });
+      }
+      return;
+    }
+    if (node.$type === "RGBAColor") {
+      if (!isNumber(node.red) || node.red < 0 || node.red > 255) {
+        accept("error", `Invalid value, must be between 0 and 255`, {
+          node,
+          property: "red"
+        });
+      }
+      if (!isNumber(node.green) || node.green < 0 || node.green > 255) {
+        accept("error", `Invalid value, must be between 0 and 255`, {
+          node,
+          property: "green"
+        });
+      }
+      if (!isNumber(node.blue) || node.blue < 0 || node.blue > 255) {
+        accept("error", `Invalid value, must be between 0 and 255`, {
+          node,
+          property: "blue"
+        });
+      }
+      if (isNumber(node.alpha)) {
+        if (node.alpha < 0 || node.alpha > 1) {
+          accept("error", `Invalid value, must be between 0 and 1`, {
+            node,
+            property: "alpha"
+          });
+        }
+      }
+      if (isString(node.alpha)) {
+        const alpha = parseFloat(node.alpha);
+        if (alpha < 0 || alpha > 100) {
+          accept("error", `Invalid value, must be between 0% and 100%`, {
+            node,
+            property: "alpha"
+          });
+        }
+      }
+      return;
+    }
+    nonexhaustive(node);
+  };
+};

package/dist/validation/relation.js

@@ -34,7 +34,7 @@ export const relationChecks = (services) => {
         });
       }
     }
-    if (isSameHierarchy(FqnRef.toModelFqn(source), FqnRef.toModelFqn(target))) {
+    if (isSameHierarchy(FqnRef.flatten(source), FqnRef.flatten(target))) {
       accept("error", "Invalid parent-child relationship", {
         node: el
       });

package/dist/validation/specification.js

@@ -97,7 +97,7 @@ export const checkDeploymentNodeKind = (services) => {
 export const checkTag = (services) => {
   const index = services.shared.workspace.IndexManager;
   return tryOrLog((node, accept) => {
-    const tagname = "#" + node.name;
+    const tagname = node.name;
     const projectId = projectIdFrom(node);
     const sameTag = index.projectElements(projectId, ast.Tag).filter((n) => n.name === tagname && n.node !== node).head();
     if (sameTag) {

package/dist/view-utils/assignNavigateTo.d.ts

@@ -1,2 +1,2 @@
-import { ComputedView } from '@likec4/core';
+import { type ComputedView } from '@likec4/core';
 export declare function assignNavigateTo<R extends Iterable<ComputedView>>(views: R): R;

package/dist/view-utils/assignNavigateTo.js

@@ -1,9 +1,9 @@
-import { ComputedNode, ComputedView } from "@likec4/core";
+import { isElementView } from "@likec4/core";
 import { find, isNullish } from "remeda";
 export function assignNavigateTo(views) {
   const allElementViews = /* @__PURE__ */ new Map();
   for (const v of views) {
-    if (ComputedView.isElement(v) && v.viewOf && isNullish(v.extends)) {
+    if (isElementView(v) && v.viewOf && isNullish(v.extends)) {
       const viewsOf = allElementViews.get(v.viewOf) ?? [];
       viewsOf.push(v.id);
       allElementViews.set(v.viewOf, viewsOf);
@@ -11,7 +11,7 @@ export function assignNavigateTo(views) {
   }
   for (const { id, nodes } of views) {
     for (const node of nodes) {
-      const modelRef = ComputedNode.modelRef(node);
+      const modelRef = node.modelRef;
       if (node.navigateTo || !modelRef) {
         continue;
       }

package/dist/views/likec4-views.d.ts

@@ -1,4 +1,4 @@
-import type { ComputedView, DiagramView, OverviewGraph, ProjectId, ViewId } from '@likec4/core';
+import type { ComputedView, DiagramView, ProjectId, ViewId } from '@likec4/core';
 import { GraphvizLayouter } from '@likec4/layouts';
 import { CancellationToken } from 'vscode-jsonrpc';
 import type { LikeC4Services } from '../module';
@@ -18,7 +18,6 @@ export interface LikeC4Views {
     layoutView(viewId: ViewId, projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<GraphvizOut | null>;
     diagrams(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<Array<DiagramView>>;
     viewsAsGraphvizOut(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<Array<GraphvizSvgOut>>;
-    overviewGraph(): Promise<OverviewGraph>;
 }
 export declare class DefaultLikeC4Views implements LikeC4Views {
     private services;
@@ -33,6 +32,5 @@ export declare class DefaultLikeC4Views implements LikeC4Views {
     layoutView(viewId: ViewId, projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<GraphvizOut | null>;
     diagrams(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<Array<DiagramView>>;
     viewsAsGraphvizOut(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<Array<GraphvizSvgOut>>;
-    overviewGraph(): Promise<OverviewGraph>;
 }
 export {};