@likec4/language-server 1.20.3 → 1.21.0

package/src/generated/ast.ts

@@ -85,9 +85,13 @@ export type LikeC4KeywordNames =
     | "instanceOf"
     | "is"
     | "kind"
+    | "large"
+    | "lg"
     | "likec4lib"
     | "line"
     | "link"
+    | "md"
+    | "medium"
     | "metadata"
     | "mobile"
     | "model"
@@ -107,6 +111,7 @@ export type LikeC4KeywordNames =
     | "opacity"
     | "open"
     | "or"
+    | "padding"
     | "par"
     | "parallel"
     | "person"
@@ -119,8 +124,11 @@ export type LikeC4KeywordNames =
     | "relationship"
     | "secondary"
     | "shape"
+    | "size"
     | "sky"
     | "slate"
+    | "sm"
+    | "small"
     | "solid"
     | "source"
     | "specification"
@@ -131,6 +139,7 @@ export type LikeC4KeywordNames =
     | "tail"
     | "target"
     | "technology"
+    | "textSize"
     | "title"
     | "true"
     | "vee"
@@ -138,6 +147,10 @@ export type LikeC4KeywordNames =
     | "views"
     | "where"
     | "with"
+    | "xl"
+    | "xlarge"
+    | "xs"
+    | "xsmall"
     | "{"
     | "}";
 
@@ -235,6 +248,14 @@ export function isElementPredicateOrWhere(item: unknown): item is ElementPredica
     return reflection.isInstance(item, ElementPredicateOrWhere);
 }
 
+export type ElementPredicateOrWhereV2 = ElementPredicateWhereV2 | FqnExpr;
+
+export const ElementPredicateOrWhereV2 = 'ElementPredicateOrWhereV2';
+
+export function isElementPredicateOrWhereV2(item: unknown): item is ElementPredicateOrWhereV2 {
+    return reflection.isInstance(item, ElementPredicateOrWhereV2);
+}
+
 export type ElementProperty = ElementStringProperty | ElementStyleProperty | IconProperty | LinkProperty | MetadataProperty;
 
 export const ElementProperty = 'ElementProperty';
@@ -249,7 +270,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 | RelationPredicateOrWhereV2;
+export type ExpressionV2 = ElementPredicateOrWhereV2 | RelationPredicateOrWhereV2;
 
 export const ExpressionV2 = 'ExpressionV2';
 
@@ -257,6 +278,14 @@ export function isExpressionV2(item: unknown): item is ExpressionV2 {
     return reflection.isInstance(item, ExpressionV2);
 }
 
+export type ExtendElementProperty = LinkProperty | MetadataProperty;
+
+export const ExtendElementProperty = 'ExtendElementProperty';
+
+export function isExtendElementProperty(item: unknown): item is ExtendElementProperty {
+    return reflection.isInstance(item, ExtendElementProperty);
+}
+
 export type FqnExpr = FqnRefExpr | WildcardExpression;
 
 export const FqnExpr = 'FqnExpr';
@@ -279,10 +308,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' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | Participant | ThemeColor | string;
+export type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | Participant | SizeValue | ThemeColor | string;
 
 export function isId(item: unknown): item is Id {
-    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)));
+    return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || isParticipant(item) || isSizeValue(item) || item === 'element' || item === 'model' || item === 'group' || item === 'node' || item === 'deployment' || item === 'instance' || (typeof item === 'string' && (/[_]*[a-zA-Z][-\w]*/.test(item)));
 }
 
 export type LikeC4View = DeploymentView | DynamicView | ElementView;
@@ -385,6 +414,20 @@ export function isRelationshipStyleProperty(item: unknown): item is Relationship
     return reflection.isInstance(item, RelationshipStyleProperty);
 }
 
