@likec4/language-server 1.27.3 → 1.28.1

package/dist/lsp/CompletionProvider.d.ts

@@ -1,6 +1,9 @@
 import { type GrammarAST, type MaybePromise } from 'langium';
 import { type CompletionAcceptor, type CompletionContext, DefaultCompletionProvider } from 'langium/lsp';
+import type { LikeC4Services } from '../module';
 export declare class LikeC4CompletionProvider extends DefaultCompletionProvider {
+    protected services: LikeC4Services;
+    constructor(services: LikeC4Services);
     readonly completionOptions: CompletionProviderOptions;
     protected completionForKeyword(context: CompletionContext, keyword: GrammarAST.Keyword, acceptor: CompletionAcceptor): MaybePromise<void>;
 }

package/dist/lsp/CompletionProvider.js

@@ -17,6 +17,10 @@ const STYLE_FIELDS = [
   "textSize"
 ].join(",");
 export class LikeC4CompletionProvider extends DefaultCompletionProvider {
+  constructor(services) {
+    super(services);
+    this.services = services;
+  }
   completionOptions = {
     triggerCharacters: ["."]
   };
@@ -24,87 +28,95 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
     if (!this.filterKeyword(context, keyword)) {
       return;
     }
-    if (keyword.value === "deployment" && AstUtils.hasContainerOfType(context.node, ast.isModelViews)) {
-      return acceptor(context, {
-        label: keyword.value,
-        detail: `Insert deployment view`,
-        kind: CompletionItemKind.Class,
-        insertTextFormat: InsertTextFormat.Snippet,
-        insertText: [
-          "deployment view ${1:view_${TM_FILENAME_BASE}_${CURRENT_SECOND}} {",
-          "	title '${2:Untitled}'",
-          "	",
-          "	include $0",
-          "}"
-        ].join("\n")
-      });
-    }
-    if (["title", "description", "technology"].includes(keyword.value)) {
-      return acceptor(context, {
-        label: keyword.value,
-        kind: CompletionItemKind.Property,
-        insertTextFormat: InsertTextFormat.Snippet,
-        insertText: `${keyword.value} '\${0}'`
-      });
-    }
-    if (keyword.value === "color") {
-      return acceptor(context, {
-        label: keyword.value,
-        kind: CompletionItemKind.Property,
-        insertTextFormat: InsertTextFormat.Snippet,
-        insertText: `${keyword.value} \${1|${ThemeColors.join(",")}|}$0`
-      });
-    }
-    if (keyword.value === "opacity") {
-      return acceptor(context, {
-        label: keyword.value,
-        kind: CompletionItemKind.Property,
-        insertTextFormat: InsertTextFormat.Snippet,
-        insertText: `${keyword.value} \${0:100}%`
-      });
-    }
-    if (["views", "specification", "model", "deployment", "with"].includes(keyword.value)) {
-      return acceptor(context, {
-        label: keyword.value,
-        detail: `Insert ${keyword.value} block`,
-        kind: CompletionItemKind.Module,
-        insertTextFormat: InsertTextFormat.Snippet,
-        insertText: `${keyword.value} {
+    switch (true) {
+      case keyword.value === "import":
+        acceptor(context, {
+          label: keyword.value,
+          kind: CompletionItemKind.Snippet,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: `${keyword.value} { $0 } from '\${1|${this.services.shared.workspace.ProjectsManager.all.join(",")}|}'`
+        });
+        break;
+      case (keyword.value === "deployment" && AstUtils.hasContainerOfType(context.node, ast.isModelViews)):
+        acceptor(context, {
+          label: keyword.value,
+          detail: `Insert deployment view`,
+          kind: CompletionItemKind.Class,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: [
+            "deployment view ${1:view_${TM_FILENAME_BASE}_${CURRENT_SECOND}} {",
+            "	title '${2:Untitled}'",
+            "	",
+            "	include $0",
+            "}"
+          ].join("\n")
+        });
+        break;
+      case ["title", "description", "technology"].includes(keyword.value):
+        acceptor(context, {
+          label: keyword.value,
+          kind: CompletionItemKind.Property,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: `${keyword.value} '\${0}'`
+        });
+        break;
+      case keyword.value === "color":
+        acceptor(context, {
+          label: keyword.value,
+          kind: CompletionItemKind.Property,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: `${keyword.value} \${1|${ThemeColors.join(",")}|}$0`
+        });
+        break;
+      case keyword.value === "opacity":
+        acceptor(context, {
+          label: keyword.value,
+          kind: CompletionItemKind.Property,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: `${keyword.value} \${0:100}%`
+        });
+        break;
+      case ["views", "specification", "model", "deployment", "with"].includes(keyword.value):
+        acceptor(context, {
+          label: keyword.value,
+          detail: `Insert ${keyword.value} block`,
+          kind: CompletionItemKind.Module,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: `${keyword.value} {
 	$0
 }`
-      });
-    }
-    if (keyword.value === "group") {
-      return acceptor(context, {
-        label: keyword.value,
-        detail: `Insert group block`,
-        kind: CompletionItemKind.Class,
-        insertTextFormat: InsertTextFormat.Snippet,
-        insertText: [
-          "group '${1:Title}' {",
-          "	$0",
-          "}"
-        ].join("\n")
-      });
-    }
-    if (keyword.value === "dynamic" && AstUtils.hasContainerOfType(context.node, ast.isModelViews)) {
-      return acceptor(context, {
-        label: keyword.value,
-        detail: `Insert dynamic view`,
-        kind: CompletionItemKind.Class,
-        insertTextFormat: InsertTextFormat.Snippet,
-        insertText: [
-          "dynamic view ${1:view_${TM_FILENAME_BASE}_${CURRENT_SECOND}} {",
-          "	title '${2:Untitled}'",
-          "	",
-          "	$0",
-          "}"
-        ].join("\n")
-      });
-    }
-    if (keyword.value === "style" && context.node) {
-      if (AstUtils.hasContainerOfType(context.node, ast.isGlobalStyle)) {
-        return acceptor(context, {
+        });
+        break;
+      case keyword.value === "group":
+        acceptor(context, {
+          label: keyword.value,
+          detail: `Insert group block`,
+          kind: CompletionItemKind.Class,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: [
+            "group '${1:Title}' {",
+            "	$0",
+            "}"
+          ].join("\n")
+        });
+        break;
+      case (keyword.value === "dynamic" && AstUtils.hasContainerOfType(context.node, ast.isModelViews)):
+        acceptor(context, {
+          label: keyword.value,
+          detail: `Insert dynamic view`,
+          kind: CompletionItemKind.Class,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: [
+            "dynamic view ${1:view_${TM_FILENAME_BASE}_${CURRENT_SECOND}} {",
+            "	title '${2:Untitled}'",
+            "	",
+            "	$0",
+            "}"
+          ].join("\n")
+        });
+        break;
+      case (keyword.value === "style" && context.node && AstUtils.hasContainerOfType(context.node, ast.isGlobalStyle)):
+        acceptor(context, {
           label: keyword.value,
           detail: `Insert ${keyword.value} block`,
           kind: CompletionItemKind.Module,
@@ -113,9 +125,9 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
 	\${3|${STYLE_FIELDS}|} $0
 }`
         });
-      }
-      if (AstUtils.hasContainerOfType(context.node, anyPass([ast.isModelViews, ast.isGlobalStyleGroup]))) {
-        return acceptor(context, {
+        break;
+      case (keyword.value === "style" && context.node && AstUtils.hasContainerOfType(context.node, anyPass([ast.isModelViews, ast.isGlobalStyleGroup]))):
+        acceptor(context, {
           label: keyword.value,
           detail: `Insert ${keyword.value} block`,
           kind: CompletionItemKind.Module,
@@ -124,39 +136,42 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
 	\${2|${STYLE_FIELDS}|} $0
 }`
         });
-      }
-      return acceptor(context, {
-        label: keyword.value,
-        detail: `Insert ${keyword.value} block`,
-        kind: CompletionItemKind.Module,
-        insertTextFormat: InsertTextFormat.Snippet,
-        insertText: `${keyword.value} {
+        break;
+      case keyword.value === "style":
+        acceptor(context, {
+          label: keyword.value,
+          detail: `Insert ${keyword.value} block`,
+          kind: CompletionItemKind.Module,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: `${keyword.value} {
 	\${1|${STYLE_FIELDS}|} $0
 }`
-      });
-    }
-    if (keyword.value === "extend") {
-      return acceptor(context, {
-        label: keyword.value,
-        detail: `Extend another view`,
-        kind: CompletionItemKind.Class,
-        insertTextFormat: InsertTextFormat.Snippet,
-        insertText: "extend $1 {\n	$0\n}"
-      });
-    }
-    if (keyword.value === "autoLayout") {
-      return acceptor(context, {
-        label: keyword.value,
-        kind: CompletionItemKind.Class,
-        insertTextFormat: InsertTextFormat.Snippet,
-        insertText: "autoLayout ${1|TopBottom,BottomTop,LeftRight,RightLeft|}$0"
-      });
+        });
+        break;
+      case keyword.value === "extend":
+        acceptor(context, {
+          label: keyword.value,
+          detail: `Extend another view`,
+          kind: CompletionItemKind.Class,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: "extend $1 {\n	$0\n}"
+        });
+        break;
+      case keyword.value === "autoLayout":
+        acceptor(context, {
+          label: keyword.value,
+          kind: CompletionItemKind.Class,
+          insertTextFormat: InsertTextFormat.Snippet,
+          insertText: "autoLayout ${1|TopBottom,BottomTop,LeftRight,RightLeft|}$0"
+        });
+        break;
+      default:
+        acceptor(context, {
+          label: keyword.value,
+          kind: this.getKeywordCompletionItemKind(keyword),
+          detail: "Keyword",
+          sortText: "1"
+        });
     }
-    acceptor(context, {
-      label: keyword.value,
-      kind: this.getKeywordCompletionItemKind(keyword),
-      detail: "Keyword",
-      sortText: "1"
-    });
   }
 }

package/dist/lsp/DocumentLinkProvider.js

@@ -1,5 +1,5 @@
 import { AstUtils, GrammarUtils } from "langium";
-import { hasLeadingSlash, hasProtocol, isRelative, withoutBase, withoutLeadingSlash } from "ufo";
+import { hasLeadingSlash, hasProtocol, isRelative, joinRelativeURL, withoutBase, withoutLeadingSlash } from "ufo";
 import { ast, isLikeC4LangiumDocument } from "../ast.js";
 import { logWarnError } from "../logger.js";
 export class LikeC4DocumentLinkProvider {
@@ -30,8 +30,11 @@ export class LikeC4DocumentLinkProvider {
     if (hasProtocol(link) || hasLeadingSlash(link)) {
       return link;
     }
-    const base = isRelative(link) ? new URL(doc.uri.toString(true)) : this.services.shared.workspace.WorkspaceManager.workspaceURL;
-    return new URL(link, base).toString();
+    if (isRelative(link)) {
+      return joinRelativeURL(doc.uri.toString(), "../", link);
+    }
+    const base = this.services.shared.workspace.ProjectsManager.getProject(doc).folder;
+    return joinRelativeURL(base.toString(), link);
   }
   relativeLink(doc, link) {
     if (hasLeadingSlash(link)) {

package/dist/lsp/HoverProvider.js

@@ -1,3 +1,4 @@
+import { FqnRef } from "@likec4/core";
 import { AstUtils } from "langium";
 import { AstNodeHoverProvider } from "langium/lsp";
 import { ast } from "../ast.js";
@@ -36,7 +37,8 @@ export class LikeC4HoverProvider extends AstNodeHoverProvider {
     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 [projectId, fqn] = FqnRef.isImportRef(instance.element) ? [instance.element.project, instance.element.model] : [doc.likec4ProjectId, instance.element.model];
+      const el = projectId ? this.locator.getParsedElement(fqn, projectId) : this.locator.getParsedElement(fqn);
       const lines = [instance.id + "  ", `instance of \`${instance.element}\``];
       if (el) {
         lines.push(`### ${el.title}`, "element kind `" + el.kind + "` ");

package/dist/lsp/SemanticTokenProvider.js

@@ -5,23 +5,9 @@ import { ast } from "../ast.js";
 export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
   // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
   highlightElement(node, acceptor) {
-    if (ast.isElement(node) || ast.isDeploymentNode(node)) {
+    if (ast.isElement(node) || ast.isDeploymentNode(node) || ast.isDeployedInstance(node)) {
       return this.highlightNameAndKind(node, acceptor);
     }
-    if (ast.isDeployedInstance(node)) {
-      if ("name" in node) {
-        acceptor({
-          node,
-          property: "name",
-          type: SemanticTokenTypes.variable,
-          modifier: [
-            SemanticTokenModifiers.definition,
-            SemanticTokenModifiers.readonly
-          ]
-        });
-      }
-      return;
-    }
     if (ast.isLikeC4View(node)) {
       return this.highlightView(node, acceptor);
     }
@@ -41,15 +27,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       });
       return "prune";
     }
-    if (ast.isOutgoingRelationExpression(node) && "kind" in node) {
-      acceptor({
-        node,
-        property: "kind",
-        type: SemanticTokenTypes.function
-      });
-      return;
-    }
-    if (ast.isRelation(node) && "kind" in node) {
+    if (ast.isRelation(node) || ast.isOutgoingRelationExpr(node) && "kind" in node) {
       acceptor({
         node,
         property: "kind",
@@ -73,7 +51,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       });
       return "prune";
     }
-    if ((ast.isElementDescedantsExpression(node) || ast.isWildcardExpression(node)) && node.$cstNode) {
+    if (ast.isFqnRefExpr(node) || ast.isWildcardExpression(node)) {
       acceptor({
         cst: node.$cstNode,
         type: SemanticTokenTypes.variable,
@@ -82,10 +60,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
           SemanticTokenModifiers.readonly
         ]
       });
-      return "prune";
-    }
-    if (ast.isFqnRefExpr(node)) {
-      if (node.selector) {
+      if (ast.isFqnRefExpr(node) && node.selector) {
         acceptor({
           node,
           property: "selector",
@@ -96,7 +71,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
           ]
         });
       }
-      return;
+      return "prune";
     }
     if (ast.isWhereRelationKind(node) && isTruthy(node.value)) {
       acceptor({
@@ -195,7 +170,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       acceptor({
         node,
         property: "value",
-        type: node.parent ? SemanticTokenTypes.property : SemanticTokenTypes.variable,
+        type: SemanticTokenTypes.variable,
         modifier: [
           SemanticTokenModifiers.definition,
           SemanticTokenModifiers.readonly
@@ -203,11 +178,11 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       });
       return !node.parent ? "prune" : void 0;
     }
-    if (ast.isElementRef(node) || ast.isStrictFqnElementRef(node)) {
+    if (ast.isStrictFqnElementRef(node)) {
       acceptor({
         node,
         property: "el",
-        type: node.parent ? SemanticTokenTypes.property : SemanticTokenTypes.variable,
+        type: SemanticTokenTypes.variable,
         modifier: [
           SemanticTokenModifiers.definition,
           SemanticTokenModifiers.readonly
@@ -215,6 +190,18 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       });
       return !node.parent ? "prune" : void 0;
     }
+    if (ast.isImported(node)) {
+      acceptor({
+        node,
+        property: "imported",
+        type: SemanticTokenTypes.variable,
+        modifier: [
+          SemanticTokenModifiers.definition,
+          SemanticTokenModifiers.readonly
+        ]
+      });
+      return "prune";
+    }
     if (ast.isSpecificationColor(node)) {
       acceptor({
         node,
@@ -244,11 +231,12 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       });
     }
     if (ast.isTags(node)) {
-      return acceptor({
+      acceptor({
         node,
         property: "values",
         type: SemanticTokenTypes.interface
       });
+      return "prune";
     }
     if (ast.isTag(node)) {
       return acceptor({
@@ -258,7 +246,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         modifier: [SemanticTokenModifiers.definition]
       });
     }
-    if (ast.isRelationStyleProperty(node) || ast.isElementStyleProperty(node) && ast.isElementBody(node.$container)) {
+    if (ast.isRelationStyleProperty(node) || ast.isElementStyleProperty(node)) {
       acceptor({
         node,
         property: "key",
@@ -322,18 +310,20 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
     acceptor({
       node,
       property: "name",
-      type: SemanticTokenTypes.variable,
+      type: SemanticTokenTypes.function,
       modifier: [
         SemanticTokenModifiers.declaration,
         SemanticTokenModifiers.readonly
       ]
     });
-    acceptor({
-      node,
-      property: "kind",
-      type: SemanticTokenTypes.keyword,
-      modifier: []
-    });
+    if (!ast.isDeployedInstance(node)) {
+      acceptor({
+        node,
+        property: "kind",
+        type: SemanticTokenTypes.keyword,
+        modifier: []
+      });
+    }
     if (ast.isElement(node)) {
       if (node.props.length > 0) {
         acceptor({
@@ -357,7 +347,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       acceptor({
         node,
         property: "name",
-        type: SemanticTokenTypes.variable,
+        type: SemanticTokenTypes.interface,
         modifier: [
           SemanticTokenModifiers.declaration,
           SemanticTokenModifiers.readonly,

package/dist/model/builder/MergedSpecification.d.ts

@@ -1,5 +1,6 @@
 import type * as c4 from '@likec4/core';
-import type { ParsedAstDeploymentRelation, ParsedAstElement, ParsedAstRelation, ParsedAstSpecification, ParsedLikeC4LangiumDocument } from '../../ast';
+import { MultiMap } from '@likec4/core';
+import type { ParsedAstDeployment, ParsedAstDeploymentRelation, ParsedAstElement, ParsedAstRelation, ParsedAstSpecification, ParsedLikeC4LangiumDocument } from '../../ast';
 /**
  * The `MergedSpecification` class is responsible for merging multiple parsed
  * LikeC4Langium documents into a single specification. It consolidates tags,
@@ -9,6 +10,7 @@ import type { ParsedAstDeploymentRelation, ParsedAstElement, ParsedAstRelation,
 export declare class MergedSpecification {
     readonly specs: ParsedAstSpecification;
     readonly globals: c4.ModelGlobals;
+    readonly imports: MultiMap<c4.ProjectId, c4.Fqn, Set<c4.Fqn>>;
     constructor(docs: ParsedLikeC4LangiumDocument[]);
     /**
      * Converts a parsed model into a C4 model element.
@@ -17,11 +19,11 @@ export declare class MergedSpecification {
     /**
      * Converts a parsed model into a C4 model relation.
      */
-    toModelRelation: ({ astPath, source, target, kind, links, id, ...model }: ParsedAstRelation) => c4.ModelRelation | null;
+    toModelRelation: ({ astPath, source: sourceFqnRef, target: targetFqnRef, kind, links, id, ...model }: ParsedAstRelation) => c4.ModelRelation | null;
     /**
      * Converts a parsed deployment model into a C4 deployment model
      */
-    toDeploymentElement: (parsed: c4.DeploymentElement) => c4.DeploymentElement | null;
+    toDeploymentElement: (parsed: ParsedAstDeployment) => c4.DeploymentElement | null;
     /**
      * Converts a parsed deployment relation into a C4 deployment relation.
      */

package/dist/model/builder/MergedSpecification.js

@@ -1,6 +1,7 @@
+import { MultiMap } from "@likec4/core";
 import {
-  DeploymentElement
-} from "@likec4/core";
+  FqnRef
+} from "@likec4/core/types";
 import {
   isBoolean,
   isEmpty,
@@ -21,11 +22,13 @@ export class MergedSpecification {
     dynamicPredicates: {},
     styles: {}
   };
+  imports = new MultiMap(Set);
   constructor(docs) {
     for (const doc of docs) {
       const {
         c4Specification: spec,
-        c4Globals
+        c4Globals,
+        c4Imports
       } = doc;
       spec.tags.forEach((t) => this.specs.tags.add(t));
       Object.assign(this.specs.elements, spec.elements);
@@ -35,6 +38,9 @@ export class MergedSpecification {
       Object.assign(this.globals.predicates, c4Globals.predicates);
       Object.assign(this.globals.dynamicPredicates, c4Globals.dynamicPredicates);
       Object.assign(this.globals.styles, c4Globals.styles);
+      for (const [projectId, fqn] of c4Imports) {
+        this.imports.set(projectId, fqn);
+      }
     }
   }
   /**
@@ -109,13 +115,15 @@ export class MergedSpecification {
    */
   toModelRelation = ({
     astPath,
-    source,
-    target,
+    source: sourceFqnRef,
+    target: targetFqnRef,
     kind,
     links,
     id,
     ...model
   }) => {
+    const target = FqnRef.toModelFqn(targetFqnRef);
+    const source = FqnRef.toModelFqn(sourceFqnRef);
     if (isNonNullish(kind) && this.specs.relationships[kind]) {
       return {
         ...this.specs.relationships[kind],
@@ -139,8 +147,14 @@ export class MergedSpecification {
    * Converts a parsed deployment model into a C4 deployment model
    */
   toDeploymentElement = (parsed) => {
-    if (!DeploymentElement.isDeploymentNode(parsed)) {
-      return parsed;
+    if ("element" in parsed && !("kind" in parsed)) {
+      return {
+        ...parsed,
+        element: FqnRef.toModelFqn(parsed.element)
+      };
+    }
+    if ("element" in parsed) {
+      return null;
     }
     try {
       const __kind = this.specs.deployments[parsed.kind];

package/dist/model/builder/buildModel.d.ts

@@ -1,5 +1,10 @@
 import type * as c4 from '@likec4/core';
+import { type MultiMap } from '@likec4/core';
 import type { ParsedLikeC4LangiumDocument } from '../../ast';
+export type BuildModelData = {
+    data: c4.ParsedLikeC4ModelData;
+    imports: MultiMap<c4.ProjectId, c4.Fqn, Set<c4.Fqn>>;
+};
 /**
  * Each document was parsed into a ParsedLikeC4LangiumDocument, where elements
  * do not inherit styles from specification.
@@ -7,4 +12,4 @@ import type { ParsedLikeC4LangiumDocument } from '../../ast';
  * This function builds a model from all documents, merging the specifications
  * and globals, and applying the extends to the elements.
  */
-export declare function buildModel(docs: ParsedLikeC4LangiumDocument[]): c4.ParsedLikeC4ModelData;
+export declare function buildModelData(docs: ParsedLikeC4LangiumDocument[]): BuildModelData;