@likec4/language-server 1.18.0 → 1.19.1

package/src/generated/ast.ts

@@ -170,38 +170,6 @@ export function isDeploymentElement(item: unknown): item is DeploymentElement {
     return reflection.isInstance(item, DeploymentElement);
 }
 
-export type DeploymentElementExpression = DeploymentRefExpression | WildcardExpression;
-
-export const DeploymentElementExpression = 'DeploymentElementExpression';
-
-export function isDeploymentElementExpression(item: unknown): item is DeploymentElementExpression {
-    return reflection.isInstance(item, DeploymentElementExpression);
-}
-
-export type DeploymentExpression = DeploymentElementExpression | DeploymentRelationExpression;
-
-export const DeploymentExpression = 'DeploymentExpression';
-
-export function isDeploymentExpression(item: unknown): item is DeploymentExpression {
-    return reflection.isInstance(item, DeploymentExpression);
-}
-
-export type DeploymentReferenceable = DeployedInstance | DeploymentNode | Element;
-
-export const DeploymentReferenceable = 'DeploymentReferenceable';
-
-export function isDeploymentReferenceable(item: unknown): item is DeploymentReferenceable {
-    return reflection.isInstance(item, DeploymentReferenceable);
-}
-
-export type DeploymentRelationExpression = DirectedDeploymentRelationExpression | InOutDeploymentRelationExpression | IncomingDeploymentRelationExpression | OutgoingDeploymentRelationExpression;
-
-export const DeploymentRelationExpression = 'DeploymentRelationExpression';
-
-export function isDeploymentRelationExpression(item: unknown): item is DeploymentRelationExpression {
-    return reflection.isInstance(item, DeploymentRelationExpression);
-}
-
 export type DeploymentViewRule = DeploymentViewRulePredicate | DeploymentViewRuleStyle | ViewRuleAutoLayout;
 
 export const DeploymentViewRule = 'DeploymentViewRule';
@@ -262,7 +230,23 @@ 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 FqnReferenceable = DeploymentReferenceable | Element | ExtendElement;
+export type ExpressionV2 = FqnExpr | RelationExpr;
+
+export const ExpressionV2 = 'ExpressionV2';
+
+export function isExpressionV2(item: unknown): item is ExpressionV2 {
+    return reflection.isInstance(item, ExpressionV2);
+}
+
+export type FqnExpr = FqnRefExpr | WildcardExpression;
+
+export const FqnExpr = 'FqnExpr';
+
+export function isFqnExpr(item: unknown): item is FqnExpr {
+    return reflection.isInstance(item, FqnExpr);
+}
+
+export type FqnReferenceable = Element | ExtendElement | Referenceable;
 
 export const FqnReferenceable = 'FqnReferenceable';
 
@@ -276,10 +260,10 @@ export function isIconId(item: unknown): item is IconId {
     return (typeof item === 'string' && (/(aws|azure|gcp|tech):[-\w]*/.test(item)));
 }
 
-export type Id = 'deployment' | 'element' | 'group' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | ThemeColor | string;
+export type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | ThemeColor | string;
 
 export function isId(item: unknown): item is Id {
-    return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || item === 'element' || item === 'model' || item === 'group' || item === 'node' || item === 'deployment' || (typeof item === 'string' && (/[_]*[a-zA-Z][-\w]*/.test(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)));
 }
 
 export type LikeC4View = DeploymentView | DynamicView | ElementView;
@@ -312,6 +296,22 @@ export function isPredicate(item: unknown): item is Predicate {
     return reflection.isInstance(item, Predicate);
 }
 
+export type Referenceable = DeployedInstance | DeploymentNode | Element;
+
+export const Referenceable = 'Referenceable';
+
+export function isReferenceable(item: unknown): item is Referenceable {
+    return reflection.isInstance(item, Referenceable);
+}
+
+export type RelationExpr = DirectedRelationExpr | InOutRelationExpr | IncomingRelationExpr | OutgoingRelationExpr;
+
+export const RelationExpr = 'RelationExpr';
+
+export function isRelationExpr(item: unknown): item is RelationExpr {
+    return reflection.isInstance(item, RelationExpr);
+}
+
 export type RelationExpression = DirectedRelationExpression | InOutRelationExpression | IncomingRelationExpression | OutgoingRelationExpression;
 
 export const RelationExpression = 'RelationExpression';
@@ -584,19 +584,6 @@ export function isDeployedInstanceBody(item: unknown): item is DeployedInstanceB
     return reflection.isInstance(item, DeployedInstanceBody);
 }
 
