@likec4/language-server 1.20.1 → 1.20.2

package/dist/formatting/LikeC4Formatter.d.ts

@@ -3,6 +3,7 @@ import { AbstractFormatter } from 'langium/lsp';
 export declare class LikeC4Formatter extends AbstractFormatter {
     protected format(node: AstNode): void;
     protected formatTags(node: AstNode): void;
+    protected formatDeploymentRelation(node: AstNode): void;
     protected formatRelation(node: AstNode): void;
     protected removeIndentFromTopLevelStatements(node: AstNode): void;
     protected indentContentInBraces(node: AstNode): void;
@@ -17,11 +18,19 @@ export declare class LikeC4Formatter extends AbstractFormatter {
     protected formatGlobals(node: AstNode): void;
     protected formatSpecificationRule(node: AstNode): void;
     protected formatWithPredicate(node: AstNode): void;
+    protected formatDeploymentNodeDeclaration(node: AstNode): void;
+    protected formatDeployedInstance(node: AstNode): void;
     protected formatViewRuleGlobalStyle(node: AstNode): void;
+    protected formatViewRuleGlobalPredicate(node: AstNode): void;
     protected formatViewRuleGroup(node: AstNode): void;
     protected formatViewRuleStyle(node: AstNode): void;
     protected formatWhereExpression(node: AstNode): void;
+    protected formatWhereExpressionV2(node: AstNode): void;
+    protected formatWhereRelationExpression(node: AstNode): void;
+    protected formatWhereElementExpression(node: AstNode): void;
     protected formatIncludeExcludeExpressions(node: AstNode): void;
+    protected formatRelationExpression(node: AstNode): void;
+    protected formatDeploymentViewRulePredicateExpressions(node: AstNode): void;
     private findPredicateExpressionRoot;
     private on;
 }

package/dist/formatting/LikeC4Formatter.js

@@ -19,11 +19,20 @@ export class LikeC4Formatter extends AbstractFormatter {
     this.formatElementDeclaration(node);
     this.formatRelation(node);
     this.formatMetadataProperty(node);
+    this.formatDeploymentNodeDeclaration(node);
+    this.formatDeployedInstance(node);
+    this.formatDeploymentRelation(node);
     this.formatView(node);
     this.formatViewRuleGroup(node);
     this.formatViewRuleGlobalStyle(node);
+    this.formatViewRuleGlobalPredicate(node);
     this.formatIncludeExcludeExpressions(node);
+    this.formatDeploymentViewRulePredicateExpressions(node);
     this.formatWhereExpression(node);
+    this.formatWhereExpressionV2(node);
+    this.formatWhereRelationExpression(node);
+    this.formatWhereElementExpression(node);
+    this.formatRelationExpression(node);
     this.formatAutolayoutProperty(node);
     this.formatWithPredicate(node);
     this.formatViewRuleStyle(node);
@@ -38,6 +47,19 @@ export class LikeC4Formatter extends AbstractFormatter {
       f.keywords(",").prepend(FormattingOptions.noSpace).append(FormattingOptions.oneSpace);
     });
   }
