@likec4/language-server 1.19.1 → 1.19.2

package/src/like-c4.langium

@@ -620,10 +620,13 @@ DeploymentViewRulePredicateExpression:
 ;
 
 ExpressionV2:
-  RelationExpr |
+  RelationPredicateOrWhereV2 |
   FqnExpr
 ;
 
+RelationPredicateOrWhereV2:
+  RelationExpr ({infer RelationPredicateWhereV2.subject=current} 'where' where=WhereRelationExpression?)?
+;
 
 FqnExpr:
   {infer WildcardExpression} isWildcard?='*' |

package/src/model/parser/DeploymentViewParser.ts

@@ -1,7 +1,7 @@
 import type * as c4 from '@likec4/core'
-import { FqnExpr, invariant, isNonEmptyArray, nonexhaustive } from '@likec4/core'
+import { invariant, isNonEmptyArray, nonexhaustive } from '@likec4/core'
 import { isNonNullish } from 'remeda'
-import { ast, type ParsedAstDeploymentView, toAutoLayout, toElementStyle, ViewOps } from '../../ast'
+import { type ParsedAstDeploymentView, ast, toAutoLayout, toElementStyle, ViewOps } from '../../ast'
 import { logWarnError } from '../../logger'
 import { stringHash } from '../../utils'
 import { parseViewManualLayout } from '../../view-utils/manual-layout'
@@ -14,7 +14,7 @@ export type WithDeploymentView = ReturnType<typeof DeploymentViewParser>
 export function DeploymentViewParser<TBase extends WithExpressionV2 & WithDeploymentModel>(B: TBase) {
   return class DeploymentViewParser extends B {
     parseDeploymentView(
-      astNode: ast.DeploymentView
+      astNode: ast.DeploymentView,
     ): ParsedAstDeploymentView {
       const body = astNode.body
       invariant(body, 'DynamicElementView body is not defined')
@@ -26,7 +26,7 @@ export function DeploymentViewParser<TBase extends WithExpressionV2 & WithDeploy
       if (!id) {
         id = 'deployment_' + stringHash(
           this.doc.uri.toString(),
-          astPath
+          astPath,
         ) as c4.ViewId
       }
 
@@ -56,7 +56,7 @@ export function DeploymentViewParser<TBase extends WithExpressionV2 & WithDeploy
             return []
           }
         }),
-        ...(manualLayout && { manualLayout })
+        ...(manualLayout && { manualLayout }),
       }
     }
 
@@ -87,6 +87,9 @@ export function DeploymentViewParser<TBase extends WithExpressionV2 & WithDeploy
               case ast.isRelationExpr(expr):
                 exprs.unshift(this.parseRelationExpr(expr))
                 break
+              case ast.isRelationPredicateWhereV2(expr):
+                exprs.unshift(this.parseRelationWhereExpr(expr))
+                break
               default:
                 nonexhaustive(expr)
             }
@@ -108,8 +111,8 @@ export function DeploymentViewParser<TBase extends WithExpressionV2 & WithDeploy
         targets,
         ...(notation && { notation }),
         style: {
-          ...toElementStyle(styleProps, this.isValid)
-        }
+          ...toElementStyle(styleProps, this.isValid),
+        },
       }
     }
   }

package/src/model/parser/FqnRefParser.ts

@@ -4,6 +4,7 @@ import { isNonNullish } from 'remeda'
 import { ast } from '../../ast'
 import { logWarnError } from '../../logger'
 import { instanceRef } from '../../utils/fqnRef'
+import { parseWhereClause } from '../model-parser-where'
 import type { Base } from './Base'
 
 export type WithExpressionV2 = ReturnType<typeof ExpressionV2Parser>
@@ -89,7 +90,20 @@ export function ExpressionV2Parser<TBase extends Base>(B: TBase) {
       return exprs.reverse()
     }
 
+    parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr {
+      return {
+        where: {
+          expr: this.parseRelationExpr(astNode.subject as ast.RelationExpr),
+          condition: astNode.where ? parseWhereClause(astNode.where) : {
+            kind: { neq: '--always-true--' },
+          },
+        },
+      }
+    }
+
     parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr {
+      if (ast.isRelationPredicateWhere(astNode)) {
+      }
       if (ast.isDirectedRelationExpr(astNode)) {
         return {
           source: this.parseFqnExpr(astNode.source.from),