@likec4/language-server 1.31.0 → 1.32.1

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

@@ -12,16 +12,15 @@ declare const DocumentParserFromMixins: {
         parseGlobalDynamicPredicateGroup(astRule: import("../generated/ast").GlobalDynamicPredicateGroup): ProjectId[];
         parseGlobalStyleOrGroup(astRule: import("../generated/ast").GlobalStyle | import("../generated/ast").GlobalStyleGroup): ProjectId[];
         parseViews(): void;
-        parseElementView(astNode: import("../generated/ast").ElementView, additionalStyles: ProjectId[]): import("../ast").ParsedAstElementView;
-        parseViewRule(astRule: import("../generated/ast").ViewRule): ProjectId;
+        parseElementView(astNode: import("../generated/ast").ElementView, additionalStyles: any[]): import("../ast").ParsedAstElementView;
+        parseElementViewRule(astRule: import("../generated/ast").ViewRule): ProjectId;
         parseViewRulePredicate(astNode: import("../generated/ast").ViewRulePredicate): ProjectId;
         parseViewRuleGlobalPredicateRef(astRule: import("../generated/ast").ViewRuleGlobalPredicateRef | import("../generated/ast").DynamicViewGlobalPredicateRef): ProjectId;
-        parseViewRuleStyleOrGlobalRef(astRule: import("../generated/ast").ViewRuleStyleOrGlobalRef): ProjectId;
+        parseViewRuleStyleOrGlobalRef(astRule: import("../generated/ast").ViewRuleStyleOrGlobalRef): any;
         parseViewRuleGroup(astNode: import("../generated/ast").ViewRuleGroup): ProjectId;
         parseViewRuleStyle(astRule: import("../generated/ast").ViewRuleStyle | import("../generated/ast").GlobalStyle): ProjectId;
-        parseRuleStyle(styleProperties: import("../generated/ast").StyleProperty[], elementExpressionsIterator: import("../generated/ast").FqnExpressions, notationProperty?: import("../generated/ast").NotationProperty): ProjectId;
         parseViewRuleGlobalStyle(astRule: import("../generated/ast").ViewRuleGlobalStyle): ProjectId;
-        parseDynamicElementView(astNode: import("../generated/ast").DynamicView, additionalStyles: ProjectId[]): import("../ast").ParsedAstDynamicView;
+        parseDynamicElementView(astNode: import("../generated/ast").DynamicView, additionalStyles: any[]): import("../ast").ParsedAstDynamicView;
         parseDynamicViewRule(astRule: import("../generated/ast").DynamicViewRule): ProjectId;
         parseDynamicViewIncludePredicate(astRule: import("../generated/ast").DynamicViewIncludePredicate): ProjectId;
         parseDynamicParallelSteps(node: import("../generated/ast").DynamicViewParallelSteps): ProjectId;
@@ -73,6 +72,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
         parseDeploymentView(astNode: import("../generated/ast").DeploymentView): import("../ast").ParsedAstDeploymentView;
@@ -89,16 +89,15 @@ declare const DocumentParserFromMixins: {
 } & {
     new (...args: any[]): {
         parseViews(): void;
-        parseElementView(astNode: import("../generated/ast").ElementView, additionalStyles: ProjectId[]): import("../ast").ParsedAstElementView;
-        parseViewRule(astRule: import("../generated/ast").ViewRule): ProjectId;
+        parseElementView(astNode: import("../generated/ast").ElementView, additionalStyles: any[]): import("../ast").ParsedAstElementView;
+        parseElementViewRule(astRule: import("../generated/ast").ViewRule): ProjectId;
         parseViewRulePredicate(astNode: import("../generated/ast").ViewRulePredicate): ProjectId;
         parseViewRuleGlobalPredicateRef(astRule: import("../generated/ast").ViewRuleGlobalPredicateRef | import("../generated/ast").DynamicViewGlobalPredicateRef): ProjectId;
-        parseViewRuleStyleOrGlobalRef(astRule: import("../generated/ast").ViewRuleStyleOrGlobalRef): ProjectId;
+        parseViewRuleStyleOrGlobalRef(astRule: import("../generated/ast").ViewRuleStyleOrGlobalRef): any;
         parseViewRuleGroup(astNode: import("../generated/ast").ViewRuleGroup): ProjectId;
         parseViewRuleStyle(astRule: import("../generated/ast").ViewRuleStyle | import("../generated/ast").GlobalStyle): ProjectId;
-        parseRuleStyle(styleProperties: import("../generated/ast").StyleProperty[], elementExpressionsIterator: import("../generated/ast").FqnExpressions, notationProperty?: import("../generated/ast").NotationProperty): ProjectId;
         parseViewRuleGlobalStyle(astRule: import("../generated/ast").ViewRuleGlobalStyle): ProjectId;
-        parseDynamicElementView(astNode: import("../generated/ast").DynamicView, additionalStyles: ProjectId[]): import("../ast").ParsedAstDynamicView;
+        parseDynamicElementView(astNode: import("../generated/ast").DynamicView, additionalStyles: any[]): import("../ast").ParsedAstDynamicView;
         parseDynamicViewRule(astRule: import("../generated/ast").DynamicViewRule): ProjectId;
         parseDynamicViewIncludePredicate(astRule: import("../generated/ast").DynamicViewIncludePredicate): ProjectId;
         parseDynamicParallelSteps(node: import("../generated/ast").DynamicViewParallelSteps): ProjectId;
@@ -150,6 +149,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
         parseDeploymentView(astNode: import("../generated/ast").DeploymentView): import("../ast").ParsedAstDeploymentView;
@@ -166,7 +166,8 @@ declare const DocumentParserFromMixins: {
 } & {
     new (...args: any[]): {
         parseSpecification(): void;
-        parseSpecificationDeploymentNodeKind({ kind, props }: import("../generated/ast").SpecificationDeploymentNodeKind): {};
+        parseElementSpecificationNode(specAst: import("../generated/ast").SpecificationElementKind): {};
+        parseElementSpecificationNode(specAst: import("../generated/ast").SpecificationDeploymentNodeKind): {};
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
         readonly doc: ParsedLikeC4LangiumDocument;
@@ -189,6 +190,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
     };
@@ -241,6 +243,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
     };
@@ -286,6 +289,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
         parseDeployment(): void;
@@ -339,6 +343,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
     };
@@ -385,6 +390,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
     };
@@ -413,6 +419,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
     };
