@likec4/language-server 1.40.0 → 1.42.0

package/dist/logger.d.ts

@@ -1,6 +1,7 @@
 import { type Logger, type Sink, type TextFormatter } from '@likec4/log';
 import type { Connection } from 'vscode-languageserver';
 export declare const logger: Logger;
+export { logger as serverLogger, };
 export declare function logError(err: unknown): void;
 /**
  * Logs an error as warning (not critical)
@@ -14,4 +15,3 @@ type LspConnectionSinkProps = {
 };
 export declare function getLspConnectionSink(connection: Connection, props?: LspConnectionSinkProps): Sink;
 export declare function getTelemetrySink(connection: Connection): Sink;
-export {};

package/dist/logger.mjs

@@ -7,6 +7,9 @@ import {
   logger as root
 } from "@likec4/log";
 export const logger = root.getChild("server");
+export {
+  logger as serverLogger
+};
 export function logError(err) {
   logger.error(loggable(err));
 }

package/dist/lsp/CompletionProvider.mjs

@@ -1,4 +1,4 @@
-import { ThemeColors } from "@likec4/core";
+import { ThemeColors } from "@likec4/core/styles";
 import { AstUtils } from "langium";
 import {
   DefaultCompletionProvider

package/dist/lsp/DocumentLinkProvider.d.ts

@@ -5,7 +5,7 @@ import type { LikeC4Services } from '../module';
 export declare class LikeC4DocumentLinkProvider implements DocumentLinkProvider {
     private services;
     constructor(services: LikeC4Services);
-    getDocumentLinks(doc: LangiumDocument, _params: DocumentLinkParams, cancelToken?: CancellationToken): Promise<DocumentLink[]>;
+    getDocumentLinks(doc: LangiumDocument, _params: DocumentLinkParams, _cancelToken?: CancellationToken): Promise<DocumentLink[]>;
     resolveLink(doc: LangiumDocument, link: string): string;
     relativeLink(doc: LangiumDocument, link: string): string | null;
 }

package/dist/lsp/DocumentLinkProvider.mjs

@@ -6,7 +6,7 @@ export class LikeC4DocumentLinkProvider {
   constructor(services) {
     this.services = services;
   }
-  async getDocumentLinks(doc, _params, cancelToken) {
+  async getDocumentLinks(doc, _params, _cancelToken) {
     if (!isLikeC4LangiumDocument(doc) || this.services.likec4.LanguageServices.isExcluded(doc)) {
       return [];
     }

package/dist/lsp/DocumentSymbolProvider.mjs

@@ -269,7 +269,7 @@ export class LikeC4DocumentSymbolProvider {
     const doc = AstUtils.getDocument(astElement);
     const instance = this.parser.forDocument(doc).parseDeployedInstance(astElement);
     const name = this.nameProvider.getNameStrict(astElement);
-    const detail = "instance of " + instance.element;
+    const detail = "instance of " + instance.element.model;
     return [
       {
         kind: this.symbolKind(astElement),

package/dist/lsp/HoverProvider.mjs

@@ -1,4 +1,4 @@
-import { FqnRef } from "@likec4/core";
+import { FqnRef, preferSummary } from "@likec4/core";
 import { AstUtils } from "langium";
 import { AstNodeHoverProvider } from "langium/lsp";
 import { ast } from "../ast.mjs";
@@ -27,6 +27,10 @@ export class LikeC4HoverProvider extends AstNodeHoverProvider {
         lines.push(`### ${el.title}`);
       }
       lines.push("deployment node `" + el.kind + "` ");
+      const summary = preferSummary(el);
+      if (summary) {
+        lines.push("", summary.md ?? summary.txt);
+      }
       return {
         contents: {
           kind: "markdown",
@@ -79,7 +83,15 @@ export class LikeC4HoverProvider extends AstNodeHoverProvider {
       if (!el) {
         return;
       }
-      const lines = [el.id, `### ${el.title}`, "element kind `" + el.kind + "` "];
+      const lines = [
+        el.id,
+        `### ${el.title}`,
+        "element kind `" + el.kind + "` "
+      ];
+      const summary = preferSummary(el);
+      if (summary) {
+        lines.push("", summary.md ?? summary.txt);
+      }
       return {
         contents: {
           kind: "markdown",

package/dist/mcp/NoopLikeC4MCPServer.d.ts

@@ -4,6 +4,6 @@ export declare class NoopLikeC4MCPServer implements LikeC4MCPServer {
     get mcp(): McpServer;
     get isStarted(): boolean;
     get port(): number;
-    start(port: number): Promise<void>;
+    start(): Promise<void>;
     stop(): Promise<void>;
 }

package/dist/mcp/NoopLikeC4MCPServer.mjs

@@ -8,7 +8,7 @@ export class NoopLikeC4MCPServer {
   get port() {
     return NaN;
   }
-  start(port) {
+  start() {
     return Promise.resolve();
   }
   stop() {

package/dist/mcp/server/StdioLikeC4MCPServer.mjs

@@ -37,7 +37,10 @@ export class StdioLikeC4MCPServer {
     }
     logger.info("Stopping MCP stdio server");
     await this.transport.close();
-    this._mcp?.close();
+    if (this._mcp) {
+      await this._mcp.close();
+    }
+    this._mcp = void 0;
     this.transport = void 0;
   }
 }

package/dist/mcp/server/StreamableLikeC4MCPServer.mjs

@@ -47,10 +47,10 @@ export class StreamableLikeC4MCPServer {
           };
           await server.connect(transport);
           await transport.handleRequest(req, res, await c.req.json());
-          res.on("close", () => {
+          res.on("close", async () => {
             logger.debug("Request closed");
-            transport.close();
-            server.close();
+            await transport.close();
+            await server.close();
           });
           return toFetchResponse(res);
         } catch (e) {

package/dist/mcp/server/WithMCPServer.mjs

@@ -19,10 +19,10 @@ const streamableLikeC4MCPServer = (services, defaultPort = 33335) => {
       port = defaultPort
     } = update.configuration.mcp;
     if (!enabled) {
-      server.stop();
+      void server.stop();
       return;
     }
-    Promise.resolve().then(() => server.start(port)).then(() => {
+    void Promise.resolve().then(() => server.start(port)).then(() => {
       connection?.telemetry?.logEvent({
         eventName: "mcp-server-started",
         mcpPort: port

package/dist/mcp/tools/_common.mjs

@@ -15,7 +15,7 @@ export const locationSchema = z.object({
     })
   }).describe("Range in the file")
 }).nullable();
-export const projectIdSchema = z.string().refine((v) => true).optional().default(ProjectsManager.DefaultProjectId).describe('Project id (optional, will use "default" if not specified)');
+export const projectIdSchema = z.string().refine((_v) => true).optional().default(ProjectsManager.DefaultProjectId).describe('Project id (optional, will use "default" if not specified)');
 export const includedInViewsSchema = z.array(z.object({
   id: z.string().describe("View id"),
   title: z.string().describe("View title"),
@@ -36,7 +36,7 @@ export const mkLocate = (languageServices, projectId) => (params) => {
       range: loc.range
     } : null;
   } catch (e) {
-    logger.debug(`Failed to locate ${params}`, { error: e });
+    logger.debug(`Failed to locate {params}`, { error: e, params });
     return null;
   }
 };

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

@@ -16,11 +16,11 @@ export declare class MergedSpecification {
     /**
      * Converts a parsed model into a C4 model element.
      */
