@likec4/language-server 1.19.1 → 1.20.0

package/dist/like-c4.langium

@@ -413,11 +413,13 @@ WhereRelationNegation:
 
 WhereRelation:
   {infer WhereRelationTag} 'tag' EqOperator value=[Tag:TagId]? |
-  {infer WhereRelationKind} 'kind' EqOperator value=[RelationshipKind:Id]?
+  {infer WhereRelationKind} 'kind' EqOperator value=[RelationshipKind:Id]? |
+  {infer WhereRelationParticipantTag} participant=Participant StickyDot 'tag' EqOperator value=[Tag:TagId]? |
+  {infer WhereRelationParticipantKind} participant=Participant StickyDot 'kind' EqOperator value=[DeploymentNodeOrElementKind:Id]?
 ;
-
-type WhereTagEqual = WhereElementTag | WhereRelationTag;
-type WhereKindEqual = WhereElementKind | WhereRelationKind;
+type DeploymentNodeOrElementKind = ElementKind | DeploymentNodeKind
+type WhereTagEqual = WhereElementTag | WhereRelationTag | WhereRelationParticipantTag;
+type WhereKindEqual = WhereElementKind | WhereRelationKind | WhereRelationParticipantKind;
 
 type WhereExpression = WhereElementExpression | WhereRelationExpression;
 
@@ -620,10 +622,13 @@ DeploymentViewRulePredicateExpression:
 ;
 
 ExpressionV2:
-  RelationExpr |
+  RelationPredicateOrWhereV2 |
   FqnExpr
 ;
 
+RelationPredicateOrWhereV2:
+  RelationExpr ({infer RelationPredicateWhereV2.subject=current} 'where' where=WhereRelationExpression?)?
+;
 
 FqnExpr:
   {infer WildcardExpression} isWildcard?='*' |
@@ -766,6 +771,8 @@ ThemeColor returns string:
   'primary' | 'secondary' | 'muted' | 'slate' | 'blue' | 'indigo' | 'sky' | 'red' | 'gray' | 'green' | 'amber';
 ElementShape returns string:
   'rectangle' | 'person' | 'browser' | 'mobile' | 'cylinder' | 'storage' | 'queue';
+Participant returns string:
+  'source' | 'target';
 
 CustomColorValue returns string:
   Hash (Id | Hex | Number);
@@ -786,7 +793,7 @@ CustomColorId returns string:
   IdTerminal | ElementShape | ArrowType | LineOptions | 'element' | 'model';
 
 Id returns string:
-  IdTerminal | ElementShape | ThemeColor | ArrowType | LineOptions | 'element' | 'model' | 'group' | 'node' | 'deployment' | 'instance';
+  IdTerminal | ElementShape | ThemeColor | ArrowType | LineOptions | Participant | 'element' | 'model' | 'group' | 'node' | 'deployment' | 'instance';
 
 fragment EqOperator:
   (

package/dist/lsp/SemanticTokenProvider.d.ts

@@ -1,5 +1,5 @@
 import type { AstNode } from 'langium';
-import { AbstractSemanticTokenProvider, type SemanticTokenAcceptor } from 'langium/lsp';
+import { type SemanticTokenAcceptor, AbstractSemanticTokenProvider } from 'langium/lsp';
 export declare class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
     protected highlightElement(node: AstNode, acceptor: SemanticTokenAcceptor): void | undefined | 'prune';
     private highlightNameAndKind;

package/dist/lsp/SemanticTokenProvider.js

@@ -118,6 +118,13 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       });
       return;
     }