-export interface DeploymentExpressionIterator extends AstNode {
-    readonly $container: DeploymentExpressionIterator | DeploymentViewRuleStyle;
-    readonly $type: 'DeploymentExpressionIterator';
-    prev?: DeploymentExpressionIterator;
-    value: DeploymentElementExpression;
-}
-
-export const DeploymentExpressionIterator = 'DeploymentExpressionIterator';
-
-export function isDeploymentExpressionIterator(item: unknown): item is DeploymentExpressionIterator {
-    return reflection.isInstance(item, DeploymentExpressionIterator);
-}
-
 export interface DeploymentNode extends AstNode {
     readonly $container: DeploymentNodeBody | ModelDeployments;
     readonly $type: 'DeploymentNode';
@@ -638,40 +625,14 @@ export function isDeploymentNodeKind(item: unknown): item is DeploymentNodeKind
     return reflection.isInstance(item, DeploymentNodeKind);
 }
 
-export interface DeploymentRef extends AstNode {
-    readonly $container: DeploymentRef | DeploymentRefExpression | DeploymentRelation;
-    readonly $type: 'DeploymentRef';
-    parent?: DeploymentRef;
-    value: Reference<DeploymentReferenceable>;
-}
-
-export const DeploymentRef = 'DeploymentRef';
-
-export function isDeploymentRef(item: unknown): item is DeploymentRef {
-    return reflection.isInstance(item, DeploymentRef);
-}
-
-export interface DeploymentRefExpression extends AstNode {
-    readonly $container: DeploymentExpressionIterator | DeploymentViewRulePredicateExpression | DirectedDeploymentRelationExpression | IncomingDeploymentRelationExpression | OutgoingDeploymentRelationExpression;
-    readonly $type: 'DeploymentRefExpression';
-    ref: DeploymentRef;
-    selector?: string;
-}
-
-export const DeploymentRefExpression = 'DeploymentRefExpression';
-
-export function isDeploymentRefExpression(item: unknown): item is DeploymentRefExpression {
-    return reflection.isInstance(item, DeploymentRefExpression);
-}
-
 export interface DeploymentRelation extends AstNode {
     readonly $container: DeploymentNodeBody | ModelDeployments;
     readonly $type: 'DeploymentRelation';
     body?: DeploymentRelationBody;
     kind?: Reference<RelationshipKind>;
-    source: DeploymentRef;
+    source: FqnRef;
     tags?: Tags;
-    target: DeploymentRef;
+    target: FqnRef;
     technology?: string;
     title?: string;
 }
@@ -739,7 +700,7 @@ export interface DeploymentViewRulePredicateExpression extends AstNode {
     readonly $container: DeploymentViewRulePredicate | DeploymentViewRulePredicateExpression;
     readonly $type: 'DeploymentViewRulePredicateExpression';
     prev?: DeploymentViewRulePredicateExpression;
-    value: DeploymentExpression;
+    value: ExpressionV2;
 }
 
 export const DeploymentViewRulePredicateExpression = 'DeploymentViewRulePredicateExpression';
@@ -752,7 +713,7 @@ export interface DeploymentViewRuleStyle extends AstNode {
     readonly $container: DeploymentViewBody;
     readonly $type: 'DeploymentViewRuleStyle';
     props: Array<NotationProperty | StyleProperty>;
-    target: DeploymentExpressionIterator;
+    targets: FqnExpressions;
 }
 
 export const DeploymentViewRuleStyle = 'DeploymentViewRuleStyle';
@@ -761,17 +722,17 @@ export function isDeploymentViewRuleStyle(item: unknown): item is DeploymentView
     return reflection.isInstance(item, DeploymentViewRuleStyle);
 }
 