+export type SizeProperty = PaddingSizeProperty | ShapeSizeProperty | TextSizeProperty;
+
+export const SizeProperty = 'SizeProperty';
+
+export function isSizeProperty(item: unknown): item is SizeProperty {
+    return reflection.isInstance(item, SizeProperty);
+}
+
+export type SizeValue = 'large' | 'lg' | 'md' | 'medium' | 'sm' | 'small' | 'xl' | 'xlarge' | 'xs' | 'xsmall';
+
+export function isSizeValue(item: unknown): item is SizeValue {
+    return item === 'xs' || item === 'sm' || item === 'md' || item === 'lg' || item === 'xl' || item === 'xsmall' || item === 'small' || item === 'medium' || item === 'large' || item === 'xlarge';
+}
+
 export type StringProperty = ElementStringProperty | MetadataAttribute | NotationProperty | NotesProperty | RelationStringProperty | SpecificationElementStringProperty | SpecificationRelationshipStringProperty | ViewStringProperty;
 
 export const StringProperty = 'StringProperty';
@@ -393,7 +436,7 @@ export function isStringProperty(item: unknown): item is StringProperty {
     return reflection.isInstance(item, StringProperty);
 }
 
-export type StyleProperty = BorderProperty | ColorProperty | IconProperty | MultipleProperty | OpacityProperty | ShapeProperty;
+export type StyleProperty = BorderProperty | ColorProperty | IconProperty | MultipleProperty | OpacityProperty | PaddingSizeProperty | ShapeProperty | ShapeSizeProperty | TextSizeProperty;
 
 export const StyleProperty = 'StyleProperty';
 
@@ -980,6 +1023,19 @@ export function isElementPredicateWhere(item: unknown): item is ElementPredicate
     return reflection.isInstance(item, ElementPredicateWhere);
 }
 
