@likec4/language-server 1.19.1 → 1.19.2

package/dist/like-c4.langium

@@ -620,10 +620,13 @@ DeploymentViewRulePredicateExpression:
 ;
 
 ExpressionV2:
-  RelationExpr |
+  RelationPredicateOrWhereV2 |
   FqnExpr
 ;
 
+RelationPredicateOrWhereV2:
+  RelationExpr ({infer RelationPredicateWhereV2.subject=current} 'where' where=WhereRelationExpression?)?
+;
 
 FqnExpr:
   {infer WildcardExpression} isWildcard?='*' |

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

@@ -60,6 +60,7 @@ declare const DocumentParserFromMixins: {
         parseFqnExpr(astNode: import("../generated/ast").FqnExpr): invariant;
         parseFqnRefExpr(astNode: import("../generated/ast").FqnRefExpr): invariant;
         parseFqnExpressions(astNode: import("../generated/ast").FqnExpressions): invariant[];
+        parseRelationWhereExpr(astNode: import("../generated/ast").RelationPredicateWhereV2): invariant;
         parseRelationExpr(astNode: import("../generated/ast").RelationExpr): invariant;
         parseDeployment(): void;
         parseDeploymentNode(astNode: import("../generated/ast").DeploymentNode): import("../ast").ParsedAstDeployment.Node;
@@ -117,6 +118,7 @@ declare const DocumentParserFromMixins: {
         parseFqnExpr(astNode: import("../generated/ast").FqnExpr): invariant;
         parseFqnRefExpr(astNode: import("../generated/ast").FqnRefExpr): invariant;
         parseFqnExpressions(astNode: import("../generated/ast").FqnExpressions): invariant[];
+        parseRelationWhereExpr(astNode: import("../generated/ast").RelationPredicateWhereV2): invariant;
         parseRelationExpr(astNode: import("../generated/ast").RelationExpr): invariant;
         parseDeployment(): void;
         parseDeploymentNode(astNode: import("../generated/ast").DeploymentNode): import("../ast").ParsedAstDeployment.Node;
@@ -183,6 +185,7 @@ declare const DocumentParserFromMixins: {
         parseFqnExpr(astNode: import("../generated/ast").FqnExpr): invariant;
         parseFqnRefExpr(astNode: import("../generated/ast").FqnRefExpr): invariant;
         parseFqnExpressions(astNode: import("../generated/ast").FqnExpressions): invariant[];
+        parseRelationWhereExpr(astNode: import("../generated/ast").RelationPredicateWhereV2): invariant;
         parseRelationExpr(astNode: import("../generated/ast").RelationExpr): invariant;
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
@@ -215,6 +218,7 @@ declare const DocumentParserFromMixins: {
         parseFqnExpr(astNode: import("../generated/ast").FqnExpr): invariant;
         parseFqnRefExpr(astNode: import("../generated/ast").FqnRefExpr): invariant;
         parseFqnExpressions(astNode: import("../generated/ast").FqnExpressions): invariant[];
+        parseRelationWhereExpr(astNode: import("../generated/ast").RelationPredicateWhereV2): invariant;
         parseRelationExpr(astNode: import("../generated/ast").RelationExpr): invariant;
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
@@ -261,6 +265,7 @@ declare const DocumentParserFromMixins: {
         parseFqnExpr(astNode: import("../generated/ast").FqnExpr): invariant;
         parseFqnRefExpr(astNode: import("../generated/ast").FqnRefExpr): invariant;
         parseFqnExpressions(astNode: import("../generated/ast").FqnExpressions): invariant[];
+        parseRelationWhereExpr(astNode: import("../generated/ast").RelationPredicateWhereV2): invariant;
         parseRelationExpr(astNode: import("../generated/ast").RelationExpr): invariant;
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;

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

@@ -12,6 +12,7 @@ export declare function DeploymentModelParser<TBase extends WithExpressionV2>(B:
         parseFqnExpr(astNode: ast.FqnExpr): c4.FqnExpr;
         parseFqnRefExpr(astNode: ast.FqnRefExpr): c4.FqnExpr.NonWildcard;
         parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[];
+        parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr;
         parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr;
         isValid: import("../../validation").IsValidFn;
         readonly services: import("../..").LikeC4Services;

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

@@ -1,5 +1,5 @@
 import type * as c4 from '@likec4/core';
-import { ast, type ParsedAstDeploymentView } from '../../ast';
+import { type ParsedAstDeploymentView, ast } from '../../ast';
 import type { WithDeploymentModel } from './DeploymentModelParser';
 import type { WithExpressionV2 } from './FqnRefParser';
 export type WithDeploymentView = ReturnType<typeof DeploymentViewParser>;
@@ -13,6 +13,7 @@ export declare function DeploymentViewParser<TBase extends WithExpressionV2 & Wi
         parseFqnExpr(astNode: ast.FqnExpr): c4.FqnExpr;
         parseFqnRefExpr(astNode: ast.FqnRefExpr): c4.FqnExpr.NonWildcard;
         parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[];
+        parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr;
         parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr;
         isValid: import("../../validation").IsValidFn;
         readonly services: import("../..").LikeC4Services;

package/dist/model/parser/DeploymentViewParser.js

@@ -70,6 +70,9 @@ export function DeploymentViewParser(B) {
               case ast.isRelationExpr(expr):
                 exprs.unshift(this.parseRelationExpr(expr));
                 break;
+              case ast.isRelationPredicateWhereV2(expr):
+                exprs.unshift(this.parseRelationWhereExpr(expr));
+                break;
               default:
                 nonexhaustive(expr);
             }

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

@@ -8,6 +8,7 @@ export declare function ExpressionV2Parser<TBase extends Base>(B: TBase): {
         parseFqnExpr(astNode: ast.FqnExpr): c4.FqnExpr;
         parseFqnRefExpr(astNode: ast.FqnRefExpr): c4.FqnExpr.NonWildcard;
         parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[];
+        parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr;
         parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr;
         isValid: import("../../validation").IsValidFn;
         readonly services: import("../..").LikeC4Services;

package/dist/model/parser/FqnRefParser.js

@@ -3,6 +3,7 @@ import { isNonNullish } from "remeda";
 import { ast } from "../../ast.js";
 import { logWarnError } from "../../logger.js";
 import { instanceRef } from "../../utils/fqnRef.js";
+import { parseWhereClause } from "../model-parser-where.js";
 export function ExpressionV2Parser(B) {
   return class ExpressionV2Parser extends B {
     parseFqnRef(astNode) {
@@ -79,7 +80,19 @@ export function ExpressionV2Parser(B) {
       }
       return exprs.reverse();
     }
+    parseRelationWhereExpr(astNode) {
+      return {
+        where: {
+          expr: this.parseRelationExpr(astNode.subject),
+          condition: astNode.where ? parseWhereClause(astNode.where) : {
+            kind: { neq: "--always-true--" }
+          }
+        }
+      };
+    }
     parseRelationExpr(astNode) {
+      if (ast.isRelationPredicateWhere(astNode)) {
+      }
       if (ast.isDirectedRelationExpr(astNode)) {
         return {
           source: this.parseFqnExpr(astNode.source.from),

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

@@ -57,6 +57,7 @@ export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase):
         parseFqnExpr(astNode: ast.FqnExpr): c4.FqnExpr;
         parseFqnRefExpr(astNode: ast.FqnRefExpr): c4.FqnExpr.NonWildcard;
         parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[];
+        parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr;
         parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr;
         parseDeployment(): void;
         parseDeploymentNode(astNode: ast.DeploymentNode): import("../../ast").ParsedAstDeployment.Node;

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

@@ -55,6 +55,7 @@ export declare function ViewsParser<TBase extends WithPredicates & WithDeploymen
         parseFqnExpr(astNode: ast.FqnExpr): c4.FqnExpr;
         parseFqnRefExpr(astNode: ast.FqnRefExpr): c4.FqnExpr.NonWildcard;
         parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[];
+        parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr;
         parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr;
         parseDeployment(): void;
         parseDeploymentNode(astNode: ast.DeploymentNode): import("../../ast").ParsedAstDeployment.Node;

package/dist/validation/index.d.ts

@@ -3,7 +3,7 @@ import { type LikeC4LangiumDocument, ast } from '../ast';
 import type { LikeC4Services } from '../module';
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementDescedantsExpression | ast.ElementKindExpression | ast.ElementRef | ast.ElementTagExpression | ast.ExpandElementExpression | ast.WildcardExpression | ast.ElementPredicateWhere | ast.ElementPredicateWith | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.FqnRefExpr | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.Element | ast.ExtendElement | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.DirectedRelationExpression | ast.InOutRelationExpression | ast.IncomingRelationExpression | ast.OutgoingRelationExpression | ast.RelationPredicateWhere | ast.RelationPredicateWith | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.ViewStringProperty | ast.BorderProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ExcludePredicate | ast.IncludePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.Tags | ast.DeploymentRelation | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.DynamicViewPredicateIterator | ast.Relation | ast.SpecificationElementKind | ast.GlobalPredicateGroup | ast.Globals | ast.GlobalStyleGroup | ast.SpecificationRule | ast.SpecificationTag;
+declare const isValidatableAstNode: (n: AstNode) => n is ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementDescedantsExpression | ast.ElementKindExpression | ast.ElementRef | ast.ElementTagExpression | ast.ExpandElementExpression | ast.WildcardExpression | ast.ElementPredicateWhere | ast.ElementPredicateWith | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.FqnRefExpr | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationPredicateWhereV2 | ast.Element | ast.ExtendElement | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.DirectedRelationExpression | ast.InOutRelationExpression | ast.IncomingRelationExpression | ast.OutgoingRelationExpression | ast.RelationPredicateWhere | ast.RelationPredicateWith | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.ViewStringProperty | ast.BorderProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ExcludePredicate | ast.IncludePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.Tags | ast.DeploymentRelation | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.DynamicViewPredicateIterator | ast.Relation | ast.SpecificationElementKind | ast.GlobalPredicateGroup | ast.Globals | ast.GlobalStyleGroup | ast.SpecificationRule | ast.SpecificationTag;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 export declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.19.1",
+  "version": "1.19.2",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -82,9 +82,9 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@likec4/core": "1.19.1",
-    "@likec4/layouts": "1.19.1",
-    "@likec4/log": "1.19.1",
+    "@likec4/core": "1.19.2",
+    "@likec4/layouts": "1.19.2",
+    "@likec4/log": "1.19.2",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "esm-env": "^1.2.1",
@@ -105,8 +105,8 @@
     "which": "^4.0.0"
   },
   "devDependencies": {
-    "@likec4/icons": "1.19.1",
-    "@likec4/tsconfig": "1.19.1",
+    "@likec4/icons": "1.19.2",
+    "@likec4/tsconfig": "1.19.2",
     "@types/node": "^20.17.7",
     "@types/which": "^3.0.4",
     "@vitest/coverage-v8": "^2.1.8",
@@ -120,5 +120,5 @@
     "unbuild": "^3.1.0",
     "vitest": "^2.1.8"
   },
-  "packageManager": "yarn@4.5.3"
+  "packageManager": "yarn@4.6.0"
 }

package/src/generated/ast.ts

@@ -230,7 +230,7 @@ export function isElementShape(item: unknown): item is ElementShape {
     return item === 'rectangle' || item === 'person' || item === 'browser' || item === 'mobile' || item === 'cylinder' || item === 'storage' || item === 'queue';
 }
 
-export type ExpressionV2 = FqnExpr | RelationExpr;
+export type ExpressionV2 = FqnExpr | RelationPredicateOrWhereV2;
 
 export const ExpressionV2 = 'ExpressionV2';
 
@@ -336,6 +336,14 @@ export function isRelationPredicateOrWhere(item: unknown): item is RelationPredi
     return reflection.isInstance(item, RelationPredicateOrWhere);
 }
 
+export type RelationPredicateOrWhereV2 = RelationExpr | RelationPredicateWhereV2;
+
+export const RelationPredicateOrWhereV2 = 'RelationPredicateOrWhereV2';
+
+export function isRelationPredicateOrWhereV2(item: unknown): item is RelationPredicateOrWhereV2 {
+    return reflection.isInstance(item, RelationPredicateOrWhereV2);
+}
+
 export type RelationProperty = LinkProperty | MetadataProperty | RelationNavigateToProperty | RelationStringProperty | RelationStyleProperty;
 
 export const RelationProperty = 'RelationProperty';
@@ -723,7 +731,7 @@ export function isDeploymentViewRuleStyle(item: unknown): item is DeploymentView
 }
 
 export interface DirectedRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $container: DeploymentViewRulePredicateExpression | RelationPredicateWhereV2;
     readonly $type: 'DirectedRelationExpr';
     source: OutgoingRelationExpr;
     target: FqnExpr;
@@ -1260,7 +1268,7 @@ export 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;
 }
@@ -1284,7 +1292,7 @@ export function isIncomingRelationExpression(item: unknown): item is IncomingRel
 }
 
 export interface InOutRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $container: DeploymentViewRulePredicateExpression | RelationPredicateWhereV2;
     readonly $type: 'InOutRelationExpr';
     inout: IncomingRelationExpr;
 }
@@ -1492,7 +1500,7 @@ export 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;
@@ -1589,6 +1597,19 @@ export function isRelationPredicateWhere(item: unknown): item is RelationPredica
     return reflection.isInstance(item, RelationPredicateWhere);
 }
 
+export interface RelationPredicateWhereV2 extends AstNode {
+    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $type: 'RelationPredicateWhereV2';
+    subject: RelationExpr;
+    where?: WhereRelationExpression;
+}
+
+export const RelationPredicateWhereV2 = 'RelationPredicateWhereV2';
+
+export function isRelationPredicateWhereV2(item: unknown): item is RelationPredicateWhereV2 {
+    return reflection.isInstance(item, RelationPredicateWhereV2);
+}
+
 export interface RelationPredicateWith extends AstNode {
     readonly $container: Predicates;
     readonly $type: 'RelationPredicateWith';
@@ -1876,7 +1897,7 @@ export 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';
@@ -1930,7 +1951,7 @@ export 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;
@@ -1944,7 +1965,7 @@ export 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;
 }
@@ -1956,7 +1977,7 @@ export function isWhereRelationNegation(item: unknown): item is WhereRelationNeg
 }
 
 export interface WhereRelationTag extends AstNode {
-    readonly $container: RelationPredicateWhere | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationTag';
     not: boolean;
     operator: 'is' | string;
@@ -2083,7 +2104,9 @@ export type LikeC4AstType = {
     RelationNavigateToProperty: RelationNavigateToProperty
     RelationPredicate: RelationPredicate
     RelationPredicateOrWhere: RelationPredicateOrWhere
+    RelationPredicateOrWhereV2: RelationPredicateOrWhereV2
     RelationPredicateWhere: RelationPredicateWhere
+    RelationPredicateWhereV2: RelationPredicateWhereV2
     RelationPredicateWith: RelationPredicateWith
     RelationProperty: RelationProperty
     RelationStringProperty: RelationStringProperty
@@ -2134,7 +2157,7 @@ export type LikeC4AstType = {
 export class LikeC4AstReflection extends AbstractAstReflection {
 
     getAllTypes(): string[] {
-        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, 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, WhereRelationTag, WhereTagEqual, WildcardExpression];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -2217,7 +2240,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return this.isSubtype(FqnReferenceable, supertype);
             }
             case FqnExpr:
-            case RelationExpr: {
+            case RelationPredicateOrWhereV2: {
                 return this.isSubtype(ExpressionV2, supertype);
             }
             case FqnRefExpr: {
@@ -2242,6 +2265,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);
@@ -3149,6 +3176,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case RelationPredicateWhereV2: {
+                return {
+                    name: RelationPredicateWhereV2,
+                    properties: [
+                        { name: 'subject' },
+                        { name: 'where' }
+                    ]
+                };
+            }
             case RelationPredicateWith: {
                 return {
                     name: RelationPredicateWith,