@likec4/language-server 1.27.3 → 1.28.1

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" | "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 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" | "from" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "import" | "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;
@@ -52,32 +52,26 @@ export declare function isDotId(item: unknown): item is DotId;
 export type DynamicViewRule = DynamicViewGlobalPredicateRef | DynamicViewIncludePredicate | ViewRuleAutoLayout | ViewRuleStyleOrGlobalRef;
 export declare const DynamicViewRule = "DynamicViewRule";
 export declare function isDynamicViewRule(item: unknown): item is DynamicViewRule;
-export type ElementExpression = ElementDescedantsExpression | ElementKindExpression | ElementRef | ElementTagExpression | ExpandElementExpression | WildcardExpression;
-export declare const ElementExpression = "ElementExpression";
-export declare function isElementExpression(item: unknown): item is ElementExpression;
-export type ElementPredicate = ElementPredicateOrWhere | ElementPredicateWith;
-export declare const ElementPredicate = "ElementPredicate";
-export declare function isElementPredicate(item: unknown): item is ElementPredicate;
-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 = ElementPredicateOrWhereV2 | RelationPredicateOrWhereV2;
+export type ExpressionV2 = FqnExprOrWith | RelationExprOrWith;
 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 type FqnExpr = ElementKindExpression | ElementTagExpression | FqnRefExpr | WildcardExpression;
 export declare const FqnExpr = "FqnExpr";
 export declare function isFqnExpr(item: unknown): item is FqnExpr;
+export type FqnExprOrWhere = FqnExpr | FqnExprWhere;
+export declare const FqnExprOrWhere = "FqnExprOrWhere";
+export declare function isFqnExprOrWhere(item: unknown): item is FqnExprOrWhere;
+export type FqnExprOrWith = FqnExprOrWhere | FqnExprWith;
+export declare const FqnExprOrWith = "FqnExprOrWith";
+export declare function isFqnExprOrWith(item: unknown): item is FqnExprOrWith;
 export type FqnReferenceable = Element | ExtendDeployment | ExtendElement | Referenceable;
 export declare const FqnReferenceable = "FqnReferenceable";
 export declare function isFqnReferenceable(item: unknown): item is FqnReferenceable;
@@ -93,29 +87,23 @@ export declare function isLineOptions(item: unknown): item is LineOptions;
 export type MetadataProperty = MetadataBody;
 export declare const MetadataProperty = "MetadataProperty";
 export declare function isMetadataProperty(item: unknown): item is MetadataProperty;
+export type ModelReferenceable = Element | Imported;
+export declare const ModelReferenceable = "ModelReferenceable";
+export declare function isModelReferenceable(item: unknown): item is ModelReferenceable;
 export type Participant = 'source' | 'target';
 export declare function isParticipant(item: unknown): item is Participant;
-export type Predicate = ElementPredicate | RelationPredicate;
-export declare const Predicate = "Predicate";
-export declare function isPredicate(item: unknown): item is Predicate;
-export type Referenceable = DeployedInstance | DeploymentNode | Element;
+export type Referenceable = DeployedInstance | DeploymentNode | Element | Imported;
 export declare const Referenceable = "Referenceable";
 export declare function isReferenceable(item: unknown): item is Referenceable;
 export type RelationExpr = DirectedRelationExpr | InOutRelationExpr | IncomingRelationExpr | OutgoingRelationExpr;
 export declare const RelationExpr = "RelationExpr";
 export declare function isRelationExpr(item: unknown): item is RelationExpr;
-export type RelationExpression = DirectedRelationExpression | InOutRelationExpression | IncomingRelationExpression | OutgoingRelationExpression;
-export declare const RelationExpression = "RelationExpression";
-export declare function isRelationExpression(item: unknown): item is RelationExpression;
-export type RelationPredicate = RelationPredicateOrWhere | RelationPredicateWith;
-export declare const RelationPredicate = "RelationPredicate";
-export declare function isRelationPredicate(item: unknown): item is RelationPredicate;
-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 RelationExprOrWhere = RelationExpr | RelationExprWhere;
+export declare const RelationExprOrWhere = "RelationExprOrWhere";
+export declare function isRelationExprOrWhere(item: unknown): item is RelationExprOrWhere;
+export type RelationExprOrWith = RelationExprOrWhere | RelationExprWith;
+export declare const RelationExprOrWith = "RelationExprOrWith";
+export declare function isRelationExprOrWith(item: unknown): item is RelationExprOrWith;
 export type RelationProperty = LinkProperty | MetadataProperty | RelationNavigateToProperty | RelationStringProperty | RelationStyleProperty;
 export declare const RelationProperty = "RelationProperty";
 export declare function isRelationProperty(item: unknown): item is RelationProperty;