-export interface DirectedDeploymentRelationExpression extends AstNode {
+export interface DirectedRelationExpr extends AstNode {
     readonly $container: DeploymentViewRulePredicateExpression;
-    readonly $type: 'DirectedDeploymentRelationExpression';
-    source: OutgoingDeploymentRelationExpression;
-    target: DeploymentElementExpression;
+    readonly $type: 'DirectedRelationExpr';
+    source: OutgoingRelationExpr;
+    target: FqnExpr;
 }
 
-export const DirectedDeploymentRelationExpression = 'DirectedDeploymentRelationExpression';
+export const DirectedRelationExpr = 'DirectedRelationExpr';
 
-export function isDirectedDeploymentRelationExpression(item: unknown): item is DirectedDeploymentRelationExpression {
-    return reflection.isInstance(item, DirectedDeploymentRelationExpression);
+export function isDirectedRelationExpr(item: unknown): item is DirectedRelationExpr {
+    return reflection.isInstance(item, DirectedRelationExpr);
 }
 
 export interface DirectedRelationExpression extends AstNode {
@@ -1154,6 +1115,45 @@ export function isFqnElementRef(item: unknown): item is FqnElementRef {
     return reflection.isInstance(item, FqnElementRef);
 }
 
+export interface FqnExpressions extends AstNode {
+    readonly $container: DeploymentViewRuleStyle | FqnExpressions;
+    readonly $type: 'FqnExpressions';
+    prev?: FqnExpressions;
+    value: FqnExpr;
+}
+
+export const FqnExpressions = 'FqnExpressions';
+
+export function isFqnExpressions(item: unknown): item is FqnExpressions {
+    return reflection.isInstance(item, FqnExpressions);
+}
+
+export interface FqnRef extends AstNode {
+    readonly $container: DeploymentRelation | FqnRef | FqnRefExpr;
+    readonly $type: 'FqnRef';
+    parent?: FqnRef;
+    value: Reference<Referenceable>;
+}
+
+export const FqnRef = 'FqnRef';
+
+export function isFqnRef(item: unknown): item is FqnRef {
+    return reflection.isInstance(item, FqnRef);
+}
+
+export interface FqnRefExpr extends AstNode {
+    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr | FqnExpressions | IncomingRelationExpr | OutgoingRelationExpr;
+    readonly $type: 'FqnRefExpr';
+    ref: FqnRef;
+    selector?: string;
+}
+
+export const FqnRefExpr = 'FqnRefExpr';
+
+export function isFqnRefExpr(item: unknown): item is FqnRefExpr {
+    return reflection.isInstance(item, FqnRefExpr);
+}
+
 export interface GlobalDynamicPredicateGroup extends AstNode {
     readonly $container: Globals;
     readonly $type: 'GlobalDynamicPredicateGroup';
@@ -1259,16 +1259,16 @@ export function isIncludePredicate(item: unknown): item is IncludePredicate {
     return reflection.isInstance(item, IncludePredicate);
 }
 
-export interface IncomingDeploymentRelationExpression extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | InOutDeploymentRelationExpression;
-    readonly $type: 'IncomingDeploymentRelationExpression';
-    to: DeploymentElementExpression;
+export interface IncomingRelationExpr extends AstNode {
+    readonly $container: DeploymentViewRulePredicateExpression | InOutRelationExpr;
+    readonly $type: 'IncomingRelationExpr';
+    to: FqnExpr;
 }
 
-export const IncomingDeploymentRelationExpression = 'IncomingDeploymentRelationExpression';
+export const IncomingRelationExpr = 'IncomingRelationExpr';
 
-export function isIncomingDeploymentRelationExpression(item: unknown): item is IncomingDeploymentRelationExpression {
-    return reflection.isInstance(item, IncomingDeploymentRelationExpression);
+export function isIncomingRelationExpr(item: unknown): item is IncomingRelationExpr {
+    return reflection.isInstance(item, IncomingRelationExpr);
 }
 
 export interface IncomingRelationExpression extends AstNode {
@@ -1283,16 +1283,16 @@ export function isIncomingRelationExpression(item: unknown): item is IncomingRel
     return reflection.isInstance(item, IncomingRelationExpression);
 }
 
-export interface InOutDeploymentRelationExpression extends AstNode {
+export interface InOutRelationExpr extends AstNode {
     readonly $container: DeploymentViewRulePredicateExpression;
-    readonly $type: 'InOutDeploymentRelationExpression';
-    inout: IncomingDeploymentRelationExpression;
+    readonly $type: 'InOutRelationExpr';
+    inout: IncomingRelationExpr;
 }
 
-export const InOutDeploymentRelationExpression = 'InOutDeploymentRelationExpression';
+export const InOutRelationExpr = 'InOutRelationExpr';
 
-export function isInOutDeploymentRelationExpression(item: unknown): item is InOutDeploymentRelationExpression {
-    return reflection.isInstance(item, InOutDeploymentRelationExpression);
+export function isInOutRelationExpr(item: unknown): item is InOutRelationExpr {
+    return reflection.isInstance(item, InOutRelationExpr);
 }
 
 export interface InOutRelationExpression extends AstNode {
@@ -1491,18 +1491,18 @@ export function isOpacityProperty(item: unknown): item is OpacityProperty {
     return reflection.isInstance(item, OpacityProperty);
 }
 
-export interface OutgoingDeploymentRelationExpression extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | DirectedDeploymentRelationExpression;
-    readonly $type: 'OutgoingDeploymentRelationExpression';
-    from: DeploymentElementExpression;
+export interface OutgoingRelationExpr extends AstNode {
+    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr;
+    readonly $type: 'OutgoingRelationExpr';
+    from: FqnExpr;
     isBidirectional: boolean;
     kind?: Reference<RelationshipKind>;
 }
 
-export const OutgoingDeploymentRelationExpression = 'OutgoingDeploymentRelationExpression';
+export const OutgoingRelationExpr = 'OutgoingRelationExpr';
 
-export function isOutgoingDeploymentRelationExpression(item: unknown): item is OutgoingDeploymentRelationExpression {
-    return reflection.isInstance(item, OutgoingDeploymentRelationExpression);
+export function isOutgoingRelationExpr(item: unknown): item is OutgoingRelationExpr {
+    return reflection.isInstance(item, OutgoingRelationExpr);
 }
 
 export interface OutgoingRelationExpression extends AstNode {
@@ -1970,7 +1970,7 @@ export function isWhereRelationTag(item: unknown): item is WhereRelationTag {
 }
 
 export interface WildcardExpression extends AstNode {
-    readonly $container: DeploymentExpressionIterator | DeploymentViewRulePredicateExpression | DirectedDeploymentRelationExpression | DirectedRelationExpression | DynamicViewPredicateIterator | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | IncomingDeploymentRelationExpression | IncomingRelationExpression | OutgoingDeploymentRelationExpression | OutgoingRelationExpression | Predicates;
+    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr | DirectedRelationExpression | DynamicViewPredicateIterator | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | FqnExpressions | IncomingRelationExpr | IncomingRelationExpression | OutgoingRelationExpr | OutgoingRelationExpression | Predicates;
     readonly $type: 'WildcardExpression';
     isWildcard: boolean;
 }
@@ -1991,25 +1991,18 @@ export type LikeC4AstType = {
     DeployedInstance: DeployedInstance
     DeployedInstanceBody: DeployedInstanceBody
     DeploymentElement: DeploymentElement
-    DeploymentElementExpression: DeploymentElementExpression
-    DeploymentExpression: DeploymentExpression
-    DeploymentExpressionIterator: DeploymentExpressionIterator
     DeploymentNode: DeploymentNode
     DeploymentNodeBody: DeploymentNodeBody
     DeploymentNodeKind: DeploymentNodeKind
-    DeploymentRef: DeploymentRef
-    DeploymentRefExpression: DeploymentRefExpression
-    DeploymentReferenceable: DeploymentReferenceable
     DeploymentRelation: DeploymentRelation
     DeploymentRelationBody: DeploymentRelationBody
-    DeploymentRelationExpression: DeploymentRelationExpression
     DeploymentView: DeploymentView
     DeploymentViewBody: DeploymentViewBody
     DeploymentViewRule: DeploymentViewRule
     DeploymentViewRulePredicate: DeploymentViewRulePredicate
     DeploymentViewRulePredicateExpression: DeploymentViewRulePredicateExpression
     DeploymentViewRuleStyle: DeploymentViewRuleStyle
-    DirectedDeploymentRelationExpression: DirectedDeploymentRelationExpression
+    DirectedRelationExpr: DirectedRelationExpr
     DirectedRelationExpression: DirectedRelationExpression
     DynamicView: DynamicView
     DynamicViewBody: DynamicViewBody
@@ -2041,9 +2034,14 @@ export type LikeC4AstType = {
     ElementViewRef: ElementViewRef
     ExcludePredicate: ExcludePredicate
     ExpandElementExpression: ExpandElementExpression
+    ExpressionV2: ExpressionV2
     ExtendElement: ExtendElement
     ExtendElementBody: ExtendElementBody
     FqnElementRef: FqnElementRef
+    FqnExpr: FqnExpr
+    FqnExpressions: FqnExpressions
+    FqnRef: FqnRef
+    FqnRefExpr: FqnRefExpr
     FqnReferenceable: FqnReferenceable
     GlobalDynamicPredicateGroup: GlobalDynamicPredicateGroup
     GlobalPredicateGroup: GlobalPredicateGroup
@@ -2052,10 +2050,10 @@ export type LikeC4AstType = {
     GlobalStyleId: GlobalStyleId
     Globals: Globals
     IconProperty: IconProperty
-    InOutDeploymentRelationExpression: InOutDeploymentRelationExpression
+    InOutRelationExpr: InOutRelationExpr
     InOutRelationExpression: InOutRelationExpression
     IncludePredicate: IncludePredicate
-    IncomingDeploymentRelationExpression: IncomingDeploymentRelationExpression
+    IncomingRelationExpr: IncomingRelationExpr
     IncomingRelationExpression: IncomingRelationExpression
     LibIcon: LibIcon
     LikeC4Grammar: LikeC4Grammar
@@ -2073,12 +2071,14 @@ export type LikeC4AstType = {
     NotationProperty: NotationProperty
     NotesProperty: NotesProperty
     OpacityProperty: OpacityProperty
-    OutgoingDeploymentRelationExpression: OutgoingDeploymentRelationExpression
+    OutgoingRelationExpr: OutgoingRelationExpr
     OutgoingRelationExpression: OutgoingRelationExpression
     Predicate: Predicate
     Predicates: Predicates
+    Referenceable: Referenceable
     Relation: Relation
     RelationBody: RelationBody
+    RelationExpr: RelationExpr
     RelationExpression: RelationExpression
     RelationNavigateToProperty: RelationNavigateToProperty
     RelationPredicate: RelationPredicate
@@ -2134,7 +2134,7 @@ export type LikeC4AstType = {
 export class LikeC4AstReflection extends AbstractAstReflection {
 
     getAllTypes(): string[] {
-        return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentElementExpression, DeploymentExpression, DeploymentExpressionIterator, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentRef, DeploymentRefExpression, DeploymentReferenceable, DeploymentRelation, DeploymentRelationBody, DeploymentRelationExpression, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRulePredicateExpression, DeploymentViewRuleStyle, DirectedDeploymentRelationExpression, 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, ExtendElement, ExtendElementBody, FqnElementRef, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, IconProperty, InOutDeploymentRelationExpression, InOutRelationExpression, IncludePredicate, IncomingDeploymentRelationExpression, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelViews, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingDeploymentRelationExpression, OutgoingRelationExpression, Predicate, Predicates, Relation, RelationBody, 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, 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];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -2153,18 +2153,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             }
             case DeployedInstance:
             case DeploymentNode: {
-                return this.isSubtype(DeploymentElement, supertype) || this.isSubtype(DeploymentReferenceable, supertype);
-            }
-            case DeploymentElementExpression:
-            case DeploymentRelationExpression: {
-                return this.isSubtype(DeploymentExpression, supertype);
-            }
-            case DeploymentReferenceable:
-            case ExtendElement: {
-                return this.isSubtype(FqnReferenceable, supertype);
-            }
-            case DeploymentRefExpression: {
-                return this.isSubtype(DeploymentElementExpression, supertype);
+                return this.isSubtype(DeploymentElement, supertype) || this.isSubtype(Referenceable, supertype);
             }
             case DeploymentView:
             case DynamicView:
@@ -2175,11 +2164,11 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case DeploymentViewRuleStyle: {
                 return this.isSubtype(DeploymentViewRule, supertype);
             }
-            case DirectedDeploymentRelationExpression:
-            case IncomingDeploymentRelationExpression:
-            case InOutDeploymentRelationExpression:
-            case OutgoingDeploymentRelationExpression: {
-                return this.isSubtype(DeploymentRelationExpression, supertype);
+            case DirectedRelationExpr:
+            case IncomingRelationExpr:
+            case InOutRelationExpr:
+            case OutgoingRelationExpr: {
+                return this.isSubtype(RelationExpr, supertype);
             }
             case DirectedRelationExpression:
             case IncomingRelationExpression:
@@ -2192,7 +2181,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return this.isSubtype(DynamicViewRule, supertype);
             }
             case Element: {
-                return this.isSubtype(DeploymentReferenceable, supertype) || this.isSubtype(FqnReferenceable, supertype);
+                return this.isSubtype(FqnReferenceable, supertype) || this.isSubtype(Referenceable, supertype);
             }
             case ElementDescedantsExpression:
             case ElementKindExpression:
@@ -2223,6 +2212,17 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case IncludePredicate: {
                 return this.isSubtype(ViewRulePredicate, supertype);
             }
+            case ExtendElement:
+            case Referenceable: {
+                return this.isSubtype(FqnReferenceable, supertype);
+            }
+            case FqnExpr:
+            case RelationExpr: {
+                return this.isSubtype(ExpressionV2, supertype);
+            }
+            case FqnRefExpr: {
+                return this.isSubtype(FqnExpr, supertype);
+            }
             case IconProperty: {
                 return this.isSubtype(ElementProperty, supertype) || this.isSubtype(StyleProperty, supertype);
             }
@@ -2303,7 +2303,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return this.isSubtype(WhereRelation, supertype) || this.isSubtype(WhereTagEqual, supertype);
             }
             case WildcardExpression: {
-                return this.isSubtype(DeploymentElementExpression, supertype) || this.isSubtype(ElementExpression, supertype);
+                return this.isSubtype(ElementExpression, supertype) || this.isSubtype(FqnExpr, supertype);
             }
             default: {
                 return false;
@@ -2320,12 +2320,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case 'DeploymentNode:kind': {
                 return DeploymentNodeKind;
             }
-            case 'DeploymentRef:value': {
-                return DeploymentReferenceable;
-            }
             case 'DeploymentRelation:kind':
             case 'DynamicViewStep:kind':
-            case 'OutgoingDeploymentRelationExpression:kind':
+            case 'OutgoingRelationExpr:kind':
             case 'OutgoingRelationExpression:kind':
             case 'Relation:kind':
             case 'WhereRelationKind:value': {
@@ -2355,6 +2352,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case 'ElementViewRef:view': {
                 return ElementView;
             }
+            case 'FqnRef:value': {
+                return Referenceable;
+            }
             case 'IconProperty:libicon': {
                 return LibIcon;
             }
@@ -2447,15 +2447,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
-            case DeploymentExpressionIterator: {
-                return {
-                    name: DeploymentExpressionIterator,
-                    properties: [
-                        { name: 'prev' },
-                        { name: 'value' }
-                    ]
-                };
-            }
             case DeploymentNode: {
                 return {
                     name: DeploymentNode,
@@ -2485,24 +2476,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
-            case DeploymentRef: {
-                return {
-                    name: DeploymentRef,
-                    properties: [
-                        { name: 'parent' },
-                        { name: 'value' }
-                    ]
-                };
-            }
-            case DeploymentRefExpression: {
-                return {
-                    name: DeploymentRefExpression,
-                    properties: [
-                        { name: 'ref' },
-                        { name: 'selector' }
-                    ]
-                };
-            }
             case DeploymentRelation: {
                 return {
                     name: DeploymentRelation,
@@ -2568,13 +2541,13 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     name: DeploymentViewRuleStyle,
                     properties: [
                         { name: 'props', defaultValue: [] },
-                        { name: 'target' }
+                        { name: 'targets' }
                     ]
                 };
             }
-            case DirectedDeploymentRelationExpression: {
+            case DirectedRelationExpr: {
                 return {
-                    name: DirectedDeploymentRelationExpression,
+                    name: DirectedRelationExpr,
                     properties: [
                         { name: 'source' },
                         { name: 'target' }
@@ -2845,6 +2818,33 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case FqnExpressions: {
+                return {
+                    name: FqnExpressions,
+                    properties: [
+                        { name: 'prev' },
+                        { name: 'value' }
+                    ]
+                };
+            }
+            case FqnRef: {
+                return {
+                    name: FqnRef,
+                    properties: [
+                        { name: 'parent' },
+                        { name: 'value' }
+                    ]
+                };
+            }
+            case FqnRefExpr: {
+                return {
+                    name: FqnRefExpr,
+                    properties: [
+                        { name: 'ref' },
+                        { name: 'selector' }
+                    ]
+                };
+            }
             case GlobalDynamicPredicateGroup: {
                 return {
                     name: GlobalDynamicPredicateGroup,
@@ -2918,9 +2918,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
-            case IncomingDeploymentRelationExpression: {
+            case IncomingRelationExpr: {
                 return {
-                    name: IncomingDeploymentRelationExpression,
+                    name: IncomingRelationExpr,
                     properties: [
                         { name: 'to' }
                     ]
@@ -2934,9 +2934,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
-            case InOutDeploymentRelationExpression: {
+            case InOutRelationExpr: {
                 return {
-                    name: InOutDeploymentRelationExpression,
+                    name: InOutRelationExpr,
                     properties: [
                         { name: 'inout' }
                     ]
@@ -3079,9 +3079,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
-            case OutgoingDeploymentRelationExpression: {
+            case OutgoingRelationExpr: {
                 return {
-                    name: OutgoingDeploymentRelationExpression,
+                    name: OutgoingRelationExpr,
                     properties: [
                         { name: 'from' },
                         { name: 'isBidirectional', defaultValue: false },