@likec4/language-server 1.30.0 → 1.32.0

package/dist/generated/module.d.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 3.4.0.
+ * This file was generated by langium-cli 3.5.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import type { LangiumSharedCoreServices, LangiumCoreServices, LangiumGeneratedCoreServices, LangiumGeneratedSharedCoreServices, Module, IParserConfig } from 'langium';

package/dist/lsp/CompletionProvider.js

@@ -22,7 +22,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
     this.services = services;
   }
   completionOptions = {
-    triggerCharacters: ["."]
+    triggerCharacters: [".", "#"]
   };
   completionForKeyword(context, keyword, acceptor) {
     if (!this.filterKeyword(context, keyword)) {

package/dist/lsp/DocumentLinkProvider.js

@@ -41,10 +41,11 @@ export class LikeC4DocumentLinkProvider {
       return withoutLeadingSlash(link);
     }
     if (isRelative(link)) {
-      const base = new URL(doc.uri.toString(true));
-      const linkURL = new URL(link, base).toString();
+      const base = this.services.shared.workspace.ProjectsManager.getProject(doc).folder.toString();
+      const docURL = new URL(doc.uri.toString());
+      const linkURL = new URL(link, docURL).toString();
       return withoutLeadingSlash(
-        withoutBase(linkURL, this.services.shared.workspace.WorkspaceManager.workspaceURL.toString())
+        withoutBase(linkURL, base)
       );
     }
     return null;

package/dist/lsp/HoverProvider.js

@@ -39,7 +39,7 @@ export class LikeC4HoverProvider extends AstNodeHoverProvider {
       const instance = this.parser.forDocument(doc).parseDeployedInstance(node);
       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}\``];
+      const lines = [instance.id + "  ", `instance of \`${FqnRef.flatten(instance.element)}\``];
       if (el) {
         lines.push(`### ${el.title}`, "element kind `" + el.kind + "` ");
       }
@@ -66,6 +66,14 @@ export class LikeC4HoverProvider extends AstNodeHoverProvider {
         }
       };
     }
+    if (ast.isRelationshipKind(node)) {
+      return {
+        contents: {
+          kind: "markdown",
+          value: "relationship kind `" + node.name + "`"
+        }
+      };
+    }
     if (ast.isElement(node)) {
       const el = this.locator.getParsedElement(node);
       if (!el) {

package/dist/lsp/SemanticTokenProvider.js

@@ -62,6 +62,13 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       });
       return "prune";
     }
+    if (ast.isRelationKindDotRef(node)) {
+      acceptor({
+        cst: node.$cstNode,
+        type: SemanticTokenTypes.function
+      });
+      return "prune";
+    }
     if (ast.isWhereRelationKind(node) && isTruthy(node.value)) {
       acceptor({
         node,
@@ -196,6 +203,14 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       });
       return;
     }
+    if (ast.isSpecificationTag(node) && isTruthy(node.color)) {
+      acceptor({
+        node,
+        keyword: "color",
+        type: SemanticTokenTypes.property
+      });
+      return;
+    }
     if (ast.isSpecificationElementKind(node) || ast.isSpecificationRelationshipKind(node) || ast.isSpecificationDeploymentNodeKind(node)) {
       acceptor({
         node,
@@ -207,11 +222,10 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         ]
       });
     }