+export interface ElementPredicateWhereV2 extends AstNode {
+    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $type: 'ElementPredicateWhereV2';
+    subject: FqnExpr;
+    where?: WhereElementExpression;
+}
+
+export const ElementPredicateWhereV2 = 'ElementPredicateWhereV2';
+
+export function isElementPredicateWhereV2(item: unknown): item is ElementPredicateWhereV2 {
+    return reflection.isInstance(item, ElementPredicateWhereV2);
+}
+
 export interface ElementPredicateWith extends AstNode {
     readonly $container: DynamicViewPredicateIterator | Predicates;
     readonly $type: 'ElementPredicateWith';
@@ -1114,7 +1170,7 @@ export interface ExtendElement extends AstNode {
     readonly $container: Model;
     readonly $type: 'ExtendElement';
     body: ExtendElementBody;
-    element: FqnElementRef;
+    element: StrictFqnElementRef;
 }
 
 export const ExtendElement = 'ExtendElement';
@@ -1127,6 +1183,8 @@ export interface ExtendElementBody extends AstNode {
     readonly $container: ExtendElement;
     readonly $type: 'ExtendElementBody';
     elements: Array<Element | Relation>;
+    props: Array<ExtendElementProperty>;
+    tags?: Tags;
 }
 
 export const ExtendElementBody = 'ExtendElementBody';
@@ -1135,19 +1193,6 @@ export function isExtendElementBody(item: unknown): item is ExtendElementBody {
     return reflection.isInstance(item, ExtendElementBody);
 }
 
-export interface FqnElementRef extends AstNode {
-    readonly $container: ExtendElement | FqnElementRef;
-    readonly $type: 'FqnElementRef';
-    el: Reference<Element>;
-    parent?: FqnElementRef;
-}
-
-export const FqnElementRef = 'FqnElementRef';
-
-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';
@@ -1175,7 +1220,7 @@ export function isFqnRef(item: unknown): item is FqnRef {
 }
 
 export interface FqnRefExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr | FqnExpressions | IncomingRelationExpr | OutgoingRelationExpr;
+    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr | ElementPredicateWhereV2 | FqnExpressions | IncomingRelationExpr | OutgoingRelationExpr;
     readonly $type: 'FqnRefExpr';
     ref: FqnRef;
     selector?: string;
@@ -1394,7 +1439,7 @@ export function isLineProperty(item: unknown): item is LineProperty {
 }
 
 export interface LinkProperty extends AstNode {
-    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelationBody | DeploymentViewBody | DynamicViewBody | ElementBody | ElementViewBody | RelationBody;
+    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelationBody | DeploymentViewBody | DynamicViewBody | ElementBody | ElementViewBody | ExtendElementBody | RelationBody;
     readonly $type: 'LinkProperty';
     key: 'link';
     title?: string;
@@ -1421,7 +1466,7 @@ export function isMetadataAttribute(item: unknown): item is MetadataAttribute {
 }
 
 export interface MetadataBody extends AstNode {
-    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelationBody | ElementBody | RelationBody;
+    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelationBody | ElementBody | ExtendElementBody | RelationBody;
     readonly $type: 'MetadataBody';
     props: Array<MetadataAttribute>;
 }
@@ -1565,6 +1610,19 @@ export function isOutgoingRelationExpression(item: unknown): item is OutgoingRel
     return reflection.isInstance(item, OutgoingRelationExpression);
 }
 
+export interface PaddingSizeProperty extends AstNode {
+    readonly $container: CustomElementProperties | DeploymentViewRuleStyle | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
+    readonly $type: 'PaddingSizeProperty';
+    key: 'padding';
+    value: SizeValue;
+}
+
+export const PaddingSizeProperty = 'PaddingSizeProperty';
+
+export function isPaddingSizeProperty(item: unknown): item is PaddingSizeProperty {
+    return reflection.isInstance(item, PaddingSizeProperty);
+}
+
 export interface Predicates extends AstNode {
     readonly $container: ExcludePredicate | IncludePredicate | Predicates;
     readonly $type: 'Predicates';
@@ -1712,6 +1770,19 @@ export function isShapeProperty(item: unknown): item is ShapeProperty {
     return reflection.isInstance(item, ShapeProperty);
 }
 
+export interface ShapeSizeProperty extends AstNode {
+    readonly $container: CustomElementProperties | DeploymentViewRuleStyle | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
+    readonly $type: 'ShapeSizeProperty';
+    key: 'size';
+    value: SizeValue;
+}
+
+export const ShapeSizeProperty = 'ShapeSizeProperty';
+
+export function isShapeSizeProperty(item: unknown): item is ShapeSizeProperty {
+    return reflection.isInstance(item, ShapeSizeProperty);
+}
+
 export interface SpecificationColor extends AstNode {
     readonly $container: SpecificationRule;
     readonly $type: 'SpecificationColor';
@@ -1819,6 +1890,19 @@ export function isSpecificationTag(item: unknown): item is SpecificationTag {
     return reflection.isInstance(item, SpecificationTag);
 }
 
+export interface StrictFqnElementRef extends AstNode {
+    readonly $container: ExtendElement | StrictFqnElementRef;
+    readonly $type: 'StrictFqnElementRef';
+    el: Reference<Element>;
+    parent?: StrictFqnElementRef;
+}
+
+export const StrictFqnElementRef = 'StrictFqnElementRef';
+
+export function isStrictFqnElementRef(item: unknown): item is StrictFqnElementRef {
+    return reflection.isInstance(item, StrictFqnElementRef);
+}
+
 export interface Tag extends AstNode {
     readonly $container: SpecificationTag;
     readonly $type: 'Tag';
@@ -1832,7 +1916,7 @@ export function isTag(item: unknown): item is Tag {
 }
 
 export interface Tags extends AstNode {
-    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelation | DeploymentRelationBody | DeploymentViewBody | DynamicViewBody | ElementBody | ElementViewBody | Relation | RelationBody | Tags;
+    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelation | DeploymentRelationBody | DeploymentViewBody | DynamicViewBody | ElementBody | ElementViewBody | ExtendElementBody | Relation | RelationBody | Tags;
     readonly $type: 'Tags';
     prev?: Tags;
     values: Array<Reference<Tag>>;
@@ -1844,6 +1928,19 @@ export function isTags(item: unknown): item is Tags {
     return reflection.isInstance(item, Tags);
 }
 
+export interface TextSizeProperty extends AstNode {
+    readonly $container: CustomElementProperties | DeploymentViewRuleStyle | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
+    readonly $type: 'TextSizeProperty';
+    key: 'textSize';
+    value: SizeValue;
+}
+
+export const TextSizeProperty = 'TextSizeProperty';
+
+export function isTextSizeProperty(item: unknown): item is TextSizeProperty {
+    return reflection.isInstance(item, TextSizeProperty);
+}
+
 export interface ViewRef extends AstNode {
     readonly $container: NavigateToProperty;
     readonly $type: 'ViewRef';
@@ -1935,7 +2032,7 @@ export function isViewStringProperty(item: unknown): item is ViewStringProperty
 }
 
 export interface WhereBinaryExpression extends AstNode {
-    readonly $container: ElementPredicateWhere | RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
+    readonly $container: ElementPredicateWhere | ElementPredicateWhereV2 | RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
     readonly $type: 'WhereBinaryExpression';
     left: WhereElementExpression | WhereRelationExpression;
     operator: 'and' | 'or';
@@ -1949,11 +2046,11 @@ export function isWhereBinaryExpression(item: unknown): item is WhereBinaryExpre
 }
 
 export interface WhereElementKind extends AstNode {
-    readonly $container: ElementPredicateWhere | WhereBinaryExpression | WhereElementNegation;
+    readonly $container: ElementPredicateWhere | ElementPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation;
     readonly $type: 'WhereElementKind';
     not: boolean;
     operator: 'is' | string;
-    value?: Reference<ElementKind>;
+    value?: Reference<DeploymentNodeOrElementKind>;
 }
 
 export const WhereElementKind = 'WhereElementKind';
@@ -1963,7 +2060,7 @@ export function isWhereElementKind(item: unknown): item is WhereElementKind {
 }
 
 export interface WhereElementNegation extends AstNode {
-    readonly $container: ElementPredicateWhere | WhereBinaryExpression | WhereElementNegation;
+    readonly $container: ElementPredicateWhere | ElementPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation;
     readonly $type: 'WhereElementNegation';
     value: WhereElementExpression;
 }
@@ -1975,7 +2072,7 @@ export function isWhereElementNegation(item: unknown): item is WhereElementNegat
 }
 
 export interface WhereElementTag extends AstNode {
-    readonly $container: ElementPredicateWhere | WhereBinaryExpression | WhereElementNegation;
+    readonly $container: ElementPredicateWhere | ElementPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation;
     readonly $type: 'WhereElementTag';
     not: boolean;
     operator: 'is' | string;
@@ -2059,7 +2156,7 @@ export function isWhereRelationTag(item: unknown): item is WhereRelationTag {
 }
 
 export interface WildcardExpression extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr | DirectedRelationExpression | DynamicViewPredicateIterator | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | FqnExpressions | IncomingRelationExpr | IncomingRelationExpression | OutgoingRelationExpr | OutgoingRelationExpression | Predicates;
+    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr | DirectedRelationExpression | DynamicViewPredicateIterator | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWhereV2 | ElementPredicateWith | FqnExpressions | IncomingRelationExpr | IncomingRelationExpression | OutgoingRelationExpr | OutgoingRelationExpression | Predicates;
     readonly $type: 'WildcardExpression';
     isWildcard: boolean;
 }
@@ -2112,7 +2209,9 @@ export type LikeC4AstType = {
     ElementKindExpression: ElementKindExpression
     ElementPredicate: ElementPredicate
     ElementPredicateOrWhere: ElementPredicateOrWhere
+    ElementPredicateOrWhereV2: ElementPredicateOrWhereV2
     ElementPredicateWhere: ElementPredicateWhere
+    ElementPredicateWhereV2: ElementPredicateWhereV2
     ElementPredicateWith: ElementPredicateWith
     ElementProperty: ElementProperty
     ElementRef: ElementRef
@@ -2127,7 +2226,7 @@ export type LikeC4AstType = {
     ExpressionV2: ExpressionV2
     ExtendElement: ExtendElement
     ExtendElementBody: ExtendElementBody
-    FqnElementRef: FqnElementRef
+    ExtendElementProperty: ExtendElementProperty
     FqnExpr: FqnExpr
     FqnExpressions: FqnExpressions
     FqnRef: FqnRef
@@ -2164,6 +2263,7 @@ export type LikeC4AstType = {
     OpacityProperty: OpacityProperty
     OutgoingRelationExpr: OutgoingRelationExpr
     OutgoingRelationExpression: OutgoingRelationExpression
+    PaddingSizeProperty: PaddingSizeProperty
     Predicate: Predicate
     Predicates: Predicates
     Referenceable: Referenceable
@@ -2184,6 +2284,8 @@ export type LikeC4AstType = {
     RelationshipKind: RelationshipKind
     RelationshipStyleProperty: RelationshipStyleProperty
     ShapeProperty: ShapeProperty
+    ShapeSizeProperty: ShapeSizeProperty
+    SizeProperty: SizeProperty
     SpecificationColor: SpecificationColor
     SpecificationDeploymentNodeKind: SpecificationDeploymentNodeKind
     SpecificationElementKind: SpecificationElementKind
@@ -2192,10 +2294,12 @@ export type LikeC4AstType = {
     SpecificationRelationshipStringProperty: SpecificationRelationshipStringProperty
     SpecificationRule: SpecificationRule
     SpecificationTag: SpecificationTag
+    StrictFqnElementRef: StrictFqnElementRef
     StringProperty: StringProperty
     StyleProperty: StyleProperty
     Tag: Tag
     Tags: Tags
+    TextSizeProperty: TextSizeProperty
     ViewProperty: ViewProperty
     ViewRef: ViewRef
     ViewRule: ViewRule
@@ -2229,7 +2333,7 @@ export type LikeC4AstType = {
 export class LikeC4AstReflection extends AbstractAstReflection {
 
     getAllTypes(): string[] {
-        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, MultipleProperty, 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];
+        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, ElementPredicateOrWhereV2, ElementPredicateWhere, ElementPredicateWhereV2, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExpressionV2, ExtendElement, ExtendElementBody, ExtendElementProperty, 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, MultipleProperty, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, OutgoingRelationExpression, PaddingSizeProperty, Predicate, Predicates, Referenceable, Relation, RelationBody, RelationExpr, RelationExpression, RelationNavigateToProperty, RelationPredicate, RelationPredicateOrWhere, RelationPredicateOrWhereV2, RelationPredicateWhere, RelationPredicateWhereV2, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, ShapeSizeProperty, SizeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StrictFqnElementRef, StringProperty, StyleProperty, Tag, Tags, TextSizeProperty, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationParticipantKind, WhereRelationParticipantTag, WhereRelationTag, WhereTagEqual, WildcardExpression];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -2302,6 +2406,14 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case ElementPredicateWith: {
                 return this.isSubtype(ElementPredicate, supertype);
             }
+            case ElementPredicateOrWhereV2:
+            case RelationPredicateOrWhereV2: {
+                return this.isSubtype(ExpressionV2, supertype);
+            }
+            case ElementPredicateWhereV2:
+            case FqnExpr: {
+                return this.isSubtype(ElementPredicateOrWhereV2, supertype);
+            }
             case ElementStringProperty: {
                 return this.isSubtype(ElementProperty, supertype) || this.isSubtype(StringProperty, supertype);
             }
@@ -2316,10 +2428,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case Referenceable: {
                 return this.isSubtype(FqnReferenceable, supertype);
             }
-            case FqnExpr:
-            case RelationPredicateOrWhereV2: {
-                return this.isSubtype(ExpressionV2, supertype);
-            }
             case FqnRefExpr: {
                 return this.isSubtype(FqnExpr, supertype);
             }
@@ -2327,7 +2435,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return this.isSubtype(ElementProperty, supertype) || this.isSubtype(StyleProperty, supertype);
             }
             case LinkProperty: {
-                return this.isSubtype(ElementProperty, supertype) || this.isSubtype(RelationProperty, supertype) || this.isSubtype(ViewProperty, supertype);
+                return this.isSubtype(ElementProperty, supertype) || this.isSubtype(ExtendElementProperty, supertype) || this.isSubtype(RelationProperty, supertype) || this.isSubtype(ViewProperty, supertype);
             }
             case MetadataAttribute:
             case NotationProperty:
@@ -2340,7 +2448,12 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return this.isSubtype(MetadataProperty, supertype);
             }
             case MetadataProperty: {
-                return this.isSubtype(ElementProperty, supertype) || this.isSubtype(RelationProperty, supertype);
+                return this.isSubtype(ElementProperty, supertype) || this.isSubtype(ExtendElementProperty, supertype) || this.isSubtype(RelationProperty, supertype);
+            }
+            case PaddingSizeProperty:
+            case ShapeSizeProperty:
+            case TextSizeProperty: {
+                return this.isSubtype(SizeProperty, supertype) || this.isSubtype(StyleProperty, supertype);
             }
             case RelationExpr:
             case RelationPredicateWhereV2: {
@@ -2441,12 +2554,11 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return DynamicView;
             }
             case 'Element:kind':
-            case 'ElementKindExpression:kind':
-            case 'WhereElementKind:value': {
+            case 'ElementKindExpression:kind': {
                 return ElementKind;
             }
             case 'ElementRef:el':
-            case 'FqnElementRef:el': {
+            case 'StrictFqnElementRef:el': {
                 return Element;
             }
             case 'ElementTagExpression:tag':
@@ -2474,6 +2586,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case 'ViewRuleGlobalStyle:style': {
                 return GlobalStyleId;
             }
+            case 'WhereElementKind:value':
             case 'WhereRelationParticipantKind:value': {
                 return DeploymentNodeOrElementKind;
             }
@@ -2812,6 +2925,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case ElementPredicateWhereV2: {
+                return {
+                    name: ElementPredicateWhereV2,
+                    properties: [
+                        { name: 'subject' },
+                        { name: 'where' }
+                    ]
+                };
+            }
             case ElementPredicateWith: {
                 return {
                     name: ElementPredicateWith,
@@ -2915,16 +3037,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: ExtendElementBody,
                     properties: [
-                        { name: 'elements', defaultValue: [] }
-                    ]
-                };
-            }
-            case FqnElementRef: {
-                return {
-                    name: FqnElementRef,
-                    properties: [
-                        { name: 'el' },
-                        { name: 'parent' }
+                        { name: 'elements', defaultValue: [] },
+                        { name: 'props', defaultValue: [] },
+                        { name: 'tags' }
                     ]
                 };
             }
@@ -3218,6 +3333,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case PaddingSizeProperty: {
+                return {
+                    name: PaddingSizeProperty,
+                    properties: [
+                        { name: 'key' },
+                        { name: 'value' }
+                    ]
+                };
+            }
             case Predicates: {
                 return {
                     name: Predicates,
@@ -3321,6 +3445,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case ShapeSizeProperty: {
+                return {
+                    name: ShapeSizeProperty,
+                    properties: [
+                        { name: 'key' },
+                        { name: 'value' }
+                    ]
+                };
+            }
             case SpecificationColor: {
                 return {
                     name: SpecificationColor,
@@ -3396,6 +3529,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case StrictFqnElementRef: {
+                return {
+                    name: StrictFqnElementRef,
+                    properties: [
+                        { name: 'el' },
+                        { name: 'parent' }
+                    ]
+                };
+            }
             case Tag: {
                 return {
                     name: Tag,
@@ -3413,6 +3555,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case TextSizeProperty: {
+                return {
+                    name: TextSizeProperty,
+                    properties: [
+                        { name: 'key' },
+                        { name: 'value' }
+                    ]
+                };
+            }
             case ViewRef: {
                 return {
                     name: ViewRef,