@@ -454,6 +461,7 @@ declare const DocumentParserFromMixins: {
         convertLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: import("../generated/ast").LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: import("../generated/ast").IconProperty | undefined): ProjectId | undefined;
+        parseColorLiteral(astNode: import("../generated/ast").ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<import("../generated/ast").ElementProperty> | import("../generated/ast").ElementStyleProperty | undefined): import("../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<import("../generated/ast").StyleProperty> | undefined): import("../ast").ParsedElementStyle;
     };

package/dist/model/model-parser.js

@@ -77,7 +77,7 @@ export class LikeC4ModelParser {
   createParser(doc) {
     const props = {
       c4Specification: {
-        tags: /* @__PURE__ */ new Set(),
+        tags: {},
         elements: {},
         relationships: {},
         colors: {},
@@ -99,12 +99,16 @@ export class LikeC4ModelParser {
     };
     doc = Object.assign(doc, props);
     const parser = new DocumentParser(this.services, doc);
-    parser.parseSpecification();
-    parser.parseImports();
-    parser.parseModel();
-    parser.parseGlobals();
-    parser.parseDeployment();
-    parser.parseViews();
+    try {
+      parser.parseSpecification();
+      parser.parseImports();
+      parser.parseModel();
+      parser.parseGlobals();
+      parser.parseDeployment();
+      parser.parseViews();
+    } catch (e) {
+      logger.error(`Error parsing document ${doc.uri.toString()}`, { cause: e });
+    }
     return parser;
   }
 }

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

@@ -32,6 +32,7 @@ export declare class BaseParser {
     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): ParsedElementStyle;
     parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): ParsedElementStyle;
 }

package/dist/model/parser/Base.js

