@likec4/language-server 1.19.2 → 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;
 
@@ -769,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);
@@ -789,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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.19.2",
+  "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.2",
-    "@likec4/layouts": "1.19.2",
-    "@likec4/log": "1.19.2",
+    "@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.2",
-    "@likec4/tsconfig": "1.19.2",
+    "@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,8 +116,8 @@
     "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.6.0"

package/src/generated/ast.ts

@@ -120,12 +120,14 @@ export type LikeC4KeywordNames =
     | "sky"
     | "slate"
     | "solid"
+    | "source"
     | "specification"
     | "storage"
     | "style"
     | "styleGroup"
     | "tag"
     | "tail"
+    | "target"
     | "technology"
     | "title"
     | "vee"
@@ -170,6 +172,14 @@ export function isDeploymentElement(item: unknown): item is DeploymentElement {
     return reflection.isInstance(item, DeploymentElement);
 }
 
+export type DeploymentNodeOrElementKind = DeploymentNodeKind | ElementKind;
+
+export const DeploymentNodeOrElementKind = 'DeploymentNodeOrElementKind';
+
+export function isDeploymentNodeOrElementKind(item: unknown): item is DeploymentNodeOrElementKind {
+    return reflection.isInstance(item, DeploymentNodeOrElementKind);
+}
+
 export type DeploymentViewRule = DeploymentViewRulePredicate | DeploymentViewRuleStyle | ViewRuleAutoLayout;
 
 export const DeploymentViewRule = 'DeploymentViewRule';
@@ -260,10 +270,10 @@ export function isIconId(item: unknown): item is IconId {
     return (typeof item === 'string' && (/(aws|azure|gcp|tech):[-\w]*/.test(item)));
 }
 
-export type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | ThemeColor | string;
+export type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | Participant | ThemeColor | string;
 
 export function isId(item: unknown): item is Id {
-    return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || item === 'element' || item === 'model' || item === 'group' || item === 'node' || item === 'deployment' || item === 'instance' || (typeof item === 'string' && (/[_]*[a-zA-Z][-\w]*/.test(item)));
+    return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || isParticipant(item) || item === 'element' || item === 'model' || item === 'group' || item === 'node' || item === 'deployment' || item === 'instance' || (typeof item === 'string' && (/[_]*[a-zA-Z][-\w]*/.test(item)));
 }
 
 export type LikeC4View = DeploymentView | DynamicView | ElementView;
@@ -288,6 +298,12 @@ export function isMetadataProperty(item: unknown): item is MetadataProperty {
     return reflection.isInstance(item, MetadataProperty);
 }
 
+export type Participant = 'source' | 'target';
+
+export function isParticipant(item: unknown): item is Participant {
+    return item === 'source' || item === 'target';
+}
+
 export type Predicate = ElementPredicate | RelationPredicate;
 
 export const Predicate = 'Predicate';
@@ -456,7 +472,7 @@ export function isWhereExpression(item: unknown): item is WhereExpression {
     return reflection.isInstance(item, WhereExpression);
 }
 
-export type WhereKindEqual = WhereElementKind | WhereRelationKind;
+export type WhereKindEqual = WhereElementKind | WhereRelationKind | WhereRelationParticipantKind;
 
 export const WhereKindEqual = 'WhereKindEqual';
 
@@ -464,7 +480,7 @@ export function isWhereKindEqual(item: unknown): item is WhereKindEqual {
     return reflection.isInstance(item, WhereKindEqual);
 }
 
-export type WhereRelation = WhereRelationKind | WhereRelationTag;
+export type WhereRelation = WhereRelationKind | WhereRelationParticipantKind | WhereRelationParticipantTag | WhereRelationTag;
 
 export const WhereRelation = 'WhereRelation';
 
@@ -480,7 +496,7 @@ export function isWhereRelationExpression(item: unknown): item is WhereRelationE
     return reflection.isInstance(item, WhereRelationExpression);
 }
 
-export type WhereTagEqual = WhereElementTag | WhereRelationTag;
+export type WhereTagEqual = WhereElementTag | WhereRelationParticipantTag | WhereRelationTag;
 
 export const WhereTagEqual = 'WhereTagEqual';
 
@@ -1976,6 +1992,36 @@ export function isWhereRelationNegation(item: unknown): item is WhereRelationNeg
     return reflection.isInstance(item, WhereRelationNegation);
 }
 