+    if (ast.isWhereRelationParticipantKind(node) || ast.isWhereRelationParticipantTag(node)) {
+      acceptor({
+        node,
+        property: "participant",
+        type: SemanticTokenTypes.keyword
+      });
+    }
     if (ast.isElementKindExpression(node) && isTruthy(node.kind)) {
       acceptor({
         node,

package/dist/model/model-parser-where.js

@@ -14,21 +14,27 @@ const parseEquals = ({ operator, not }, value) => {
   }
   return not ? { neq: value } : { eq: value };
 };
+function parseParticipant(astNode) {
+  if (!ast.isWhereRelationParticipantKind(astNode) && !ast.isWhereRelationParticipantTag(astNode)) {
+    return null;
+  }
+  return astNode.participant;
+}
 export function parseWhereClause(astNode) {
   switch (true) {
     case ast.isWhereTagEqual(astNode): {
       const tag = astNode.value?.ref?.name;
+      const participant = parseParticipant(astNode);
       invariant(tag, "Expected tag name");
-      return {
-        tag: parseEquals(astNode, tag)
-      };
+      const tagOperator = { tag: parseEquals(astNode, tag) };
+      return participant ? { participant, operator: tagOperator } : tagOperator;
     }
     case ast.isWhereKindEqual(astNode): {
       const kind = astNode.value?.ref?.name;
+      const participant = parseParticipant(astNode);
       invariant(kind, "Expected kind name");
-      return {
-        kind: parseEquals(astNode, kind)
-      };
+      const kindOperator = { kind: parseEquals(astNode, kind) };
+      return participant ? { participant, operator: kindOperator } : kindOperator;
     }
     case (ast.isWhereElementNegation(astNode) || ast.isWhereRelationNegation(astNode)): {
       return {

package/dist/model/model-parser.d.ts

@@ -60,6 +60,7 @@ declare const DocumentParserFromMixins: {
         parseFqnExpr(astNode: import("../generated/ast").FqnExpr): invariant;
         parseFqnRefExpr(astNode: import("../generated/ast").FqnRefExpr): invariant;
         parseFqnExpressions(astNode: import("../generated/ast").FqnExpressions): invariant[];
+        parseRelationWhereExpr(astNode: import("../generated/ast").RelationPredicateWhereV2): invariant;
         parseRelationExpr(astNode: import("../generated/ast").RelationExpr): invariant;
         parseDeployment(): void;
         parseDeploymentNode(astNode: import("../generated/ast").DeploymentNode): import("../ast").ParsedAstDeployment.Node;
@@ -117,6 +118,7 @@ declare const DocumentParserFromMixins: {
         parseFqnExpr(astNode: import("../generated/ast").FqnExpr): invariant;
         parseFqnRefExpr(astNode: import("../generated/ast").FqnRefExpr): invariant;
         parseFqnExpressions(astNode: import("../generated/ast").FqnExpressions): invariant[];
+        parseRelationWhereExpr(astNode: import("../generated/ast").RelationPredicateWhereV2): invariant;
         parseRelationExpr(astNode: import("../generated/ast").RelationExpr): invariant;
         parseDeployment(): void;
         parseDeploymentNode(astNode: import("../generated/ast").DeploymentNode): import("../ast").ParsedAstDeployment.Node;
@@ -183,6 +185,7 @@ declare const DocumentParserFromMixins: {
         parseFqnExpr(astNode: import("../generated/ast").FqnExpr): invariant;
         parseFqnRefExpr(astNode: import("../generated/ast").FqnRefExpr): invariant;
         parseFqnExpressions(astNode: import("../generated/ast").FqnExpressions): invariant[];
+        parseRelationWhereExpr(astNode: import("../generated/ast").RelationPredicateWhereV2): invariant;
         parseRelationExpr(astNode: import("../generated/ast").RelationExpr): invariant;
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
@@ -215,6 +218,7 @@ declare const DocumentParserFromMixins: {
         parseFqnExpr(astNode: import("../generated/ast").FqnExpr): invariant;
         parseFqnRefExpr(astNode: import("../generated/ast").FqnRefExpr): invariant;
         parseFqnExpressions(astNode: import("../generated/ast").FqnExpressions): invariant[];
+        parseRelationWhereExpr(astNode: import("../generated/ast").RelationPredicateWhereV2): invariant;
         parseRelationExpr(astNode: import("../generated/ast").RelationExpr): invariant;
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;
@@ -261,6 +265,7 @@ declare const DocumentParserFromMixins: {
         parseFqnExpr(astNode: import("../generated/ast").FqnExpr): invariant;
         parseFqnRefExpr(astNode: import("../generated/ast").FqnRefExpr): invariant;
         parseFqnExpressions(astNode: import("../generated/ast").FqnExpressions): invariant[];
+        parseRelationWhereExpr(astNode: import("../generated/ast").RelationPredicateWhereV2): invariant;
         parseRelationExpr(astNode: import("../generated/ast").RelationExpr): invariant;
         isValid: import("../validation").IsValidFn;
         readonly services: LikeC4Services;

package/dist/model/parser/DeploymentModelParser.d.ts

@@ -12,6 +12,7 @@ export declare function DeploymentModelParser<TBase extends WithExpressionV2>(B:
         parseFqnExpr(astNode: ast.FqnExpr): c4.FqnExpr;
         parseFqnRefExpr(astNode: ast.FqnRefExpr): c4.FqnExpr.NonWildcard;
         parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[];
+        parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr;
         parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr;
         isValid: import("../../validation").IsValidFn;
         readonly services: import("../..").LikeC4Services;

package/dist/model/parser/DeploymentViewParser.d.ts

@@ -1,5 +1,5 @@
 import type * as c4 from '@likec4/core';
-import { ast, type ParsedAstDeploymentView } from '../../ast';
+import { type ParsedAstDeploymentView, ast } from '../../ast';
 import type { WithDeploymentModel } from './DeploymentModelParser';
 import type { WithExpressionV2 } from './FqnRefParser';
 export type WithDeploymentView = ReturnType<typeof DeploymentViewParser>;
@@ -13,6 +13,7 @@ export declare function DeploymentViewParser<TBase extends WithExpressionV2 & Wi
         parseFqnExpr(astNode: ast.FqnExpr): c4.FqnExpr;
         parseFqnRefExpr(astNode: ast.FqnRefExpr): c4.FqnExpr.NonWildcard;
         parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[];
+        parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr;
         parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr;
         isValid: import("../../validation").IsValidFn;
         readonly services: import("../..").LikeC4Services;

package/dist/model/parser/DeploymentViewParser.js

@@ -70,6 +70,9 @@ export function DeploymentViewParser(B) {
               case ast.isRelationExpr(expr):
                 exprs.unshift(this.parseRelationExpr(expr));
                 break;
+              case ast.isRelationPredicateWhereV2(expr):
+                exprs.unshift(this.parseRelationWhereExpr(expr));
+                break;
               default:
                 nonexhaustive(expr);
             }

package/dist/model/parser/FqnRefParser.d.ts

@@ -8,6 +8,7 @@ export declare function ExpressionV2Parser<TBase extends Base>(B: TBase): {
         parseFqnExpr(astNode: ast.FqnExpr): c4.FqnExpr;
         parseFqnRefExpr(astNode: ast.FqnRefExpr): c4.FqnExpr.NonWildcard;
         parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[];
+        parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr;
         parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr;
         isValid: import("../../validation").IsValidFn;
         readonly services: import("../..").LikeC4Services;

package/dist/model/parser/FqnRefParser.js

@@ -3,6 +3,7 @@ import { isNonNullish } from "remeda";
 import { ast } from "../../ast.js";
 import { logWarnError } from "../../logger.js";
 import { instanceRef } from "../../utils/fqnRef.js";
+import { parseWhereClause } from "../model-parser-where.js";
 export function ExpressionV2Parser(B) {
   return class ExpressionV2Parser extends B {
     parseFqnRef(astNode) {
@@ -79,7 +80,19 @@ export function ExpressionV2Parser(B) {
       }
       return exprs.reverse();
     }
+    parseRelationWhereExpr(astNode) {
+      return {
+        where: {
+          expr: this.parseRelationExpr(astNode.subject),
+          condition: astNode.where ? parseWhereClause(astNode.where) : {
+            kind: { neq: "--always-true--" }
+          }
+        }
+      };
+    }
     parseRelationExpr(astNode) {
+      if (ast.isRelationPredicateWhere(astNode)) {
+      }
       if (ast.isDirectedRelationExpr(astNode)) {
         return {
           source: this.parseFqnExpr(astNode.source.from),

package/dist/model/parser/GlobalsParser.d.ts

@@ -57,6 +57,7 @@ export declare function GlobalsParser<TBase extends WithViewsParser>(B: TBase):
         parseFqnExpr(astNode: ast.FqnExpr): c4.FqnExpr;
         parseFqnRefExpr(astNode: ast.FqnRefExpr): c4.FqnExpr.NonWildcard;
         parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[];
+        parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr;
         parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr;
         parseDeployment(): void;
         parseDeploymentNode(astNode: ast.DeploymentNode): import("../../ast").ParsedAstDeployment.Node;

package/dist/model/parser/ViewsParser.d.ts

@@ -55,6 +55,7 @@ export declare function ViewsParser<TBase extends WithPredicates & WithDeploymen
         parseFqnExpr(astNode: ast.FqnExpr): c4.FqnExpr;
         parseFqnRefExpr(astNode: ast.FqnRefExpr): c4.FqnExpr.NonWildcard;
         parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[];
+        parseRelationWhereExpr(astNode: ast.RelationPredicateWhereV2): c4.RelationExpr;
         parseRelationExpr(astNode: ast.RelationExpr): c4.RelationExpr;
         parseDeployment(): void;
         parseDeploymentNode(astNode: ast.DeploymentNode): import("../../ast").ParsedAstDeployment.Node;

package/dist/validation/index.d.ts

@@ -3,7 +3,7 @@ import { type LikeC4LangiumDocument, ast } from '../ast';
 import type { LikeC4Services } from '../module';
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementDescedantsExpression | ast.ElementKindExpression | ast.ElementRef | ast.ElementTagExpression | ast.ExpandElementExpression | ast.WildcardExpression | ast.ElementPredicateWhere | ast.ElementPredicateWith | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.FqnRefExpr | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.Element | ast.ExtendElement | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.DirectedRelationExpression | ast.InOutRelationExpression | ast.IncomingRelationExpression | ast.OutgoingRelationExpression | ast.RelationPredicateWhere | ast.RelationPredicateWith | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.ViewStringProperty | ast.BorderProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ExcludePredicate | ast.IncludePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.Tags | ast.DeploymentRelation | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.DynamicViewPredicateIterator | ast.Relation | ast.SpecificationElementKind | ast.GlobalPredicateGroup | ast.Globals | ast.GlobalStyleGroup | ast.SpecificationRule | ast.SpecificationTag;
+declare const isValidatableAstNode: (n: AstNode) => n is ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementDescedantsExpression | ast.ElementKindExpression | ast.ElementRef | ast.ElementTagExpression | ast.ExpandElementExpression | ast.WildcardExpression | ast.ElementPredicateWhere | ast.ElementPredicateWith | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.FqnRefExpr | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationPredicateWhereV2 | ast.Element | ast.ExtendElement | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.DirectedRelationExpression | ast.InOutRelationExpression | ast.IncomingRelationExpression | ast.OutgoingRelationExpression | ast.RelationPredicateWhere | ast.RelationPredicateWith | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.ViewStringProperty | ast.BorderProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ExcludePredicate | ast.IncludePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.Tags | ast.DeploymentRelation | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.DynamicViewPredicateIterator | ast.Relation | ast.SpecificationElementKind | ast.GlobalPredicateGroup | ast.Globals | ast.GlobalStyleGroup | ast.SpecificationRule | ast.SpecificationTag;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 export declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.19.1",
+  "version": "1.20.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -17,7 +17,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/likec4/likec4.git",
+    "url": "git+https://github.com/likec4/likec4.git",
     "directory": "packages/language-server"
   },
   "type": "module",
@@ -82,9 +82,9 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@likec4/core": "1.19.1",
-    "@likec4/layouts": "1.19.1",
-    "@likec4/log": "1.19.1",
+    "@likec4/core": "1.20.0",
+    "@likec4/layouts": "1.20.0",
+    "@likec4/log": "1.20.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "esm-env": "^1.2.1",
@@ -94,7 +94,7 @@
     "json5": "^2.2.3",
     "langium": "3.3.0",
     "p-debounce": "^4.0.0",
-    "remeda": "^2.17.4",
+    "remeda": "^2.19.0",
     "strip-indent": "^4.0.0",
     "type-fest": "4.28.1",
     "ufo": "^1.5.4",
@@ -105,8 +105,8 @@
     "which": "^4.0.0"
   },
   "devDependencies": {
-    "@likec4/icons": "1.19.1",
-    "@likec4/tsconfig": "1.19.1",
+    "@likec4/icons": "1.20.0",
+    "@likec4/tsconfig": "1.20.0",
     "@types/node": "^20.17.7",
     "@types/which": "^3.0.4",
     "@vitest/coverage-v8": "^2.1.8",
@@ -116,9 +116,9 @@
     "npm-run-all2": "^7.0.1",
     "tsx": "~4.19.2",
     "turbo": "^2.3.3",
-    "typescript": "^5.7.2",
-    "unbuild": "^3.1.0",
+    "typescript": "^5.7.3",
+    "unbuild": "^3.2.0",
     "vitest": "^2.1.8"
   },
-  "packageManager": "yarn@4.5.3"
+  "packageManager": "yarn@4.6.0"
 }