@likec4/language-server 1.20.2 → 1.21.0

package/dist/formatting/LikeC4Formatter.js

@@ -126,7 +126,7 @@ export class LikeC4Formatter extends AbstractFormatter {
     this.on(node, ast.isDeploymentView)?.keywords("deployment", "view").append(FormattingOptions.oneSpace);
   }
   formatLeafProperty(node) {
-    if (ast.isElementStringProperty(node) || ast.isRelationStringProperty(node) || ast.isViewStringProperty(node) || ast.isNotationProperty(node) || ast.isSpecificationElementStringProperty(node) || ast.isSpecificationRelationshipStringProperty(node) || ast.isColorProperty(node) || ast.isLineProperty(node) || ast.isArrowProperty(node) || ast.isIconProperty(node) || ast.isShapeProperty(node) || ast.isBorderProperty(node) || ast.isOpacityProperty(node) || ast.isMultipleProperty(node)) {
+    if (ast.isElementStringProperty(node) || ast.isRelationStringProperty(node) || ast.isViewStringProperty(node) || ast.isNotationProperty(node) || ast.isSpecificationElementStringProperty(node) || ast.isSpecificationRelationshipStringProperty(node) || ast.isColorProperty(node) || ast.isLineProperty(node) || ast.isArrowProperty(node) || ast.isIconProperty(node) || ast.isShapeProperty(node) || ast.isBorderProperty(node) || ast.isOpacityProperty(node) || ast.isMultipleProperty(node) || ast.isShapeSizeProperty(node) || ast.isPaddingSizeProperty(node) || ast.isTextSizeProperty(node)) {
       const formatter = this.getNodeFormatter(node);
       const colon = formatter.keyword(":");
       const propertyName = formatter.keywords(
@@ -142,7 +142,10 @@ export class LikeC4Formatter extends AbstractFormatter {
         "shape",
         "border",
         "opacity",
-        "multiple"
+        "multiple",
+        "size",
+        "padding",
+        "textSize"
       );
       if (colon.nodes.length === 0) {
         propertyName.append(FormattingOptions.oneSpace);
@@ -278,7 +281,7 @@ export class LikeC4Formatter extends AbstractFormatter {
     }
   }
   formatWhereExpressionV2(node) {
-    if (ast.isRelationPredicateOrWhereV2(node)) {
+    if (ast.isRelationPredicateOrWhereV2(node) || ast.isElementPredicateOrWhereV2(node)) {
       const formatter = this.getNodeFormatter(node);
       formatter.keyword("where").append(FormattingOptions.oneSpace);
     }

package/dist/generated/ast.d.ts

@@ -26,7 +26,7 @@ export declare const LikeC4Terminals: {
     Hex: RegExp;
 };
 export type LikeC4TerminalNames = keyof typeof LikeC4Terminals;
-export type LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diamond" | "dot" | "dotted" | "dynamic" | "dynamicPredicateGroup" | "element" | "element.kind" | "element.tag" | "exclude" | "extend" | "extends" | "false" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "likec4lib" | "line" | "link" | "metadata" | "mobile" | "model" | "multiple" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rectangle" | "red" | "relationship" | "secondary" | "shape" | "sky" | "slate" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "tag" | "tail" | "target" | "technology" | "title" | "true" | "vee" | "view" | "views" | "where" | "with" | "{" | "}";
+export type LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diamond" | "dot" | "dotted" | "dynamic" | "dynamicPredicateGroup" | "element" | "element.kind" | "element.tag" | "exclude" | "extend" | "extends" | "false" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "large" | "lg" | "likec4lib" | "line" | "link" | "md" | "medium" | "metadata" | "mobile" | "model" | "multiple" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "padding" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rectangle" | "red" | "relationship" | "secondary" | "shape" | "size" | "sky" | "slate" | "sm" | "small" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "tag" | "tail" | "target" | "technology" | "textSize" | "title" | "true" | "vee" | "view" | "views" | "where" | "with" | "xl" | "xlarge" | "xs" | "xsmall" | "{" | "}";
 export type LikeC4TokenNames = LikeC4TerminalNames | LikeC4KeywordNames;
 export type ArrowType = 'crow' | 'diamond' | 'dot' | 'none' | 'normal' | 'odiamond' | 'odot' | 'onormal' | 'open' | 'vee';
 export declare function isArrowType(item: unknown): item is ArrowType;
@@ -61,14 +61,20 @@ export declare function isElementPredicate(item: unknown): item is ElementPredic
 export type ElementPredicateOrWhere = ElementExpression | ElementPredicateWhere;
 export declare const ElementPredicateOrWhere = "ElementPredicateOrWhere";
 export declare function isElementPredicateOrWhere(item: unknown): item is ElementPredicateOrWhere;
+export type ElementPredicateOrWhereV2 = ElementPredicateWhereV2 | FqnExpr;
+export declare const ElementPredicateOrWhereV2 = "ElementPredicateOrWhereV2";
+export declare function isElementPredicateOrWhereV2(item: unknown): item is ElementPredicateOrWhereV2;
 export type ElementProperty = ElementStringProperty | ElementStyleProperty | IconProperty | LinkProperty | MetadataProperty;
 export declare const ElementProperty = "ElementProperty";
 export declare function isElementProperty(item: unknown): item is ElementProperty;
 export type ElementShape = 'browser' | 'cylinder' | 'mobile' | 'person' | 'queue' | 'rectangle' | 'storage';
 export declare function isElementShape(item: unknown): item is ElementShape;
-export type ExpressionV2 = FqnExpr | RelationPredicateOrWhereV2;
+export type ExpressionV2 = ElementPredicateOrWhereV2 | RelationPredicateOrWhereV2;
 export declare const ExpressionV2 = "ExpressionV2";
 export declare function isExpressionV2(item: unknown): item is ExpressionV2;
+export type ExtendElementProperty = LinkProperty | MetadataProperty;
+export declare const ExtendElementProperty = "ExtendElementProperty";
+export declare function isExtendElementProperty(item: unknown): item is ExtendElementProperty;
 export type FqnExpr = FqnRefExpr | WildcardExpression;
 export declare const FqnExpr = "FqnExpr";
 export declare function isFqnExpr(item: unknown): item is FqnExpr;
@@ -77,7 +83,7 @@ export declare const FqnReferenceable = "FqnReferenceable";
 export declare function isFqnReferenceable(item: unknown): item is FqnReferenceable;
 export type IconId = string;
 export declare function isIconId(item: unknown): item is IconId;
-export type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | Participant | ThemeColor | string;
+export type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | Participant | SizeValue | ThemeColor | string;
 export declare function isId(item: unknown): item is Id;
 export type LikeC4View = DeploymentView | DynamicView | ElementView;
 export declare const LikeC4View = "LikeC4View";
@@ -116,10 +122,15 @@ export declare function isRelationProperty(item: unknown): item is RelationPrope
 export type RelationshipStyleProperty = ArrowProperty | ColorProperty | LineProperty;
 export declare const RelationshipStyleProperty = "RelationshipStyleProperty";
 export declare function isRelationshipStyleProperty(item: unknown): item is RelationshipStyleProperty;
+export type SizeProperty = PaddingSizeProperty | ShapeSizeProperty | TextSizeProperty;
+export declare const SizeProperty = "SizeProperty";
+export declare function isSizeProperty(item: unknown): item is SizeProperty;
+export type SizeValue = 'large' | 'lg' | 'md' | 'medium' | 'sm' | 'small' | 'xl' | 'xlarge' | 'xs' | 'xsmall';
+export declare function isSizeValue(item: unknown): item is SizeValue;
 export type StringProperty = ElementStringProperty | MetadataAttribute | NotationProperty | NotesProperty | RelationStringProperty | SpecificationElementStringProperty | SpecificationRelationshipStringProperty | ViewStringProperty;
 export declare const StringProperty = "StringProperty";
 export declare function isStringProperty(item: unknown): item is StringProperty;
-export type StyleProperty = BorderProperty | ColorProperty | IconProperty | MultipleProperty | OpacityProperty | ShapeProperty;
+export type StyleProperty = BorderProperty | ColorProperty | IconProperty | MultipleProperty | OpacityProperty | PaddingSizeProperty | ShapeProperty | ShapeSizeProperty | TextSizeProperty;
 export declare const StyleProperty = "StyleProperty";
 export declare function isStyleProperty(item: unknown): item is StyleProperty;
 export type TagId = string;
@@ -455,6 +466,14 @@ export interface ElementPredicateWhere extends AstNode {
 }
 export declare const ElementPredicateWhere = "ElementPredicateWhere";
 export declare function isElementPredicateWhere(item: unknown): item is ElementPredicateWhere;
+export interface ElementPredicateWhereV2 extends AstNode {
+    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $type: 'ElementPredicateWhereV2';
+    subject: FqnExpr;
+    where?: WhereElementExpression;
+}
+export declare const ElementPredicateWhereV2 = "ElementPredicateWhereV2";
+export declare function isElementPredicateWhereV2(item: unknown): item is ElementPredicateWhereV2;
 export interface ElementPredicateWith extends AstNode {
     readonly $container: DynamicViewPredicateIterator | Predicates;
     readonly $type: 'ElementPredicateWith';
@@ -539,7 +558,7 @@ export interface ExtendElement extends AstNode {
     readonly $container: Model;
     readonly $type: 'ExtendElement';
     body: ExtendElementBody;
-    element: FqnElementRef;
+    element: StrictFqnElementRef;
 }
 export declare const ExtendElement = "ExtendElement";
 export declare function isExtendElement(item: unknown): item is ExtendElement;
@@ -547,17 +566,11 @@ export interface ExtendElementBody extends AstNode {
     readonly $container: ExtendElement;
     readonly $type: 'ExtendElementBody';
     elements: Array<Element | Relation>;
+    props: Array<ExtendElementProperty>;
+    tags?: Tags;
 }
 export declare const ExtendElementBody = "ExtendElementBody";
 export declare function isExtendElementBody(item: unknown): item is ExtendElementBody;
-export interface FqnElementRef extends AstNode {
-    readonly $container: ExtendElement | FqnElementRef;
-    readonly $type: 'FqnElementRef';
-    el: Reference<Element>;
-    parent?: FqnElementRef;
-}
-export declare const FqnElementRef = "FqnElementRef";
-export declare function isFqnElementRef(item: unknown): item is FqnElementRef;
 export interface FqnExpressions extends AstNode {
     readonly $container: DeploymentViewRuleStyle | FqnExpressions;
     readonly $type: 'FqnExpressions';
@@ -575,7 +588,7 @@ export interface FqnRef extends AstNode {
 export declare const FqnRef = "FqnRef";
 export declare 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;
@@ -709,7 +722,7 @@ export interface LineProperty extends AstNode {
 export declare const LineProperty = "LineProperty";
 export declare 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;
@@ -726,7 +739,7 @@ export interface MetadataAttribute extends AstNode {
 export declare const MetadataAttribute = "MetadataAttribute";
 export declare 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>;
 }
@@ -815,6 +828,14 @@ export interface OutgoingRelationExpression extends AstNode {
 }
 export declare const OutgoingRelationExpression = "OutgoingRelationExpression";
 export declare function isOutgoingRelationExpression(item: unknown): item is OutgoingRelationExpression;
+export interface PaddingSizeProperty extends AstNode {
+    readonly $container: CustomElementProperties | DeploymentViewRuleStyle | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
+    readonly $type: 'PaddingSizeProperty';
+    key: 'padding';
+    value: SizeValue;
+}
+export declare const PaddingSizeProperty = "PaddingSizeProperty";
+export declare function isPaddingSizeProperty(item: unknown): item is PaddingSizeProperty;
 export interface Predicates extends AstNode {
     readonly $container: ExcludePredicate | IncludePredicate | Predicates;
     readonly $type: 'Predicates';
@@ -907,6 +928,14 @@ export interface ShapeProperty extends AstNode {
 }
 export declare const ShapeProperty = "ShapeProperty";
 export declare function isShapeProperty(item: unknown): item is ShapeProperty;
+export interface ShapeSizeProperty extends AstNode {
+    readonly $container: CustomElementProperties | DeploymentViewRuleStyle | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
+    readonly $type: 'ShapeSizeProperty';
+    key: 'size';
+    value: SizeValue;
+}
+export declare const ShapeSizeProperty = "ShapeSizeProperty";
+export declare function isShapeSizeProperty(item: unknown): item is ShapeSizeProperty;
 export interface SpecificationColor extends AstNode {
     readonly $container: SpecificationRule;
     readonly $type: 'SpecificationColor';
@@ -974,6 +1003,14 @@ export interface SpecificationTag extends AstNode {
 }
 export declare const SpecificationTag = "SpecificationTag";
 export declare function isSpecificationTag(item: unknown): item is SpecificationTag;
+export interface StrictFqnElementRef extends AstNode {
+    readonly $container: ExtendElement | StrictFqnElementRef;
+    readonly $type: 'StrictFqnElementRef';
+    el: Reference<Element>;
+    parent?: StrictFqnElementRef;
+}
+export declare const StrictFqnElementRef = "StrictFqnElementRef";
+export declare function isStrictFqnElementRef(item: unknown): item is StrictFqnElementRef;
 export interface Tag extends AstNode {
     readonly $container: SpecificationTag;
     readonly $type: 'Tag';
@@ -982,13 +1019,21 @@ export interface Tag extends AstNode {
 export declare const Tag = "Tag";
 export declare 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>>;
 }
 export declare const Tags = "Tags";
 export declare function isTags(item: unknown): item is Tags;
+export interface TextSizeProperty extends AstNode {
+    readonly $container: CustomElementProperties | DeploymentViewRuleStyle | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
+    readonly $type: 'TextSizeProperty';
+    key: 'textSize';
+    value: SizeValue;
+}
+export declare const TextSizeProperty = "TextSizeProperty";
+export declare function isTextSizeProperty(item: unknown): item is TextSizeProperty;
 export interface ViewRef extends AstNode {
     readonly $container: NavigateToProperty;
     readonly $type: 'ViewRef';
@@ -1045,7 +1090,7 @@ export interface ViewStringProperty extends AstNode {
 export declare const ViewStringProperty = "ViewStringProperty";
 export declare function isViewStringProperty(item: unknown): item is ViewStringProperty;
 export interface WhereBinaryExpression extends AstNode {
-    readonly $container: ElementPredicateWhere | RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
+    readonly $container: ElementPredicateWhere | ElementPredicateWhereV2 | RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
     readonly $type: 'WhereBinaryExpression';
     left: WhereElementExpression | WhereRelationExpression;
     operator: 'and' | 'or';
@@ -1054,23 +1099,23 @@ export interface WhereBinaryExpression extends AstNode {
 export declare const WhereBinaryExpression = "WhereBinaryExpression";
 export declare function isWhereBinaryExpression(item: unknown): item is WhereBinaryExpression;
 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 declare const WhereElementKind = "WhereElementKind";
 export declare 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;
 }
 export declare const WhereElementNegation = "WhereElementNegation";
 export declare function isWhereElementNegation(item: unknown): item is WhereElementNegation;
 export interface WhereElementTag extends AstNode {
-    readonly $container: ElementPredicateWhere | WhereBinaryExpression | WhereElementNegation;
+    readonly $container: ElementPredicateWhere | ElementPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation;
     readonly $type: 'WhereElementTag';
     not: boolean;
     operator: 'is' | string;
@@ -1124,7 +1169,7 @@ export interface WhereRelationTag extends AstNode {
 export declare const WhereRelationTag = "WhereRelationTag";
 export declare 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;
 }
@@ -1172,7 +1217,9 @@ export type LikeC4AstType = {
     ElementKindExpression: ElementKindExpression;
     ElementPredicate: ElementPredicate;
     ElementPredicateOrWhere: ElementPredicateOrWhere;
+    ElementPredicateOrWhereV2: ElementPredicateOrWhereV2;
     ElementPredicateWhere: ElementPredicateWhere;
+    ElementPredicateWhereV2: ElementPredicateWhereV2;
     ElementPredicateWith: ElementPredicateWith;
     ElementProperty: ElementProperty;
     ElementRef: ElementRef;
@@ -1187,7 +1234,7 @@ export type LikeC4AstType = {
     ExpressionV2: ExpressionV2;
     ExtendElement: ExtendElement;
     ExtendElementBody: ExtendElementBody;
-    FqnElementRef: FqnElementRef;
+    ExtendElementProperty: ExtendElementProperty;
     FqnExpr: FqnExpr;
     FqnExpressions: FqnExpressions;
     FqnRef: FqnRef;
@@ -1224,6 +1271,7 @@ export type LikeC4AstType = {
     OpacityProperty: OpacityProperty;
     OutgoingRelationExpr: OutgoingRelationExpr;
     OutgoingRelationExpression: OutgoingRelationExpression;
+    PaddingSizeProperty: PaddingSizeProperty;
     Predicate: Predicate;
     Predicates: Predicates;
     Referenceable: Referenceable;
@@ -1244,6 +1292,8 @@ export type LikeC4AstType = {
     RelationshipKind: RelationshipKind;
     RelationshipStyleProperty: RelationshipStyleProperty;
     ShapeProperty: ShapeProperty;
+    ShapeSizeProperty: ShapeSizeProperty;
+    SizeProperty: SizeProperty;
     SpecificationColor: SpecificationColor;
     SpecificationDeploymentNodeKind: SpecificationDeploymentNodeKind;
     SpecificationElementKind: SpecificationElementKind;
@@ -1252,10 +1302,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;

package/dist/generated/ast.js

@@ -66,6 +66,10 @@ export const ElementPredicateOrWhere = "ElementPredicateOrWhere";
 export function isElementPredicateOrWhere(item) {
   return reflection.isInstance(item, ElementPredicateOrWhere);
 }
+export const ElementPredicateOrWhereV2 = "ElementPredicateOrWhereV2";
+export function isElementPredicateOrWhereV2(item) {
+  return reflection.isInstance(item, ElementPredicateOrWhereV2);
+}
 export const ElementProperty = "ElementProperty";
 export function isElementProperty(item) {
   return reflection.isInstance(item, ElementProperty);
@@ -77,6 +81,10 @@ export const ExpressionV2 = "ExpressionV2";
 export function isExpressionV2(item) {
   return reflection.isInstance(item, ExpressionV2);
 }
+export const ExtendElementProperty = "ExtendElementProperty";
+export function isExtendElementProperty(item) {
+  return reflection.isInstance(item, ExtendElementProperty);
+}
 export const FqnExpr = "FqnExpr";
 export function isFqnExpr(item) {
   return reflection.isInstance(item, FqnExpr);
@@ -89,7 +97,7 @@ export function isIconId(item) {
   return typeof item === "string" && /(aws|azure|gcp|tech):[-\w]*/.test(item);
 }
 export function isId(item) {
-  return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || isParticipant(item) || 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 const LikeC4View = "LikeC4View";
 export function isLikeC4View(item) {
@@ -141,6 +149,13 @@ export const RelationshipStyleProperty = "RelationshipStyleProperty";
 export function isRelationshipStyleProperty(item) {
   return reflection.isInstance(item, RelationshipStyleProperty);
 }
+export const SizeProperty = "SizeProperty";
+export function isSizeProperty(item) {
+  return reflection.isInstance(item, SizeProperty);
+}
+export function isSizeValue(item) {
+  return item === "xs" || item === "sm" || item === "md" || item === "lg" || item === "xl" || item === "xsmall" || item === "small" || item === "medium" || item === "large" || item === "xlarge";
+}
 export const StringProperty = "StringProperty";
 export function isStringProperty(item) {
   return reflection.isInstance(item, StringProperty);
@@ -345,6 +360,10 @@ export const ElementPredicateWhere = "ElementPredicateWhere";
 export function isElementPredicateWhere(item) {
   return reflection.isInstance(item, ElementPredicateWhere);
 }
+export const ElementPredicateWhereV2 = "ElementPredicateWhereV2";
+export function isElementPredicateWhereV2(item) {
+  return reflection.isInstance(item, ElementPredicateWhereV2);
+}
 export const ElementPredicateWith = "ElementPredicateWith";
 export function isElementPredicateWith(item) {
   return reflection.isInstance(item, ElementPredicateWith);
@@ -393,10 +412,6 @@ export const ExtendElementBody = "ExtendElementBody";
 export function isExtendElementBody(item) {
   return reflection.isInstance(item, ExtendElementBody);
 }
-export const FqnElementRef = "FqnElementRef";
-export function isFqnElementRef(item) {
-  return reflection.isInstance(item, FqnElementRef);
-}
 export const FqnExpressions = "FqnExpressions";
 export function isFqnExpressions(item) {
   return reflection.isInstance(item, FqnExpressions);
@@ -525,6 +540,10 @@ export const OutgoingRelationExpression = "OutgoingRelationExpression";
 export function isOutgoingRelationExpression(item) {
   return reflection.isInstance(item, OutgoingRelationExpression);
 }
+export const PaddingSizeProperty = "PaddingSizeProperty";
+export function isPaddingSizeProperty(item) {
+  return reflection.isInstance(item, PaddingSizeProperty);
+}
 export const Predicates = "Predicates";
 export function isPredicates(item) {
   return reflection.isInstance(item, Predicates);
@@ -569,6 +588,10 @@ export const ShapeProperty = "ShapeProperty";
 export function isShapeProperty(item) {
   return reflection.isInstance(item, ShapeProperty);
 }
+export const ShapeSizeProperty = "ShapeSizeProperty";
+export function isShapeSizeProperty(item) {
+  return reflection.isInstance(item, ShapeSizeProperty);
+}
 export const SpecificationColor = "SpecificationColor";
 export function isSpecificationColor(item) {
   return reflection.isInstance(item, SpecificationColor);
@@ -601,6 +624,10 @@ export const SpecificationTag = "SpecificationTag";
 export function isSpecificationTag(item) {
   return reflection.isInstance(item, SpecificationTag);
 }
+export const StrictFqnElementRef = "StrictFqnElementRef";
+export function isStrictFqnElementRef(item) {
+  return reflection.isInstance(item, StrictFqnElementRef);
+}
 export const Tag = "Tag";
 export function isTag(item) {
   return reflection.isInstance(item, Tag);
@@ -609,6 +636,10 @@ export const Tags = "Tags";
 export function isTags(item) {
   return reflection.isInstance(item, Tags);
 }
+export const TextSizeProperty = "TextSizeProperty";
+export function isTextSizeProperty(item) {
+  return reflection.isInstance(item, TextSizeProperty);
+}
 export const ViewRef = "ViewRef";
 export function isViewRef(item) {
   return reflection.isInstance(item, ViewRef);
@@ -679,7 +710,7 @@ export function isWildcardExpression(item) {
 }
 export class LikeC4AstReflection extends AbstractAstReflection {
   getAllTypes() {
-    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];
   }
   computeIsSubtype(subtype, supertype) {
     switch (subtype) {
@@ -751,6 +782,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);
       }
@@ -765,10 +804,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);
       }
@@ -776,7 +811,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:
@@ -789,7 +824,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: {
@@ -889,12 +929,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":
@@ -922,6 +961,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case "ViewRuleGlobalStyle:style": {
         return GlobalStyleId;
       }
+      case "WhereElementKind:value":
       case "WhereRelationParticipantKind:value": {
         return DeploymentNodeOrElementKind;
       }
@@ -1259,6 +1299,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case ElementPredicateWhereV2: {
+        return {
+          name: ElementPredicateWhereV2,
+          properties: [
+            { name: "subject" },
+            { name: "where" }
+          ]
+        };
+      }
       case ElementPredicateWith: {
         return {
           name: ElementPredicateWith,
@@ -1362,16 +1411,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" }
           ]
         };
       }
@@ -1665,6 +1707,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case PaddingSizeProperty: {
+        return {
+          name: PaddingSizeProperty,
+          properties: [
+            { name: "key" },
+            { name: "value" }
+          ]
+        };
+      }
       case Predicates: {
         return {
           name: Predicates,
@@ -1768,6 +1819,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case ShapeSizeProperty: {
+        return {
+          name: ShapeSizeProperty,
+          properties: [
+            { name: "key" },
+            { name: "value" }
+          ]
+        };
+      }
       case SpecificationColor: {
         return {
           name: SpecificationColor,
@@ -1843,6 +1903,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case StrictFqnElementRef: {
+        return {
+          name: StrictFqnElementRef,
+          properties: [
+            { name: "el" },
+            { name: "parent" }
+          ]
+        };
+      }
       case Tag: {
         return {
           name: Tag,
@@ -1860,6 +1929,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case TextSizeProperty: {
+        return {
+          name: TextSizeProperty,
+          properties: [
+            { name: "key" },
+            { name: "value" }
+          ]
+        };
+      }
       case ViewRef: {
         return {
           name: ViewRef,