+export interface WhereRelationParticipantKind extends AstNode {
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
+    readonly $type: 'WhereRelationParticipantKind';
+    not: boolean;
+    operator: 'is' | string;
+    participant: Participant;
+    value?: Reference<DeploymentNodeOrElementKind>;
+}
+
+export const WhereRelationParticipantKind = 'WhereRelationParticipantKind';
+
+export function isWhereRelationParticipantKind(item: unknown): item is WhereRelationParticipantKind {
+    return reflection.isInstance(item, WhereRelationParticipantKind);
+}
+
+export interface WhereRelationParticipantTag extends AstNode {
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
+    readonly $type: 'WhereRelationParticipantTag';
+    not: boolean;
+    operator: 'is' | string;
+    participant: Participant;
+    value?: Reference<Tag>;
+}
+
+export const WhereRelationParticipantTag = 'WhereRelationParticipantTag';
+
+export function isWhereRelationParticipantTag(item: unknown): item is WhereRelationParticipantTag {
+    return reflection.isInstance(item, WhereRelationParticipantTag);
+}
+
 export interface WhereRelationTag extends AstNode {
     readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationTag';
@@ -2015,6 +2061,7 @@ export type LikeC4AstType = {
     DeploymentNode: DeploymentNode
     DeploymentNodeBody: DeploymentNodeBody
     DeploymentNodeKind: DeploymentNodeKind
+    DeploymentNodeOrElementKind: DeploymentNodeOrElementKind
     DeploymentRelation: DeploymentRelation
     DeploymentRelationBody: DeploymentRelationBody
     DeploymentView: DeploymentView
@@ -2149,6 +2196,8 @@ export type LikeC4AstType = {
     WhereRelationExpression: WhereRelationExpression
     WhereRelationKind: WhereRelationKind
     WhereRelationNegation: WhereRelationNegation
+    WhereRelationParticipantKind: WhereRelationParticipantKind
+    WhereRelationParticipantTag: WhereRelationParticipantTag
     WhereRelationTag: WhereRelationTag
     WhereTagEqual: WhereTagEqual
     WildcardExpression: WildcardExpression
@@ -2157,7 +2206,7 @@ export type LikeC4AstType = {
 export class LikeC4AstReflection extends AbstractAstReflection {
 
     getAllTypes(): string[] {
-        return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRulePredicateExpression, DeploymentViewRuleStyle, DirectedRelationExpr, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewPredicateIterator, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementDescedantsExpression, ElementExpression, ElementExpressionsIterator, ElementKind, ElementKindExpression, ElementPredicate, ElementPredicateOrWhere, ElementPredicateWhere, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExpressionV2, ExtendElement, ExtendElementBody, FqnElementRef, FqnExpr, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, IconProperty, InOutRelationExpr, InOutRelationExpression, IncludePredicate, IncomingRelationExpr, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelViews, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, OutgoingRelationExpression, Predicate, Predicates, Referenceable, Relation, RelationBody, RelationExpr, RelationExpression, RelationNavigateToProperty, RelationPredicate, RelationPredicateOrWhere, RelationPredicateOrWhereV2, RelationPredicateWhere, RelationPredicateWhereV2, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StringProperty, StyleProperty, Tag, Tags, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationTag, WhereTagEqual, WildcardExpression];
+        return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentNodeOrElementKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRulePredicateExpression, DeploymentViewRuleStyle, DirectedRelationExpr, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewPredicateIterator, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementDescedantsExpression, ElementExpression, ElementExpressionsIterator, ElementKind, ElementKindExpression, ElementPredicate, ElementPredicateOrWhere, ElementPredicateWhere, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExpressionV2, ExtendElement, ExtendElementBody, FqnElementRef, FqnExpr, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, IconProperty, InOutRelationExpr, InOutRelationExpression, IncludePredicate, IncomingRelationExpr, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelViews, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, OutgoingRelationExpression, Predicate, Predicates, Referenceable, Relation, RelationBody, RelationExpr, RelationExpression, RelationNavigateToProperty, RelationPredicate, RelationPredicateOrWhere, RelationPredicateOrWhereV2, RelationPredicateWhere, RelationPredicateWhereV2, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StringProperty, StyleProperty, Tag, Tags, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationParticipantKind, WhereRelationParticipantTag, WhereRelationTag, WhereTagEqual, WildcardExpression];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -2178,6 +2227,10 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case DeploymentNode: {
                 return this.isSubtype(DeploymentElement, supertype) || this.isSubtype(Referenceable, supertype);
             }
+            case DeploymentNodeKind:
+            case ElementKind: {
+                return this.isSubtype(DeploymentNodeOrElementKind, supertype);
+            }
             case DeploymentView:
             case DynamicView:
             case ElementView: {
@@ -2323,9 +2376,11 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case WhereRelationNegation: {
                 return this.isSubtype(WhereRelationExpression, supertype);
             }
-            case WhereRelationKind: {
+            case WhereRelationKind:
+            case WhereRelationParticipantKind: {
                 return this.isSubtype(WhereKindEqual, supertype) || this.isSubtype(WhereRelation, supertype);
             }
+            case WhereRelationParticipantTag:
             case WhereRelationTag: {
                 return this.isSubtype(WhereRelation, supertype) || this.isSubtype(WhereTagEqual, supertype);
             }
@@ -2373,6 +2428,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case 'ElementTagExpression:tag':
             case 'Tags:values':
             case 'WhereElementTag:value':
+            case 'WhereRelationParticipantTag:value':
             case 'WhereRelationTag:value': {
                 return Tag;
             }
@@ -2394,6 +2450,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case 'ViewRuleGlobalStyle:style': {
                 return GlobalStyleId;
             }
+            case 'WhereRelationParticipantKind:value': {
+                return DeploymentNodeOrElementKind;
+            }
             default: {
                 throw new Error(`${referenceId} is not a valid reference id.`);
             }
@@ -3439,6 +3498,28 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case WhereRelationParticipantKind: {
+                return {
+                    name: WhereRelationParticipantKind,
+                    properties: [
+                        { name: 'not', defaultValue: false },
+                        { name: 'operator' },
+                        { name: 'participant' },
+                        { name: 'value' }
+                    ]
+                };
+            }
+            case WhereRelationParticipantTag: {
+                return {
+                    name: WhereRelationParticipantTag,
+                    properties: [
+                        { name: 'not', defaultValue: false },
+                        { name: 'operator' },
+                        { name: 'participant' },
+                        { name: 'value' }
+                    ]
+                };
+            }
             case WhereRelationTag: {
                 return {
                     name: WhereRelationTag,