@@ -147,9 +135,6 @@ export declare function isViewProperty(item: unknown): item is ViewProperty;
 export type ViewRule = ViewRuleAutoLayout | ViewRuleGlobalPredicateRef | ViewRuleGroup | ViewRulePredicate | ViewRuleStyleOrGlobalRef;
 export declare const ViewRule = "ViewRule";
 export declare function isViewRule(item: unknown): item is ViewRule;
-export type ViewRulePredicate = ExcludePredicate | IncludePredicate;
-export declare const ViewRulePredicate = "ViewRulePredicate";
-export declare function isViewRulePredicate(item: unknown): item is ViewRulePredicate;
 export type ViewRuleStyleOrGlobalRef = ViewRuleGlobalStyle | ViewRuleStyle;
 export declare const ViewRuleStyleOrGlobalRef = "ViewRuleStyleOrGlobalRef";
 export declare function isViewRuleStyleOrGlobalRef(item: unknown): item is ViewRuleStyleOrGlobalRef;
@@ -207,14 +192,14 @@ export interface CustomColor extends AstNode {
 export declare const CustomColor = "CustomColor";
 export declare function isCustomColor(item: unknown): item is CustomColor;
 export interface CustomElementProperties extends AstNode {
-    readonly $container: ElementPredicateWith;
+    readonly $container: FqnExprWith;
     readonly $type: 'CustomElementProperties';
     props: Array<ElementStringProperty | NavigateToProperty | NotationProperty | StyleProperty>;
 }
 export declare const CustomElementProperties = "CustomElementProperties";
 export declare function isCustomElementProperties(item: unknown): item is CustomElementProperties;
 export interface CustomRelationProperties extends AstNode {
-    readonly $container: DynamicViewStep | RelationPredicateWith;
+    readonly $container: DynamicViewStep | RelationExprWith;
     readonly $type: 'CustomRelationProperties';
     props: Array<NotationProperty | NotesProperty | RelationNavigateToProperty | RelationStringProperty | RelationshipStyleProperty>;
 }
@@ -224,8 +209,8 @@ export interface DeployedInstance extends AstNode {
     readonly $container: DeploymentNodeBody | ExtendDeploymentBody;
     readonly $type: 'DeployedInstance';
     body?: DeployedInstanceBody;
-    element: ElementRef;
     name?: Id;
+    target: ElementRef;
     title?: string;
 }
 export declare const DeployedInstance = "DeployedInstance";
@@ -233,6 +218,7 @@ export declare function isDeployedInstance(item: unknown): item is DeployedInsta
 export interface DeployedInstanceBody extends AstNode {
     readonly $container: DeployedInstance;
     readonly $type: 'DeployedInstanceBody';
+    elements: Array<DeploymentRelation>;
     props: Array<ElementProperty>;
     tags?: Tags;
 }
@@ -265,11 +251,11 @@ export interface DeploymentNodeKind extends AstNode {
 export declare const DeploymentNodeKind = "DeploymentNodeKind";
 export declare function isDeploymentNodeKind(item: unknown): item is DeploymentNodeKind;
 export interface DeploymentRelation extends AstNode {
-    readonly $container: DeploymentNodeBody | ExtendDeploymentBody | ModelDeployments;
+    readonly $container: DeployedInstanceBody | DeploymentNodeBody | ExtendDeploymentBody | ModelDeployments;
     readonly $type: 'DeploymentRelation';
     body?: DeploymentRelationBody;
     kind?: Reference<RelationshipKind>;
-    source: FqnRef;
+    source?: FqnRef;
     tags?: Tags;
     target: FqnRef;
     technology?: string;
@@ -305,19 +291,11 @@ export declare function isDeploymentViewBody(item: unknown): item is DeploymentV
 export interface DeploymentViewRulePredicate extends AstNode {
     readonly $container: DeploymentViewBody;
     readonly $type: 'DeploymentViewRulePredicate';
-    expr: DeploymentViewRulePredicateExpression;
+    expr: Expressions;
     isInclude: boolean;
 }
 export declare const DeploymentViewRulePredicate = "DeploymentViewRulePredicate";
 export declare function isDeploymentViewRulePredicate(item: unknown): item is DeploymentViewRulePredicate;
-export interface DeploymentViewRulePredicateExpression extends AstNode {
-    readonly $container: DeploymentViewRulePredicate | DeploymentViewRulePredicateExpression;
-    readonly $type: 'DeploymentViewRulePredicateExpression';
-    prev?: DeploymentViewRulePredicateExpression;
-    value: ExpressionV2;
-}
-export declare const DeploymentViewRulePredicateExpression = "DeploymentViewRulePredicateExpression";
-export declare function isDeploymentViewRulePredicateExpression(item: unknown): item is DeploymentViewRulePredicateExpression;
 export interface DeploymentViewRuleStyle extends AstNode {
     readonly $container: DeploymentViewBody;
     readonly $type: 'DeploymentViewRuleStyle';
@@ -327,21 +305,13 @@ 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 | RelationPredicateWhereV2;
+    readonly $container: Expressions | RelationExprWhere | RelationExprWith;
     readonly $type: 'DirectedRelationExpr';
     source: OutgoingRelationExpr;
     target: FqnExpr;
 }
 export declare const DirectedRelationExpr = "DirectedRelationExpr";
 export declare function isDirectedRelationExpr(item: unknown): item is DirectedRelationExpr;
-export interface DirectedRelationExpression extends AstNode {
-    readonly $container: Predicates | RelationPredicateWhere | RelationPredicateWith;
-    readonly $type: 'DirectedRelationExpression';
-    source: OutgoingRelationExpression;
-    target: ElementExpression;
-}
-export declare const DirectedRelationExpression = "DirectedRelationExpression";
-export declare function isDirectedRelationExpression(item: unknown): item is DirectedRelationExpression;
 export interface DynamicView extends AstNode {
     readonly $container: ModelViews;
     readonly $type: 'DynamicView';
@@ -370,7 +340,7 @@ export declare function isDynamicViewGlobalPredicateRef(item: unknown): item is
 export interface DynamicViewIncludePredicate extends AstNode {
     readonly $container: DynamicViewBody | GlobalDynamicPredicateGroup;
     readonly $type: 'DynamicViewIncludePredicate';
-    predicates: DynamicViewPredicateIterator;
+    exprs: Expressions;
 }
 export declare const DynamicViewIncludePredicate = "DynamicViewIncludePredicate";
 export declare function isDynamicViewIncludePredicate(item: unknown): item is DynamicViewIncludePredicate;
@@ -381,14 +351,6 @@ export interface DynamicViewParallelSteps extends AstNode {
 }
 export declare const DynamicViewParallelSteps = "DynamicViewParallelSteps";
 export declare function isDynamicViewParallelSteps(item: unknown): item is DynamicViewParallelSteps;
-export interface DynamicViewPredicateIterator extends AstNode {
-    readonly $container: DynamicViewIncludePredicate | DynamicViewPredicateIterator;
-    readonly $type: 'DynamicViewPredicateIterator';
-    prev?: DynamicViewPredicateIterator;
-    value: ElementPredicate;
-}
-export declare const DynamicViewPredicateIterator = "DynamicViewPredicateIterator";
-export declare function isDynamicViewPredicateIterator(item: unknown): item is DynamicViewPredicateIterator;
 export interface DynamicViewRef extends AstNode {
     readonly $container: RelationNavigateToProperty;
     readonly $type: 'DynamicViewRef';
@@ -427,22 +389,6 @@ export interface ElementBody extends AstNode {
 }
 export declare const ElementBody = "ElementBody";
 export declare function isElementBody(item: unknown): item is ElementBody;
-export interface ElementDescedantsExpression extends AstNode {
-    readonly $container: DirectedRelationExpression | DynamicViewPredicateIterator | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | IncomingRelationExpression | OutgoingRelationExpression | Predicates;
-    readonly $type: 'ElementDescedantsExpression';
-    parent: ElementRef;
-    suffix: string;
-}
-export declare const ElementDescedantsExpression = "ElementDescedantsExpression";
-export declare function isElementDescedantsExpression(item: unknown): item is ElementDescedantsExpression;
-export interface ElementExpressionsIterator extends AstNode {
-    readonly $container: ElementExpressionsIterator | GlobalStyle | ViewRuleStyle;
-    readonly $type: 'ElementExpressionsIterator';
-    prev?: ElementExpressionsIterator;
-    value: ElementExpression;
-}
-export declare const ElementExpressionsIterator = "ElementExpressionsIterator";
-export declare function isElementExpressionsIterator(item: unknown): item is ElementExpressionsIterator;
 export interface ElementKind extends AstNode {
     readonly $container: SpecificationElementKind;
     readonly $type: 'ElementKind';
@@ -451,42 +397,17 @@ export interface ElementKind extends AstNode {
 export declare const ElementKind = "ElementKind";
 export declare function isElementKind(item: unknown): item is ElementKind;
 export interface ElementKindExpression extends AstNode {
-    readonly $container: DirectedRelationExpression | DynamicViewPredicateIterator | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | IncomingRelationExpression | OutgoingRelationExpression | Predicates;
+    readonly $container: DirectedRelationExpr | Expressions | FqnExprWhere | FqnExprWith | FqnExpressions | IncomingRelationExpr | OutgoingRelationExpr;
     readonly $type: 'ElementKindExpression';
     isEqual: boolean;
     kind?: Reference<ElementKind>;
 }
 export declare const ElementKindExpression = "ElementKindExpression";
 export declare function isElementKindExpression(item: unknown): item is ElementKindExpression;
-export interface ElementPredicateWhere extends AstNode {
-    readonly $container: DynamicViewPredicateIterator | ElementPredicateWith | Predicates;
-    readonly $type: 'ElementPredicateWhere';
-    subject: ElementExpression;
-    where?: WhereElementExpression;
-}
-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';
-    custom?: CustomElementProperties;
-    subject: ElementPredicateOrWhere;
-}
-export declare const ElementPredicateWith = "ElementPredicateWith";
-export declare function isElementPredicateWith(item: unknown): item is ElementPredicateWith;
 export interface ElementRef extends AstNode {
-    readonly $container: DeployedInstance | DirectedRelationExpression | DynamicViewPredicateIterator | DynamicViewStep | ElementDescedantsExpression | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | ElementRef | ElementView | ExpandElementExpression | IncomingRelationExpression | OutgoingRelationExpression | Predicates | Relation;
+    readonly $container: DeployedInstance | DynamicViewStep | ElementView;
     readonly $type: 'ElementRef';
-    el: Reference<Element>;
-    parent?: ElementRef;
+    modelElement: FqnRef;
 }
 export declare const ElementRef = "ElementRef";
 export declare function isElementRef(item: unknown): item is ElementRef;
@@ -507,7 +428,7 @@ export interface ElementStyleProperty extends AstNode {
 export declare const ElementStyleProperty = "ElementStyleProperty";
 export declare function isElementStyleProperty(item: unknown): item is ElementStyleProperty;
 export interface ElementTagExpression extends AstNode {
-    readonly $container: DirectedRelationExpression | DynamicViewPredicateIterator | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | IncomingRelationExpression | OutgoingRelationExpression | Predicates;
+    readonly $container: DirectedRelationExpr | Expressions | FqnExprWhere | FqnExprWith | FqnExpressions | IncomingRelationExpr | OutgoingRelationExpr;
     readonly $type: 'ElementTagExpression';
     isEqual: boolean;
     tag?: Reference<Tag>;
@@ -540,20 +461,14 @@ export interface ElementViewRef extends AstNode {
 }
 export declare const ElementViewRef = "ElementViewRef";
 export declare function isElementViewRef(item: unknown): item is ElementViewRef;
-export interface ExcludePredicate extends AstNode {
-    readonly $container: ElementViewBody | GlobalPredicateGroup | ViewRuleGroup;
-    readonly $type: 'ExcludePredicate';
-    predicates: Predicates;
-}
-export declare const ExcludePredicate = "ExcludePredicate";
-export declare function isExcludePredicate(item: unknown): item is ExcludePredicate;
-export interface ExpandElementExpression extends AstNode {
-    readonly $container: DirectedRelationExpression | DynamicViewPredicateIterator | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | IncomingRelationExpression | OutgoingRelationExpression | Predicates;
-    readonly $type: 'ExpandElementExpression';
-    expand: ElementRef;
-}
-export declare const ExpandElementExpression = "ExpandElementExpression";
-export declare function isExpandElementExpression(item: unknown): item is ExpandElementExpression;
+export interface Expressions extends AstNode {
+    readonly $container: DeploymentViewRulePredicate | DynamicViewIncludePredicate | Expressions | ViewRulePredicate;
+    readonly $type: 'Expressions';
+    prev?: Expressions;
+    value: ExpressionV2;
+}
+export declare const Expressions = "Expressions";
+export declare function isExpressions(item: unknown): item is Expressions;
 export interface ExtendDeployment extends AstNode {
     readonly $container: ModelDeployments;
     readonly $type: 'ExtendDeployment';
@@ -589,15 +504,31 @@ export interface ExtendElementBody extends AstNode {
 export declare const ExtendElementBody = "ExtendElementBody";
 export declare function isExtendElementBody(item: unknown): item is ExtendElementBody;
 export interface FqnExpressions extends AstNode {
-    readonly $container: DeploymentViewRuleStyle | FqnExpressions;
+    readonly $container: DeploymentViewRuleStyle | FqnExpressions | GlobalStyle | ViewRuleStyle;
     readonly $type: 'FqnExpressions';
     prev?: FqnExpressions;
     value: FqnExpr;
 }
 export declare const FqnExpressions = "FqnExpressions";
 export declare function isFqnExpressions(item: unknown): item is FqnExpressions;
+export interface FqnExprWhere extends AstNode {
+    readonly $container: Expressions | FqnExprWith;
+    readonly $type: 'FqnExprWhere';
+    subject: FqnExpr;
+    where?: WhereElementExpression;
+}
+export declare const FqnExprWhere = "FqnExprWhere";
+export declare function isFqnExprWhere(item: unknown): item is FqnExprWhere;
+export interface FqnExprWith extends AstNode {
+    readonly $container: Expressions;
+    readonly $type: 'FqnExprWith';
+    custom?: CustomElementProperties;
+    subject: FqnExprOrWhere;
+}
+export declare const FqnExprWith = "FqnExprWith";
+export declare function isFqnExprWith(item: unknown): item is FqnExprWith;
 export interface FqnRef extends AstNode {
-    readonly $container: DeploymentRelation | FqnRef | FqnRefExpr;
+    readonly $container: DeploymentRelation | ElementRef | FqnRef | FqnRefExpr | Relation;
     readonly $type: 'FqnRef';
     parent?: FqnRef;
     value: Reference<Referenceable>;
@@ -605,7 +536,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 | ElementPredicateWhereV2 | FqnExpressions | IncomingRelationExpr | OutgoingRelationExpr;
+    readonly $container: DirectedRelationExpr | Expressions | FqnExprWhere | FqnExprWith | FqnExpressions | IncomingRelationExpr | OutgoingRelationExpr;
     readonly $type: 'FqnRefExpr';
     ref: FqnRef;
     selector?: string;
@@ -642,7 +573,7 @@ export interface GlobalStyle extends AstNode {
     readonly $type: 'GlobalStyle';
     id: GlobalStyleId;
     props: Array<NotationProperty | StyleProperty>;
-    target: ElementExpressionsIterator;
+    targets: FqnExpressions;
 }
 export declare const GlobalStyle = "GlobalStyle";
 export declare function isGlobalStyle(item: unknown): item is GlobalStyle;
@@ -670,41 +601,36 @@ export interface IconProperty extends AstNode {
 }
 export declare const IconProperty = "IconProperty";
 export declare function isIconProperty(item: unknown): item is IconProperty;
-export interface IncludePredicate extends AstNode {
-    readonly $container: ElementViewBody | GlobalPredicateGroup | ViewRuleGroup;
-    readonly $type: 'IncludePredicate';
-    predicates: Predicates;
+export interface Imported extends AstNode {
+    readonly $container: Imported | ImportsFromPoject;
+    readonly $type: 'Imported';
+    imported: Reference<Element>;
+    prev?: Imported;
+}
+export declare const Imported = "Imported";
+export declare function isImported(item: unknown): item is Imported;
+export interface ImportsFromPoject extends AstNode {
+    readonly $container: LikeC4Grammar;
+    readonly $type: 'ImportsFromPoject';
+    imports: Imported;
+    project: string;
 }
-export declare const IncludePredicate = "IncludePredicate";
-export declare function isIncludePredicate(item: unknown): item is IncludePredicate;
+export declare const ImportsFromPoject = "ImportsFromPoject";
+export declare function isImportsFromPoject(item: unknown): item is ImportsFromPoject;
 export interface IncomingRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | InOutRelationExpr | RelationPredicateWhereV2;
+    readonly $container: Expressions | InOutRelationExpr | RelationExprWhere | RelationExprWith;
     readonly $type: 'IncomingRelationExpr';
     to: FqnExpr;
 }
 export declare const IncomingRelationExpr = "IncomingRelationExpr";
 export declare function isIncomingRelationExpr(item: unknown): item is IncomingRelationExpr;
-export interface IncomingRelationExpression extends AstNode {
-    readonly $container: InOutRelationExpression | Predicates | RelationPredicateWhere | RelationPredicateWith;
-    readonly $type: 'IncomingRelationExpression';
-    to: ElementExpression;
-}
-export declare const IncomingRelationExpression = "IncomingRelationExpression";
-export declare function isIncomingRelationExpression(item: unknown): item is IncomingRelationExpression;
 export interface InOutRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | RelationPredicateWhereV2;
+    readonly $container: Expressions | RelationExprWhere | RelationExprWith;
     readonly $type: 'InOutRelationExpr';
     inout: IncomingRelationExpr;
 }
 export declare const InOutRelationExpr = "InOutRelationExpr";
 export declare function isInOutRelationExpr(item: unknown): item is InOutRelationExpr;
-export interface InOutRelationExpression extends AstNode {
-    readonly $container: Predicates | RelationPredicateWhere | RelationPredicateWith;
-    readonly $type: 'InOutRelationExpression';
-    inout: IncomingRelationExpression;
-}
-export declare const InOutRelationExpression = "InOutRelationExpression";
-export declare function isInOutRelationExpression(item: unknown): item is InOutRelationExpression;
 export interface LibIcon extends AstNode {
     readonly $container: LikeC4Lib;
     readonly $type: 'LibIcon';
@@ -716,6 +642,7 @@ export interface LikeC4Grammar extends AstNode {
     readonly $type: 'LikeC4Grammar';
     deployments: Array<ModelDeployments>;
     globals: Array<Globals>;
+    imports: Array<ImportsFromPoject>;
     likec4lib: Array<LikeC4Lib>;
     models: Array<Model>;
     specifications: Array<SpecificationRule>;
@@ -828,7 +755,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 | RelationPredicateWhereV2;
+    readonly $container: DirectedRelationExpr | Expressions | RelationExprWhere | RelationExprWith;
     readonly $type: 'OutgoingRelationExpr';
     from: FqnExpr;
     isBidirectional: boolean;
@@ -836,15 +763,6 @@ export interface OutgoingRelationExpr extends AstNode {
 }
 export declare const OutgoingRelationExpr = "OutgoingRelationExpr";
 export declare function isOutgoingRelationExpr(item: unknown): item is OutgoingRelationExpr;
-export interface OutgoingRelationExpression extends AstNode {
-    readonly $container: DirectedRelationExpression | Predicates | RelationPredicateWhere | RelationPredicateWith;
-    readonly $type: 'OutgoingRelationExpression';
-    from: ElementExpression;
-    isBidirectional: boolean;
-    kind?: Reference<RelationshipKind>;
-}
-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';
@@ -853,22 +771,14 @@ export interface PaddingSizeProperty extends AstNode {
 }
 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';
-    prev?: Predicates;
-    value: Predicate;
-}
-export declare const Predicates = "Predicates";
-export declare function isPredicates(item: unknown): item is Predicates;
 export interface Relation extends AstNode {
     readonly $container: ElementBody | ExtendElementBody | Model;
     readonly $type: 'Relation';
     body?: RelationBody;
     kind?: Reference<RelationshipKind>;
-    source?: ElementRef;
+    source?: FqnRef;
     tags?: Tags;
-    target: ElementRef;
+    target: FqnRef;
     technology?: string;
     title?: string;
 }
@@ -882,6 +792,22 @@ export interface RelationBody extends AstNode {
 }
 export declare const RelationBody = "RelationBody";
 export declare function isRelationBody(item: unknown): item is RelationBody;
+export interface RelationExprWhere extends AstNode {
+    readonly $container: Expressions | RelationExprWith;
+    readonly $type: 'RelationExprWhere';
+    subject: RelationExpr;
+    where?: WhereRelationExpression;
+}
+export declare const RelationExprWhere = "RelationExprWhere";
+export declare function isRelationExprWhere(item: unknown): item is RelationExprWhere;
+export interface RelationExprWith extends AstNode {
+    readonly $container: Expressions;
+    readonly $type: 'RelationExprWith';
+    custom?: CustomRelationProperties;
+    subject: RelationExprOrWhere;
+}
+export declare const RelationExprWith = "RelationExprWith";
+export declare function isRelationExprWith(item: unknown): item is RelationExprWith;
 export interface RelationNavigateToProperty extends AstNode {
     readonly $container: CustomRelationProperties | DeploymentRelationBody | RelationBody;
     readonly $type: 'RelationNavigateToProperty';
@@ -890,30 +816,6 @@ export interface RelationNavigateToProperty extends AstNode {
 }
 export declare const RelationNavigateToProperty = "RelationNavigateToProperty";
 export declare function isRelationNavigateToProperty(item: unknown): item is RelationNavigateToProperty;
-export interface RelationPredicateWhere extends AstNode {
-    readonly $container: Predicates | RelationPredicateWith;
-    readonly $type: 'RelationPredicateWhere';
-    subject: RelationExpression;
-    where?: WhereRelationExpression;
-}
-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';
-    custom?: CustomRelationProperties;
-    subject: RelationPredicateOrWhere;
-}
-export declare const RelationPredicateWith = "RelationPredicateWith";
-export declare function isRelationPredicateWith(item: unknown): item is RelationPredicateWith;
 export interface RelationshipKind extends AstNode {
     readonly $container: SpecificationRelationshipKind;
     readonly $type: 'RelationshipKind';
@@ -1098,11 +1000,19 @@ export interface ViewRuleGroup extends AstNode {
 }
 export declare const ViewRuleGroup = "ViewRuleGroup";
 export declare function isViewRuleGroup(item: unknown): item is ViewRuleGroup;
+export interface ViewRulePredicate extends AstNode {
+    readonly $container: ElementViewBody | GlobalPredicateGroup | ViewRuleGroup;
+    readonly $type: 'ViewRulePredicate';
+    exprs: Expressions;
+    isInclude: boolean;
+}
+export declare const ViewRulePredicate = "ViewRulePredicate";
+export declare function isViewRulePredicate(item: unknown): item is ViewRulePredicate;
 export interface ViewRuleStyle extends AstNode {
     readonly $container: DynamicViewBody | ElementViewBody | GlobalStyleGroup | ModelViews;
     readonly $type: 'ViewRuleStyle';
     props: Array<NotationProperty | StyleProperty>;
-    target: ElementExpressionsIterator;
+    targets: FqnExpressions;
 }
 export declare const ViewRuleStyle = "ViewRuleStyle";
 export declare function isViewRuleStyle(item: unknown): item is ViewRuleStyle;
@@ -1115,7 +1025,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 | ElementPredicateWhereV2 | RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
+    readonly $container: FqnExprWhere | RelationExprWhere | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
     readonly $type: 'WhereBinaryExpression';
     left: WhereElementExpression | WhereRelationExpression;
     operator: 'and' | 'or';
@@ -1124,7 +1034,7 @@ 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 | ElementPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation;
+    readonly $container: FqnExprWhere | WhereBinaryExpression | WhereElementNegation;
     readonly $type: 'WhereElementKind';
     not: boolean;
     operator: 'is' | string;
@@ -1133,14 +1043,14 @@ export interface WhereElementKind extends AstNode {
 export declare const WhereElementKind = "WhereElementKind";
 export declare function isWhereElementKind(item: unknown): item is WhereElementKind;
 export interface WhereElementNegation extends AstNode {
-    readonly $container: ElementPredicateWhere | ElementPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation;
+    readonly $container: FqnExprWhere | 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 | ElementPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation;
+    readonly $container: FqnExprWhere | WhereBinaryExpression | WhereElementNegation;
     readonly $type: 'WhereElementTag';
     not: boolean;
     operator: 'is' | string;
@@ -1149,7 +1059,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 | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationExprWhere | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationKind';
     not: boolean;
     operator: 'is' | string;
@@ -1158,14 +1068,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 | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationExprWhere | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationNegation';
     value: WhereRelationExpression;
 }
 export declare const WhereRelationNegation = "WhereRelationNegation";
 export declare function isWhereRelationNegation(item: unknown): item is WhereRelationNegation;
 export interface WhereRelationParticipantKind extends AstNode {
-    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationExprWhere | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationParticipantKind';
     not: boolean;
     operator: 'is' | string;
@@ -1175,7 +1085,7 @@ export interface WhereRelationParticipantKind extends AstNode {
 export declare const WhereRelationParticipantKind = "WhereRelationParticipantKind";
 export declare function isWhereRelationParticipantKind(item: unknown): item is WhereRelationParticipantKind;
 export interface WhereRelationParticipantTag extends AstNode {
-    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationExprWhere | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationParticipantTag';
     not: boolean;
     operator: 'is' | string;
@@ -1185,7 +1095,7 @@ export interface WhereRelationParticipantTag extends AstNode {
 export declare const WhereRelationParticipantTag = "WhereRelationParticipantTag";
 export declare function isWhereRelationParticipantTag(item: unknown): item is WhereRelationParticipantTag;
 export interface WhereRelationTag extends AstNode {
-    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationExprWhere | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationTag';
     not: boolean;
     operator: 'is' | string;
@@ -1194,7 +1104,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 | ElementPredicateWhereV2 | ElementPredicateWith | FqnExpressions | IncomingRelationExpr | IncomingRelationExpression | OutgoingRelationExpr | OutgoingRelationExpression | Predicates;
+    readonly $container: DirectedRelationExpr | Expressions | FqnExprWhere | FqnExprWith | FqnExpressions | IncomingRelationExpr | OutgoingRelationExpr;
     readonly $type: 'WildcardExpression';
     isWildcard: boolean;
 }
@@ -1220,32 +1130,20 @@ export type LikeC4AstType = {
     DeploymentViewBody: DeploymentViewBody;
     DeploymentViewRule: DeploymentViewRule;
     DeploymentViewRulePredicate: DeploymentViewRulePredicate;
-    DeploymentViewRulePredicateExpression: DeploymentViewRulePredicateExpression;
     DeploymentViewRuleStyle: DeploymentViewRuleStyle;
     DirectedRelationExpr: DirectedRelationExpr;
-    DirectedRelationExpression: DirectedRelationExpression;
     DynamicView: DynamicView;
     DynamicViewBody: DynamicViewBody;
     DynamicViewGlobalPredicateRef: DynamicViewGlobalPredicateRef;
     DynamicViewIncludePredicate: DynamicViewIncludePredicate;
     DynamicViewParallelSteps: DynamicViewParallelSteps;
-    DynamicViewPredicateIterator: DynamicViewPredicateIterator;
     DynamicViewRef: DynamicViewRef;
     DynamicViewRule: DynamicViewRule;
     DynamicViewStep: DynamicViewStep;
     Element: Element;
     ElementBody: ElementBody;
-    ElementDescedantsExpression: ElementDescedantsExpression;
-    ElementExpression: ElementExpression;
-    ElementExpressionsIterator: ElementExpressionsIterator;
     ElementKind: ElementKind;
     ElementKindExpression: ElementKindExpression;
-    ElementPredicate: ElementPredicate;
-    ElementPredicateOrWhere: ElementPredicateOrWhere;
-    ElementPredicateOrWhereV2: ElementPredicateOrWhereV2;
-    ElementPredicateWhere: ElementPredicateWhere;
-    ElementPredicateWhereV2: ElementPredicateWhereV2;
-    ElementPredicateWith: ElementPredicateWith;
     ElementProperty: ElementProperty;
     ElementRef: ElementRef;
     ElementStringProperty: ElementStringProperty;
@@ -1254,15 +1152,18 @@ export type LikeC4AstType = {
     ElementView: ElementView;
     ElementViewBody: ElementViewBody;
     ElementViewRef: ElementViewRef;
-    ExcludePredicate: ExcludePredicate;
-    ExpandElementExpression: ExpandElementExpression;
     ExpressionV2: ExpressionV2;
+    Expressions: Expressions;
     ExtendDeployment: ExtendDeployment;
     ExtendDeploymentBody: ExtendDeploymentBody;
     ExtendElement: ExtendElement;
     ExtendElementBody: ExtendElementBody;
     ExtendElementProperty: ExtendElementProperty;
     FqnExpr: FqnExpr;
+    FqnExprOrWhere: FqnExprOrWhere;
+    FqnExprOrWith: FqnExprOrWith;
+    FqnExprWhere: FqnExprWhere;
+    FqnExprWith: FqnExprWith;
     FqnExpressions: FqnExpressions;
     FqnRef: FqnRef;
     FqnRefExpr: FqnRefExpr;
@@ -1274,11 +1175,10 @@ export type LikeC4AstType = {
     GlobalStyleId: GlobalStyleId;
     Globals: Globals;
     IconProperty: IconProperty;
+    Imported: Imported;
+    ImportsFromPoject: ImportsFromPoject;
     InOutRelationExpr: InOutRelationExpr;
-    InOutRelationExpression: InOutRelationExpression;
-    IncludePredicate: IncludePredicate;
     IncomingRelationExpr: IncomingRelationExpr;
-    IncomingRelationExpression: IncomingRelationExpression;
     LibIcon: LibIcon;
     LikeC4Grammar: LikeC4Grammar;
     LikeC4Lib: LikeC4Lib;
@@ -1290,6 +1190,7 @@ export type LikeC4AstType = {
     MetadataProperty: MetadataProperty;
     Model: Model;
     ModelDeployments: ModelDeployments;
+    ModelReferenceable: ModelReferenceable;
     ModelViews: ModelViews;
     MultipleProperty: MultipleProperty;
     NavigateToProperty: NavigateToProperty;
@@ -1297,22 +1198,16 @@ export type LikeC4AstType = {
     NotesProperty: NotesProperty;
     OpacityProperty: OpacityProperty;
     OutgoingRelationExpr: OutgoingRelationExpr;
-    OutgoingRelationExpression: OutgoingRelationExpression;
     PaddingSizeProperty: PaddingSizeProperty;
-    Predicate: Predicate;
-    Predicates: Predicates;
     Referenceable: Referenceable;
     Relation: Relation;
     RelationBody: RelationBody;
     RelationExpr: RelationExpr;
-    RelationExpression: RelationExpression;
+    RelationExprOrWhere: RelationExprOrWhere;
+    RelationExprOrWith: RelationExprOrWith;
+    RelationExprWhere: RelationExprWhere;
+    RelationExprWith: RelationExprWith;
     RelationNavigateToProperty: RelationNavigateToProperty;
-    RelationPredicate: RelationPredicate;
-    RelationPredicateOrWhere: RelationPredicateOrWhere;
-    RelationPredicateOrWhereV2: RelationPredicateOrWhereV2;
-    RelationPredicateWhere: RelationPredicateWhere;
-    RelationPredicateWhereV2: RelationPredicateWhereV2;
-    RelationPredicateWith: RelationPredicateWith;
     RelationProperty: RelationProperty;
     RelationStringProperty: RelationStringProperty;
     RelationStyleProperty: RelationStyleProperty;