@likec4/language-server 1.31.0 → 1.32.1

package/dist/formatting/LikeC4Formatter.js

@@ -1,5 +1,7 @@
 import { nonexhaustive } from "@likec4/core";
-import { GrammarUtils } from "langium";
+import {
+  GrammarUtils
+} from "langium";
 import { AbstractFormatter, Formatting } from "langium/lsp";
 import { filter, isTruthy } from "remeda";
 import * as ast from "../generated/ast.js";
@@ -62,7 +64,8 @@ export class LikeC4Formatter extends AbstractFormatter {
   }
   formatTags(node) {
     this.on(node, ast.isTags, (n, f) => {
-      f.cst(GrammarUtils.findNodesForProperty(n.$cstNode, "values").slice(1)).prepend(FormattingOptions.oneSpace);
+      const tags = GrammarUtils.findNodesForProperty(n.$cstNode, "values").filter((x) => x).slice(1);
+      f.cst(tags).prepend(FormattingOptions.oneSpace);
       f.keywords(",").prepend(FormattingOptions.noSpace).append(FormattingOptions.oneSpace);
     });
   }
@@ -102,8 +105,7 @@ export class LikeC4Formatter extends AbstractFormatter {
     );
     this.on(node, ast.isDynamicViewStep, (n, f) => {
       f.keywords("->", "<-").surround(FormattingOptions.oneSpace);
-      const kind = f.property("kind");
-      kind.nodes[0]?.text.startsWith(".") && kind.surround(FormattingOptions.oneSpace);
+      f.property("dotKind").prepend(FormattingOptions.oneSpace).append(FormattingOptions.oneSpace);
       f.keywords("]->").prepend(FormattingOptions.noSpace).append(FormattingOptions.oneSpace);
       f.keywords("-[").prepend(FormattingOptions.oneSpace).append(FormattingOptions.noSpace);
       f.properties("title").prepend(FormattingOptions.oneSpace);
@@ -369,8 +371,7 @@ export class LikeC4Formatter extends AbstractFormatter {
       f.keywords("->", "<->").prepend(FormattingOptions.oneSpace);
       f.keywords("-[").prepend(FormattingOptions.oneSpace).append(FormattingOptions.noSpace);
       f.keywords("]->").prepend(FormattingOptions.noSpace).append(FormattingOptions.oneSpace);
-      const kind = f.property("kind");
-      kind.nodes[0]?.text.startsWith(".") && kind.surround(FormattingOptions.oneSpace);
+      f.property("dotKind").prepend(FormattingOptions.oneSpace).append(FormattingOptions.oneSpace);
     });
     this.on(node, ast.isDirectedRelationExpr, (n, f) => {
       f.property("target").prepend(FormattingOptions.oneSpace);

package/dist/generated/ast.d.ts

@@ -20,12 +20,13 @@ export declare const LikeC4Terminals: {
     Eq: RegExp;
     Percent: RegExp;
     String: RegExp;
-    IdTerminal: RegExp;
+    Float: RegExp;
     Number: RegExp;
     Hex: RegExp;
+    IdTerminal: RegExp;
 };
 export type LikeC4TerminalNames = keyof typeof LikeC4Terminals;
-export type LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diamond" | "dot" | "dotted" | "dynamic" | "dynamicPredicateGroup" | "element" | "element.kind" | "element.tag" | "exclude" | "extend" | "extends" | "false" | "from" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "import" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "large" | "lg" | "likec4lib" | "line" | "link" | "md" | "medium" | "metadata" | "mobile" | "model" | "multiple" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "padding" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rectangle" | "red" | "relationship" | "secondary" | "shape" | "size" | "sky" | "slate" | "sm" | "small" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "tag" | "tail" | "target" | "technology" | "textSize" | "title" | "true" | "vee" | "view" | "views" | "where" | "with" | "xl" | "xlarge" | "xs" | "xsmall" | "{" | "}";
+export type LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diamond" | "dot" | "dotted" | "dynamic" | "dynamicPredicateGroup" | "element" | "element.kind" | "element.tag" | "exclude" | "extend" | "extends" | "false" | "from" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "import" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "large" | "lg" | "likec4lib" | "line" | "link" | "md" | "medium" | "metadata" | "mobile" | "model" | "multiple" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "padding" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rectangle" | "red" | "relationship" | "rgb" | "rgba" | "secondary" | "shape" | "size" | "sky" | "slate" | "sm" | "small" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "tag" | "tail" | "target" | "technology" | "textSize" | "title" | "true" | "vee" | "view" | "views" | "where" | "with" | "xl" | "xlarge" | "xs" | "xsmall" | "{" | "}";
 export type LikeC4TokenNames = LikeC4TerminalNames | LikeC4KeywordNames;
 export type ArrowType = 'crow' | 'diamond' | 'dot' | 'none' | 'normal' | 'odiamond' | 'odot' | 'onormal' | 'open' | 'vee';
 export declare function isArrowType(item: unknown): item is ArrowType;
@@ -33,10 +34,11 @@ export type Boolean = boolean;
 export declare function isBoolean(item: unknown): item is Boolean;
 export type BorderStyleValue = 'none' | LineOptions;
 export declare function isBorderStyleValue(item: unknown): item is BorderStyleValue;
+export type ColorLiteral = HexColor | RGBAColor;
+export declare const ColorLiteral = "ColorLiteral";
+export declare function isColorLiteral(item: unknown): item is ColorLiteral;
 export type CustomColorId = 'element' | 'model' | ArrowType | ElementShape | LineOptions | string;
 export declare function isCustomColorId(item: unknown): item is CustomColorId;
-export type CustomColorValue = string;
-export declare function isCustomColorValue(item: unknown): item is CustomColorValue;
 export type DeploymentElement = DeployedInstance | DeploymentNode;
 export declare const DeploymentElement = "DeploymentElement";
 export declare function isDeploymentElement(item: unknown): item is DeploymentElement;
@@ -46,8 +48,6 @@ export declare function isDeploymentNodeOrElementKind(item: unknown): item is De
 export type DeploymentViewRule = DeploymentViewRulePredicate | DeploymentViewRuleStyle | ViewRuleAutoLayout;
 export declare const DeploymentViewRule = "DeploymentViewRule";
 export declare function isDeploymentViewRule(item: unknown): item is DeploymentViewRule;
-export type DotId = string;
-export declare function isDotId(item: unknown): item is DotId;
 export type DynamicViewRule = DynamicViewGlobalPredicateRef | DynamicViewIncludePredicate | ViewRuleAutoLayout | ViewRuleStyleOrGlobalRef;
 export declare const DynamicViewRule = "DynamicViewRule";
 export declare function isDynamicViewRule(item: unknown): item is DynamicViewRule;
@@ -120,8 +120,6 @@ export declare function isStringProperty(item: unknown): item is StringProperty;
 export type StyleProperty = BorderProperty | ColorProperty | IconProperty | MultipleProperty | OpacityProperty | PaddingSizeProperty | ShapeProperty | ShapeSizeProperty | TextSizeProperty;
 export declare const StyleProperty = "StyleProperty";
 export declare function isStyleProperty(item: unknown): item is StyleProperty;
-export type TagId = string;
-export declare function isTagId(item: unknown): item is TagId;
 export type ThemeColor = 'amber' | 'blue' | 'gray' | 'green' | 'indigo' | 'muted' | 'primary' | 'red' | 'secondary' | 'sky' | 'slate';
 export declare function isThemeColor(item: unknown): item is ThemeColor;
 export type Uri = string;
@@ -253,6 +251,7 @@ export interface DeploymentRelation extends langium.AstNode {
     readonly $container: DeployedInstanceBody | DeploymentNodeBody | ExtendDeploymentBody | ModelDeployments;
     readonly $type: 'DeploymentRelation';
     body?: DeploymentRelationBody;
+    dotKind?: RelationKindDotRef;
     kind?: langium.Reference<RelationshipKind>;
     source?: FqnRef;
     tags?: Tags;
@@ -361,6 +360,7 @@ export interface DynamicViewStep extends langium.AstNode {
     readonly $container: DynamicViewBody | DynamicViewParallelSteps;
     readonly $type: 'DynamicViewStep';
     custom?: CustomRelationProperties;
+    dotKind?: RelationKindDotRef;
     isBackward: boolean;
     kind?: langium.Reference<RelationshipKind>;
     source: ElementRef;
@@ -399,7 +399,7 @@ export interface ElementKindExpression extends langium.AstNode {
     readonly $container: DirectedRelationExpr | Expressions | FqnExprWhere | FqnExprWith | FqnExpressions | IncomingRelationExpr | OutgoingRelationExpr;
     readonly $type: 'ElementKindExpression';
     isEqual: boolean;
-    kind?: langium.Reference<ElementKind>;
+    kind: langium.Reference<ElementKind>;
 }
 export declare const ElementKindExpression = "ElementKindExpression";
 export declare function isElementKindExpression(item: unknown): item is ElementKindExpression;
@@ -430,7 +430,7 @@ export interface ElementTagExpression extends langium.AstNode {
     readonly $container: DirectedRelationExpr | Expressions | FqnExprWhere | FqnExprWith | FqnExpressions | IncomingRelationExpr | OutgoingRelationExpr;
     readonly $type: 'ElementTagExpression';
     isEqual: boolean;
-    tag?: langium.Reference<Tag>;
+    tag: TagRef;
 }
 export declare const ElementTagExpression = "ElementTagExpression";
 export declare function isElementTagExpression(item: unknown): item is ElementTagExpression;
@@ -591,6 +591,13 @@ export interface GlobalStyleId extends langium.AstNode {
 }
 export declare const GlobalStyleId = "GlobalStyleId";
 export declare function isGlobalStyleId(item: unknown): item is GlobalStyleId;
+export interface HexColor extends langium.AstNode {
+    readonly $container: SpecificationColor | SpecificationTag;
+    readonly $type: 'HexColor';
+    hex: number | string;
+}
+export declare const HexColor = "HexColor";
+export declare function isHexColor(item: unknown): item is HexColor;
 export interface IconProperty extends langium.AstNode {
     readonly $container: CustomElementProperties | DeployedInstanceBody | DeploymentNodeBody | DeploymentViewRuleStyle | ElementBody | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
     readonly $type: 'IconProperty';
@@ -756,6 +763,7 @@ export declare function isOpacityProperty(item: unknown): item is OpacityPropert
 export interface OutgoingRelationExpr extends langium.AstNode {
     readonly $container: DirectedRelationExpr | Expressions | RelationExprWhere | RelationExprWith;
     readonly $type: 'OutgoingRelationExpr';
+    dotKind?: RelationKindDotRef;
     from: FqnExpr;
     isBidirectional: boolean;
     kind?: langium.Reference<RelationshipKind>;
@@ -774,6 +782,7 @@ export interface Relation extends langium.AstNode {
     readonly $container: ElementBody | ExtendElementBody | Model;
     readonly $type: 'Relation';
     body?: RelationBody;
+    dotKind?: RelationKindDotRef;
     kind?: langium.Reference<RelationshipKind>;
     source?: FqnRef;
     tags?: Tags;
@@ -807,6 +816,13 @@ export interface RelationExprWith extends langium.AstNode {
 }
 export declare const RelationExprWith = "RelationExprWith";
 export declare function isRelationExprWith(item: unknown): item is RelationExprWith;
+export interface RelationKindDotRef extends langium.AstNode {
+    readonly $container: DeploymentRelation | DynamicViewStep | OutgoingRelationExpr | Relation;
+    readonly $type: 'RelationKindDotRef';
+    kind: langium.Reference<RelationshipKind>;
+}
+export declare const RelationKindDotRef = "RelationKindDotRef";
+export declare function isRelationKindDotRef(item: unknown): item is RelationKindDotRef;
 export interface RelationNavigateToProperty extends langium.AstNode {
     readonly $container: CustomRelationProperties | DeploymentRelationBody | RelationBody;
     readonly $type: 'RelationNavigateToProperty';
@@ -838,6 +854,16 @@ export interface RelationStyleProperty extends langium.AstNode {
 }
 export declare const RelationStyleProperty = "RelationStyleProperty";
 export declare function isRelationStyleProperty(item: unknown): item is RelationStyleProperty;
+export interface RGBAColor extends langium.AstNode {
+    readonly $container: SpecificationColor | SpecificationTag;
+    readonly $type: 'RGBAColor';
+    alpha?: number | string;
+    blue: number;
+    green: number;
+    red: number;
+}
+export declare const RGBAColor = "RGBAColor";
+export declare function isRGBAColor(item: unknown): item is RGBAColor;
 export interface ShapeProperty extends langium.AstNode {
     readonly $container: CustomElementProperties | DeploymentViewRuleStyle | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
     readonly $type: 'ShapeProperty';
@@ -857,7 +883,7 @@ export declare function isShapeSizeProperty(item: unknown): item is ShapeSizePro
 export interface SpecificationColor extends langium.AstNode {
     readonly $container: SpecificationRule;
     readonly $type: 'SpecificationColor';
-    color: CustomColorValue;
+    color: ColorLiteral;
     name: CustomColor;
 }
 export declare const SpecificationColor = "SpecificationColor";
@@ -867,6 +893,7 @@ export interface SpecificationDeploymentNodeKind extends langium.AstNode {
     readonly $type: 'SpecificationDeploymentNodeKind';
     kind: DeploymentNodeKind;
     props: Array<ElementStyleProperty | SpecificationElementStringProperty>;
+    tags?: Tags;
 }
 export declare const SpecificationDeploymentNodeKind = "SpecificationDeploymentNodeKind";
 export declare function isSpecificationDeploymentNodeKind(item: unknown): item is SpecificationDeploymentNodeKind;
@@ -875,6 +902,7 @@ export interface SpecificationElementKind extends langium.AstNode {
     readonly $type: 'SpecificationElementKind';
     kind: ElementKind;
     props: Array<ElementStyleProperty | SpecificationElementStringProperty>;
+    tags?: Tags;
 }
 export declare const SpecificationElementKind = "SpecificationElementKind";
 export declare function isSpecificationElementKind(item: unknown): item is SpecificationElementKind;
@@ -917,6 +945,7 @@ export declare function isSpecificationRule(item: unknown): item is Specificatio
 export interface SpecificationTag extends langium.AstNode {
     readonly $container: SpecificationRule;
     readonly $type: 'SpecificationTag';
+    color?: ColorLiteral;
     tag: Tag;
 }
 export declare const SpecificationTag = "SpecificationTag";
@@ -944,11 +973,18 @@ export interface Tag extends langium.AstNode {
 }
 export declare const Tag = "Tag";
 export declare function isTag(item: unknown): item is Tag;
+export interface TagRef extends langium.AstNode {
+    readonly $container: ElementTagExpression | Tags | WhereElementTag | WhereRelationParticipantTag | WhereRelationTag;
+    readonly $type: 'TagRef';
+    tag: langium.Reference<Tag>;
+}
+export declare const TagRef = "TagRef";
+export declare function isTagRef(item: unknown): item is TagRef;
 export interface Tags extends langium.AstNode {
-    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelation | DeploymentRelationBody | DeploymentViewBody | DynamicViewBody | ElementBody | ElementViewBody | ExtendDeploymentBody | ExtendElementBody | Relation | RelationBody | Tags;
+    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelation | DeploymentRelationBody | DeploymentViewBody | DynamicViewBody | ElementBody | ElementViewBody | ExtendDeploymentBody | ExtendElementBody | Relation | RelationBody | SpecificationDeploymentNodeKind | SpecificationElementKind | Tags;
     readonly $type: 'Tags';
     prev?: Tags;
-    values: Array<langium.Reference<Tag>>;
+    values: Array<TagRef>;
 }
 export declare const Tags = "Tags";
 export declare function isTags(item: unknown): item is Tags;
@@ -1037,7 +1073,7 @@ export interface WhereElementKind extends langium.AstNode {
     readonly $type: 'WhereElementKind';
     not: boolean;
     operator: 'is' | string;
-    value?: langium.Reference<DeploymentNodeOrElementKind>;
+    value: langium.Reference<DeploymentNodeOrElementKind>;
 }
 export declare const WhereElementKind = "WhereElementKind";
 export declare function isWhereElementKind(item: unknown): item is WhereElementKind;
@@ -1053,7 +1089,7 @@ export interface WhereElementTag extends langium.AstNode {
     readonly $type: 'WhereElementTag';
     not: boolean;
     operator: 'is' | string;
-    value?: langium.Reference<Tag>;
+    value: TagRef;
 }
 export declare const WhereElementTag = "WhereElementTag";
 export declare function isWhereElementTag(item: unknown): item is WhereElementTag;
@@ -1062,7 +1098,7 @@ export interface WhereRelationKind extends langium.AstNode {
     readonly $type: 'WhereRelationKind';
     not: boolean;
     operator: 'is' | string;
-    value?: langium.Reference<RelationshipKind>;
+    value: langium.Reference<RelationshipKind>;
 }
 export declare const WhereRelationKind = "WhereRelationKind";
 export declare function isWhereRelationKind(item: unknown): item is WhereRelationKind;
@@ -1079,7 +1115,7 @@ export interface WhereRelationParticipantKind extends langium.AstNode {
     not: boolean;
     operator: 'is' | string;
     participant: Participant;
-    value?: langium.Reference<DeploymentNodeOrElementKind>;
+    value: langium.Reference<DeploymentNodeOrElementKind>;
 }
 export declare const WhereRelationParticipantKind = "WhereRelationParticipantKind";
 export declare function isWhereRelationParticipantKind(item: unknown): item is WhereRelationParticipantKind;
@@ -1089,7 +1125,7 @@ export interface WhereRelationParticipantTag extends langium.AstNode {
     not: boolean;
     operator: 'is' | string;
     participant: Participant;
-    value?: langium.Reference<Tag>;
+    value: TagRef;
 }
 export declare const WhereRelationParticipantTag = "WhereRelationParticipantTag";
 export declare function isWhereRelationParticipantTag(item: unknown): item is WhereRelationParticipantTag;
@@ -1098,7 +1134,7 @@ export interface WhereRelationTag extends langium.AstNode {
     readonly $type: 'WhereRelationTag';
     not: boolean;
     operator: 'is' | string;
-    value?: langium.Reference<Tag>;
+    value: TagRef;
 }
 export declare const WhereRelationTag = "WhereRelationTag";
 export declare function isWhereRelationTag(item: unknown): item is WhereRelationTag;
@@ -1112,6 +1148,7 @@ export declare function isWildcardExpression(item: unknown): item is WildcardExp
 export type LikeC4AstType = {
     ArrowProperty: ArrowProperty;
     BorderProperty: BorderProperty;
+    ColorLiteral: ColorLiteral;
     ColorProperty: ColorProperty;
     CustomColor: CustomColor;
     CustomElementProperties: CustomElementProperties;
@@ -1173,6 +1210,7 @@ export type LikeC4AstType = {
     GlobalStyleGroup: GlobalStyleGroup;
     GlobalStyleId: GlobalStyleId;
     Globals: Globals;
+    HexColor: HexColor;
     IconProperty: IconProperty;
     Imported: Imported;
     ImportsFromPoject: ImportsFromPoject;
@@ -1198,6 +1236,7 @@ export type LikeC4AstType = {
     OpacityProperty: OpacityProperty;
     OutgoingRelationExpr: OutgoingRelationExpr;
     PaddingSizeProperty: PaddingSizeProperty;
+    RGBAColor: RGBAColor;
     Referenceable: Referenceable;
     Relation: Relation;
     RelationBody: RelationBody;
@@ -1206,6 +1245,7 @@ export type LikeC4AstType = {
     RelationExprOrWith: RelationExprOrWith;
     RelationExprWhere: RelationExprWhere;
     RelationExprWith: RelationExprWith;
+    RelationKindDotRef: RelationKindDotRef;
     RelationNavigateToProperty: RelationNavigateToProperty;
     RelationProperty: RelationProperty;
     RelationStringProperty: RelationStringProperty;
@@ -1228,6 +1268,7 @@ export type LikeC4AstType = {
     StringProperty: StringProperty;
     StyleProperty: StyleProperty;
     Tag: Tag;
+    TagRef: TagRef;
     Tags: Tags;
     TextSizeProperty: TextSizeProperty;
     ViewProperty: ViewProperty;

package/dist/generated/ast.js

@@ -15,10 +15,11 @@ export const LikeC4Terminals = {
   NotEqual: /\!\={1,2}/,
   Eq: /\={1,2}/,
   Percent: /\b\d+%/,
-  String: /"[^"]*"|'[^']*'/,
-  IdTerminal: /[_]*[a-zA-Z][-\w]*/,
+  String: /"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'/,
+  Float: /\b\d+\.\d+\b/,
   Number: /\b\d+\b/,
-  Hex: /\b[a-zA-Z0-9]+\b/
+  Hex: /\b[a-fA-F0-9]{3,}\b/,
+  IdTerminal: /[_]*[a-zA-Z][-\w]*/
 };
 export function isArrowType(item) {
   return item === "none" || item === "normal" || item === "onormal" || item === "dot" || item === "odot" || item === "diamond" || item === "odiamond" || item === "crow" || item === "open" || item === "vee";
@@ -29,11 +30,12 @@ export function isBoolean(item) {
 export function isBorderStyleValue(item) {
   return isLineOptions(item) || item === "none";
 }
-export function isCustomColorId(item) {
-  return isElementShape(item) || isArrowType(item) || isLineOptions(item) || item === "element" || item === "model" || typeof item === "string" && /[_]*[a-zA-Z][-\w]*/.test(item);
+export const ColorLiteral = "ColorLiteral";
+export function isColorLiteral(item) {
+  return reflection.isInstance(item, ColorLiteral);
 }
-export function isCustomColorValue(item) {
-  return typeof item === "string";
+export function isCustomColorId(item) {
+  return isElementShape(item) || isArrowType(item) || isLineOptions(item) || item === "element" || item === "model" || typeof item === "string" && (/\b[a-fA-F0-9]{3,}\b/.test(item) || /[_]*[a-zA-Z][-\w]*/.test(item));
 }
 export const DeploymentElement = "DeploymentElement";
 export function isDeploymentElement(item) {
@@ -47,9 +49,6 @@ export const DeploymentViewRule = "DeploymentViewRule";
 export function isDeploymentViewRule(item) {
   return reflection.isInstance(item, DeploymentViewRule);
 }
-export function isDotId(item) {
-  return typeof item === "string";
-}
 export const DynamicViewRule = "DynamicViewRule";
 export function isDynamicViewRule(item) {
   return reflection.isInstance(item, DynamicViewRule);
@@ -89,7 +88,7 @@ export function isIconId(item) {
   return typeof item === "string" && /(aws|azure|gcp|tech):[-\w]*/.test(item);
 }
 export function isId(item) {
-  return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || isParticipant(item) || isSizeValue(item) || item === "element" || item === "model" || item === "group" || item === "node" || item === "deployment" || item === "instance" || typeof item === "string" && /[_]*[a-zA-Z][-\w]*/.test(item);
+  return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || isParticipant(item) || isSizeValue(item) || item === "element" || item === "model" || item === "group" || item === "node" || item === "deployment" || item === "instance" || typeof item === "string" && (/\b[a-fA-F0-9]{3,}\b/.test(item) || /[_]*[a-zA-Z][-\w]*/.test(item));
 }
 export const LikeC4View = "LikeC4View";
 export function isLikeC4View(item) {
@@ -148,9 +147,6 @@ export const StyleProperty = "StyleProperty";
 export function isStyleProperty(item) {
   return reflection.isInstance(item, StyleProperty);
 }
-export function isTagId(item) {
-  return typeof item === "string";
-}
 export function isThemeColor(item) {
   return item === "primary" || item === "secondary" || item === "muted" || item === "slate" || item === "blue" || item === "indigo" || item === "sky" || item === "red" || item === "gray" || item === "green" || item === "amber";
 }
@@ -408,6 +404,10 @@ export const GlobalStyleId = "GlobalStyleId";
 export function isGlobalStyleId(item) {
   return reflection.isInstance(item, GlobalStyleId);
 }
+export const HexColor = "HexColor";
+export function isHexColor(item) {
+  return reflection.isInstance(item, HexColor);
+}
 export const IconProperty = "IconProperty";
 export function isIconProperty(item) {
   return reflection.isInstance(item, IconProperty);
@@ -512,6 +512,10 @@ export const RelationExprWith = "RelationExprWith";
 export function isRelationExprWith(item) {
   return reflection.isInstance(item, RelationExprWith);
 }
+export const RelationKindDotRef = "RelationKindDotRef";
+export function isRelationKindDotRef(item) {
+  return reflection.isInstance(item, RelationKindDotRef);
+}
 export const RelationNavigateToProperty = "RelationNavigateToProperty";
 export function isRelationNavigateToProperty(item) {
   return reflection.isInstance(item, RelationNavigateToProperty);
@@ -528,6 +532,10 @@ export const RelationStyleProperty = "RelationStyleProperty";
 export function isRelationStyleProperty(item) {
   return reflection.isInstance(item, RelationStyleProperty);
 }
+export const RGBAColor = "RGBAColor";
+export function isRGBAColor(item) {
+  return reflection.isInstance(item, RGBAColor);
+}
 export const ShapeProperty = "ShapeProperty";
 export function isShapeProperty(item) {
   return reflection.isInstance(item, ShapeProperty);
@@ -580,6 +588,10 @@ export const Tag = "Tag";
 export function isTag(item) {
   return reflection.isInstance(item, Tag);
 }
+export const TagRef = "TagRef";
+export function isTagRef(item) {
+  return reflection.isInstance(item, TagRef);
+}
 export const Tags = "Tags";
 export function isTags(item) {
   return reflection.isInstance(item, Tags);
@@ -662,7 +674,7 @@ export function isWildcardExpression(item) {
 }
 export class LikeC4AstReflection extends langium.AbstractAstReflection {
   getAllTypes() {
-    return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentNodeOrElementKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRuleStyle, DirectedRelationExpr, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementKind, ElementKindExpression, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExpressionV2, Expressions, ExtendDeployment, ExtendDeploymentBody, ExtendElement, ExtendElementBody, ExtendElementProperty, FqnExpr, FqnExprOrWhere, FqnExprOrWith, FqnExprWhere, FqnExprWith, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, IconProperty, Imported, ImportsFromPoject, InOutRelationExpr, IncomingRelationExpr, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelReferenceable, ModelViews, MultipleProperty, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, PaddingSizeProperty, Referenceable, Relation, RelationBody, RelationExpr, RelationExprOrWhere, RelationExprOrWith, RelationExprWhere, RelationExprWith, RelationNavigateToProperty, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, ShapeSizeProperty, SizeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StrictFqnElementRef, StrictFqnRef, StringProperty, StyleProperty, Tag, Tags, TextSizeProperty, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationParticipantKind, WhereRelationParticipantTag, WhereRelationTag, WhereTagEqual, WildcardExpression];
+    return [ArrowProperty, BorderProperty, ColorLiteral, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentNodeOrElementKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRuleStyle, DirectedRelationExpr, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementKind, ElementKindExpression, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExpressionV2, Expressions, ExtendDeployment, ExtendDeploymentBody, ExtendElement, ExtendElementBody, ExtendElementProperty, FqnExpr, FqnExprOrWhere, FqnExprOrWith, FqnExprWhere, FqnExprWith, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, HexColor, IconProperty, Imported, ImportsFromPoject, InOutRelationExpr, IncomingRelationExpr, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelReferenceable, ModelViews, MultipleProperty, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, PaddingSizeProperty, RGBAColor, Referenceable, Relation, RelationBody, RelationExpr, RelationExprOrWhere, RelationExprOrWith, RelationExprWhere, RelationExprWith, RelationKindDotRef, RelationNavigateToProperty, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, ShapeSizeProperty, SizeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StrictFqnElementRef, StrictFqnRef, StringProperty, StyleProperty, Tag, TagRef, Tags, TextSizeProperty, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationParticipantKind, WhereRelationParticipantTag, WhereRelationTag, WhereTagEqual, WildcardExpression];
   }
   computeIsSubtype(subtype, supertype) {
     switch (subtype) {
@@ -738,6 +750,10 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
       case RelationExprOrWith: {
         return this.isSubtype(ExpressionV2, supertype);
       }
+      case HexColor:
+      case RGBAColor: {
+        return this.isSubtype(ColorLiteral, supertype);
+      }
       case IconProperty: {
         return this.isSubtype(ElementProperty, supertype) || this.isSubtype(StyleProperty, supertype);
       }
@@ -845,6 +861,7 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
       case "DynamicViewStep:kind":
       case "OutgoingRelationExpr:kind":
       case "Relation:kind":
+      case "RelationKindDotRef:kind":
       case "WhereRelationKind:value": {
         return RelationshipKind;
       }
@@ -858,13 +875,6 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
       case "ElementKindExpression:kind": {
         return ElementKind;
       }
-      case "ElementTagExpression:tag":
-      case "Tags:values":
-      case "WhereElementTag:value":
-      case "WhereRelationParticipantTag:value":
-      case "WhereRelationTag:value": {
-        return Tag;
-      }
       case "ElementViewRef:view": {
         return ElementView;
       }
@@ -879,6 +889,9 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
       case "StrictFqnElementRef:el": {
         return Element;
       }
+      case "TagRef:tag": {
+        return Tag;
+      }
       case "ViewRef:view": {
         return LikeC4View;
       }
@@ -1006,6 +1019,7 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           name: DeploymentRelation,
           properties: [
             { name: "body" },
+            { name: "dotKind" },
             { name: "kind" },
             { name: "source" },
             { name: "tags" },
@@ -1127,6 +1141,7 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           name: DynamicViewStep,
           properties: [
             { name: "custom" },
+            { name: "dotKind" },
             { name: "isBackward", defaultValue: false },
             { name: "kind" },
             { name: "source" },
@@ -1384,6 +1399,14 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           ]
         };
       }
+      case HexColor: {
+        return {
+          name: HexColor,
+          properties: [
+            { name: "hex" }
+          ]
+        };
+      }
       case IconProperty: {
         return {
           name: IconProperty,
@@ -1571,6 +1594,7 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
         return {
           name: OutgoingRelationExpr,
           properties: [
+            { name: "dotKind" },
             { name: "from" },
             { name: "isBidirectional", defaultValue: false },
             { name: "kind" }
@@ -1591,6 +1615,7 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           name: Relation,
           properties: [
             { name: "body" },
+            { name: "dotKind" },
             { name: "kind" },
             { name: "source" },
             { name: "tags" },
@@ -1627,6 +1652,14 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           ]
         };
       }
+      case RelationKindDotRef: {
+        return {
+          name: RelationKindDotRef,
+          properties: [
+            { name: "kind" }
+          ]
+        };
+      }
       case RelationNavigateToProperty: {
         return {
           name: RelationNavigateToProperty,
@@ -1662,6 +1695,17 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           ]
         };
       }
+      case RGBAColor: {
+        return {
+          name: RGBAColor,
+          properties: [
+            { name: "alpha" },
+            { name: "blue" },
+            { name: "green" },
+            { name: "red" }
+          ]
+        };
+      }
       case ShapeProperty: {
         return {
           name: ShapeProperty,
@@ -1694,7 +1738,8 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           name: SpecificationDeploymentNodeKind,
           properties: [
             { name: "kind" },
-            { name: "props", defaultValue: [] }
+            { name: "props", defaultValue: [] },
+            { name: "tags" }
           ]
         };
       }
@@ -1703,7 +1748,8 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           name: SpecificationElementKind,
           properties: [
             { name: "kind" },
-            { name: "props", defaultValue: [] }
+            { name: "props", defaultValue: [] },
+            { name: "tags" }
           ]
         };
       }
@@ -1751,6 +1797,7 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
         return {
           name: SpecificationTag,
           properties: [
+            { name: "color" },
             { name: "tag" }
           ]
         };
@@ -1781,6 +1828,14 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           ]
         };
       }
+      case TagRef: {
+        return {
+          name: TagRef,
+          properties: [
+            { name: "tag" }
+          ]
+        };
+      }
       case Tags: {
         return {
           name: Tags,