-    toModelElement: ({ tags, links, style: { color, shape, icon, opacity, border, size, multiple, padding, textSize, }, id, kind, title, description, technology, metadata, }: ParsedAstElement) => c4.Element | null;
+    toModelElement: ({ tags, links, style, id, kind, title, description, technology, summary, metadata, }: ParsedAstElement) => c4.Element | null;
     /**
      * Converts a parsed model into a C4 model relation.
      */
-    toModelRelation: ({ astPath, source, target, kind, links, id, ...model }: ParsedAstRelation) => c4.Relationship | null;
+    toModelRelation: ({ astPath: _astPath, source, target, kind, links, id, ...model }: ParsedAstRelation) => c4.Relationship | null;
     /**
      * Converts a parsed deployment model into a C4 deployment model
      */
@@ -28,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.DeploymentRelationship | null;
+    toDeploymentRelation: ({ astPath: _astPath, source, target, kind, links, id, ...model }: ParsedAstDeploymentRelation) => c4.DeploymentRelationship | null;
 }

package/dist/model/builder/MergedSpecification.mjs

@@ -1,10 +1,9 @@
-import { FqnRef } from "@likec4/core/types";
-import { MultiMap, nameFromFqn } from "@likec4/core/utils";
+import { exact, FqnRef } from "@likec4/core/types";
+import { isNonEmptyArray, MultiMap, nameFromFqn } from "@likec4/core/utils";
 import {
-  isBoolean,
   isEmpty,
   isNonNullish,
-  isNumber
+  unique
 } from "remeda";
 import { logger, logWarnError } from "../../logger.mjs";
 import { assignTagColors } from "./assignTagColors.mjs";