+  formatDeploymentRelation(node) {
+    this.on(node, ast.isDeploymentRelation, (n, f) => {
+      const sourceNodes = n?.source?.$cstNode ? [n?.source?.$cstNode] : [];
+      f.cst(sourceNodes).append(FormattingOptions.oneSpace);
+      f.keywords("]->").prepend(FormattingOptions.noSpace);
+      f.keywords("-[").append(FormattingOptions.noSpace);
+      f.nodes(...filter([
+        n.target,
+        n.tags
+      ], isTruthy)).prepend(FormattingOptions.oneSpace);
+      f.properties("title", "technology").prepend(FormattingOptions.oneSpace);
+    });
+  }
   formatRelation(node) {
     this.on(node, ast.isRelation, (n, f) => {
       const sourceNodes = n?.source?.$cstNode ? [n?.source?.$cstNode] : [];
@@ -68,13 +90,13 @@ export class LikeC4Formatter extends AbstractFormatter {
     this.on(node, ast.isInOutRelationExpression)?.keyword("->").prepend(FormattingOptions.oneSpace);
   }
   removeIndentFromTopLevelStatements(node) {
-    if (ast.isModel(node) || ast.isSpecificationRule(node) || ast.isModelViews(node) || ast.isLikeC4Lib(node) || ast.isGlobals(node)) {
+    if (ast.isModel(node) || ast.isSpecificationRule(node) || ast.isModelViews(node) || ast.isLikeC4Lib(node) || ast.isGlobals(node) || ast.isModelDeployments(node)) {
       const formatter = this.getNodeFormatter(node);
-      formatter.keywords("specification", "model", "views", "likec4lib", "global").prepend(FormattingOptions.noIndent);
+      formatter.keywords("specification", "model", "views", "likec4lib", "global", "deployments").prepend(FormattingOptions.noIndent);
     }
   }
   indentContentInBraces(node) {
-    if (ast.isLikeC4Lib(node) || ast.isSpecificationRule(node) || ast.isSpecificationElementKind(node) || ast.isSpecificationRelationshipKind(node) || ast.isGlobals(node) || ast.isGlobalStyle(node) || ast.isGlobalStyleGroup(node) || ast.isModel(node) || ast.isElementBody(node) || ast.isExtendElementBody(node) || ast.isRelationBody(node) || ast.isRelationStyleProperty(node) || ast.isMetadataBody(node) || ast.isModelViews(node) || ast.isElementViewBody(node) || ast.isDynamicViewBody(node) || ast.isViewRuleStyle(node) || ast.isViewRuleGroup(node) || ast.isCustomElementProperties(node) || ast.isCustomRelationProperties(node) || ast.isElementStyleProperty(node) || ast.isDynamicViewParallelSteps(node)) {
+    if (ast.isLikeC4Lib(node) || ast.isSpecificationRule(node) || ast.isSpecificationElementKind(node) || ast.isSpecificationRelationshipKind(node) || ast.isSpecificationDeploymentNodeKind(node) || ast.isGlobals(node) || ast.isGlobalStyle(node) || ast.isGlobalStyleGroup(node) || ast.isGlobalPredicateGroup(node) || ast.isGlobalDynamicPredicateGroup(node) || ast.isGlobalStyleGroup(node) || ast.isModel(node) || ast.isElementBody(node) || ast.isExtendElementBody(node) || ast.isRelationBody(node) || ast.isRelationStyleProperty(node) || ast.isMetadataBody(node) || ast.isModelViews(node) || ast.isElementViewBody(node) || ast.isDynamicViewBody(node) || ast.isDeploymentViewBody(node) || ast.isViewRuleStyle(node) || ast.isViewRuleGroup(node) || ast.isCustomElementProperties(node) || ast.isCustomRelationProperties(node) || ast.isElementStyleProperty(node) || ast.isDynamicViewParallelSteps(node) || ast.isModelDeployments(node) || ast.isDeploymentNodeBody(node) || ast.isDeploymentRelationBody(node) || ast.isDeployedInstanceBody(node)) {
       const formatter = this.getNodeFormatter(node);
       const openBrace = formatter.keywords("{");
       const closeBrace = formatter.keywords("}");
@@ -101,9 +123,10 @@ export class LikeC4Formatter extends AbstractFormatter {
       f.keywords("of", "extends").surround(FormattingOptions.oneSpace);
     });
     this.on(node, ast.isDynamicView)?.keywords("dynamic", "view").append(FormattingOptions.oneSpace);
+    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)) {
+    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)) {
       const formatter = this.getNodeFormatter(node);
       const colon = formatter.keyword(":");
       const propertyName = formatter.keywords(
@@ -118,7 +141,8 @@ export class LikeC4Formatter extends AbstractFormatter {
         "icon",
         "shape",
         "border",
-        "opacity"
+        "opacity",
+        "multiple"
       );
       if (colon.nodes.length === 0) {
         propertyName.append(FormattingOptions.oneSpace);
@@ -176,11 +200,17 @@ export class LikeC4Formatter extends AbstractFormatter {
     this.on(node, ast.isGlobalStyleGroup, (n, f) => {
       f.keyword("styleGroup").append(FormattingOptions.oneSpace);
     });
+    this.on(node, ast.isGlobalPredicateGroup, (n, f) => {
+      f.keyword("predicateGroup").append(FormattingOptions.oneSpace);
+    });
+    this.on(node, ast.isGlobalDynamicPredicateGroup, (n, f) => {
+      f.keyword("dynamicPredicateGroup").append(FormattingOptions.oneSpace);
+    });
   }
   formatSpecificationRule(node) {
-    if (ast.isSpecificationElementKind(node) || ast.isSpecificationRelationshipKind(node) || ast.isSpecificationTag(node)) {
+    if (ast.isSpecificationElementKind(node) || ast.isSpecificationRelationshipKind(node) || ast.isSpecificationTag(node) || ast.isSpecificationDeploymentNodeKind(node)) {
       const formatter = this.getNodeFormatter(node);
-      formatter.keywords("element", "relationship", "tag").append(FormattingOptions.oneSpace);
+      formatter.keywords("element", "relationship", "tag", "deploymentNode").append(FormattingOptions.oneSpace);
     }
     if (ast.isSpecificationColor(node)) {
       const formatter = this.getNodeFormatter(node);
@@ -194,11 +224,42 @@ export class LikeC4Formatter extends AbstractFormatter {
       formatter.keyword("with").prepend(FormattingOptions.oneSpace);
     }
   }
+  formatDeploymentNodeDeclaration(node) {
+    this.on(node, ast.isDeploymentNode, (n, f) => {
+      const kind = GrammarUtils.findNodeForProperty(n.$cstNode, "kind");
+      const name = GrammarUtils.findNodeForProperty(n.$cstNode, "name");
+      if (name && kind) {
+        if (utils.compareRanges(name, kind) > 0) {
+          f.cst([kind]).append(FormattingOptions.oneSpace);
+        } else {
+          f.cst([name]).append(FormattingOptions.oneSpace);
+          f.cst([kind]).prepend(FormattingOptions.oneSpace);
+        }
+      }
+      f.properties("title").prepend(FormattingOptions.oneSpace);
+    });
+  }
+  formatDeployedInstance(node) {
+    this.on(node, ast.isDeployedInstance, (n, f) => {
+      const eqNode = n.$cstNode?.content.find((c) => c.text === "=");
+      if (eqNode) {
+        f.cst([eqNode]).surround(FormattingOptions.oneSpace);
+      }
+      f.keyword("instanceOf").append(FormattingOptions.oneSpace);
+      f.property("title").prepend(FormattingOptions.oneSpace);
+    });
+  }
   formatViewRuleGlobalStyle(node) {
     this.on(node, ast.isViewRuleGlobalStyle, (n, f) => {
       f.keywords("global", "style").append(FormattingOptions.oneSpace);
     });
   }
+  formatViewRuleGlobalPredicate(node) {
+    const formatter = this.getNodeFormatter(node);
+    if (ast.isViewRuleGlobalPredicateRef(node) || ast.isDynamicViewGlobalPredicateRef(node)) {
+      formatter.keywords("global", "predicate").append(FormattingOptions.oneSpace);
+    }
+  }
   formatViewRuleGroup(node) {
     this.on(node, ast.isViewRuleGroup, (n, f) => {
       f.keyword("group").append(FormattingOptions.oneSpace);
@@ -206,29 +267,50 @@ export class LikeC4Formatter extends AbstractFormatter {
   }
   formatViewRuleStyle(node) {
     this.on(node, ast.isViewRuleStyle)?.keyword("style").append(FormattingOptions.oneSpace);
+    this.on(node, ast.isDeploymentViewRuleStyle)?.keyword("style").append(FormattingOptions.oneSpace);
     this.on(node, ast.isElementExpressionsIterator)?.keyword(",").prepend(FormattingOptions.noSpace).append(FormattingOptions.oneSpace);
+    this.on(node, ast.isFqnExpressions)?.keyword(",").prepend(FormattingOptions.noSpace).append(FormattingOptions.oneSpace);
   }
   formatWhereExpression(node) {
     if (ast.isRelationPredicateOrWhere(node) || ast.isElementPredicateOrWhere(node)) {
       const formatter = this.getNodeFormatter(node);
       formatter.keyword("where").append(FormattingOptions.oneSpace);
     }
-    if (ast.isWhereRelationExpression(node) || ast.isWhereElementExpression(node)) {
+  }
+  formatWhereExpressionV2(node) {
+    if (ast.isRelationPredicateOrWhereV2(node)) {
       const formatter = this.getNodeFormatter(node);
-      formatter.property("operator").surround(FormattingOptions.oneSpace);
+      formatter.keyword("where").append(FormattingOptions.oneSpace);
     }
-    if (ast.isWhereElementNegation(node) || ast.isWhereRelationNegation(node)) {
+  }
+  formatWhereRelationExpression(node) {
+    this.on(node, ast.isWhereRelationExpression, (n, f) => {
+      f.property("operator").surround(FormattingOptions.oneSpace);
+    });
+    this.on(node, ast.isWhereRelationNegation, (n, f) => {
+      f.keyword("not").append(FormattingOptions.oneSpace);
+    });
+    if (ast.isWhereRelation(node) || ast.isWhereRelationTag(node) || ast.isWhereRelationKind(node)) {
       const formatter = this.getNodeFormatter(node);
-      formatter.keyword("not").append(FormattingOptions.oneSpace);
+      formatter.property("operator").surround(FormattingOptions.oneSpace);
+      formatter.property("not").surround(FormattingOptions.oneSpace);
     }
-    if (ast.isWhereElement(node) || ast.isWhereElementTag(node) || ast.isWhereElementKind(node) || ast.isWhereRelation(node) || ast.isWhereRelationTag(node) || ast.isWhereRelationKind(node)) {
+  }
+  formatWhereElementExpression(node) {
+    this.on(node, ast.isWhereElementExpression, (n, f) => {
+      f.property("operator").surround(FormattingOptions.oneSpace);
+    });
+    this.on(node, ast.isWhereElementNegation, (n, f) => {
+      f.keyword("not").append(FormattingOptions.oneSpace);
+    });
+    if (ast.isWhereElement(node) || ast.isWhereElementTag(node) || ast.isWhereElementKind(node)) {
       const formatter = this.getNodeFormatter(node);
       formatter.property("operator").surround(FormattingOptions.oneSpace);
       formatter.property("not").surround(FormattingOptions.oneSpace);
     }
   }
   formatIncludeExcludeExpressions(node) {
-    if (ast.isDynamicViewRule(node) || ast.isIncludePredicate(node) || ast.isExcludePredicate(node)) {
+    if (ast.isDynamicViewRule(node) || ast.isIncludePredicate(node) || ast.isExcludePredicate(node) || ast.isDeploymentViewRulePredicate(node)) {
       const formatter = this.getNodeFormatter(node);
       if (!node.$cstNode || !utils.isMultiline(node.$cstNode)) {
         formatter.keywords("include", "exclude").append(FormattingOptions.oneSpace);
@@ -244,10 +326,45 @@ export class LikeC4Formatter extends AbstractFormatter {
       formatter.keyword(",").prepend(FormattingOptions.noSpace).append(isMultiline ? FormattingOptions.newLine : FormattingOptions.oneSpace);
     }
   }
+  formatRelationExpression(node) {
+    this.on(node, ast.isIncomingRelationExpr, (n, f) => {
+      f.keyword("->").append(FormattingOptions.oneSpace);
+    });
+    this.on(node, ast.isInOutRelationExpr, (n, f) => {
+      f.keyword("->").prepend(FormattingOptions.oneSpace);
+    });
+    this.on(node, ast.isOutgoingRelationExpr, (n, f) => {
+      f.keywords("->", "<->").prepend(FormattingOptions.oneSpace);
+      f.keywords("-[").prepend(FormattingOptions.oneSpace).append(FormattingOptions.noSpace);
+      f.keywords("]->").prepend(FormattingOptions.noSpace).append(FormattingOptions.oneSpace);
+      const kind = f.property("kind");
+      kind.nodes[0]?.text.startsWith(".") && kind.surround(FormattingOptions.oneSpace);
+    });
+    this.on(node, ast.isDirectedRelationExpr, (n, f) => {
+      f.property("target").prepend(FormattingOptions.oneSpace);
+    });
+  }
+  formatDeploymentViewRulePredicateExpressions(node) {
+    if (ast.isDynamicViewRule(node) || ast.isIncludePredicate(node) || ast.isExcludePredicate(node) || ast.isDeploymentViewRulePredicate(node)) {
+      const formatter = this.getNodeFormatter(node);
+      if (!node.$cstNode || !utils.isMultiline(node.$cstNode)) {
+        formatter.keywords("include", "exclude").append(FormattingOptions.oneSpace);
+      }
+    }
+    if (ast.isDeploymentViewRulePredicateExpression(node)) {
+      const formatter = this.getNodeFormatter(node);
+      const parent = this.findPredicateExpressionRoot(node);
+      const isMultiline = parent?.$cstNode && utils.isMultiline(parent?.$cstNode);
+      if (isMultiline) {
+        formatter.property("value").prepend(FormattingOptions.indent);
+      }
+      formatter.keyword(",").prepend(FormattingOptions.noSpace).append(isMultiline ? FormattingOptions.newLine : FormattingOptions.oneSpace);
+    }
+  }
   findPredicateExpressionRoot(node) {
     let parent = node.$container;
     while (true) {
-      if (!parent || ast.isDynamicViewRule(parent) || ast.isIncludePredicate(parent) || ast.isExcludePredicate(parent)) {
+      if (!parent || ast.isDynamicViewRule(parent) || ast.isIncludePredicate(parent) || ast.isExcludePredicate(parent) || ast.isDeploymentViewRulePredicate(parent)) {
         return parent;
       }
       parent = parent.$container;

package/dist/generated/ast.d.ts

@@ -26,10 +26,12 @@ export declare const LikeC4Terminals: {
     Hex: RegExp;
 };
 export type LikeC4TerminalNames = keyof typeof LikeC4Terminals;
-export type LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diamond" | "dot" | "dotted" | "dynamic" | "dynamicPredicateGroup" | "element" | "element.kind" | "element.tag" | "exclude" | "extend" | "extends" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "likec4lib" | "line" | "link" | "metadata" | "mobile" | "model" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rectangle" | "red" | "relationship" | "secondary" | "shape" | "sky" | "slate" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "tag" | "tail" | "target" | "technology" | "title" | "vee" | "view" | "views" | "where" | "with" | "{" | "}";
+export type LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diamond" | "dot" | "dotted" | "dynamic" | "dynamicPredicateGroup" | "element" | "element.kind" | "element.tag" | "exclude" | "extend" | "extends" | "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 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;
+export type Boolean = boolean;
+export declare function isBoolean(item: unknown): item is Boolean;
 export type BorderStyleValue = 'none' | LineOptions;
 export declare function isBorderStyleValue(item: unknown): item is BorderStyleValue;
 export type CustomColorId = 'element' | 'model' | ArrowType | ElementShape | LineOptions | string;
@@ -117,7 +119,7 @@ export declare function isRelationshipStyleProperty(item: unknown): item is Rela
 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 | OpacityProperty | ShapeProperty;
+export type StyleProperty = BorderProperty | ColorProperty | IconProperty | MultipleProperty | OpacityProperty | ShapeProperty;
 export declare const StyleProperty = "StyleProperty";
 export declare function isStyleProperty(item: unknown): item is StyleProperty;
 export type TagId = string;
@@ -755,6 +757,14 @@ export interface ModelViews extends AstNode {
 }
 export declare const ModelViews = "ModelViews";
 export declare function isModelViews(item: unknown): item is ModelViews;
+export interface MultipleProperty extends AstNode {
+    readonly $container: CustomElementProperties | DeploymentViewRuleStyle | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
+    readonly $type: 'MultipleProperty';
+    key: 'multiple';
+    value: Boolean;
+}
+export declare const MultipleProperty = "MultipleProperty";
+export declare function isMultipleProperty(item: unknown): item is MultipleProperty;
 export interface NavigateToProperty extends AstNode {
     readonly $container: CustomElementProperties;
     readonly $type: 'NavigateToProperty';
@@ -1207,6 +1217,7 @@ export type LikeC4AstType = {
     Model: Model;
     ModelDeployments: ModelDeployments;
     ModelViews: ModelViews;
+    MultipleProperty: MultipleProperty;
     NavigateToProperty: NavigateToProperty;
     NotationProperty: NotationProperty;
     NotesProperty: NotesProperty;

package/dist/generated/ast.js

@@ -23,6 +23,9 @@ export const LikeC4Terminals = {
 export function isArrowType(item) {
   return item === "none" || item === "normal" || item === "onormal" || item === "dot" || item === "odot" || item === "diamond" || item === "odiamond" || item === "crow" || item === "open" || item === "vee";
 }
+export function isBoolean(item) {
+  return typeof item === "boolean";
+}
 export function isBorderStyleValue(item) {
   return isLineOptions(item) || item === "none";
 }
@@ -494,6 +497,10 @@ export const ModelViews = "ModelViews";
 export function isModelViews(item) {
   return reflection.isInstance(item, ModelViews);
 }
+export const MultipleProperty = "MultipleProperty";
+export function isMultipleProperty(item) {
+  return reflection.isInstance(item, MultipleProperty);
+}
 export const NavigateToProperty = "NavigateToProperty";
 export function isNavigateToProperty(item) {
   return reflection.isInstance(item, NavigateToProperty);
@@ -672,7 +679,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, 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, 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];
   }
   computeIsSubtype(subtype, supertype) {
     switch (subtype) {
@@ -681,6 +688,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
         return this.isSubtype(RelationshipStyleProperty, supertype);
       }
       case BorderProperty:
+      case MultipleProperty:
       case OpacityProperty:
       case ShapeProperty: {
         return this.isSubtype(StyleProperty, supertype);
@@ -1592,6 +1600,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case MultipleProperty: {
+        return {
+          name: MultipleProperty,
+          properties: [
+            { name: "key" },
+            { name: "value" }
+          ]
+        };
+      }
       case NavigateToProperty: {
         return {
           name: NavigateToProperty,