@likec4/language-server 0.57.1 → 0.60.0

package/dist/Rpc.js

@@ -30,30 +30,17 @@ export class Rpc {
         }
       )
     );
-    connection.onRequest(fetchModel, async (_cancelToken) => {
-      let model;
-      try {
-        model = modelBuilder.buildModel() ?? null;
-      } catch (e) {
-        model = null;
-        logError(e);
-      }
-      return Promise.resolve({ model });
+    connection.onRequest(fetchModel, async (cancelToken) => {
+      const model = await modelBuilder.buildModel(cancelToken);
+      return { model };
     });
-    connection.onRequest(fetchRawModel, async (_cancelToken) => {
-      let rawmodel;
-      try {
-        rawmodel = modelBuilder.buildRawModel() ?? null;
-      } catch (e) {
-        rawmodel = null;
-        logError(e);
-      }
-      return Promise.resolve({ rawmodel });
+    connection.onRequest(fetchRawModel, async (cancelToken) => {
+      const rawmodel = await modelBuilder.buildRawModel(cancelToken);
+      return { rawmodel };
     });
-    connection.onRequest(computeView, async ({ viewId }, _cancelToken) => {
-      return Promise.resolve({
-        view: modelBuilder.computeView(viewId)
-      });
+    connection.onRequest(computeView, async ({ viewId }, cancelToken) => {
+      const view = await modelBuilder.computeView(viewId, cancelToken);
+      return { view };
     });
     connection.onRequest(buildDocuments, async ({ docs }, cancelToken) => {
       const changed = docs.map((d) => URI.parse(d));

package/dist/ast.d.ts

@@ -53,6 +53,7 @@ export interface ParsedAstRelation {
     line?: c4.RelationshipLineType;
     head?: c4.RelationshipArrowType;
     tail?: c4.RelationshipArrowType;
+    links?: c4.NonEmptyArray<string>;
 }
 export interface ParsedAstElementView {
     id: c4.ViewID;

package/dist/ast.js

@@ -7,7 +7,7 @@ import {
   nonexhaustive,
   RelationRefError
 } from "@likec4/core";
-import { DocumentState, getContainerOfType } from "langium";
+import { AstUtils, DocumentState } from "langium";
 import { isNil } from "remeda";
 import { DiagnosticSeverity } from "vscode-languageserver-protocol";
 import { elementRef } from "./elementRef.js";
@@ -77,7 +77,7 @@ export function checksFromDiagnostics(doc) {
   const invalidNodes = new WeakSet(
     doc.diagnostics?.flatMap((d) => {
       if (d.severity === DiagnosticSeverity.Error) {
-        return getContainerOfType(d.node, isValidatableAstNode) ?? [];
+        return AstUtils.getContainerOfType(d.node, isValidatableAstNode) ?? [];
       }
       return [];
     }) ?? []

package/dist/browser/index.js

@@ -1,11 +1,11 @@
-import { EmptyFileSystem, startLanguageServer as startLanguim } from "langium";
+import { startLanguageServer as startLanguim } from "langium/lsp";
 import { BrowserMessageReader, BrowserMessageWriter, createConnection } from "vscode-languageserver/browser";
 import { createLanguageServices } from "../module.js";
 export function startLanguageServer() {
   const messageReader = new BrowserMessageReader(self);
   const messageWriter = new BrowserMessageWriter(self);
   const connection = createConnection(messageReader, messageWriter);
-  const services = createLanguageServices({ connection, ...EmptyFileSystem });
+  const services = createLanguageServices({ connection });
   startLanguim(services.shared);
   return {
     ...services,

package/dist/generated/ast.d.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import type { AstNode, Reference, ReferenceInfo, TypeMetaData } from 'langium';
@@ -38,7 +38,7 @@ export declare function isLineOptions(item: unknown): item is LineOptions;
 export type Relation = ExplicitRelation | ImplicitRelation;
 export declare const Relation = "Relation";
 export declare function isRelation(item: unknown): item is Relation;
-export type RelationProperty = RelationStringProperty | RelationStyleProperty;
+export type RelationProperty = LinkProperty | RelationStringProperty | RelationStyleProperty;
 export declare const RelationProperty = "RelationProperty";
 export declare function isRelationProperty(item: unknown): item is RelationProperty;
 export type RelationshipStyleProperty = ArrowProperty | ColorProperty | LineProperty;
@@ -288,7 +288,7 @@ export interface LineProperty extends AstNode {
 export declare const LineProperty = "LineProperty";
 export declare function isLineProperty(item: unknown): item is LineProperty;
 export interface LinkProperty extends AstNode {
-    readonly $container: ElementBody | ElementViewBody;
+    readonly $container: ElementBody | ElementViewBody | RelationBody;
     readonly $type: 'LinkProperty';
     key: 'link';
     value: Uri;

package/dist/generated/ast.js

@@ -321,7 +321,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
         return this.isSubtype(StyleProperty, supertype);
       }
       case LinkProperty: {
-        return this.isSubtype(ElementProperty, supertype) || this.isSubtype(ViewProperty, supertype);
+        return this.isSubtype(ElementProperty, supertype) || this.isSubtype(RelationProperty, supertype) || this.isSubtype(ViewProperty, supertype);
       }
       case RelationStringProperty:
       case RelationStyleProperty: {
@@ -369,177 +369,450 @@ export class LikeC4AstReflection extends AbstractAstReflection {
   }
   getTypeMetaData(type) {
     switch (type) {
+      case "ArrowProperty": {
+        return {
+          name: "ArrowProperty",
+          properties: [
+            { name: "key" },
+            { name: "value" }
+          ]
+        };
+      }
+      case "ColorProperty": {
+        return {
+          name: "ColorProperty",
+          properties: [
+            { name: "key" },
+            { name: "value" }
+          ]
+        };
+      }
+      case "CustomElementExpr": {
+        return {
+          name: "CustomElementExpr",
+          properties: [
+            { name: "body" },
+            { name: "target" }
+          ]
+        };
+      }
       case "CustomElementExprBody": {
         return {
           name: "CustomElementExprBody",
-          mandatory: [
-            { name: "props", type: "array" }
+          properties: [
+            { name: "props", defaultValue: [] }
+          ]
+        };
+      }
+      case "DescedantsExpr": {
+        return {
+          name: "DescedantsExpr",
+          properties: [
+            { name: "parent" }
           ]
         };
       }
       case "Element": {
         return {
           name: "Element",
-          mandatory: [
-            { name: "props", type: "array" }
+          properties: [
+            { name: "body" },
+            { name: "kind" },
+            { name: "name" },
+            { name: "props" }
           ]
         };
       }
       case "ElementBody": {
         return {
           name: "ElementBody",
-          mandatory: [
-            { name: "elements", type: "array" },
-            { name: "props", type: "array" }
+          properties: [
+            { name: "elements", defaultValue: [] },
+            { name: "props", defaultValue: [] },
+            { name: "tags" }
+          ]
+        };
+      }
+      case "ElementKind": {
+        return {
+          name: "ElementKind",
+          properties: [
+            { name: "name" }
           ]
         };
       }
       case "ElementKindExpr": {
         return {
           name: "ElementKindExpr",
-          mandatory: [
-            { name: "isEqual", type: "boolean" }
+          properties: [
+            { name: "isEqual", defaultValue: false },
+            { name: "kind" }
+          ]
+        };
+      }
+      case "ElementRef": {
+        return {
+          name: "ElementRef",
+          properties: [
+            { name: "el" },
+            { name: "parent" }
+          ]
+        };
+      }
+      case "ElementStringProperty": {
+        return {
+          name: "ElementStringProperty",
+          properties: [
+            { name: "key" },
+            { name: "value" }
           ]
         };
       }
       case "ElementTagExpr": {
         return {
           name: "ElementTagExpr",
-          mandatory: [
-            { name: "isEqual", type: "boolean" }
+          properties: [
+            { name: "isEqual", defaultValue: false },
+            { name: "tag" }
+          ]
+        };
+      }
+      case "ElementView": {
+        return {
+          name: "ElementView",
+          properties: [
+            { name: "body" },
+            { name: "extends" },
+            { name: "name" },
+            { name: "viewOf" }
           ]
         };
       }
       case "ElementViewBody": {
         return {
           name: "ElementViewBody",
-          mandatory: [
-            { name: "props", type: "array" },
-            { name: "rules", type: "array" }
+          properties: [
+            { name: "props", defaultValue: [] },
+            { name: "rules", defaultValue: [] },
+            { name: "tags" }
+          ]
+        };
+      }
+      case "ElementViewRef": {
+        return {
+          name: "ElementViewRef",
+          properties: [
+            { name: "view" }
           ]
         };
       }
       case "ExcludePredicate": {
         return {
           name: "ExcludePredicate",
-          mandatory: [
-            { name: "expressions", type: "array" }
+          properties: [
+            { name: "expressions", defaultValue: [] }
+          ]
+        };
+      }
+      case "ExplicitRelation": {
+        return {
+          name: "ExplicitRelation",
+          properties: [
+            { name: "body" },
+            { name: "kind" },
+            { name: "source" },
+            { name: "tags" },
+            { name: "target" },
+            { name: "title" }
+          ]
+        };
+      }
+      case "ExtendElement": {
+        return {
+          name: "ExtendElement",
+          properties: [
+            { name: "body" },
+            { name: "element" }
           ]
         };
       }
       case "ExtendElementBody": {
         return {
           name: "ExtendElementBody",
-          mandatory: [
-            { name: "elements", type: "array" }
+          properties: [
+            { name: "elements", defaultValue: [] }
+          ]
+        };
+      }
+      case "FqnElementRef": {
+        return {
+          name: "FqnElementRef",
+          properties: [
+            { name: "el" },
+            { name: "parent" }
+          ]
+        };
+      }
+      case "IconProperty": {
+        return {
+          name: "IconProperty",
+          properties: [
+            { name: "key" },
+            { name: "value" }
+          ]
+        };
+      }
+      case "ImplicitRelation": {
+        return {
+          name: "ImplicitRelation",
+          properties: [
+            { name: "body" },
+            { name: "kind" },
+            { name: "tags" },
+            { name: "target" },
+            { name: "title" }
           ]
         };
       }
       case "IncludePredicate": {
         return {
           name: "IncludePredicate",
-          mandatory: [
-            { name: "expressions", type: "array" }
+          properties: [
+            { name: "expressions", defaultValue: [] }
+          ]
+        };
+      }
+      case "IncomingExpr": {
+        return {
+          name: "IncomingExpr",
+          properties: [
+            { name: "to" }
+          ]
+        };
+      }
+      case "InOutExpr": {
+        return {
+          name: "InOutExpr",
+          properties: [
+            { name: "inout" }
           ]
         };
       }
       case "LikeC4Grammar": {
         return {
           name: "LikeC4Grammar",
-          mandatory: [
-            { name: "models", type: "array" },
-            { name: "specifications", type: "array" },
-            { name: "views", type: "array" }
+          properties: [
+            { name: "models", defaultValue: [] },
+            { name: "specifications", defaultValue: [] },
+            { name: "views", defaultValue: [] }
+          ]
+        };
+      }
+      case "LineProperty": {
+        return {
+          name: "LineProperty",
+          properties: [
+            { name: "key" },
+            { name: "value" }
+          ]
+        };
+      }
+      case "LinkProperty": {
+        return {
+          name: "LinkProperty",
+          properties: [
+            { name: "key" },
+            { name: "value" }
           ]
         };
       }
       case "Model": {
         return {
           name: "Model",
-          mandatory: [
-            { name: "elements", type: "array" }
+          properties: [
+            { name: "elements", defaultValue: [] },
+            { name: "name" }
           ]
         };
       }
       case "ModelViews": {
         return {
           name: "ModelViews",
-          mandatory: [
-            { name: "views", type: "array" }
+          properties: [
+            { name: "name" },
+            { name: "views", defaultValue: [] }
+          ]
+        };
+      }
+      case "NavigateToProperty": {
+        return {
+          name: "NavigateToProperty",
+          properties: [
+            { name: "value" }
+          ]
+        };
+      }
+      case "OutgoingExpr": {
+        return {
+          name: "OutgoingExpr",
+          properties: [
+            { name: "from" }
           ]
         };
       }
       case "RelationBody": {
         return {
           name: "RelationBody",
-          mandatory: [
-            { name: "props", type: "array" }
+          properties: [
+            { name: "props", defaultValue: [] },
+            { name: "tags" }
+          ]
+        };
+      }
+      case "RelationExpr": {
+        return {
+          name: "RelationExpr",
+          properties: [
+            { name: "source" },
+            { name: "target" }
+          ]
+        };
+      }
+      case "RelationshipKind": {
+        return {
+          name: "RelationshipKind",
+          properties: [
+            { name: "name" }
+          ]
+        };
+      }
+      case "RelationStringProperty": {
+        return {
+          name: "RelationStringProperty",
+          properties: [
+            { name: "key" },
+            { name: "value" }
           ]
         };
       }
       case "RelationStyleProperty": {
         return {
           name: "RelationStyleProperty",
-          mandatory: [
-            { name: "props", type: "array" }
+          properties: [
+            { name: "key" },
+            { name: "props", defaultValue: [] }
+          ]
+        };
+      }
+      case "ShapeProperty": {
+        return {
+          name: "ShapeProperty",
+          properties: [
+            { name: "key" },
+            { name: "value" }
+          ]
+        };
+      }
+      case "SpecificationElementKind": {
+        return {
+          name: "SpecificationElementKind",
+          properties: [
+            { name: "kind" },
+            { name: "style" }
           ]
         };
       }
       case "SpecificationRelationshipKind": {
         return {
           name: "SpecificationRelationshipKind",
-          mandatory: [
-            { name: "props", type: "array" }
+          properties: [
+            { name: "kind" },
+            { name: "props", defaultValue: [] }
           ]
         };
       }
       case "SpecificationRule": {
         return {
           name: "SpecificationRule",
-          mandatory: [
-            { name: "elements", type: "array" },
-            { name: "relationships", type: "array" },
-            { name: "tags", type: "array" }
+          properties: [
+            { name: "elements", defaultValue: [] },
+            { name: "name" },
+            { name: "relationships", defaultValue: [] },
+            { name: "tags", defaultValue: [] }
+          ]
+        };
+      }
+      case "SpecificationTag": {
+        return {
+          name: "SpecificationTag",
+          properties: [
+            { name: "tag" }
           ]
         };
       }
       case "StyleProperties": {
         return {
           name: "StyleProperties",
-          mandatory: [
-            { name: "props", type: "array" }
+          properties: [
+            { name: "key" },
+            { name: "props", defaultValue: [] }
+          ]
+        };
+      }
+      case "Tag": {
+        return {
+          name: "Tag",
+          properties: [
+            { name: "name" }
           ]
         };
       }
       case "Tags": {
         return {
           name: "Tags",
-          mandatory: [
-            { name: "value", type: "array" }
+          properties: [
+            { name: "value", defaultValue: [] }
+          ]
+        };
+      }
+      case "ViewRuleAutoLayout": {
+        return {
+          name: "ViewRuleAutoLayout",
+          properties: [
+            { name: "direction" }
           ]
         };
       }
       case "ViewRuleStyle": {
         return {
           name: "ViewRuleStyle",
-          mandatory: [
-            { name: "styleprops", type: "array" },
-            { name: "targets", type: "array" }
+          properties: [
+            { name: "styleprops", defaultValue: [] },
+            { name: "targets", defaultValue: [] }
+          ]
+        };
+      }
+      case "ViewStringProperty": {
+        return {
+          name: "ViewStringProperty",
+          properties: [
+            { name: "key" },
+            { name: "value" }
           ]
         };
       }
       case "WildcardExpr": {
         return {
           name: "WildcardExpr",
-          mandatory: [
-            { name: "isWildcard", type: "boolean" }
+          properties: [
+            { name: "isWildcard", defaultValue: false }
           ]
         };
       }
       default: {
         return {
           name: type,
-          mandatory: []
+          properties: []
         };
       }
     }

package/dist/generated/grammar.d.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import type { Grammar } from 'langium';