-    if (ast.isTags(node)) {
+    if (ast.isTagRef(node)) {
       acceptor({
-        node,
-        property: "values",
-        type: SemanticTokenTypes.interface
+        cst: node.$cstNode,
+        type: SemanticTokenTypes.type
       });
       return "prune";
     }

package/dist/mcp/LikeC4MCPServerFactory.d.ts

@@ -1,15 +1,18 @@
 import type { ServerOptions } from '@modelcontextprotocol/sdk/server/index.js';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { LikeC4Services } from '../module';
 export interface LikeC4MCPServer {
     start(port: number): Promise<void>;
     stop(): Promise<void>;
 }
+export interface LikeC4MCPServerFactory {
+    create(options?: ServerOptions): McpServer;
+}
 export declare class NoopLikeC4MCPServer implements LikeC4MCPServer {
     start(port: number): Promise<never>;
     stop(): Promise<never>;
 }
-export declare class LikeC4MCPServerFactory {
+export declare class NoopLikeC4MCPServerFactory implements LikeC4MCPServerFactory {
     private services;
     constructor(services: LikeC4Services);
     create(options?: ServerOptions): McpServer;

package/dist/mcp/LikeC4MCPServerFactory.js

@@ -1,6 +1,3 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import packageJson from "../../package.json" with { type: "json" };
-import { LikeC4MCPTools } from "./LikeC4MCPTools.js";
 export class NoopLikeC4MCPServer {
   start(port) {
     return Promise.reject(new Error("Not implemented"));
@@ -9,78 +6,11 @@ export class NoopLikeC4MCPServer {
     return Promise.reject(new Error("Not implemented"));
   }
 }
-function toolResponse(text) {
-  return {
-    content: [{
-      type: "text",
-      text
-    }]
-  };
-}
-export class LikeC4MCPServerFactory {
+export class NoopLikeC4MCPServerFactory {
   constructor(services) {
     this.services = services;
   }
   create(options) {
-    const {
-      instructions,
-      listProjects,
-      readProjectSummary,
-      searchElement,
-      readElement,
-      readView
-    } = LikeC4MCPTools;
-    const mcp = new McpServer({
-      name: "LikeC4",
-      version: packageJson.version
-    }, {
-      instructions,
-      ...options,
-      capabilities: {
-        tools: {},
-        ...options?.capabilities
-      }
-    });
-    const tools = this.services.mcp.Tools;
-    mcp.tool(
-      listProjects.name,
-      listProjects.description,
-      async () => {
-        return toolResponse(await tools.listProjects());
-      }
-    );
-    mcp.tool(
-      readProjectSummary.name,
-      readProjectSummary.description,
-      readProjectSummary.paramsSchema,
-      async (params) => {
-        return toolResponse(await tools.readProjectSummary(params.project));
-      }
-    );
-    mcp.tool(
-      searchElement.name,
-      searchElement.description,
-      searchElement.paramsSchema,
-      async (params) => {
-        return toolResponse(await tools.searchElement(params));
-      }
-    );
-    mcp.tool(
-      readElement.name,
-      readElement.description,
-      readElement.paramsSchema,
-      async (params) => {
-        return toolResponse(await tools.readElement(params));
-      }
-    );
-    mcp.tool(
-      readView.name,
-      readView.description,
-      readView.paramsSchema,
-      async (params) => {
-        return toolResponse(await tools.readView(params));
-      }
-    );
-    return mcp;
+    throw new Error("NoopLikeC4MCPServerFactory - switch to implementation");
   }
 }

package/dist/mcp/LikeC4MCPTools.js

@@ -1,3 +1,4 @@
+import { _type } from "@likec4/core";
 import { loggable } from "@likec4/log";
 import { flatMap } from "remeda";
 import stripIndent from "strip-indent";
@@ -194,10 +195,11 @@ export class DefaultLikeC4MCPTools {
         ""
       );
     }
-    if (model.allTags().length > 0) {
+    const tags = model.tags;
+    if (tags.length > 0) {
       response.push(
         "tags:",
-        ...model.allTags().map((t) => `- ${t}`),
+        ...tags.map((t) => `- ${t}`),
         ""
       );
     }
@@ -224,7 +226,7 @@ export class DefaultLikeC4MCPTools {
       "<views>",
       ...outputEach(model.views(), "No views", (v) => [
         `- id: ${v.id}`,
-        `  viewType: ${v.__}`,
+        `  viewType: ${v[_type]}`,
         `  title: ${singleLine(v.title)}`,
         ""
       ]),

package/dist/mcp/sseserver/MCPServerFactory.d.ts

@@ -0,0 +1,8 @@
+import type { ServerOptions } from '@modelcontextprotocol/sdk/server/index.js';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { LikeC4Services } from '../../module';
+export declare class LikeC4MCPServerFactory {
+    private services;
+    constructor(services: LikeC4Services);
+    create(options?: ServerOptions): McpServer;
+}

package/dist/mcp/sseserver/MCPServerFactory.js

@@ -0,0 +1,78 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import packageJson from "../../../package.json" with { type: "json" };
+import { LikeC4MCPTools } from "../LikeC4MCPTools.js";
+function toolResponse(text) {
+  return {
+    content: [{
+      type: "text",
+      text
+    }]
+  };
+}
+export class LikeC4MCPServerFactory {
+  constructor(services) {
+    this.services = services;
+  }
+  create(options) {
+    const {
+      instructions,
+      listProjects,
+      readProjectSummary,
+      searchElement,
+      readElement,
+      readView
+    } = LikeC4MCPTools;
+    const mcp = new McpServer({
+      name: "LikeC4",
+      version: packageJson.version
+    }, {
+      instructions,
+      ...options,
+      capabilities: {
+        tools: {},
+        ...options?.capabilities
+      }
+    });
+    const tools = this.services.mcp.Tools;
+    mcp.tool(
+      listProjects.name,
+      listProjects.description,
+      async () => {
+        return toolResponse(await tools.listProjects());
+      }
+    );
+    mcp.tool(
+      readProjectSummary.name,
+      readProjectSummary.description,
+      readProjectSummary.paramsSchema,
+      async (params) => {
+        return toolResponse(await tools.readProjectSummary(params.project));
+      }
+    );
+    mcp.tool(
+      searchElement.name,
+      searchElement.description,
+      searchElement.paramsSchema,
+      async (params) => {
+        return toolResponse(await tools.searchElement(params));
+      }
+    );
+    mcp.tool(
+      readElement.name,
+      readElement.description,
+      readElement.paramsSchema,
+      async (params) => {
+        return toolResponse(await tools.readElement(params));
+      }
+    );
+    mcp.tool(
+      readView.name,
+      readView.description,
+      readView.paramsSchema,
+      async (params) => {
+        return toolResponse(await tools.readView(params));
+      }
+    );
+    return mcp;
+  }
+}

package/dist/mcp/sseserver/with-mcp-server.d.ts

@@ -1,7 +1,9 @@
 import type { LikeC4Services } from '../../module';
 import type { LikeC4MCPServer } from '../LikeC4MCPServerFactory';
+import { LikeC4MCPServerFactory } from './MCPServerFactory';
 export declare const WithMCPServer: {
     mcp: {
         Server(services: LikeC4Services): LikeC4MCPServer;
+        ServerFactory(services: LikeC4Services): LikeC4MCPServerFactory;
     };
 };

package/dist/mcp/sseserver/with-mcp-server.js

@@ -1,5 +1,6 @@
 import { logger } from "../../logger.js";
-import { SSELikeC4MCPServer } from "./SSELikeC4MCPServer.js";
+import { SSELikeC4MCPServer } from "./MCPServer.js";
+import { LikeC4MCPServerFactory } from "./MCPServerFactory.js";
 export const WithMCPServer = {
   mcp: {
     Server(services) {
@@ -28,6 +29,9 @@ export const WithMCPServer = {
         }).catch((err) => logger.error("Failed to start LikeC4 MCP Server", { err }));
       });
       return server;
+    },
+    ServerFactory(services) {
+      return new LikeC4MCPServerFactory(services);
     }
   }
 };

package/dist/mcp/utils.d.ts

@@ -1,6 +1,7 @@
-import { type LikeC4Model, type ProjectId } from '@likec4/core';
+import { type Any, type aux, type ProjectId } from '@likec4/core';
+import { type ElementModel, type LikeC4ViewModel } from '@likec4/core/model';
 import type { LikeC4LanguageServices } from '../LikeC4LanguageServices';
-export declare function elementResource(languageServices: LikeC4LanguageServices, el: LikeC4Model.Element, projectId?: ProjectId): {
+export declare function elementResource<A extends Any = Any>(languageServices: LikeC4LanguageServices, el: ElementModel<A>, projectId?: aux.ProjectId<A>): {
     id: any;
     parent: {
         id: any;
@@ -22,11 +23,11 @@ export declare function elementResource(languageServices: LikeC4LanguageServices
     views: any;
     sourceFile: import("../protocol").Locate.Res;
 };
-export declare function modelViewResource(languageServices: LikeC4LanguageServices, view: LikeC4Model.View, projectId?: ProjectId): {
+export declare function modelViewResource(languageServices: LikeC4LanguageServices, view: LikeC4ViewModel<aux.Any>, projectId?: ProjectId): {
     id: any;
     title: any;
     projectId: any;
-    viewType: any;
+    viewType: LikeC4ViewModel<aux.Any>;
     description: any;
     tags: any;
     nodes: any;

package/dist/mcp/utils.js

@@ -1,4 +1,4 @@
-import { imap, toArray } from "@likec4/core";
+import { _type, imap, toArray } from "@likec4/core";
 export function elementResource(languageServices, el, projectId) {
   return {
     id: el.id,
@@ -78,7 +78,7 @@ export function modelViewResource(languageServices, view, projectId) {
     id: view.id,
     title: view.title,
     projectId,
-    viewType: view.__,
+    viewType: view[_type],
     description: view.$view.description ?? "",
     tags: view.tags,
     nodes: toArray(imap(view.nodes(), (node) => ({

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

@@ -3,10 +3,10 @@ import type { ParsedAstExtend } from '../../ast';
 export declare class MergedExtends {
     private mergedData;
     merge(parsedExtends: ParsedAstExtend[]): void;
-    apply<E extends {
-        id: c4.Fqn;
-        tags?: c4.NonEmptyArray<c4.Tag> | null;
-        links?: c4.NonEmptyArray<c4.Link> | null;
+    applyExtended<E extends {
+        id: string;
+        tags?: readonly string[] | null;
+        links?: readonly c4.Link[] | null;
         metadata?: Record<string, string>;
     }>(el: E): E;
 }

package/dist/model/builder/MergedExtends.js

@@ -31,7 +31,7 @@ export class MergedExtends {
       this.mergedData.set(id, existing);
     }
   }
-  apply(el) {
+  applyExtended(el) {
     const extendData = this.mergedData.get(el.id);
     if (!extendData) {
       return el;

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

@@ -8,7 +8,8 @@ import type { ParsedAstDeployment, ParsedAstDeploymentRelation, ParsedAstElement
  * and provides methods to convert parsed models into C4 model elements and relations.
  */
 export declare class MergedSpecification {
-    readonly specs: ParsedAstSpecification;
+    readonly specs: Omit<ParsedAstSpecification, 'tags'>;
+    readonly tags: Readonly<Record<c4.Tag, c4.TagSpecification>>;
     readonly globals: c4.ModelGlobals;
     readonly imports: MultiMap<c4.ProjectId, c4.Fqn, Set<c4.Fqn>>;
     constructor(docs: ParsedLikeC4LangiumDocument[]);
@@ -19,7 +20,7 @@ export declare class MergedSpecification {
     /**
      * Converts a parsed model into a C4 model relation.
      */
-    toModelRelation: ({ astPath, source: sourceFqnRef, target: targetFqnRef, kind, links, id, ...model }: ParsedAstRelation) => c4.ModelRelation | null;
+    toModelRelation: ({ astPath, source, target, kind, links, id, ...model }: ParsedAstRelation) => c4.Relationship | null;
     /**
      * Converts a parsed deployment model into a C4 deployment model
      */
@@ -27,5 +28,5 @@ export declare class MergedSpecification {
     /**
      * Converts a parsed deployment relation into a C4 deployment relation.
      */
-    toDeploymentRelation: ({ astPath, source, target, kind, links, id, ...model }: ParsedAstDeploymentRelation) => c4.DeploymentRelation | null;
+    toDeploymentRelation: ({ astPath, source, target, kind, links, id, ...model }: ParsedAstDeploymentRelation) => c4.DeploymentRelationship | null;
 }

package/dist/model/builder/MergedSpecification.js

@@ -9,14 +9,15 @@ import {
   isNumber
 } from "remeda";
 import { logger, logWarnError } from "../../logger.js";
+import { assignTagColors } from "./assignTagColors.js";
 export class MergedSpecification {
   specs = {
-    tags: /* @__PURE__ */ new Set(),
     elements: {},
     deployments: {},
     relationships: {},
     colors: {}
   };
+  tags;
   globals = {
     predicates: {},
     dynamicPredicates: {},
@@ -24,13 +25,14 @@ export class MergedSpecification {
   };
   imports = new MultiMap(Set);
   constructor(docs) {
+    const tags = {};
     for (const doc of docs) {
       const {
         c4Specification: spec,
         c4Globals,
         c4Imports
       } = doc;
-      spec.tags.forEach((t) => this.specs.tags.add(t));
+      Object.assign(tags, spec.tags);
       Object.assign(this.specs.elements, spec.elements);
       Object.assign(this.specs.relationships, spec.relationships);
       Object.assign(this.specs.colors, spec.colors);
@@ -42,6 +44,7 @@ export class MergedSpecification {
         this.imports.set(projectId, fqn);
       }
     }
+    this.tags = assignTagColors(tags);
   }
   /**
    * Converts a parsed model into a C4 model element.
@@ -98,7 +101,7 @@ export class MergedSpecification {
           ...isNumber(opacity) && { opacity }
         },
         links: links ?? null,
-        tags: tags ?? null,
+        tags: tags ?? [],
         technology: technology ?? null,
         description: description ?? null,
         title,
@@ -115,15 +118,13 @@ export class MergedSpecification {
    */
   toModelRelation = ({
     astPath,
-    source: sourceFqnRef,
-    target: targetFqnRef,
+    source,
+    target,
     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],
@@ -150,7 +151,7 @@ export class MergedSpecification {
     if ("element" in parsed && !("kind" in parsed)) {
       return {
         ...parsed,
-        element: FqnRef.toModelFqn(parsed.element)
+        element: FqnRef.flatten(parsed.element)
       };
     }
     if ("element" in parsed) {

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

@@ -0,0 +1,7 @@
+import type * as c4 from '@likec4/core/types';
+import type { ParsedAstSpecification } from '../../ast';
+/**
+ * Colors are taken from the styles presets of the LikeC4
+ */
+export declare const radixColors: string[];
+export declare function assignTagColors(tags: ParsedAstSpecification['tags']): Record<c4.Tag, c4.TagSpecification>;

package/dist/model/builder/assignTagColors.js

@@ -0,0 +1,51 @@
+import { compareNatural, nonNullable } from "@likec4/core";
+import { concat, entries, isTruthy, map, pipe, prop, pullObject, sort } from "remeda";
+export const radixColors = [
+  "tomato",
+  "grass",
+  "blue",
+  "ruby",
+  "orange",
+  "indigo",
+  "pink",
+  "teal",
+  "purple",
+  "amber",
+  "crimson",
+  "red",
+  "lime",
+  "yellow",
+  "violet"
+];
+export function assignTagColors(tags) {
+  const tagsWithColors = [];
+  const tagsWithoutColors = [];
+  for (const [tag, spec] of entries(tags)) {
+    if (isTruthy(spec.color)) {
+      tagsWithColors.push({
+        tag,
+        spec: {
+          color: spec.color
+        }
+      });
+    } else {
+      tagsWithoutColors.push(tag);
+    }
+  }
+  return pipe(
+    tagsWithoutColors,
+    sort(compareNatural),
+    map((tag, idx) => {
+      const color = nonNullable(radixColors[idx % radixColors.length]);
+      return {
+        tag,
+        spec: {
+          color
+        }
+      };
+    }),
+    concat(tagsWithColors),
+    sort((a, b) => compareNatural(a.tag, b.tag)),
+    pullObject(prop("tag"), prop("spec"))
+  );
+}

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

@@ -1,4 +1,4 @@
-import type * as c4 from '@likec4/core';
+import * as c4 from '@likec4/core';
 import { type MultiMap } from '@likec4/core';
 import type { ParsedLikeC4LangiumDocument } from '../../ast';
 export type BuildModelData = {
@@ -12,4 +12,4 @@ export type BuildModelData = {
  * This function builds a model from all documents, merging the specifications
  * and globals, and applying the extends to the elements.
  */
-export declare function buildModelData(docs: ParsedLikeC4LangiumDocument[]): BuildModelData;
+export declare function buildModelData(projectId: string, docs: ParsedLikeC4LangiumDocument[]): BuildModelData;