@@ -50,22 +49,13 @@ export class MergedSpecification {
   toModelElement = ({
     tags,
     links,
-    style: {
-      color,
-      shape,
-      icon,
-      opacity,
-      border,
-      size,
-      multiple,
-      padding,
-      textSize
-    },
+    style,
     id,
     kind,
     title,
     description,
     technology,
+    summary,
     metadata
   }) => {
     try {
@@ -74,41 +64,33 @@ export class MergedSpecification {
         logger.warn`No kind '${kind}' found for ${id}`;
         return null;
       }
-      color ??= __kind.style.color;
-      shape ??= __kind.style.shape;
-      icon ??= __kind.style.icon;
-      opacity ??= __kind.style.opacity;
-      border ??= __kind.style.border;
       technology ??= __kind.technology;
-      multiple ??= __kind.style.multiple;
-      size ??= __kind.style.size;
-      padding ??= __kind.style.padding;
-      textSize ??= __kind.style.textSize;
       description ??= __kind.description;
+      summary ??= __kind.summary;
       links ??= __kind.links;
       title = title === nameFromFqn(id) && __kind.title ? __kind.title : title;
-      return {
-        ...color && { color },
-        ...shape && { shape },
-        ...icon && { icon },
-        ...metadata && !isEmpty(metadata) && { metadata },
-        ...__kind.notation && { notation: __kind.notation },
-        style: {
-          ...border && { border },
-          ...size && { size },
-          ...padding && { padding },
-          ...textSize && { textSize },
-          ...isBoolean(multiple) && { multiple },
-          ...isNumber(opacity) && { opacity }
-        },
-        links: links ?? null,
-        tags: tags ?? [],
-        ...technology && { technology },
-        ...description && { description },
+      if (__kind.tags && isNonEmptyArray(__kind.tags)) {
+        tags = tags ? unique([
+          ...__kind.tags,
+          ...tags
+        ]) : __kind.tags;
+      }
+      return exact({
+        metadata: metadata && !isEmpty(metadata) ? metadata : void 0,
+        notation: __kind.notation,
+        style: exact({
+          ...__kind.style,
+          ...style
+        }),
+        links,
+        tags,
+        summary,
+        technology,
+        description,
         title,
         kind,
         id
-      };
+      });
     } catch (e) {
       logWarnError(e);
     }
@@ -118,7 +100,8 @@ export class MergedSpecification {
    * Converts a parsed model into a C4 model relation.
    */
   toModelRelation = ({
-    astPath,
+    astPath: _astPath,
+    // omit
     source,
     target,
     kind,
@@ -166,28 +149,22 @@ export class MergedSpecification {
         return null;
       }
       let {
-        technology = __kind.technology,
-        notation = __kind.notation,
+        id,
         style,
         title,
-        description,
         ...rest
       } = parsed;
-      description ??= __kind.description;
       title = title === nameFromFqn(parsed.id) && __kind.title ? __kind.title : title;
-      return {
+      return exact({
+        ...__kind,
         ...rest,
-        ...{ title },
-        ...description && { description },
-        ...notation && { notation },
-        ...technology && { technology },
-        style: {
-          border: "dashed",
-          opacity: 10,
+        title,
+        style: exact({
           ...__kind.style,
           ...style
-        }
-      };
+        }),
+        id
+      });
     } catch (e) {
       logWarnError(e);
     }
@@ -197,7 +174,8 @@ export class MergedSpecification {
    * Converts a parsed deployment relation into a C4 deployment relation.
    */
   toDeploymentRelation = ({
-    astPath,
+    astPath: _astPath,
+    // omit
     source,
     target,
     kind,

package/dist/model/builder/buildModel.mjs

@@ -1,15 +1,16 @@
 import {
-  computeColorValues,
   isDeploymentNode,
   isGlobalFqn
 } from "@likec4/core";
 import { resolveRulesExtendedViews } from "@likec4/core/compute-view";
-import { _stage, _type, FqnRef } from "@likec4/core/types";
+import { computeColorValues } from "@likec4/core/styles";
+import { _stage, _type, exact, FqnRef, isExtendsElementView } from "@likec4/core/types";
 import {
   compareNatural,
   parentFqn,
   sortByFqnHierarchically
 } from "@likec4/core/utils";
+import { UriUtils } from "langium";
 import {
   filter,
   flatMap,
@@ -27,7 +28,6 @@ import {
   reduce
 } from "remeda";
 import { logger } from "../../logger.mjs";
-import { resolveRelativePaths } from "../../view-utils/index.mjs";
 import { MergedExtends } from "./MergedExtends.mjs";
 import { MergedSpecification } from "./MergedSpecification.mjs";
 export function buildModelData(project, docs) {
@@ -156,6 +156,7 @@ export function buildModelData(project, docs) {
       return {
         ...omitBy(model, (v) => v === void 0),
         [_stage]: "parsed",
+        sourcePath: UriUtils.relative(project.folderUri, docUri),
         docUri,
         description,
         title,
@@ -163,12 +164,7 @@ export function buildModelData(project, docs) {
       };
     };
   }
-  const parsedViews = pipe(
-    docs,
-    flatMap((d) => map(d.c4Views, toC4View(d))),
-    // Resolve relative paths and sort by
-    resolveRelativePaths
-  );
+  const parsedViews = docs.flatMap((d) => map(d.c4Views, toC4View(d)));
   if (!parsedViews.some((v) => v.id === "index")) {
     parsedViews.unshift({
       [_stage]: "parsed",
@@ -176,8 +172,6 @@ export function buildModelData(project, docs) {
       id: "index",
       title: "Landscape view",
       description: null,
-      tags: null,
-      links: null,
       rules: [
         {
           include: [
@@ -189,19 +183,22 @@ export function buildModelData(project, docs) {
       ]
     });
   }
-  const views = pipe(
+  let views = pipe(
     parsedViews,
-    indexBy(prop("id")),
-    resolveRulesExtendedViews
+    indexBy(prop("id"))
   );
+  if (parsedViews.some(isExtendsElementView)) {
+    views = resolveRulesExtendedViews(views);
+  }
   return {
     data: {
       [_stage]: "parsed",
       projectId: project.id,
-      project: {
+      project: exact({
         id: project.id,
-        title: project.config.title ?? project.config.name
-      },
+        title: project.config.title ?? project.config.name,
+        styles: project.config.styles
+      }),
       specification: {
         tags: c4Specification.tags,
         elements: c4Specification.specs.elements,

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

@@ -1,6 +1,6 @@
-import * as c4 from '@likec4/core';
 import { type ViewId } from '@likec4/core';
 import { LikeC4Model } from '@likec4/core/model';
+import type * as c4 from '@likec4/core/types';
 import { type URI, Disposable } from 'langium';
 import { CancellationToken } from 'vscode-jsonrpc';
 import type { LikeC4Services } from '../module';

package/dist/model/model-builder.mjs

@@ -1,5 +1,5 @@
-import * as c4 from "@likec4/core";
 import {
+  _stage,
   isScopedElementView
 } from "@likec4/core";
 import { computeView } from "@likec4/core/compute-view";
@@ -22,7 +22,6 @@ import {
   prop,
   values
 } from "remeda";
-import { CancellationToken } from "vscode-jsonrpc";
 import { isLikeC4Builtin } from "../likec4lib.mjs";
 import { logger as mainLogger, logWarnError } from "../logger.mjs";
 import { ADisposable, performanceMark } from "../utils/index.mjs";
@@ -132,7 +131,7 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
       return LikeC4Model.create(parsedData);
     });
   }
-  async parseModel(projectId, cancelToken = CancellationToken.None) {
+  async parseModel(projectId, cancelToken) {
     const project = this.projects.ensureProjectId(projectId);
     const logger = builderLogger.getChild(project);
     const cache = this.cache;
@@ -143,7 +142,9 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
     }
     const t0 = performanceMark();
     return await this.mutex.read(async () => {
-      await interruptAndCheck(cancelToken);
+      if (cancelToken) {
+        await interruptAndCheck(cancelToken);
+      }
       const result = this.unsafeSyncJoinedModelData(project);
       logger.debug`parseModel in ${t0.pretty}`;
       return result;
@@ -178,18 +179,18 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
         const key = computedViewKey(projectId, v.id);
         const previous = this.previousViews[key];
         const view = previous && eq(v, previous) ? previous : v;
+        this.previousViews[key] = view;
         viewsCache.set(key, view);
         return [v.id, view];
       });
-      this.previousViews = { ...this.previousViews, ...views };
       return LikeC4Model.create({
         ...parsedModel.$data,
-        [c4._stage]: "computed",
+        [_stage]: "computed",
         views
       });
     });
   }
-  async buildLikeC4Model(projectId, cancelToken = CancellationToken.None) {
+  async buildLikeC4Model(projectId, cancelToken) {
     const project = this.projects.ensureProjectId(projectId);
     const logger = builderLogger.getChild(project);
     const cache = this.cache;
@@ -200,13 +201,15 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
     }
     const t0 = performanceMark();
     return await this.mutex.read(async () => {
-      await interruptAndCheck(cancelToken);
+      if (cancelToken) {
+        await interruptAndCheck(cancelToken);
+      }
       const result = this.unsafeSyncBuildModel(project);
       logger.debug(`buildLikeC4Model in ${t0.pretty}`);
       return result;
     });
   }
-  async computeView(viewId, projectId, cancelToken = CancellationToken.None) {
+  async computeView(viewId, projectId, cancelToken) {
     const project = this.projects.ensureProjectId(projectId);
     const logger = builderLogger.getChild(project);
     const cache = this.cache;

package/dist/model/model-locator.d.ts

@@ -30,4 +30,9 @@ export declare class LikeC4ModelLocator {
         range: Range;
         isSpecification: boolean;
     }>>;
+    locateDynamicViewStep(params: {
+        view: c4.ViewId;
+        astPath: string;
+        projectId?: c4.ProjectId | undefined;
+    }): Location | null;
 }

package/dist/model/model-locator.mjs

@@ -95,9 +95,10 @@ export class LikeC4ModelLocator {
       if (!ast.isRelation(node) && !ast.isDeploymentRelation(node)) {
         continue;
       }
-      let targetNode = node.title ? findNodeForProperty(node.$cstNode, "title") : void 0;
-      targetNode ??= node.kind ? findNodeForProperty(node.$cstNode, "kind") : void 0;
+      let targetNode = node.kind ? findNodeForProperty(node.$cstNode, "kind") : void 0;
+      targetNode ??= node.dotKind ? findNodeForProperty(node.$cstNode, "dotKind") : void 0;
       targetNode ??= findNodeForKeyword(node.$cstNode, "->");
+      targetNode ??= findNodeForProperty(node.$cstNode, "title");
       targetNode ??= findNodeForProperty(node.$cstNode, "target");
       targetNode ??= node.$cstNode;
       if (!targetNode) {
@@ -105,7 +106,10 @@ export class LikeC4ModelLocator {
       }
       return {
         uri: doc.uri.toString(),
-        range: targetNode.range
+        range: {
+          start: targetNode.range.start,
+          end: targetNode.range.start
+        }
       };
     }
     return null;
@@ -199,4 +203,37 @@ export class LikeC4ModelLocator {
       return [];
     }
   }
+  locateDynamicViewStep(params) {
+    const { doc, viewAst } = this.locateViewAst(params.view, params.projectId) ?? {};
+    if (!doc || !viewAst) {
+      return null;
+    }
+    if (!ast.isDynamicView(viewAst) || !viewAst.body) {
+      logger.warn(`View ${params.view} is not a dynamic view`);
+      return null;
+    }
+    const astPath = this.services.workspace.AstNodeLocator.getAstNodePath(viewAst.body) + params.astPath;
+    const node = this.services.workspace.AstNodeLocator.getAstNode(doc.parseResult.value, astPath);
+    if (!node || !ast.isDynamicViewStep(node)) {
+      logger.warn(`Failed to locate dynamic view step ${astPath} in view ${params.view}`);
+      return null;
+    }
+    let targetNode = node.kind ? findNodeForProperty(node.$cstNode, "kind") : void 0;
+    targetNode ??= node.dotKind ? findNodeForProperty(node.$cstNode, "dotKind") : void 0;
+    targetNode ??= findNodeForKeyword(node.$cstNode, "->");
+    targetNode ??= findNodeForKeyword(node.$cstNode, "<-");
+    targetNode ??= findNodeForProperty(node.$cstNode, "title");
+    targetNode ??= findNodeForProperty(node.$cstNode, "target");
+    targetNode ??= node.$cstNode;
+    if (!targetNode) {
+      return null;
+    }
+    return {
+      uri: doc.uri.toString(),
+      range: {
+        start: targetNode.range.start,
+        end: targetNode.range.start
+      }
+    };
+  }
 }

package/dist/model/model-parser-where.mjs

@@ -1,5 +1,4 @@
-import { invariant, isNonEmptyArray, nonexhaustive } from "@likec4/core";
-import { isAndOperator, isOrOperator } from "@likec4/core";
+import { invariant, isAndOperator, isNonEmptyArray, isOrOperator, nonexhaustive } from "@likec4/core";
 import { ast } from "../ast.mjs";
 const parseEquals = ({ operator, not }, value) => {
   if (operator.startsWith("!=")) {