@likec4/language-server 1.19.1 → 1.19.2

package/dist/generated/ast.d.ts

@@ -61,7 +61,7 @@ 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 | RelationExpr;
+export type ExpressionV2 = FqnExpr | RelationPredicateOrWhereV2;
 export declare const ExpressionV2 = "ExpressionV2";
 export declare function isExpressionV2(item: unknown): item is ExpressionV2;
 export type FqnExpr = FqnRefExpr | WildcardExpression;
@@ -100,6 +100,9 @@ export declare function isRelationPredicate(item: unknown): item is RelationPred
 export type RelationPredicateOrWhere = RelationExpression | RelationPredicateWhere;
 export declare const RelationPredicateOrWhere = "RelationPredicateOrWhere";
 export declare function isRelationPredicateOrWhere(item: unknown): item is RelationPredicateOrWhere;
+export type RelationPredicateOrWhereV2 = RelationExpr | RelationPredicateWhereV2;
+export declare const RelationPredicateOrWhereV2 = "RelationPredicateOrWhereV2";
+export declare function isRelationPredicateOrWhereV2(item: unknown): item is RelationPredicateOrWhereV2;
 export type RelationProperty = LinkProperty | MetadataProperty | RelationNavigateToProperty | RelationStringProperty | RelationStyleProperty;
 export declare const RelationProperty = "RelationProperty";
 export declare function isRelationProperty(item: unknown): item is RelationProperty;
