@likec4/language-server 1.19.0 → 1.19.2

package/src/Rpc.ts

@@ -12,8 +12,9 @@ import {
   computeView,
   fetchComputedModel,
   fetchModel,
+  layoutView,
   locate,
-  onDidChangeModel
+  onDidChangeModel,
 } from './protocol'
 
 export class Rpc implements Disposable {
@@ -25,6 +26,7 @@ export class Rpc implements Disposable {
     const modelBuilder = this.services.likec4.ModelBuilder
     const modelLocator = this.services.likec4.ModelLocator
     const modelEditor = this.services.likec4.ModelChanges
+    const views = this.services.likec4.Views
     const connection = this.services.shared.lsp.Connection
     if (!connection) {
       logger.info(`[ServerRpc] no connection, not initializing`)
@@ -44,8 +46,8 @@ export class Rpc implements Disposable {
       {
         timing: 'trailing',
         waitMs: 300,
-        maxWaitMs: 1000
-      }
+        maxWaitMs: 1000,
+      },
     )
 
     let isFirstBuild = true
@@ -70,6 +72,10 @@ export class Rpc implements Disposable {
         const view = await modelBuilder.computeView(viewId, cancelToken)
         return { view }
       }),
+      connection.onRequest(layoutView, async ({ viewId }, cancelToken) => {
+        const result = await views.layoutView(viewId, cancelToken)
+        return { result }
+      }),
       connection.onRequest(buildDocuments, async ({ docs }, cancelToken) => {
         const changed = docs.map(d => URI.parse(d))
         const notChanged = (uri: URI) => changed.every(c => !UriUtils.equals(c, uri))
@@ -80,7 +86,7 @@ export class Rpc implements Disposable {
         logger.debug(
           `[ServerRpc] received request to build:
   changed (total ${changed.length}):${docs.map(d => '\n    - ' + d).join('')}
-  deleted (total ${deleted.length}):${deleted.map(d => '\n    - ' + d.toString()).join('\n')}`
+  deleted (total ${deleted.length}):${deleted.map(d => '\n    - ' + d.toString()).join('\n')}`,
         )
 
         if (!isFirstBuild && (changed.length + deleted.length) > 0) {
@@ -91,13 +97,13 @@ export class Rpc implements Disposable {
               try {
                 await connection.sendDiagnostics({
                   uri,
-                  diagnostics: []
+                  diagnostics: [],
                 })
               } catch (e) {
                 // Ignore
                 logger.warn(`error clearing diagnostics for ${uri}: ${e}`)
               }
-            })
+            }),
           )
           await interruptAndCheck(cancelToken)
         }
@@ -121,7 +127,7 @@ export class Rpc implements Disposable {
       }),
       connection.onRequest(changeView, async (request, _cancelToken) => {
         return await modelEditor.applyChange(request)
-      })
+      }),
     )
   }
 

package/src/browser.ts

@@ -7,6 +7,7 @@ export type { DocumentParser, LikeC4ModelBuilder, LikeC4ModelLocator, LikeC4Mode
 
 export { createCustomLanguageServices, createLanguageServices, LikeC4Module } from './module'
 export type { LikeC4Services, LikeC4SharedServices } from './module'
+export type { LikeC4Views } from './views'
 
 // This is an example copied as is from here:
 // https://github.com/microsoft/vscode-extension-samples/blob/main/lsp-web-extension-sample/server/src/browserServerMain.ts

package/src/documentation/documentation-provider.ts

@@ -0,0 +1,52 @@
+import { type AstNode, type DocumentationProvider, AstUtils } from 'langium'
+import { ast } from '../ast'
+import { logWarnError } from '../logger'
+import type { LikeC4ModelLocator, LikeC4ModelParser } from '../model'
+import type { LikeC4Services } from '../module'
+
+export class LikeC4DocumentationProvider implements DocumentationProvider {
+  private parser: LikeC4ModelParser
+  private locator: LikeC4ModelLocator
+
+  constructor(services: LikeC4Services) {
+    this.parser = services.likec4.ModelParser
+    this.locator = services.likec4.ModelLocator
+  }
+  getDocumentation(node: AstNode): string | undefined {
+    try {
+      if (ast.isDeploymentNode(node)) {
+        const doc = AstUtils.getDocument(node)
+        const el = this.parser.forDocument(doc).parseDeploymentNode(node)
+        const lines = [el.id as string]
+        if (el.title !== node.name) {
+          lines.push(' ', `**${el.title}**`)
+        }
+        return lines.join('  \n')
+      }
+
+      if (ast.isDeployedInstance(node)) {
+        const doc = AstUtils.getDocument(node)
+        const instance = this.parser.forDocument(doc).parseDeployedInstance(node)
+        const el = this.locator.getParsedElement(instance.element)
+        const lines = [instance.id, `_instance of_ ${instance.element}`]
+        if (el) {
+          lines.push(' ', `**${el.title}**`)
+        }
+        return lines.join('  \n')
+      }
+
+      if (ast.isElement(node)) {
+        const doc = AstUtils.getDocument(node)
+        const el = this.parser.forDocument(doc).parseElement(node)
+        if (!el) {
+          return
+        }
+        const lines = [el.id, ' ', `**${el.title}**`]
+        return lines.join('  \n')
+      }
+    } catch (e) {
+      logWarnError(e)
+    }
+    return
+  }
+}

package/src/documentation/index.ts

@@ -0,0 +1 @@
+export { LikeC4DocumentationProvider } from './documentation-provider'

package/src/generated/ast.ts

@@ -230,7 +230,7 @@ export function isElementShape(item: unknown): item is ElementShape {
     return item === 'rectangle' || item === 'person' || item === 'browser' || item === 'mobile' || item === 'cylinder' || item === 'storage' || item === 'queue';
 }
 
-export type ExpressionV2 = FqnExpr | RelationExpr;
+export type ExpressionV2 = FqnExpr | RelationPredicateOrWhereV2;
 
 export const ExpressionV2 = 'ExpressionV2';
 
@@ -336,6 +336,14 @@ export function isRelationPredicateOrWhere(item: unknown): item is RelationPredi
     return reflection.isInstance(item, RelationPredicateOrWhere);
 }
 
+export type RelationPredicateOrWhereV2 = RelationExpr | RelationPredicateWhereV2;
+
+export const RelationPredicateOrWhereV2 = 'RelationPredicateOrWhereV2';
+
+export function isRelationPredicateOrWhereV2(item: unknown): item is RelationPredicateOrWhereV2 {
+    return reflection.isInstance(item, RelationPredicateOrWhereV2);
+}
+
 export type RelationProperty = LinkProperty | MetadataProperty | RelationNavigateToProperty | RelationStringProperty | RelationStyleProperty;
 
 export const RelationProperty = 'RelationProperty';
@@ -723,7 +731,7 @@ export function isDeploymentViewRuleStyle(item: unknown): item is DeploymentView
 }
 
 export interface DirectedRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $container: DeploymentViewRulePredicateExpression | RelationPredicateWhereV2;
     readonly $type: 'DirectedRelationExpr';
     source: OutgoingRelationExpr;
     target: FqnExpr;
@@ -1260,7 +1268,7 @@ export function isIncludePredicate(item: unknown): item is IncludePredicate {
 }
 
 export interface IncomingRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | InOutRelationExpr;
+    readonly $container: DeploymentViewRulePredicateExpression | InOutRelationExpr | RelationPredicateWhereV2;
     readonly $type: 'IncomingRelationExpr';
     to: FqnExpr;
 }
@@ -1284,7 +1292,7 @@ export function isIncomingRelationExpression(item: unknown): item is IncomingRel
 }
 
 export interface InOutRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $container: DeploymentViewRulePredicateExpression | RelationPredicateWhereV2;
     readonly $type: 'InOutRelationExpr';
     inout: IncomingRelationExpr;
 }
@@ -1492,7 +1500,7 @@ export function isOpacityProperty(item: unknown): item is OpacityProperty {
 }
 
 export interface OutgoingRelationExpr extends AstNode {
-    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr;
+    readonly $container: DeploymentViewRulePredicateExpression | DirectedRelationExpr | RelationPredicateWhereV2;
     readonly $type: 'OutgoingRelationExpr';
     from: FqnExpr;
     isBidirectional: boolean;
@@ -1589,6 +1597,19 @@ export function isRelationPredicateWhere(item: unknown): item is RelationPredica
     return reflection.isInstance(item, RelationPredicateWhere);
 }
 
+export interface RelationPredicateWhereV2 extends AstNode {
+    readonly $container: DeploymentViewRulePredicateExpression;
+    readonly $type: 'RelationPredicateWhereV2';
+    subject: RelationExpr;
+    where?: WhereRelationExpression;
+}
+
+export const RelationPredicateWhereV2 = 'RelationPredicateWhereV2';
+
+export function isRelationPredicateWhereV2(item: unknown): item is RelationPredicateWhereV2 {
+    return reflection.isInstance(item, RelationPredicateWhereV2);
+}
+
 export interface RelationPredicateWith extends AstNode {
     readonly $container: Predicates;
     readonly $type: 'RelationPredicateWith';
@@ -1876,7 +1897,7 @@ export function isViewStringProperty(item: unknown): item is ViewStringProperty
 }
 
 export interface WhereBinaryExpression extends AstNode {
-    readonly $container: ElementPredicateWhere | RelationPredicateWhere | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
+    readonly $container: ElementPredicateWhere | RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereElementNegation | WhereRelationNegation;
     readonly $type: 'WhereBinaryExpression';
     left: WhereElementExpression | WhereRelationExpression;
     operator: 'and' | 'or';
@@ -1930,7 +1951,7 @@ export function isWhereElementTag(item: unknown): item is WhereElementTag {
 }
 
 export interface WhereRelationKind extends AstNode {
-    readonly $container: RelationPredicateWhere | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationKind';
     not: boolean;
     operator: 'is' | string;
@@ -1944,7 +1965,7 @@ export function isWhereRelationKind(item: unknown): item is WhereRelationKind {
 }
 
 export interface WhereRelationNegation extends AstNode {
-    readonly $container: RelationPredicateWhere | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationNegation';
     value: WhereRelationExpression;
 }
@@ -1956,7 +1977,7 @@ export function isWhereRelationNegation(item: unknown): item is WhereRelationNeg
 }
 
 export interface WhereRelationTag extends AstNode {
-    readonly $container: RelationPredicateWhere | WhereBinaryExpression | WhereRelationNegation;
+    readonly $container: RelationPredicateWhere | RelationPredicateWhereV2 | WhereBinaryExpression | WhereRelationNegation;
     readonly $type: 'WhereRelationTag';
     not: boolean;
     operator: 'is' | string;
@@ -2083,7 +2104,9 @@ export type LikeC4AstType = {
     RelationNavigateToProperty: RelationNavigateToProperty
     RelationPredicate: RelationPredicate
     RelationPredicateOrWhere: RelationPredicateOrWhere
+    RelationPredicateOrWhereV2: RelationPredicateOrWhereV2
     RelationPredicateWhere: RelationPredicateWhere
+    RelationPredicateWhereV2: RelationPredicateWhereV2
     RelationPredicateWith: RelationPredicateWith
     RelationProperty: RelationProperty
     RelationStringProperty: RelationStringProperty
@@ -2134,7 +2157,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, RelationPredicateWhere, 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, 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];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -2217,7 +2240,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return this.isSubtype(FqnReferenceable, supertype);
             }
             case FqnExpr:
-            case RelationExpr: {
+            case RelationPredicateOrWhereV2: {
                 return this.isSubtype(ExpressionV2, supertype);
             }
             case FqnRefExpr: {
@@ -2242,6 +2265,10 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case MetadataProperty: {
                 return this.isSubtype(ElementProperty, supertype) || this.isSubtype(RelationProperty, supertype);
             }
+            case RelationExpr:
+            case RelationPredicateWhereV2: {
+                return this.isSubtype(RelationPredicateOrWhereV2, supertype);
+            }
             case RelationExpression:
             case RelationPredicateWhere: {
                 return this.isSubtype(RelationPredicateOrWhere, supertype);
@@ -3149,6 +3176,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case RelationPredicateWhereV2: {
+                return {
+                    name: RelationPredicateWhereV2,
+                    properties: [
+                        { name: 'subject' },
+                        { name: 'where' }
+                    ]
+                };
+            }
             case RelationPredicateWith: {
                 return {
                     name: RelationPredicateWith,