@likec4/language-server 1.27.3 → 1.28.0

package/dist/generated/ast.js

@@ -5,7 +5,7 @@ export const LikeC4Terminals = {
   WS: /[\t ]+/,
   NL: /[\r\n]+/,
   LIB_ICON: /(aws|azure|gcp|tech):[-\w]*/,
-  URI_WITH_SCHEMA: /\w+:\/\/\S+/,
+  URI_WITH_SCHEMA: /\w+:\/{2}\S+/,
   URI_RELATIVE: /\.{0,2}\/[^\/]\S+/,
   DotUnderscore: /\b\._(?![_a-zA-Z])/,
   DotWildcard: /\b\.\*{1,2}/,
@@ -54,22 +54,6 @@ export const DynamicViewRule = "DynamicViewRule";
 export function isDynamicViewRule(item) {
   return reflection.isInstance(item, DynamicViewRule);
 }
-export const ElementExpression = "ElementExpression";
-export function isElementExpression(item) {
-  return reflection.isInstance(item, ElementExpression);
-}
-export const ElementPredicate = "ElementPredicate";
-export function isElementPredicate(item) {
-  return reflection.isInstance(item, ElementPredicate);
-}
-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);
@@ -89,6 +73,14 @@ export const FqnExpr = "FqnExpr";
 export function isFqnExpr(item) {
   return reflection.isInstance(item, FqnExpr);
 }
