@likec4/language-server 1.3.0 → 1.5.0

package/README.md

@@ -1,5 +1,5 @@
 # `@likec4/language-server`
 
-[docs](https://docs.likec4.dev/) | [playground](https://playground.likec4.dev/) | [demo](https://template.likec4.dev/view/cloud)
+[docs](https://likec4.dev/) | [playground](https://playground.likec4.dev/) | [demo](https://template.likec4.dev/view/cloud)
 
 Language Server Protocol (LSP) based on [languim](https://github.com/languim/languim) library.

package/contrib/likec4.tmLanguage.json

@@ -12,7 +12,7 @@
     },
     {
       "name": "keyword.control.likec4",
-      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|autoLayout|blue|border|browser|color|crow|cylinder|dashed|description|diamond|dotted|dynamic|element|exclude|extend|extends|gray|green|head|icon|include|indigo|it|kind|line|link|mobile|model|muted|navigateTo|none|normal|odiamond|of|onormal|opacity|open|person|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|specification|storage|style|tag|tail|technology|this|title|vee|view|views|with)\\b"
+      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|autoLayout|blue|border|browser|color|crow|cylinder|dashed|description|diamond|dot|dotted|dynamic|element|exclude|extend|extends|gray|green|head|icon|include|indigo|it|kind|line|link|mobile|model|muted|navigateTo|none|normal|odiamond|odot|of|onormal|opacity|open|person|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|specification|storage|style|tag|tail|technology|this|title|vee|view|views|with)\\b"
     },
     {
       "name": "string.quoted.double.likec4",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -78,38 +78,38 @@
     "lint": "run -T eslint src/ --fix",
     "clean": "run -T rimraf dist contrib",
     "test": "vitest run --no-isolate",
+    "vitest:ui": "vitest --no-isolate --ui",
     "test:watch": "vitest"
   },
   "dependencies": {
     "@dagrejs/graphlib": "^2.2.2",
-    "@likec4/core": "1.3.0",
+    "@likec4/core": "1.5.0",
     "@total-typescript/ts-reset": "^0.5.1",
     "fast-equals": "^5.0.1",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
-    "langium": "3.1.0",
+    "langium": "3.1.2",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
-    "rambdax": "^9.1.1",
-    "remeda": "^1.61.0",
+    "remeda": "^2.3.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
-    "type-fest": "^4.18.2",
+    "type-fest": "^4.21.0",
     "ufo": "^1.5.3",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/tsconfig": "1.3.0",
-    "@types/node": "^20.14.2",
+    "@likec4/tsconfig": "1.5.0",
+    "@types/node": "^20.14.10",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
-    "execa": "^9.1.0",
+    "execa": "^9.3.0",
     "langium-cli": "3.1.0",
-    "npm-run-all2": "^6.1.2",
-    "typescript": "^5.4.5",
-    "vitest": "~1.5.3"
+    "npm-run-all2": "^6.2.2",
+    "typescript": "^5.5.3",
+    "vitest": "~1.6.0"
   },
-  "packageManager": "yarn@4.3.0"
+  "packageManager": "yarn@4.3.1"
 }

package/src/Rpc.ts

@@ -3,7 +3,7 @@ import { logError, logger } from './logger'
 import type { LikeC4Services } from './module'
 
 import { nonexhaustive } from '@likec4/core'
-import { Disposable, URI, UriUtils } from 'langium'
+import { Disposable, interruptAndCheck, URI, UriUtils } from 'langium'
 import { isLikeC4LangiumDocument } from './ast'
 import {
   buildDocuments,
@@ -46,6 +46,8 @@ export class Rpc implements Disposable {
       }
     )
 
