@likec4/language-server 1.19.1 → 1.20.0

package/contrib/likec4.tmLanguage.json

@@ -12,7 +12,7 @@
     },
     {
       "name": "keyword.control.likec4",
-      "match": "\\b(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|global|gray|green|group|head|icon|icons|include|indigo|instance|instanceOf|is|kind|likec4lib|line|link|metadata|mobile|model|muted|navigateTo|node|none|normal|not|notation|notes|odiamond|odot|of|onormal|opacity|open|or|par|parallel|person|predicate|predicateGroup|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|specification|storage|style|styleGroup|tag|tail|technology|title|vee|view|views|where|with)\\b"
+      "match": "\\b(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|global|gray|green|group|head|icon|icons|include|indigo|instance|instanceOf|is|kind|likec4lib|line|link|metadata|mobile|model|muted|navigateTo|node|none|normal|not|notation|notes|odiamond|odot|of|onormal|opacity|open|or|par|parallel|person|predicate|predicateGroup|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|source|specification|storage|style|styleGroup|tag|tail|target|technology|title|vee|view|views|where|with)\\b"
     },
     {
       "name": "string.quoted.double.likec4",

package/dist/generated/ast.d.ts

@@ -26,7 +26,7 @@ export declare const LikeC4Terminals: {
     Hex: 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" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "likec4lib" | "line" | "link" | "metadata" | "mobile" | "model" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rectangle" | "red" | "relationship" | "secondary" | "shape" | "sky" | "slate" | "solid" | "specification" | "storage" | "style" | "styleGroup" | "tag" | "tail" | "technology" | "title" | "vee" | "view" | "views" | "where" | "with" | "{" | "}";
+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" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "likec4lib" | "line" | "link" | "metadata" | "mobile" | "model" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rectangle" | "red" | "relationship" | "secondary" | "shape" | "sky" | "slate" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "tag" | "tail" | "target" | "technology" | "title" | "vee" | "view" | "views" | "where" | "with" | "{" | "}";
 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;
@@ -39,6 +39,9 @@ export declare function isCustomColorValue(item: unknown): item is CustomColorVa
 export type DeploymentElement = DeployedInstance | DeploymentNode;
 export declare const DeploymentElement = "DeploymentElement";
 export declare function isDeploymentElement(item: unknown): item is DeploymentElement;
+export type DeploymentNodeOrElementKind = DeploymentNodeKind | ElementKind;
+export declare const DeploymentNodeOrElementKind = "DeploymentNodeOrElementKind";
+export declare function isDeploymentNodeOrElementKind(item: unknown): item is DeploymentNodeOrElementKind;
 export type DeploymentViewRule = DeploymentViewRulePredicate | DeploymentViewRuleStyle | ViewRuleAutoLayout;
 export declare const DeploymentViewRule = "DeploymentViewRule";
 export declare function isDeploymentViewRule(item: unknown): item is DeploymentViewRule;
@@ -61,7 +64,7 @@ export declare const ElementProperty = "ElementProperty";
 export declare function isElementProperty(item: unknown): item is ElementProperty;
 export type ElementShape = 'browser' | 'cylinder' | 'mobile' | 'person' | 'queue' | 'rectangle' | 'storage';
 export declare function isElementShape(item: unknown): item is ElementShape;
-export type ExpressionV2 = FqnExpr | RelationExpr;
+export type ExpressionV2 = FqnExpr | RelationPredicateOrWhereV2;
 export declare const ExpressionV2 = "ExpressionV2";
 export declare function isExpressionV2(item: unknown): item is ExpressionV2;
 export type FqnExpr = FqnRefExpr | WildcardExpression;
@@ -72,7 +75,7 @@ export declare const FqnReferenceable = "FqnReferenceable";
 export declare function isFqnReferenceable(item: unknown): item is FqnReferenceable;
 export type IconId = string;
 export declare function isIconId(item: unknown): item is IconId;
-export type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | ThemeColor | string;
+export type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | Participant | ThemeColor | string;
 export declare function isId(item: unknown): item is Id;
 export type LikeC4View = DeploymentView | DynamicView | ElementView;
 export declare const LikeC4View = "LikeC4View";
@@ -82,6 +85,8 @@ export declare function isLineOptions(item: unknown): item is LineOptions;
 export type MetadataProperty = MetadataBody;
 export declare const MetadataProperty = "MetadataProperty";
 export declare function isMetadataProperty(item: unknown): item is MetadataProperty;
+export type Participant = 'source' | 'target';
+export declare function isParticipant(item: unknown): item is Participant;
 export type Predicate = ElementPredicate | RelationPredicate;
 export declare const Predicate = "Predicate";
 export declare function isPredicate(item: unknown): item is Predicate;
@@ -100,6 +105,9 @@ export declare function isRelationPredicate(item: unknown): item is RelationPred
 export type RelationPredicateOrWhere = RelationExpression | RelationPredicateWhere;
 export declare const RelationPredicateOrWhere = "RelationPredicateOrWhere";
 export declare function isRelationPredicateOrWhere(item: unknown): item is RelationPredicateOrWhere;
+export type RelationPredicateOrWhereV2 = RelationExpr | RelationPredicateWhereV2;
+export declare const RelationPredicateOrWhereV2 = "RelationPredicateOrWhereV2";
+export declare function isRelationPredicateOrWhereV2(item: unknown): item is RelationPredicateOrWhereV2;
 export type RelationProperty = LinkProperty | MetadataProperty | RelationNavigateToProperty | RelationStringProperty | RelationStyleProperty;
 export declare const RelationProperty = "RelationProperty";
 export declare function isRelationProperty(item: unknown): item is RelationProperty;
@@ -141,16 +149,16 @@ export declare function isWhereElementExpression(item: unknown): item is WhereEl
 export type WhereExpression = WhereElementExpression | WhereRelationExpression;
 export declare const WhereExpression = "WhereExpression";
 export declare function isWhereExpression(item: unknown): item is WhereExpression;
-export type WhereKindEqual = WhereElementKind | WhereRelationKind;
+export type WhereKindEqual = WhereElementKind | WhereRelationKind | WhereRelationParticipantKind;
 export declare const WhereKindEqual = "WhereKindEqual";
 export declare function isWhereKindEqual(item: unknown): item is WhereKindEqual;
-export type WhereRelation = WhereRelationKind | WhereRelationTag;
+export type WhereRelation = WhereRelationKind | WhereRelationParticipantKind | WhereRelationParticipantTag | WhereRelationTag;
 export declare const WhereRelation = "WhereRelation";
 export declare function isWhereRelation(item: unknown): item is WhereRelation;
 export type WhereRelationExpression = WhereBinaryExpression | WhereRelation | WhereRelationNegation;
 export declare const WhereRelationExpression = "WhereRelationExpression";
 export declare function isWhereRelationExpression(item: unknown): item is WhereRelationExpression;
-export type WhereTagEqual = WhereElementTag | WhereRelationTag;
+export type WhereTagEqual = WhereElementTag | WhereRelationParticipantTag | WhereRelationTag;
 export declare const WhereTagEqual = "WhereTagEqual";
 export declare function isWhereTagEqual(item: unknown): item is WhereTagEqual;
 export interface ArrowProperty extends AstNode {
@@ -306,7 +314,7 @@ export interface DeploymentViewRuleStyle extends AstNode {
 export declare const DeploymentViewRuleStyle = "DeploymentViewRuleStyle";
 export declare function isDeploymentViewRuleStyle(item: unknown): item is DeploymentViewRuleStyle;
 export interface DirectedRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $container: DeploymentViewRulePredicateExpression | RelationPredicateWhereV2;
     readonly $type: 'DirectedRelationExpr';
     source: OutgoingRelationExpr;
     target: FqnExpr;
@@ -638,7 +646,7 @@ export interface IncludePredicate extends AstNode {
 export declare const IncludePredicate = "IncludePredicate";
 export declare function isIncludePredicate(item: unknown): item is IncludePredicate;
 export interface IncomingRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | InOutRelationExpr;
+    readonly $container: DeploymentViewRulePredicateExpression | InOutRelationExpr | RelationPredicateWhereV2;
     readonly $type: 'IncomingRelationExpr';
     to: FqnExpr;
 }
@@ -652,7 +660,7 @@ export interface IncomingRelationExpression extends AstNode {
 export declare const IncomingRelationExpression = "IncomingRelationExpression";
 export declare function isIncomingRelationExpression(item: unknown): item is IncomingRelationExpression;
 export interface InOutRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $container: DeploymentViewRulePredicateExpression | RelationPredicateWhereV2;
     readonly $type: 'InOutRelationExpr';
     inout: IncomingRelationExpr;
 }
@@ -780,7 +788,7 @@ export interface OpacityProperty extends AstNode {
 export declare const OpacityProperty = "OpacityProperty";
 export declare function isOpacityProperty(item: unknown): item is OpacityProperty;
 export interface OutgoingRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr;
+    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr | RelationPredicateWhereV2;
     readonly $type: 'OutgoingRelationExpr';
     from: FqnExpr;
     isBidirectional: boolean;
@@ -842,6 +850,14 @@ export interface RelationPredicateWhere extends AstNode {
 }
 export declare const RelationPredicateWhere = "RelationPredicateWhere";
 export declare function isRelationPredicateWhere(item: unknown): item is RelationPredicateWhere;
+export interface RelationPredicateWhereV2 extends AstNode {
+    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $type: 'RelationPredicateWhereV2';
+    subject: RelationExpr;
+    where?: WhereRelationExpression;
+}
+export declare const RelationPredicateWhereV2 = "RelationPredicateWhereV2";
+export declare function isRelationPredicateWhereV2(item: unknown): item is RelationPredicateWhereV2;
 export interface RelationPredicateWith extends AstNode {
     readonly $container: Predicates;
     readonly $type: 'RelationPredicateWith';
@@ -1019,7 +1035,7 @@ export interface ViewStringProperty extends AstNode {
 export declare const ViewStringProperty = "ViewStringProperty";
 export declare function isViewStringProperty(item: unknown): item is ViewStringProperty;
 export interface WhereBinaryExpression extends AstNode {
-    readonly $container: ElementPredicateWhere | RelationPredicateWhere | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
+    readonly $container: ElementPredicateWhere | RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
     readonly $type: 'WhereBinaryExpression';
     left: WhereElementExpression | WhereRelationExpression;
     operator: 'and' | 'or';
@@ -1053,7 +1069,7 @@ export interface WhereElementTag extends AstNode {
 export declare const WhereElementTag = "WhereElementTag";
 export declare function isWhereElementTag(item: unknown): item is WhereElementTag;
 export interface WhereRelationKind extends AstNode {
-    readonly $container: RelationPredicateWhere | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationKind';
     not: boolean;
     operator: 'is' | string;
@@ -1062,14 +1078,34 @@ export interface WhereRelationKind extends AstNode {
 export declare const WhereRelationKind = "WhereRelationKind";
 export declare function isWhereRelationKind(item: unknown): item is WhereRelationKind;
 export interface WhereRelationNegation extends AstNode {
-    readonly $container: RelationPredicateWhere | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationNegation';
     value: WhereRelationExpression;
 }
 export declare const WhereRelationNegation = "WhereRelationNegation";
 export declare function isWhereRelationNegation(item: unknown): item is WhereRelationNegation;
+export interface WhereRelationParticipantKind extends AstNode {
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
+    readonly $type: 'WhereRelationParticipantKind';
+    not: boolean;
+    operator: 'is' | string;
+    participant: Participant;
+    value?: Reference<DeploymentNodeOrElementKind>;
+}
+export declare const WhereRelationParticipantKind = "WhereRelationParticipantKind";
+export declare function isWhereRelationParticipantKind(item: unknown): item is WhereRelationParticipantKind;
+export interface WhereRelationParticipantTag extends AstNode {
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
+    readonly $type: 'WhereRelationParticipantTag';
+    not: boolean;
+    operator: 'is' | string;
+    participant: Participant;
+    value?: Reference<Tag>;
+}
+export declare const WhereRelationParticipantTag = "WhereRelationParticipantTag";
+export declare function isWhereRelationParticipantTag(item: unknown): item is WhereRelationParticipantTag;
 export interface WhereRelationTag extends AstNode {
-    readonly $container: RelationPredicateWhere | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationTag';
     not: boolean;
     operator: 'is' | string;
@@ -1097,6 +1133,7 @@ export type LikeC4AstType = {
     DeploymentNode: DeploymentNode;
     DeploymentNodeBody: DeploymentNodeBody;
     DeploymentNodeKind: DeploymentNodeKind;
+    DeploymentNodeOrElementKind: DeploymentNodeOrElementKind;
     DeploymentRelation: DeploymentRelation;
     DeploymentRelationBody: DeploymentRelationBody;
     DeploymentView: DeploymentView;
@@ -1186,7 +1223,9 @@ export type LikeC4AstType = {
     RelationNavigateToProperty: RelationNavigateToProperty;
     RelationPredicate: RelationPredicate;
     RelationPredicateOrWhere: RelationPredicateOrWhere;
+    RelationPredicateOrWhereV2: RelationPredicateOrWhereV2;
     RelationPredicateWhere: RelationPredicateWhere;
+    RelationPredicateWhereV2: RelationPredicateWhereV2;
     RelationPredicateWith: RelationPredicateWith;
     RelationProperty: RelationProperty;
     RelationStringProperty: RelationStringProperty;
@@ -1229,6 +1268,8 @@ export type LikeC4AstType = {
     WhereRelationExpression: WhereRelationExpression;
     WhereRelationKind: WhereRelationKind;
     WhereRelationNegation: WhereRelationNegation;
+    WhereRelationParticipantKind: WhereRelationParticipantKind;
+    WhereRelationParticipantTag: WhereRelationParticipantTag;
     WhereRelationTag: WhereRelationTag;
     WhereTagEqual: WhereTagEqual;
     WildcardExpression: WildcardExpression;

package/dist/generated/ast.js

@@ -36,6 +36,10 @@ export const DeploymentElement = "DeploymentElement";
 export function isDeploymentElement(item) {
   return reflection.isInstance(item, DeploymentElement);
 }
+export const DeploymentNodeOrElementKind = "DeploymentNodeOrElementKind";
+export function isDeploymentNodeOrElementKind(item) {
+  return reflection.isInstance(item, DeploymentNodeOrElementKind);
+}
 export const DeploymentViewRule = "DeploymentViewRule";
 export function isDeploymentViewRule(item) {
   return reflection.isInstance(item, DeploymentViewRule);
@@ -82,7 +86,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) || 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) || item === "element" || item === "model" || item === "group" || item === "node" || item === "deployment" || item === "instance" || typeof item === "string" && /[_]*[a-zA-Z][-\w]*/.test(item);
 }
 export const LikeC4View = "LikeC4View";
 export function isLikeC4View(item) {
@@ -95,6 +99,9 @@ export const MetadataProperty = "MetadataProperty";
 export function isMetadataProperty(item) {
   return reflection.isInstance(item, MetadataProperty);
 }
+export function isParticipant(item) {
+  return item === "source" || item === "target";
+}
 export const Predicate = "Predicate";
 export function isPredicate(item) {
   return reflection.isInstance(item, Predicate);
@@ -119,6 +126,10 @@ export const RelationPredicateOrWhere = "RelationPredicateOrWhere";
 export function isRelationPredicateOrWhere(item) {
   return reflection.isInstance(item, RelationPredicateOrWhere);
 }
+export const RelationPredicateOrWhereV2 = "RelationPredicateOrWhereV2";
+export function isRelationPredicateOrWhereV2(item) {
+  return reflection.isInstance(item, RelationPredicateOrWhereV2);
+}
 export const RelationProperty = "RelationProperty";
 export function isRelationProperty(item) {
   return reflection.isInstance(item, RelationProperty);
@@ -527,6 +538,10 @@ export const RelationPredicateWhere = "RelationPredicateWhere";
 export function isRelationPredicateWhere(item) {
   return reflection.isInstance(item, RelationPredicateWhere);
 }
+export const RelationPredicateWhereV2 = "RelationPredicateWhereV2";
+export function isRelationPredicateWhereV2(item) {
+  return reflection.isInstance(item, RelationPredicateWhereV2);
+}
 export const RelationPredicateWith = "RelationPredicateWith";
 export function isRelationPredicateWith(item) {
   return reflection.isInstance(item, RelationPredicateWith);
@@ -639,6 +654,14 @@ export const WhereRelationNegation = "WhereRelationNegation";
 export function isWhereRelationNegation(item) {
   return reflection.isInstance(item, WhereRelationNegation);
 }
+export const WhereRelationParticipantKind = "WhereRelationParticipantKind";
+export function isWhereRelationParticipantKind(item) {
+  return reflection.isInstance(item, WhereRelationParticipantKind);
+}
+export const WhereRelationParticipantTag = "WhereRelationParticipantTag";
+export function isWhereRelationParticipantTag(item) {
+  return reflection.isInstance(item, WhereRelationParticipantTag);
+}
 export const WhereRelationTag = "WhereRelationTag";
 export function isWhereRelationTag(item) {
   return reflection.isInstance(item, WhereRelationTag);
@@ -649,7 +672,7 @@ export function isWildcardExpression(item) {
 }
 export class LikeC4AstReflection extends AbstractAstReflection {
   getAllTypes() {
-    return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRulePredicateExpression, DeploymentViewRuleStyle, DirectedRelationExpr, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewPredicateIterator, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementDescedantsExpression, ElementExpression, ElementExpressionsIterator, ElementKind, ElementKindExpression, ElementPredicate, ElementPredicateOrWhere, ElementPredicateWhere, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExpressionV2, ExtendElement, ExtendElementBody, FqnElementRef, FqnExpr, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, IconProperty, InOutRelationExpr, InOutRelationExpression, IncludePredicate, IncomingRelationExpr, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelViews, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, OutgoingRelationExpression, Predicate, Predicates, Referenceable, Relation, RelationBody, RelationExpr, RelationExpression, RelationNavigateToProperty, RelationPredicate, RelationPredicateOrWhere, RelationPredicateWhere, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StringProperty, StyleProperty, Tag, Tags, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationTag, WhereTagEqual, WildcardExpression];
+    return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentNodeOrElementKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRulePredicateExpression, DeploymentViewRuleStyle, DirectedRelationExpr, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewPredicateIterator, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementDescedantsExpression, ElementExpression, ElementExpressionsIterator, ElementKind, ElementKindExpression, ElementPredicate, ElementPredicateOrWhere, ElementPredicateWhere, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExpressionV2, ExtendElement, ExtendElementBody, FqnElementRef, FqnExpr, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, IconProperty, InOutRelationExpr, InOutRelationExpression, IncludePredicate, IncomingRelationExpr, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelViews, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, OutgoingRelationExpression, Predicate, Predicates, Referenceable, Relation, RelationBody, RelationExpr, RelationExpression, RelationNavigateToProperty, RelationPredicate, RelationPredicateOrWhere, RelationPredicateOrWhereV2, RelationPredicateWhere, RelationPredicateWhereV2, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StringProperty, StyleProperty, Tag, Tags, 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) {
@@ -669,6 +692,10 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case DeploymentNode: {
         return this.isSubtype(DeploymentElement, supertype) || this.isSubtype(Referenceable, supertype);
       }
+      case DeploymentNodeKind:
+      case ElementKind: {
+        return this.isSubtype(DeploymentNodeOrElementKind, supertype);
+      }
       case DeploymentView:
       case DynamicView:
       case ElementView: {
@@ -731,7 +758,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
         return this.isSubtype(FqnReferenceable, supertype);
       }
       case FqnExpr:
-      case RelationExpr: {
+      case RelationPredicateOrWhereV2: {
         return this.isSubtype(ExpressionV2, supertype);
       }
       case FqnRefExpr: {
@@ -756,6 +783,10 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case MetadataProperty: {
         return this.isSubtype(ElementProperty, supertype) || this.isSubtype(RelationProperty, supertype);
       }
+      case RelationExpr:
+      case RelationPredicateWhereV2: {
+        return this.isSubtype(RelationPredicateOrWhereV2, supertype);
+      }
       case RelationExpression:
       case RelationPredicateWhere: {
         return this.isSubtype(RelationPredicateOrWhere, supertype);
@@ -810,9 +841,11 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case WhereRelationNegation: {
         return this.isSubtype(WhereRelationExpression, supertype);
       }
-      case WhereRelationKind: {
+      case WhereRelationKind:
+      case WhereRelationParticipantKind: {
         return this.isSubtype(WhereKindEqual, supertype) || this.isSubtype(WhereRelation, supertype);
       }
+      case WhereRelationParticipantTag:
       case WhereRelationTag: {
         return this.isSubtype(WhereRelation, supertype) || this.isSubtype(WhereTagEqual, supertype);
       }
@@ -859,6 +892,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case "ElementTagExpression:tag":
       case "Tags:values":
       case "WhereElementTag:value":
+      case "WhereRelationParticipantTag:value":
       case "WhereRelationTag:value": {
         return Tag;
       }
@@ -880,6 +914,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case "ViewRuleGlobalStyle:style": {
         return GlobalStyleId;
       }
+      case "WhereRelationParticipantKind:value": {
+        return DeploymentNodeOrElementKind;
+      }
       default: {
         throw new Error(`${referenceId} is not a valid reference id.`);
       }
@@ -1661,6 +1698,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case RelationPredicateWhereV2: {
+        return {
+          name: RelationPredicateWhereV2,
+          properties: [
+            { name: "subject" },
+            { name: "where" }
+          ]
+        };
+      }
       case RelationPredicateWith: {
         return {
           name: RelationPredicateWith,
@@ -1915,6 +1961,28 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case WhereRelationParticipantKind: {
+        return {
+          name: WhereRelationParticipantKind,
+          properties: [
+            { name: "not", defaultValue: false },
+            { name: "operator" },
+            { name: "participant" },
+            { name: "value" }
+          ]
+        };
+      }
+      case WhereRelationParticipantTag: {
+        return {
+          name: WhereRelationParticipantTag,
+          properties: [
+            { name: "not", defaultValue: false },
+            { name: "operator" },
+            { name: "participant" },
+            { name: "value" }
+          ]
+        };
+      }
       case WhereRelationTag: {
         return {
           name: WhereRelationTag,