@likec4/language-server 0.42.0 → 0.42.2

package/dist/ast.d.ts

@@ -41,6 +41,7 @@ export interface ParsedAstRelation {
     source: c4.Fqn;
     target: c4.Fqn;
     kind?: c4.RelationshipKind;
+    tags?: c4.NonEmptyArray<c4.Tag>;
     title: string;
 }
 export interface ParsedAstElementView {

package/dist/ast.js

@@ -1,4 +1,12 @@
-import { DefaultElementShape, DefaultThemeColor, RelationRefError, nonexhaustive, DefaultLineStyle, DefaultArrowType, DefaultRelationshipColor } from "@likec4/core";
+import {
+  DefaultElementShape,
+  DefaultThemeColor,
+  RelationRefError,
+  nonexhaustive,
+  DefaultLineStyle,
+  DefaultArrowType,
+  DefaultRelationshipColor
+} from "@likec4/core";
 import { DocumentState } from "langium";
 import { elementRef } from "./elementRef.js";
 import * as ast from "./generated/ast.js";

package/dist/model/model-builder.js

@@ -78,15 +78,16 @@ function buildModel(docs) {
     astPath,
     source,
     target,
+    kind,
     ...model
   }) => {
     if (source in elements && target in elements) {
-      if (model.kind) {
-        const kind = c4Specification.relationships[model.kind];
+      if (!!kind && kind in c4Specification.relationships) {
         return {
           source,
           target,
-          ...kind,
+          kind,
+          ...c4Specification.relationships[kind],
           ...model
         };
       }

package/dist/model/model-parser.js

@@ -64,9 +64,7 @@ ${printDocs(docs)}`);
           continue;
         }
         try {
-          specification.relationships[kind.name] = toRelationshipStyleExcludeDefaults(
-            props
-          );
+          specification.relationships[kind.name] = toRelationshipStyleExcludeDefaults(props);
         } catch (e) {
           logWarnError(e);
         }
@@ -136,19 +134,23 @@ ${printDocs(docs)}`);
     const coupling = resolveRelationPoints(astNode);
     const target = this.resolveFqn(coupling.target);
     const source = this.resolveFqn(coupling.source);
+    const tags = this.convertTags(astNode.body);
     const kind = astNode.kind?.ref?.name;
-    const hashdata = {
-      astPath: this.getAstNodePath(astNode),
+    const astPath = this.getAstNodePath(astNode);
+    const title = astNode.title ?? astNode.body?.props.find((p) => p.key === "title")?.value ?? "";
+    const id = objectHash({
+      astPath,
       source,
       target
-    };
-    const id = objectHash(hashdata);
-    const title = astNode.title ?? astNode.body?.props.find((p) => p.key === "title")?.value ?? "";
+    });
     return {
       id,
-      ...hashdata,
+      astPath,
+      source,
+      target,
+      title,
       ...kind && { kind },
-      title
+      ...tags && { tags }
     };
   }
   parseElementExpression(astNode) {
@@ -178,11 +180,14 @@ ${printDocs(docs)}`);
       };
     }
     if (ast.isElementRefExpression(astNode)) {
-      const element = elementRef(astNode.id);
-      invariant(element, "Element not found " + astNode.id.$cstNode?.text);
-      return {
-        element: this.resolveFqn(element),
+      const elementNode = elementRef(astNode.id);
+      invariant(elementNode, "Element not found " + astNode.id.$cstNode?.text);
+      const element = this.resolveFqn(elementNode);
+      return astNode.isDescedants ? {
+        element,
         isDescedants: astNode.isDescedants
+      } : {
+        element
       };
     }
     nonexhaustive(astNode);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.42.0",
+  "version": "0.42.2",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -50,8 +50,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@likec4/core": "0.42.0",
-    "@likec4/graph": "0.42.0",
+    "@likec4/core": "0.42.2",
+    "@likec4/graph": "0.42.2",
     "langium": "^2.0.2",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",