@@ -306,7 +309,7 @@ export interface DeploymentViewRuleStyle extends AstNode {
 export declare const DeploymentViewRuleStyle = "DeploymentViewRuleStyle";
 export declare function isDeploymentViewRuleStyle(item: unknown): item is DeploymentViewRuleStyle;
 export interface DirectedRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $container: DeploymentViewRulePredicateExpression | RelationPredicateWhereV2;
     readonly $type: 'DirectedRelationExpr';
     source: OutgoingRelationExpr;
     target: FqnExpr;
@@ -638,7 +641,7 @@ export interface IncludePredicate extends AstNode {
 export declare const IncludePredicate = "IncludePredicate";
 export declare function isIncludePredicate(item: unknown): item is IncludePredicate;
 export interface IncomingRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | InOutRelationExpr;
+    readonly $container: DeploymentViewRulePredicateExpression | InOutRelationExpr | RelationPredicateWhereV2;
     readonly $type: 'IncomingRelationExpr';
     to: FqnExpr;
 }
@@ -652,7 +655,7 @@ export interface IncomingRelationExpression extends AstNode {
 export declare const IncomingRelationExpression = "IncomingRelationExpression";
 export declare function isIncomingRelationExpression(item: unknown): item is IncomingRelationExpression;
 export interface InOutRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $container: DeploymentViewRulePredicateExpression | RelationPredicateWhereV2;
     readonly $type: 'InOutRelationExpr';
     inout: IncomingRelationExpr;
 }
@@ -780,7 +783,7 @@ export interface OpacityProperty extends AstNode {
 export declare const OpacityProperty = "OpacityProperty";
 export declare function isOpacityProperty(item: unknown): item is OpacityProperty;
 export interface OutgoingRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr;
+    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr | RelationPredicateWhereV2;
     readonly $type: 'OutgoingRelationExpr';
     from: FqnExpr;
     isBidirectional: boolean;
@@ -842,6 +845,14 @@ export interface RelationPredicateWhere extends AstNode {
 }
 export declare const RelationPredicateWhere = "RelationPredicateWhere";
 export declare function isRelationPredicateWhere(item: unknown): item is RelationPredicateWhere;
+export interface RelationPredicateWhereV2 extends AstNode {
+    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $type: 'RelationPredicateWhereV2';
+    subject: RelationExpr;
+    where?: WhereRelationExpression;
+}
+export declare const RelationPredicateWhereV2 = "RelationPredicateWhereV2";
+export declare function isRelationPredicateWhereV2(item: unknown): item is RelationPredicateWhereV2;
 export interface RelationPredicateWith extends AstNode {
     readonly $container: Predicates;
     readonly $type: 'RelationPredicateWith';
@@ -1019,7 +1030,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 | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
+    readonly $container: ElementPredicateWhere | RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
     readonly $type: 'WhereBinaryExpression';
     left: WhereElementExpression | WhereRelationExpression;
     operator: 'and' | 'or';
@@ -1053,7 +1064,7 @@ export interface WhereElementTag extends AstNode {
 export declare const WhereElementTag = "WhereElementTag";
 export declare function isWhereElementTag(item: unknown): item is WhereElementTag;
 export interface WhereRelationKind extends AstNode {
-    readonly $container: RelationPredicateWhere | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationKind';
     not: boolean;
     operator: 'is' | string;
@@ -1062,14 +1073,14 @@ export interface WhereRelationKind extends AstNode {
 export declare const WhereRelationKind = "WhereRelationKind";
 export declare function isWhereRelationKind(item: unknown): item is WhereRelationKind;
 export interface WhereRelationNegation extends AstNode {
-    readonly $container: RelationPredicateWhere | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationNegation';
     value: WhereRelationExpression;
 }
 export declare const WhereRelationNegation = "WhereRelationNegation";
 export declare function isWhereRelationNegation(item: unknown): item is WhereRelationNegation;
 export interface WhereRelationTag extends AstNode {
-    readonly $container: RelationPredicateWhere | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationTag';
     not: boolean;
     operator: 'is' | string;
@@ -1186,7 +1197,9 @@ export type LikeC4AstType = {
     RelationNavigateToProperty: RelationNavigateToProperty;
     RelationPredicate: RelationPredicate;
     RelationPredicateOrWhere: RelationPredicateOrWhere;
+    RelationPredicateOrWhereV2: RelationPredicateOrWhereV2;
     RelationPredicateWhere: RelationPredicateWhere;
+    RelationPredicateWhereV2: RelationPredicateWhereV2;
     RelationPredicateWith: RelationPredicateWith;
     RelationProperty: RelationProperty;
     RelationStringProperty: RelationStringProperty;

package/dist/generated/ast.js

@@ -119,6 +119,10 @@ export const RelationPredicateOrWhere = "RelationPredicateOrWhere";
 export function isRelationPredicateOrWhere(item) {
   return reflection.isInstance(item, RelationPredicateOrWhere);
 }
+export const RelationPredicateOrWhereV2 = "RelationPredicateOrWhereV2";
+export function isRelationPredicateOrWhereV2(item) {
+  return reflection.isInstance(item, RelationPredicateOrWhereV2);
+}
 export const RelationProperty = "RelationProperty";
 export function isRelationProperty(item) {
   return reflection.isInstance(item, RelationProperty);
@@ -527,6 +531,10 @@ 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);
@@ -649,7 +657,7 @@ export function isWildcardExpression(item) {
 }
 export class LikeC4AstReflection extends AbstractAstReflection {
   getAllTypes() {
-    return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRulePredicateExpression, DeploymentViewRuleStyle, DirectedRelationExpr, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewPredicateIterator, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementDescedantsExpression, ElementExpression, ElementExpressionsIterator, ElementKind, ElementKindExpression, ElementPredicate, ElementPredicateOrWhere, ElementPredicateWhere, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExpressionV2, ExtendElement, ExtendElementBody, FqnElementRef, FqnExpr, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, IconProperty, InOutRelationExpr, InOutRelationExpression, IncludePredicate, IncomingRelationExpr, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelViews, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, OutgoingRelationExpression, Predicate, Predicates, Referenceable, Relation, RelationBody, RelationExpr, RelationExpression, RelationNavigateToProperty, RelationPredicate, RelationPredicateOrWhere, RelationPredicateWhere, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StringProperty, StyleProperty, Tag, Tags, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationTag, WhereTagEqual, WildcardExpression];
+    return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRulePredicateExpression, DeploymentViewRuleStyle, DirectedRelationExpr, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewPredicateIterator, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementDescedantsExpression, ElementExpression, ElementExpressionsIterator, ElementKind, ElementKindExpression, ElementPredicate, ElementPredicateOrWhere, ElementPredicateWhere, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExpressionV2, ExtendElement, ExtendElementBody, FqnElementRef, FqnExpr, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, IconProperty, InOutRelationExpr, InOutRelationExpression, IncludePredicate, IncomingRelationExpr, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelViews, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, OutgoingRelationExpression, Predicate, Predicates, Referenceable, Relation, RelationBody, RelationExpr, RelationExpression, RelationNavigateToProperty, RelationPredicate, RelationPredicateOrWhere, 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, WhereRelationTag, WhereTagEqual, WildcardExpression];
   }
   computeIsSubtype(subtype, supertype) {
     switch (subtype) {
@@ -731,7 +739,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
         return this.isSubtype(FqnReferenceable, supertype);
       }
       case FqnExpr:
-      case RelationExpr: {
+      case RelationPredicateOrWhereV2: {
         return this.isSubtype(ExpressionV2, supertype);
       }
       case FqnRefExpr: {
@@ -756,6 +764,10 @@ export class LikeC4AstReflection extends AbstractAstReflection {
       case MetadataProperty: {
         return this.isSubtype(ElementProperty, supertype) || this.isSubtype(RelationProperty, supertype);
       }
+      case RelationExpr:
+      case RelationPredicateWhereV2: {
+        return this.isSubtype(RelationPredicateOrWhereV2, supertype);
+      }
       case RelationExpression:
       case RelationPredicateWhere: {
         return this.isSubtype(RelationPredicateOrWhere, supertype);
@@ -1661,6 +1673,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
           ]
         };
       }
+      case RelationPredicateWhereV2: {
+        return {
+          name: RelationPredicateWhereV2,
+          properties: [
+            { name: "subject" },
+            { name: "where" }
+          ]
+        };
+      }
       case RelationPredicateWith: {
         return {
           name: RelationPredicateWith,