+export const FqnExprOrWhere = "FqnExprOrWhere";
+export function isFqnExprOrWhere(item) {
+  return reflection.isInstance(item, FqnExprOrWhere);
+}
+export const FqnExprOrWith = "FqnExprOrWith";
+export function isFqnExprOrWith(item) {
+  return reflection.isInstance(item, FqnExprOrWith);
+}
 export const FqnReferenceable = "FqnReferenceable";
 export function isFqnReferenceable(item) {
   return reflection.isInstance(item, FqnReferenceable);
@@ -110,13 +102,13 @@ export const MetadataProperty = "MetadataProperty";
 export function isMetadataProperty(item) {
   return reflection.isInstance(item, MetadataProperty);
 }
+export const ModelReferenceable = "ModelReferenceable";
+export function isModelReferenceable(item) {
+  return reflection.isInstance(item, ModelReferenceable);
+}
 export function isParticipant(item) {
   return item === "source" || item === "target";
 }
-export const Predicate = "Predicate";
-export function isPredicate(item) {
-  return reflection.isInstance(item, Predicate);
-}
 export const Referenceable = "Referenceable";
 export function isReferenceable(item) {
   return reflection.isInstance(item, Referenceable);
@@ -125,21 +117,13 @@ export const RelationExpr = "RelationExpr";
 export function isRelationExpr(item) {
   return reflection.isInstance(item, RelationExpr);
 }
-export const RelationExpression = "RelationExpression";
-export function isRelationExpression(item) {
-  return reflection.isInstance(item, RelationExpression);
-}
-export const RelationPredicate = "RelationPredicate";
-export function isRelationPredicate(item) {
-  return reflection.isInstance(item, RelationPredicate);
-}
-export const RelationPredicateOrWhere = "RelationPredicateOrWhere";
-export function isRelationPredicateOrWhere(item) {
-  return reflection.isInstance(item, RelationPredicateOrWhere);
+export const RelationExprOrWhere = "RelationExprOrWhere";
+export function isRelationExprOrWhere(item) {
+  return reflection.isInstance(item, RelationExprOrWhere);
 }
-export const RelationPredicateOrWhereV2 = "RelationPredicateOrWhereV2";
-export function isRelationPredicateOrWhereV2(item) {
-  return reflection.isInstance(item, RelationPredicateOrWhereV2);
+export const RelationExprOrWith = "RelationExprOrWith";
+export function isRelationExprOrWith(item) {
+  return reflection.isInstance(item, RelationExprOrWith);
 }
 export const RelationProperty = "RelationProperty";
 export function isRelationProperty(item) {
@@ -171,7 +155,7 @@ export function isThemeColor(item) {
   return item === "primary" || item === "secondary" || item === "muted" || item === "slate" || item === "blue" || item === "indigo" || item === "sky" || item === "red" || item === "gray" || item === "green" || item === "amber";
 }
 export function isUri(item) {
-  return typeof item === "string" && (/\w+:\/\/\S+/.test(item) || /\.{0,2}\/[^\/]\S+/.test(item));
+  return typeof item === "string" && (/\w+:\/{2}\S+/.test(item) || /\.{0,2}\/[^\/]\S+/.test(item));
 }
 export function isViewLayoutDirection(item) {
   return item === "TopBottom" || item === "LeftRight" || item === "BottomTop" || item === "RightLeft";
@@ -184,10 +168,6 @@ export const ViewRule = "ViewRule";
 export function isViewRule(item) {
   return reflection.isInstance(item, ViewRule);
 }
-export const ViewRulePredicate = "ViewRulePredicate";
-export function isViewRulePredicate(item) {
-  return reflection.isInstance(item, ViewRulePredicate);
-}
 export const ViewRuleStyleOrGlobalRef = "ViewRuleStyleOrGlobalRef";
 export function isViewRuleStyleOrGlobalRef(item) {
   return reflection.isInstance(item, ViewRuleStyleOrGlobalRef);
@@ -284,10 +264,6 @@ export const DeploymentViewRulePredicate = "DeploymentViewRulePredicate";
 export function isDeploymentViewRulePredicate(item) {
   return reflection.isInstance(item, DeploymentViewRulePredicate);
 }
-export const DeploymentViewRulePredicateExpression = "DeploymentViewRulePredicateExpression";
-export function isDeploymentViewRulePredicateExpression(item) {
-  return reflection.isInstance(item, DeploymentViewRulePredicateExpression);
-}
 export const DeploymentViewRuleStyle = "DeploymentViewRuleStyle";
 export function isDeploymentViewRuleStyle(item) {
   return reflection.isInstance(item, DeploymentViewRuleStyle);
@@ -296,10 +272,6 @@ export const DirectedRelationExpr = "DirectedRelationExpr";
 export function isDirectedRelationExpr(item) {
   return reflection.isInstance(item, DirectedRelationExpr);
 }
-export const DirectedRelationExpression = "DirectedRelationExpression";
-export function isDirectedRelationExpression(item) {
-  return reflection.isInstance(item, DirectedRelationExpression);
-}
 export const DynamicView = "DynamicView";
 export function isDynamicView(item) {
   return reflection.isInstance(item, DynamicView);
@@ -320,10 +292,6 @@ export const DynamicViewParallelSteps = "DynamicViewParallelSteps";
 export function isDynamicViewParallelSteps(item) {
   return reflection.isInstance(item, DynamicViewParallelSteps);
 }
-export const DynamicViewPredicateIterator = "DynamicViewPredicateIterator";
-export function isDynamicViewPredicateIterator(item) {
-  return reflection.isInstance(item, DynamicViewPredicateIterator);
-}
 export const DynamicViewRef = "DynamicViewRef";
 export function isDynamicViewRef(item) {
   return reflection.isInstance(item, DynamicViewRef);
@@ -340,14 +308,6 @@ export const ElementBody = "ElementBody";
 export function isElementBody(item) {
   return reflection.isInstance(item, ElementBody);
 }
-export const ElementDescedantsExpression = "ElementDescedantsExpression";
-export function isElementDescedantsExpression(item) {
-  return reflection.isInstance(item, ElementDescedantsExpression);
-}
-export const ElementExpressionsIterator = "ElementExpressionsIterator";
-export function isElementExpressionsIterator(item) {
-  return reflection.isInstance(item, ElementExpressionsIterator);
-}
 export const ElementKind = "ElementKind";
 export function isElementKind(item) {
   return reflection.isInstance(item, ElementKind);
@@ -356,18 +316,6 @@ export const ElementKindExpression = "ElementKindExpression";
 export function isElementKindExpression(item) {
   return reflection.isInstance(item, ElementKindExpression);
 }
-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);
-}
 export const ElementRef = "ElementRef";
 export function isElementRef(item) {
   return reflection.isInstance(item, ElementRef);
@@ -396,13 +344,9 @@ export const ElementViewRef = "ElementViewRef";
 export function isElementViewRef(item) {
   return reflection.isInstance(item, ElementViewRef);
 }
-export const ExcludePredicate = "ExcludePredicate";
-export function isExcludePredicate(item) {
-  return reflection.isInstance(item, ExcludePredicate);
-}
-export const ExpandElementExpression = "ExpandElementExpression";
-export function isExpandElementExpression(item) {
-  return reflection.isInstance(item, ExpandElementExpression);
+export const Expressions = "Expressions";
+export function isExpressions(item) {
+  return reflection.isInstance(item, Expressions);
 }
 export const ExtendDeployment = "ExtendDeployment";
 export function isExtendDeployment(item) {
@@ -424,6 +368,14 @@ export const FqnExpressions = "FqnExpressions";
 export function isFqnExpressions(item) {
   return reflection.isInstance(item, FqnExpressions);
 }
+export const FqnExprWhere = "FqnExprWhere";
+export function isFqnExprWhere(item) {
+  return reflection.isInstance(item, FqnExprWhere);
+}
+export const FqnExprWith = "FqnExprWith";
+export function isFqnExprWith(item) {
+  return reflection.isInstance(item, FqnExprWith);
+}
 export const FqnRef = "FqnRef";
 export function isFqnRef(item) {
   return reflection.isInstance(item, FqnRef);
@@ -460,26 +412,22 @@ export const IconProperty = "IconProperty";
 export function isIconProperty(item) {
   return reflection.isInstance(item, IconProperty);
 }
-export const IncludePredicate = "IncludePredicate";
-export function isIncludePredicate(item) {
-  return reflection.isInstance(item, IncludePredicate);
+export const Imported = "Imported";
+export function isImported(item) {
+  return reflection.isInstance(item, Imported);
+}
+export const ImportsFromPoject = "ImportsFromPoject";
+export function isImportsFromPoject(item) {
+  return reflection.isInstance(item, ImportsFromPoject);
 }
 export const IncomingRelationExpr = "IncomingRelationExpr";
 export function isIncomingRelationExpr(item) {
   return reflection.isInstance(item, IncomingRelationExpr);
 }
-export const IncomingRelationExpression = "IncomingRelationExpression";
-export function isIncomingRelationExpression(item) {
-  return reflection.isInstance(item, IncomingRelationExpression);
-}
 export const InOutRelationExpr = "InOutRelationExpr";
 export function isInOutRelationExpr(item) {
   return reflection.isInstance(item, InOutRelationExpr);
 }
-export const InOutRelationExpression = "InOutRelationExpression";
-export function isInOutRelationExpression(item) {
-  return reflection.isInstance(item, InOutRelationExpression);
-}
 export const LibIcon = "LibIcon";
 export function isLibIcon(item) {
   return reflection.isInstance(item, LibIcon);
@@ -544,18 +492,10 @@ export const OutgoingRelationExpr = "OutgoingRelationExpr";
 export function isOutgoingRelationExpr(item) {
   return reflection.isInstance(item, OutgoingRelationExpr);
 }
-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);
-}
 export const Relation = "Relation";
 export function isRelation(item) {
   return reflection.isInstance(item, Relation);
@@ -564,22 +504,18 @@ export const RelationBody = "RelationBody";
 export function isRelationBody(item) {
   return reflection.isInstance(item, RelationBody);
 }
+export const RelationExprWhere = "RelationExprWhere";
+export function isRelationExprWhere(item) {
+  return reflection.isInstance(item, RelationExprWhere);
+}
+export const RelationExprWith = "RelationExprWith";
+export function isRelationExprWith(item) {
+  return reflection.isInstance(item, RelationExprWith);
+}
 export const RelationNavigateToProperty = "RelationNavigateToProperty";
 export function isRelationNavigateToProperty(item) {
   return reflection.isInstance(item, RelationNavigateToProperty);
 }
-export const RelationPredicateWhere = "RelationPredicateWhere";
-export function isRelationPredicateWhere(item) {
-  return reflection.isInstance(item, RelationPredicateWhere);
-}
-export const RelationPredicateWhereV2 = "RelationPredicateWhereV2";
-export function isRelationPredicateWhereV2(item) {
-  return reflection.isInstance(item, RelationPredicateWhereV2);
-}
-export const RelationPredicateWith = "RelationPredicateWith";
-export function isRelationPredicateWith(item) {
-  return reflection.isInstance(item, RelationPredicateWith);
-}
 export const RelationshipKind = "RelationshipKind";
 export function isRelationshipKind(item) {
   return reflection.isInstance(item, RelationshipKind);
@@ -672,6 +608,10 @@ export const ViewRuleGroup = "ViewRuleGroup";
 export function isViewRuleGroup(item) {
   return reflection.isInstance(item, ViewRuleGroup);
 }
+export const ViewRulePredicate = "ViewRulePredicate";
+export function isViewRulePredicate(item) {
+  return reflection.isInstance(item, ViewRulePredicate);
+}
 export const ViewRuleStyle = "ViewRuleStyle";
 export function isViewRuleStyle(item) {
   return reflection.isInstance(item, ViewRuleStyle);
@@ -722,7 +662,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, ElementPredicateOrWhereV2, ElementPredicateWhere, ElementPredicateWhereV2, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExpressionV2, ExtendDeployment, ExtendDeploymentBody, 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, StrictFqnRef, 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];
+    return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentNodeOrElementKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRuleStyle, DirectedRelationExpr, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementKind, ElementKindExpression, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExpressionV2, Expressions, ExtendDeployment, ExtendDeploymentBody, ExtendElement, ExtendElementBody, ExtendElementProperty, FqnExpr, FqnExprOrWhere, FqnExprOrWith, FqnExprWhere, FqnExprWith, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, IconProperty, Imported, ImportsFromPoject, InOutRelationExpr, IncomingRelationExpr, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelReferenceable, ModelViews, MultipleProperty, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, PaddingSizeProperty, Referenceable, Relation, RelationBody, RelationExpr, RelationExprOrWhere, RelationExprOrWith, RelationExprWhere, RelationExprWith, RelationNavigateToProperty, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, ShapeSizeProperty, SizeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StrictFqnElementRef, StrictFqnRef, 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) {
@@ -762,45 +702,18 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case OutgoingRelationExpr: {
         return this.isSubtype(RelationExpr, supertype);
       }
-      case DirectedRelationExpression:
-      case IncomingRelationExpression:
-      case InOutRelationExpression:
-      case OutgoingRelationExpression: {
-        return this.isSubtype(RelationExpression, supertype);
-      }
       case DynamicViewGlobalPredicateRef:
       case DynamicViewIncludePredicate: {
         return this.isSubtype(DynamicViewRule, supertype);
       }
       case Element: {
-        return this.isSubtype(FqnReferenceable, supertype) || this.isSubtype(Referenceable, supertype);
+        return this.isSubtype(FqnReferenceable, supertype) || this.isSubtype(ModelReferenceable, supertype) || this.isSubtype(Referenceable, supertype);
       }
-      case ElementDescedantsExpression:
       case ElementKindExpression:
-      case ElementRef:
       case ElementTagExpression:
-      case ExpandElementExpression: {
-        return this.isSubtype(ElementExpression, supertype);
-      }
-      case ElementExpression:
-      case ElementPredicateWhere: {
-        return this.isSubtype(ElementPredicateOrWhere, supertype);
-      }
-      case ElementPredicate:
-      case RelationPredicate: {
-        return this.isSubtype(Predicate, supertype);
-      }
-      case ElementPredicateOrWhere:
-      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 FqnRefExpr:
+      case WildcardExpression: {
+        return this.isSubtype(FqnExpr, supertype);
       }
       case ElementStringProperty: {
         return this.isSubtype(ElementProperty, supertype) || this.isSubtype(StringProperty, supertype);
@@ -808,21 +721,29 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case ElementStyleProperty: {
         return this.isSubtype(ElementProperty, supertype);
       }
-      case ExcludePredicate:
-      case IncludePredicate: {
-        return this.isSubtype(ViewRulePredicate, supertype);
-      }
       case ExtendDeployment:
       case ExtendElement:
       case Referenceable: {
         return this.isSubtype(FqnReferenceable, supertype);
       }
-      case FqnRefExpr: {
-        return this.isSubtype(FqnExpr, supertype);
+      case FqnExpr:
+      case FqnExprWhere: {
+        return this.isSubtype(FqnExprOrWhere, supertype);
+      }
+      case FqnExprOrWhere:
+      case FqnExprWith: {
+        return this.isSubtype(FqnExprOrWith, supertype);
+      }
+      case FqnExprOrWith:
+      case RelationExprOrWith: {
+        return this.isSubtype(ExpressionV2, supertype);
       }
       case IconProperty: {
         return this.isSubtype(ElementProperty, supertype) || this.isSubtype(StyleProperty, supertype);
       }
+      case Imported: {
+        return this.isSubtype(ModelReferenceable, supertype) || this.isSubtype(Referenceable, supertype);
+      }
       case LinkProperty: {
         return this.isSubtype(ElementProperty, supertype) || this.isSubtype(ExtendElementProperty, supertype) || this.isSubtype(RelationProperty, supertype) || this.isSubtype(ViewProperty, supertype);
       }
@@ -845,21 +766,17 @@ export class LikeC4AstReflection extends AbstractAstReflection {
         return this.isSubtype(SizeProperty, supertype) || this.isSubtype(StyleProperty, supertype);
       }
       case RelationExpr:
-      case RelationPredicateWhereV2: {
-        return this.isSubtype(RelationPredicateOrWhereV2, supertype);
+      case RelationExprWhere: {
+        return this.isSubtype(RelationExprOrWhere, supertype);
       }
-      case RelationExpression:
-      case RelationPredicateWhere: {
-        return this.isSubtype(RelationPredicateOrWhere, supertype);
+      case RelationExprOrWhere:
+      case RelationExprWith: {
+        return this.isSubtype(RelationExprOrWith, supertype);
       }
       case RelationNavigateToProperty:
       case RelationStyleProperty: {
         return this.isSubtype(RelationProperty, supertype);
       }
-      case RelationPredicateOrWhere:
-      case RelationPredicateWith: {
-        return this.isSubtype(RelationPredicate, supertype);
-      }
       case RelationStringProperty: {
         return this.isSubtype(RelationProperty, supertype) || this.isSubtype(StringProperty, supertype);
       }
@@ -910,9 +827,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case WhereRelationTag: {
         return this.isSubtype(WhereRelation, supertype) || this.isSubtype(WhereTagEqual, supertype);
       }
-      case WildcardExpression: {
-        return this.isSubtype(ElementExpression, supertype) || this.isSubtype(FqnExpr, supertype);
-      }
       default: {
         return false;
       }
@@ -930,7 +844,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case "DeploymentRelation:kind":
       case "DynamicViewStep:kind":
       case "OutgoingRelationExpr:kind":
-      case "OutgoingRelationExpression:kind":
       case "Relation:kind":
       case "WhereRelationKind:value": {
         return RelationshipKind;
@@ -945,10 +858,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case "ElementKindExpression:kind": {
         return ElementKind;
       }
-      case "ElementRef:el":
-      case "StrictFqnElementRef:el": {
-        return Element;
-      }
       case "ElementTagExpression:tag":
       case "Tags:values":
       case "WhereElementTag:value":
@@ -966,6 +875,10 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case "IconProperty:libicon": {
         return LibIcon;
       }
+      case "Imported:imported":
+      case "StrictFqnElementRef:el": {
+        return Element;
+      }
       case "ViewRef:view": {
         return LikeC4View;
       }
@@ -1043,8 +956,8 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           name: DeployedInstance,
           properties: [
             { name: "body" },
-            { name: "element" },
             { name: "name" },
+            { name: "target" },
             { name: "title" }
           ]
         };
@@ -1053,6 +966,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
         return {
           name: DeployedInstanceBody,
           properties: [
+            { name: "elements", defaultValue: [] },
             { name: "props", defaultValue: [] },
             { name: "tags" }
           ]
@@ -1138,15 +1052,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case DeploymentViewRulePredicateExpression: {
-        return {
-          name: DeploymentViewRulePredicateExpression,
-          properties: [
-            { name: "prev" },
-            { name: "value" }
-          ]
-        };
-      }
       case DeploymentViewRuleStyle: {
         return {
           name: DeploymentViewRuleStyle,
@@ -1165,15 +1070,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case DirectedRelationExpression: {
-        return {
-          name: DirectedRelationExpression,
-          properties: [
-            { name: "source" },
-            { name: "target" }
-          ]
-        };
-      }
       case DynamicView: {
         return {
           name: DynamicView,
@@ -1206,7 +1102,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
         return {
           name: DynamicViewIncludePredicate,
           properties: [
-            { name: "predicates" }
+            { name: "exprs" }
           ]
         };
       }
@@ -1218,15 +1114,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case DynamicViewPredicateIterator: {
-        return {
-          name: DynamicViewPredicateIterator,
-          properties: [
-            { name: "prev" },
-            { name: "value" }
-          ]
-        };
-      }
       case DynamicViewRef: {
         return {
           name: DynamicViewRef,
@@ -1269,24 +1156,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case ElementDescedantsExpression: {
-        return {
-          name: ElementDescedantsExpression,
-          properties: [
-            { name: "parent" },
-            { name: "suffix" }
-          ]
-        };
-      }
-      case ElementExpressionsIterator: {
-        return {
-          name: ElementExpressionsIterator,
-          properties: [
-            { name: "prev" },
-            { name: "value" }
-          ]
-        };
-      }
       case ElementKind: {
         return {
           name: ElementKind,
@@ -1304,39 +1173,11 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case ElementPredicateWhere: {
-        return {
-          name: ElementPredicateWhere,
-          properties: [
-            { name: "subject" },
-            { name: "where" }
-          ]
-        };
-      }
-      case ElementPredicateWhereV2: {
-        return {
-          name: ElementPredicateWhereV2,
-          properties: [
-            { name: "subject" },
-            { name: "where" }
-          ]
-        };
-      }
-      case ElementPredicateWith: {
-        return {
-          name: ElementPredicateWith,
-          properties: [
-            { name: "custom" },
-            { name: "subject" }
-          ]
-        };
-      }
       case ElementRef: {
         return {
           name: ElementRef,
           properties: [
-            { name: "el" },
-            { name: "parent" }
+            { name: "modelElement" }
           ]
         };
       }
@@ -1396,19 +1237,12 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case ExcludePredicate: {
+      case Expressions: {
         return {
-          name: ExcludePredicate,
+          name: Expressions,
           properties: [
-            { name: "predicates" }
-          ]
-        };
-      }
-      case ExpandElementExpression: {
-        return {
-          name: ExpandElementExpression,
-          properties: [
-            { name: "expand" }
+            { name: "prev" },
+            { name: "value" }
           ]
         };
       }
@@ -1459,6 +1293,24 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case FqnExprWhere: {
+        return {
+          name: FqnExprWhere,
+          properties: [
+            { name: "subject" },
+            { name: "where" }
+          ]
+        };
+      }
+      case FqnExprWith: {
+        return {
+          name: FqnExprWith,
+          properties: [
+            { name: "custom" },
+            { name: "subject" }
+          ]
+        };
+      }
       case FqnRef: {
         return {
           name: FqnRef,
@@ -1542,25 +1394,27 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case IncludePredicate: {
+      case Imported: {
         return {
-          name: IncludePredicate,
+          name: Imported,
           properties: [
-            { name: "predicates" }
+            { name: "imported" },
+            { name: "prev" }
           ]
         };
       }
-      case IncomingRelationExpr: {
+      case ImportsFromPoject: {
         return {
-          name: IncomingRelationExpr,
+          name: ImportsFromPoject,
           properties: [
-            { name: "to" }
+            { name: "imports" },
+            { name: "project" }
           ]
         };
       }
-      case IncomingRelationExpression: {
+      case IncomingRelationExpr: {
         return {
-          name: IncomingRelationExpression,
+          name: IncomingRelationExpr,
           properties: [
             { name: "to" }
           ]
@@ -1574,14 +1428,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case InOutRelationExpression: {
-        return {
-          name: InOutRelationExpression,
-          properties: [
-            { name: "inout" }
-          ]
-        };
-      }
       case LibIcon: {
         return {
           name: LibIcon,
@@ -1596,6 +1442,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           properties: [
             { name: "deployments", defaultValue: [] },
             { name: "globals", defaultValue: [] },
+            { name: "imports", defaultValue: [] },
             { name: "likec4lib", defaultValue: [] },
             { name: "models", defaultValue: [] },
             { name: "specifications", defaultValue: [] },
@@ -1730,16 +1577,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case OutgoingRelationExpression: {
-        return {
-          name: OutgoingRelationExpression,
-          properties: [
-            { name: "from" },
-            { name: "isBidirectional", defaultValue: false },
-            { name: "kind" }
-          ]
-        };
-      }
       case PaddingSizeProperty: {
         return {
           name: PaddingSizeProperty,
@@ -1749,15 +1586,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case Predicates: {
-        return {
-          name: Predicates,
-          properties: [
-            { name: "prev" },
-            { name: "value" }
-          ]
-        };
-      }
       case Relation: {
         return {
           name: Relation,
@@ -1781,39 +1609,30 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
-      case RelationNavigateToProperty: {
+      case RelationExprWhere: {
         return {
-          name: RelationNavigateToProperty,
-          properties: [
-            { name: "key" },
-            { name: "value" }
-          ]
-        };
-      }
-      case RelationPredicateWhere: {
-        return {
-          name: RelationPredicateWhere,
+          name: RelationExprWhere,
           properties: [
             { name: "subject" },
             { name: "where" }
           ]
         };
       }
-      case RelationPredicateWhereV2: {
+      case RelationExprWith: {
         return {
-          name: RelationPredicateWhereV2,
+          name: RelationExprWith,
           properties: [
-            { name: "subject" },
-            { name: "where" }
+            { name: "custom" },
+            { name: "subject" }
           ]
         };
       }
-      case RelationPredicateWith: {
+      case RelationNavigateToProperty: {
         return {
-          name: RelationPredicateWith,
+          name: RelationNavigateToProperty,
           properties: [
-            { name: "custom" },
-            { name: "subject" }
+            { name: "key" },
+            { name: "value" }
           ]
         };
       }
@@ -2024,6 +1843,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case ViewRulePredicate: {
+        return {
+          name: ViewRulePredicate,
+          properties: [
+            { name: "exprs" },
+            { name: "isInclude", defaultValue: false }
+          ]
+        };
+      }
       case ViewRuleStyle: {
         return {
           name: ViewRuleStyle,