@@ -7,6 +7,8 @@ import {
   isBoolean,
   isEmpty,
   isNonNullish,
+  isNumber,
+  isString,
   isTruthy,
   map,
   pipe,
@@ -17,6 +19,7 @@ import { hasLeadingSlash, hasProtocol, isRelative, joinRelativeURL, joinURL } fr
 import {
   ast,
   parseAstOpacityProperty,
+  parseAstPercent,
   parseAstSizeValue,
   toColor
 } from "../../ast.js";
@@ -86,7 +89,7 @@ export class BaseParser {
     while (iter) {
       try {
         if (this.isValid(iter)) {
-          const values = iter.values.map((t) => t.ref?.name).filter(isTruthy);
+          const values = iter.values.map((t) => t.tag.ref?.name).filter(isTruthy);
           if (values.length > 0) {
             tags.push(...values);
           }
@@ -95,8 +98,7 @@ export class BaseParser {
       }
       iter = iter.prev;
     }
-    tags = unique(tags.reverse());
-    return isNonEmptyArray(tags) ? tags : null;
+    return isNonEmptyArray(tags) ? unique(tags) : null;
   }
   convertLinks(source) {
     return this.parseLinks(source);
@@ -155,6 +157,25 @@ export class BaseParser {
       }
     }
   }
+  parseColorLiteral(astNode) {
+    if (!this.isValid(astNode)) {
+      return void 0;
+    }
+    if (ast.isHexColor(astNode)) {
+      return `#${astNode.hex}`;
+    }
+    if (ast.isRGBAColor(astNode)) {
+      let alpha = isNumber(astNode.alpha) ? astNode.alpha : void 0;
+      if (isString(astNode.alpha)) {
+        alpha = parseAstPercent(astNode.alpha) / 100;
+      }
+      if (alpha !== void 0) {
+        return `rgba(${astNode.red},${astNode.green},${astNode.blue},${alpha})`;
+      }
+      return `rgb(${astNode.red},${astNode.green},${astNode.blue})`;
+    }
+    nonexhaustive(astNode);
+  }
   parseElementStyle(elementProps) {
     if (!elementProps) {
       return {};

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

@@ -12,7 +12,7 @@ export declare function DeploymentModelParser<TBase extends WithExpressionV2>(B:
         _resolveDeploymentRelationSource(node: ast.DeploymentRelation): FqnRef;
         parseDeploymentRelation(astNode: ast.DeploymentRelation): ParsedAstDeploymentRelation;
         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;
@@ -47,6 +47,7 @@ export declare function DeploymentModelParser<TBase extends WithExpressionV2>(B:
         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;
     };

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;
@@ -45,6 +45,7 @@ export declare function DeploymentViewParser<TBase extends WithExpressionV2 & Wi
         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;
         parseDeployment(): void;

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;
@@ -40,6 +40,7 @@ export declare function ExpressionV2Parser<TBase extends Base>(B: TBase): {
         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;
     };

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;
@@ -70,11 +69,12 @@ export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase):
         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;

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/ImportsParser.d.ts

@@ -26,6 +26,7 @@ export declare function ImportsParser<TBase extends Base>(B: TBase): {
         convertLinks(source?: ast.LinkProperty["$container"]): ProjectId[] | undefined;
         parseLinks(source?: ast.LinkProperty["$container"]): ProjectId[] | undefined;
         parseIconProperty(prop: ast.IconProperty | undefined): ProjectId | undefined;
+        parseColorLiteral(astNode: ast.ColorLiteral): ProjectId | undefined;
         parseElementStyle(elementProps: Array<ast.ElementProperty> | ast.ElementStyleProperty | undefined): import("../../ast").ParsedElementStyle;
         parseStyleProps(styleProps: Array<ast.StyleProperty> | undefined): import("../../ast").ParsedElementStyle;
     };

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;
@@ -46,6 +46,7 @@ export declare function ModelParser<TBase extends WithExpressionV2>(B: TBase): {
         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;
     };

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;
@@ -51,6 +51,7 @@ export declare function PredicatesParser<TBase extends WithExpressionV2>(B: TBas
         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;
     };

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;
@@ -29,6 +32,7 @@ export declare function SpecificationParser<TBase extends Base>(B: TBase): {
         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;
     };