+    let isFirstBuild = true
+
     this.disposables.push(
       Disposable.create(() => {
         notifyModelParsed.cancel()
@@ -75,6 +77,26 @@ export class Rpc implements Disposable {
   changed (total ${changed.length}):${docs.map(d => '\n    - ' + d).join('')}
   deleted (total ${deleted.length}):${deleted.map(d => '\n    - ' + d.toString()).join('\n')}`
         )
+
+        if (!isFirstBuild && (changed.length + deleted.length) > 0) {
+          await Promise.allSettled(
+            [...changed, ...deleted].map(async d => {
+              const uri = d.toString()
+              logger.debug(`clear diagnostics for ${uri}`)
+              try {
+                await connection.sendDiagnostics({
+                  uri,
+                  diagnostics: []
+                })
+              } catch (e) {
+                // Ignore
+                logger.warn(`error clearing diagnostics for ${uri}: ${e}`)
+              }
+            })
+          )
+          await interruptAndCheck(cancelToken)
+        }
+        isFirstBuild = false
         await DocumentBuilder.update(changed, deleted, cancelToken)
       }),
       connection.onRequest(locate, params => {

package/src/ast.ts

@@ -6,7 +6,7 @@ import {
   nonexhaustive,
   RelationRefError
 } from '@likec4/core'
-import type { AstNode, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium'
+import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium'
 import { AstUtils, DocumentState } from 'langium'
 import { clamp, isNullish } from 'remeda'
 import type { ConditionalPick, SetRequired, ValueOf } from 'type-fest'
@@ -133,10 +133,8 @@ export const ElementOps = {
   }
 }
 
-export interface DocFqnIndexEntry {
-  name: string
-  el: WeakRef<ast.Element>
-  path: string
+export interface DocFqnIndexAstNodeDescription extends AstNodeDescription {
+  fqn: c4.Fqn
 }
 
 // export type LikeC4AstNode = ast.LikeC4AstType[keyof ast.LikeC4AstType]
@@ -150,14 +148,14 @@ export interface LikeC4DocumentProps {
   c4Relations?: ParsedAstRelation[]
   c4Views?: ParsedAstView[]
   // Fqn -> Element
-  c4fqns?: MultiMap<c4.Fqn, DocFqnIndexEntry>
+  c4fqnIndex?: MultiMap<c4.Fqn, DocFqnIndexAstNodeDescription>
 }
 
 export interface LikeC4LangiumDocument
   extends Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>, LikeC4DocumentProps
 {}
 export interface FqnIndexedDocument
-  extends Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>, SetRequired<LikeC4DocumentProps, 'c4fqns'>
+  extends Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>, SetRequired<LikeC4DocumentProps, 'c4fqnIndex'>
 {}
 
 // export type ParsedLikeC4LangiumDocument = SetRequired<FqnIndexedDocument, keyof  LikeC4DocumentProps>
@@ -166,7 +164,7 @@ export interface ParsedLikeC4LangiumDocument
 {}
 
 export function cleanParsedModel(doc: LikeC4LangiumDocument) {
-  const props: Required<Omit<LikeC4DocumentProps, 'c4fqns' | 'diagnostics'>> = {
+  const props: Required<Omit<LikeC4DocumentProps, 'c4fqnIndex' | 'diagnostics'>> = {
     c4Specification: {
       kinds: {},
       relationships: {}
@@ -179,7 +177,7 @@ export function cleanParsedModel(doc: LikeC4LangiumDocument) {
 }
 
 export function isFqnIndexedDocument(doc: LangiumDocument): doc is FqnIndexedDocument {
-  return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !!doc.c4fqns
+  return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !!doc.c4fqnIndex
 }
 
 export function isLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument {
@@ -196,7 +194,7 @@ export function isParsedLikeC4LangiumDocument(
     && !!doc.c4Elements
     && !!doc.c4Relations
     && !!doc.c4Views
-    && !!doc.c4fqns
+    && !!doc.c4fqnIndex
   )
 }
 
@@ -209,15 +207,16 @@ function validatableAstNodeGuards<const Predicates extends Guard<AstNode>[]>(
   return (n: AstNode): n is Guarded<Predicates[number]> => predicates.some(p => p(n))
 }
 const isValidatableAstNode = validatableAstNodeGuards([
-  ast.isCustomElementExprBody,
+  ast.isCustomElementExpr,
+  ast.isCustomRelationExpr,
   ast.isViewRulePredicateExpr,
   ast.isDynamicViewRulePredicate,
+  ast.isDynamicViewStep,
   ast.isViewProperty,
   ast.isStyleProperty,
   ast.isTags,
   ast.isViewRule,
   ast.isDynamicViewRule,
-  ast.isDynamicViewStep,
   ast.isElementViewBody,
   ast.isDynamicViewBody,
   ast.isLikeC4View,

package/src/generated/ast.ts

@@ -20,18 +20,15 @@ export const LikeC4Terminals = {
     Dot: /\./,
     NotEqual: /\!\={1,2}/,
     Eq: /\={1,2}/,
-    Colon: /:/,
-    SemiColon: /;/,
-    Comma: /,/,
     Percent: /\b\d+%/,
     String: /"[^"]*"|'[^']*'/,
     IdTerminal: /\b[_]*[a-zA-Z][_-\w]*/,
 };
 
-export type ArrowType = 'crow' | 'diamond' | 'none' | 'normal' | 'odiamond' | 'onormal' | 'open' | 'vee';
+export type ArrowType = 'crow' | 'diamond' | 'dot' | 'none' | 'normal' | 'odiamond' | 'odot' | 'onormal' | 'open' | 'vee';
 
 export function isArrowType(item: unknown): item is ArrowType {
-    return item === 'none' || item === 'normal' || item === 'onormal' || item === 'diamond' || item === 'odiamond' || item === 'crow' || item === 'open' || item === 'vee';
+    return item === 'none' || item === 'normal' || item === 'onormal' || item === 'dot' || item === 'odot' || item === 'diamond' || item === 'odiamond' || item === 'crow' || item === 'open' || item === 'vee';
 }
 
 export type BorderStyleValue = 'none' | LineOptions;
@@ -62,6 +59,14 @@ export function isElementExpr(item: unknown): item is ElementExpr {
     return reflection.isInstance(item, ElementExpr);
 }
 
+export type ElementPredicateExpression = CustomElementExpr | ElementExpr;
+
+export const ElementPredicateExpression = 'ElementPredicateExpression';
+
+export function isElementPredicateExpression(item: unknown): item is ElementPredicateExpression {
+    return reflection.isInstance(item, ElementPredicateExpression);
+}
+
 export type ElementProperty = ElementStringProperty | LinkProperty | StyleProperties;
 
 export const ElementProperty = 'ElementProperty';
@@ -104,6 +109,14 @@ export function isRelation(item: unknown): item is Relation {
     return reflection.isInstance(item, Relation);
 }
 
+export type RelationPredicateExpression = OutgoingExpr | ViewRulePredicateRelations;
+
+export const RelationPredicateExpression = 'RelationPredicateExpression';
+
+export function isRelationPredicateExpression(item: unknown): item is RelationPredicateExpression {
+    return reflection.isInstance(item, RelationPredicateExpression);
+}
+
 export type RelationProperty = LinkProperty | RelationStringProperty | RelationStyleProperty;
 
 export const RelationProperty = 'RelationProperty';
@@ -120,7 +133,7 @@ export function isRelationshipStyleProperty(item: unknown): item is Relationship
     return reflection.isInstance(item, RelationshipStyleProperty);
 }
 
-export type StringProperty = ElementStringProperty | ViewStringProperty;
+export type StringProperty = ElementStringProperty | RelationStringProperty | ViewStringProperty;
 
 export const StringProperty = 'StringProperty';
 
@@ -184,7 +197,7 @@ export function isViewRulePredicate(item: unknown): item is ViewRulePredicate {
     return reflection.isInstance(item, ViewRulePredicate);
 }
 
-export type ViewRulePredicateExpr = CustomElementExpr | ElementExpr | InOutExpr | IncomingExpr | OutgoingExpr | RelationExpr;
+export type ViewRulePredicateExpr = ElementPredicateExpression | RelationPredicateExpression;
 
 export const ViewRulePredicateExpr = 'ViewRulePredicateExpr';
 
@@ -192,8 +205,16 @@ export function isViewRulePredicateExpr(item: unknown): item is ViewRulePredicat
     return reflection.isInstance(item, ViewRulePredicateExpr);
 }
 
+export type ViewRulePredicateRelations = CustomRelationExpr | InOutExpr | IncomingExpr | RelationExpr;
+
+export const ViewRulePredicateRelations = 'ViewRulePredicateRelations';
+
+export function isViewRulePredicateRelations(item: unknown): item is ViewRulePredicateRelations {
+    return reflection.isInstance(item, ViewRulePredicateRelations);
+}
+
 export interface ArrowProperty extends AstNode {
-    readonly $container: RelationStyleProperty | SpecificationRelationshipKind;
+    readonly $container: CustomRelationExprBody | RelationStyleProperty | SpecificationRelationshipKind;
     readonly $type: 'ArrowProperty';
     key: 'head' | 'tail';
     value: ArrowType;
@@ -219,7 +240,7 @@ export function isBorderProperty(item: unknown): item is BorderProperty {
 }
 
 export interface ColorProperty extends AstNode {
-    readonly $container: CustomElementExprBody | RelationStyleProperty | SpecificationRelationshipKind | StyleProperties | ViewRuleStyle;
+    readonly $container: CustomElementExprBody | CustomRelationExprBody | RelationStyleProperty | SpecificationRelationshipKind | StyleProperties | ViewRuleStyle;
     readonly $type: 'ColorProperty';
     key: 'color';
     value: ThemeColor;
@@ -256,6 +277,31 @@ export function isCustomElementExprBody(item: unknown): item is CustomElementExp
     return reflection.isInstance(item, CustomElementExprBody);
 }
 
+export interface CustomRelationExpr extends AstNode {
+    readonly $container: ExcludePredicate | IncludePredicate;
+    readonly $type: 'CustomRelationExpr';
+    body: CustomRelationExprBody;
+    relation: RelationExpr;
+}
+
+export const CustomRelationExpr = 'CustomRelationExpr';
+
+export function isCustomRelationExpr(item: unknown): item is CustomRelationExpr {
+    return reflection.isInstance(item, CustomRelationExpr);
+}
+
+export interface CustomRelationExprBody extends AstNode {
+    readonly $container: CustomRelationExpr;
+    readonly $type: 'CustomRelationExprBody';
+    props: Array<RelationStringProperty | RelationshipStyleProperty>;
+}
+
+export const CustomRelationExprBody = 'CustomRelationExprBody';
+
+export function isCustomRelationExprBody(item: unknown): item is CustomRelationExprBody {
+    return reflection.isInstance(item, CustomRelationExprBody);
+}
+
 export interface DescedantsExpr extends AstNode {
     readonly $container: CustomElementExpr | DynamicViewRulePredicate | ExcludePredicate | IncludePredicate | IncomingExpr | OutgoingExpr | RelationExpr | ViewRuleStyle;
     readonly $type: 'DescedantsExpr';
@@ -299,8 +345,7 @@ export function isDynamicViewBody(item: unknown): item is DynamicViewBody {
 export interface DynamicViewRulePredicate extends AstNode {
     readonly $container: DynamicViewBody;
     readonly $type: 'DynamicViewRulePredicate';
-    commas: Array<string>;
-    expressions: Array<ViewRulePredicateExpr>;
+    expressions: Array<ElementPredicateExpression>;
 }
 
 export const DynamicViewRulePredicate = 'DynamicViewRulePredicate';
@@ -463,7 +508,6 @@ export function isElementViewRef(item: unknown): item is ElementViewRef {
 export interface ExcludePredicate extends AstNode {
     readonly $container: ElementViewBody;
     readonly $type: 'ExcludePredicate';
-    commas: Array<string>;
     expressions: Array<ViewRulePredicateExpr>;
 }
 
@@ -573,7 +617,6 @@ export function isImplicitRelation(item: unknown): item is ImplicitRelation {
 export interface IncludePredicate extends AstNode {
     readonly $container: ElementViewBody;
     readonly $type: 'IncludePredicate';
-    commas: Array<string>;
     expressions: Array<ViewRulePredicateExpr>;
 }
 
@@ -584,7 +627,7 @@ export function isIncludePredicate(item: unknown): item is IncludePredicate {
 }
 
 export interface IncomingExpr extends AstNode {
-    readonly $container: DynamicViewRulePredicate | ExcludePredicate | InOutExpr | IncludePredicate;
+    readonly $container: ExcludePredicate | InOutExpr | IncludePredicate;
     readonly $type: 'IncomingExpr';
     to: ElementExpr;
 }
@@ -596,7 +639,7 @@ export function isIncomingExpr(item: unknown): item is IncomingExpr {
 }
 
 export interface InOutExpr extends AstNode {
-    readonly $container: DynamicViewRulePredicate | ExcludePredicate | IncludePredicate;
+    readonly $container: ExcludePredicate | IncludePredicate;
     readonly $type: 'InOutExpr';
     inout: IncomingExpr;
 }
@@ -621,7 +664,7 @@ export function isLikeC4Grammar(item: unknown): item is LikeC4Grammar {
 }
 
 export interface LineProperty extends AstNode {
-    readonly $container: RelationStyleProperty | SpecificationRelationshipKind;
+    readonly $container: CustomRelationExprBody | RelationStyleProperty | SpecificationRelationshipKind;
     readonly $type: 'LineProperty';
     key: 'line';
     value: LineOptions;
@@ -699,7 +742,7 @@ export function isOpacityProperty(item: unknown): item is OpacityProperty {
 }
 
 export interface OutgoingExpr extends AstNode {
-    readonly $container: DynamicViewRulePredicate | ExcludePredicate | IncludePredicate;
+    readonly $container: ExcludePredicate | IncludePredicate;
     readonly $type: 'OutgoingExpr';
     from: ElementExpr;
 }
@@ -724,7 +767,7 @@ export function isRelationBody(item: unknown): item is RelationBody {
 }
 
 export interface RelationExpr extends AstNode {
-    readonly $container: DynamicViewRulePredicate | ExcludePredicate | IncludePredicate;
+    readonly $container: CustomRelationExpr | ExcludePredicate | IncludePredicate;
     readonly $type: 'RelationExpr';
     isBidirectional: boolean;
     source: ElementExpr;
@@ -750,7 +793,7 @@ export function isRelationshipKind(item: unknown): item is RelationshipKind {
 }
 
 export interface RelationStringProperty extends AstNode {
-    readonly $container: RelationBody;
+    readonly $container: CustomRelationExprBody | RelationBody;
     readonly $type: 'RelationStringProperty';
     key: 'title';
     value: string;
@@ -869,7 +912,6 @@ export function isTag(item: unknown): item is Tag {
 export interface Tags extends AstNode {
     readonly $container: DynamicViewBody | ElementBody | ElementViewBody | ExplicitRelation | ImplicitRelation | RelationBody;
     readonly $type: 'Tags';
-    comma: Array<string>;
     value: Array<Reference<Tag>>;
 }
 
@@ -906,7 +948,6 @@ export function isViewRuleAutoLayout(item: unknown): item is ViewRuleAutoLayout
 export interface ViewRuleStyle extends AstNode {
     readonly $container: DynamicViewBody | ElementViewBody;
     readonly $type: 'ViewRuleStyle';
-    commas: Array<string>;
     styleprops: Array<StyleProperty>;
     targets: Array<ElementExpr>;
 }
@@ -948,6 +989,8 @@ export type LikeC4AstType = {
     ColorProperty: ColorProperty
     CustomElementExpr: CustomElementExpr
     CustomElementExprBody: CustomElementExprBody
+    CustomRelationExpr: CustomRelationExpr
+    CustomRelationExprBody: CustomRelationExprBody
     DescedantsExpr: DescedantsExpr
     DynamicView: DynamicView
     DynamicViewBody: DynamicViewBody
@@ -959,6 +1002,7 @@ export type LikeC4AstType = {
     ElementExpr: ElementExpr
     ElementKind: ElementKind
     ElementKindExpr: ElementKindExpr
+    ElementPredicateExpression: ElementPredicateExpression
     ElementProperty: ElementProperty
     ElementRef: ElementRef
     ElementStringProperty: ElementStringProperty
@@ -989,6 +1033,7 @@ export type LikeC4AstType = {
     Relation: Relation
     RelationBody: RelationBody
     RelationExpr: RelationExpr
+    RelationPredicateExpression: RelationPredicateExpression
     RelationProperty: RelationProperty
     RelationStringProperty: RelationStringProperty
     RelationStyleProperty: RelationStyleProperty
@@ -1010,6 +1055,7 @@ export type LikeC4AstType = {
     ViewRuleAutoLayout: ViewRuleAutoLayout
     ViewRulePredicate: ViewRulePredicate
     ViewRulePredicateExpr: ViewRulePredicateExpr
+    ViewRulePredicateRelations: ViewRulePredicateRelations
     ViewRuleStyle: ViewRuleStyle
     ViewStringProperty: ViewStringProperty
     WildcardExpr: WildcardExpr
@@ -1018,7 +1064,7 @@ export type LikeC4AstType = {
 export class LikeC4AstReflection extends AbstractAstReflection {
 
     getAllTypes(): string[] {
-        return [ArrowProperty, BorderProperty, ColorProperty, CustomElementExpr, CustomElementExprBody, DescedantsExpr, DynamicView, DynamicViewBody, DynamicViewRule, DynamicViewRulePredicate, DynamicViewStep, Element, ElementBody, ElementExpr, ElementKind, ElementKindExpr, ElementProperty, ElementRef, ElementStringProperty, ElementTagExpr, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpr, ExplicitRelation, ExtendElement, ExtendElementBody, FqnElementRef, IconProperty, ImplicitRelation, InOutExpr, IncludePredicate, IncomingExpr, LikeC4Grammar, LikeC4View, LineProperty, LinkProperty, Model, ModelViews, NavigateToProperty, OpacityProperty, OutgoingExpr, Relation, RelationBody, RelationExpr, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationElementKind, SpecificationRelationshipKind, SpecificationRule, SpecificationTag, StringProperty, StyleProperties, StyleProperty, Tag, Tags, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRulePredicate, ViewRulePredicateExpr, ViewRuleStyle, ViewStringProperty, WildcardExpr];
+        return [ArrowProperty, BorderProperty, ColorProperty, CustomElementExpr, CustomElementExprBody, CustomRelationExpr, CustomRelationExprBody, DescedantsExpr, DynamicView, DynamicViewBody, DynamicViewRule, DynamicViewRulePredicate, DynamicViewStep, Element, ElementBody, ElementExpr, ElementKind, ElementKindExpr, ElementPredicateExpression, ElementProperty, ElementRef, ElementStringProperty, ElementTagExpr, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpr, ExplicitRelation, ExtendElement, ExtendElementBody, FqnElementRef, IconProperty, ImplicitRelation, InOutExpr, IncludePredicate, IncomingExpr, LikeC4Grammar, LikeC4View, LineProperty, LinkProperty, Model, ModelViews, NavigateToProperty, OpacityProperty, OutgoingExpr, Relation, RelationBody, RelationExpr, RelationPredicateExpression, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationElementKind, SpecificationRelationshipKind, SpecificationRule, SpecificationTag, StringProperty, StyleProperties, StyleProperty, Tag, Tags, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRulePredicate, ViewRulePredicateExpr, ViewRulePredicateRelations, ViewRuleStyle, ViewStringProperty, WildcardExpr];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -1037,12 +1083,14 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return this.isSubtype(RelationshipStyleProperty, supertype) || this.isSubtype(StyleProperty, supertype);
             }
             case CustomElementExpr:
-            case ElementExpr:
+            case ElementExpr: {
+                return this.isSubtype(ElementPredicateExpression, supertype);
+            }
+            case CustomRelationExpr:
             case IncomingExpr:
             case InOutExpr:
-            case OutgoingExpr:
             case RelationExpr: {
-                return this.isSubtype(ViewRulePredicateExpr, supertype);
+                return this.isSubtype(ViewRulePredicateRelations, supertype);
             }
             case DescedantsExpr:
             case ElementKindExpr:
@@ -1059,6 +1107,10 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case DynamicViewRulePredicate: {
                 return this.isSubtype(DynamicViewRule, supertype);
             }
+            case ElementPredicateExpression:
+            case RelationPredicateExpression: {
+                return this.isSubtype(ViewRulePredicateExpr, supertype);
+            }
             case ElementStringProperty: {
                 return this.isSubtype(ElementProperty, supertype) || this.isSubtype(StringProperty, supertype);
             }
@@ -1073,7 +1125,13 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case LinkProperty: {
                 return this.isSubtype(ElementProperty, supertype) || this.isSubtype(RelationProperty, supertype) || this.isSubtype(ViewProperty, supertype);
             }
-            case RelationStringProperty:
+            case OutgoingExpr:
+            case ViewRulePredicateRelations: {
+                return this.isSubtype(RelationPredicateExpression, supertype);
+            }
+            case RelationStringProperty: {
+                return this.isSubtype(RelationProperty, supertype) || this.isSubtype(StringProperty, supertype);
+            }
             case RelationStyleProperty: {
                 return this.isSubtype(RelationProperty, supertype);
             }
@@ -1174,6 +1232,23 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case CustomRelationExpr: {
+                return {
+                    name: CustomRelationExpr,
+                    properties: [
+                        { name: 'body' },
+                        { name: 'relation' }
+                    ]
+                };
+            }
+            case CustomRelationExprBody: {
+                return {
+                    name: CustomRelationExprBody,
+                    properties: [
+                        { name: 'props', defaultValue: [] }
+                    ]
+                };
+            }
             case DescedantsExpr: {
                 return {
                     name: DescedantsExpr,
@@ -1206,7 +1281,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: DynamicViewRulePredicate,
                     properties: [
-                        { name: 'commas', defaultValue: [] },
                         { name: 'expressions', defaultValue: [] }
                     ]
                 };
@@ -1322,7 +1396,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: ExcludePredicate,
                     properties: [
-                        { name: 'commas', defaultValue: [] },
                         { name: 'expressions', defaultValue: [] }
                     ]
                 };
@@ -1400,7 +1473,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: IncludePredicate,
                     properties: [
-                        { name: 'commas', defaultValue: [] },
                         { name: 'expressions', defaultValue: [] }
                     ]
                 };
@@ -1605,7 +1677,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: Tags,
                     properties: [
-                        { name: 'comma', defaultValue: [] },
                         { name: 'value', defaultValue: [] }
                     ]
                 };
@@ -1630,7 +1701,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: ViewRuleStyle,
                     properties: [
-                        { name: 'commas', defaultValue: [] },
                         { name: 'styleprops', defaultValue: [] },
                         { name: 'targets', defaultValue: [] }
                     ]