@likec4/language-server 1.38.1 → 1.39.1

package/dist/LikeC4LanguageServices.d.ts

@@ -1,3 +1,4 @@
+import type { LikeC4ProjectConfig } from '@likec4/config';
 import { type DiagramView, type NonEmptyArray, type ProjectId } from '@likec4/core';
 import { LikeC4Model } from '@likec4/core/model';
 import { type LangiumDocument, URI } from 'langium';
@@ -20,6 +21,7 @@ export interface LikeC4LanguageServices {
         folder: URI;
         title: string;
         documents: ReadonlyArray<URI>;
+        config: Readonly<LikeC4ProjectConfig>;
     }>;
     /**
      * Returns project by ID
@@ -30,6 +32,7 @@ export interface LikeC4LanguageServices {
         folder: URI;
         title: string;
         documents: ReadonlyArray<URI>;
+        config: Readonly<LikeC4ProjectConfig>;
     };
     /**
      * Returns diagrams (i.e. views with layout computed) for the specified project
@@ -60,6 +63,7 @@ export interface LikeC4LanguageServices {
      * Checks if the specified document should be excluded from processing.
      */
     isExcluded(doc: LangiumDocument): boolean;
+    dispose(): Promise<void>;
 }
 /**
  * Public Language Services
@@ -76,12 +80,14 @@ export declare class DefaultLikeC4LanguageServices implements LikeC4LanguageServ
         folder: URI;
         title: string;
         documents: ReadonlyArray<URI>;
+        config: LikeC4ProjectConfig;
     }>;
     project(projectId?: ProjectId): {
         id: ProjectId;
         folder: URI;
         title: string;
         documents: ReadonlyArray<URI>;
+        config: LikeC4ProjectConfig;
     };
     /**
      * Diagram is a computed view, layouted using Graphviz
@@ -117,4 +123,5 @@ export declare class DefaultLikeC4LanguageServices implements LikeC4LanguageServ
      * Checks if the specified document should be excluded from processing.
      */
     isExcluded(doc: LangiumDocument): boolean;
+    dispose(): Promise<void>;
 }

package/dist/LikeC4LanguageServices.js

@@ -9,7 +9,7 @@ import { DiagnosticSeverity } from "vscode-languageserver-types";
 import { isLikeC4LangiumDocument } from "./ast.js";
 import { logger as mainLogger, logWarnError } from "./logger.js";
 import { ProjectsManager } from "./workspace/index.js";
-const logger = mainLogger.getChild("LikeC4LanguageServices");
+const logger = mainLogger.getChild("LanguageServices");
 export class DefaultLikeC4LanguageServices {
   constructor(services) {
     this.services = services;
@@ -35,10 +35,19 @@ export class DefaultLikeC4LanguageServices {
           id,
           folder: folderUri2,
           title: config2.title ?? config2.name,
-          documents: map(docs, prop("uri"))
+          documents: map(docs, prop("uri")),
+          config: config2
         };
       })
     );
+    if (hasAtLeast(projectsWithDocs, 2) && projectsManager.defaultProjectId) {
+      const idx = projectsWithDocs.findIndex((p) => p.id === projectsManager.defaultProjectId);
+      if (idx > 0) {
+        const [defaultProject] = projectsWithDocs.splice(idx, 1);
+        return [defaultProject, ...projectsWithDocs];
+      }
+      return projectsWithDocs;
+    }
     if (hasAtLeast(projectsWithDocs, 1)) {
       return projectsWithDocs;
     }
@@ -51,7 +60,8 @@ export class DefaultLikeC4LanguageServices {
       id: ProjectsManager.DefaultProjectId,
       folder: folderUri,
       title: config.title ?? config.name,
-      documents
+      documents,
+      config
     }];
   }
   project(projectId) {
@@ -66,7 +76,8 @@ export class DefaultLikeC4LanguageServices {
       id: projectId,
       folder: folderUri,
       title: config.title ?? config.name,
-      documents
+      documents,
+      config
     };
   }
   /**
@@ -172,4 +183,14 @@ export class DefaultLikeC4LanguageServices {
       return false;
     }
   }
+  async dispose() {
+    logger.debug("disposing LikeC4LanguageServices");
+    await this.services.shared.workspace.FileSystemWatcher.dispose();
+    if (this.services.mcp.Server.isStarted) {
+      await this.services.mcp.Server.stop();
+    }
+    this.services.Rpc.dispose();
+    this.services.likec4.ModelBuilder.dispose();
+    logger.debug("LikeC4LanguageServices disposed");
+  }
 }

package/dist/Rpc.js

@@ -1,5 +1,6 @@
 import { filter, flatMap, funnel, indexBy, keys, map, mapValues, pipe, sort } from "remeda";
 import { logger as rootLogger } from "./logger.js";
+import { serializableLikeC4ProjectConfig } from "@likec4/config";
 import {
   nonexhaustive
 } from "@likec4/core";
@@ -20,6 +21,7 @@ import {
   GetDocumentTags,
   LayoutView,
   Locate,
+  RegisterProject,
   ReloadProjects,
   ValidateLayout
 } from "./protocol.js";
@@ -114,7 +116,7 @@ export class Rpc extends ADisposable {
             } = projects.getProject(projectId);
             return {
               folder: folderUri.toString(),
-              config,
+              config: serializableLikeC4ProjectConfig(config),
               docs: map(docs, (d) => d.uri.toString())
             };
           })
@@ -125,6 +127,11 @@ export class Rpc extends ADisposable {
         await projects.reloadProjects(cancelToken);
         return;
       }),
+      connection.onRequest(RegisterProject.req, async (params) => {
+        logger.debug`received request ${"RegisterProject"}`;
+        const project = await projects.registerProject(params);
+        return { id: project.id };
+      }),
       connection.onRequest(FetchViewsFromAllProjects.req, async (cancelToken) => {
         logger.debug`received request ${"FetchViewsFromAllProjects"}`;
         const promises = projects.all.map(async (projectId) => {
@@ -272,7 +279,7 @@ export class Rpc extends ADisposable {
   async openView(params) {
     const lspConnection = this.services.shared.lsp.Connection;
     if (!lspConnection) {
-      logger.error("No LSP connection");
+      logger.warn("No LSP connection");
       return;
     }
     await lspConnection.sendNotification(

package/dist/ast.d.ts

@@ -1,5 +1,5 @@
 import type * as c4 from '@likec4/core';
-import { MultiMap } from '@likec4/core';
+import { MultiMap } from '@likec4/core/utils';
 import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument } from 'langium';
 import type { ConditionalPick, MergeExclusive, Simplify, ValueOf, Writable } from 'type-fest';
 import type { Diagnostic } from 'vscode-languageserver-types';

package/dist/ast.js

@@ -1,4 +1,5 @@
-import { DefaultArrowType, DefaultLineStyle, DefaultRelationshipColor, nonexhaustive } from "@likec4/core";
+import { DefaultArrowType, DefaultLineStyle, DefaultRelationshipColor } from "@likec4/core";
+import { nonexhaustive } from "@likec4/core/utils";
 import { AstUtils, DocumentState } from "langium";
 import { clamp, isNullish, isTruthy } from "remeda";
 import * as ast from "./generated/ast.js";

package/dist/bundled.d.ts

@@ -0,0 +1,8 @@
+import { type LikeC4Services, type LikeC4SharedServices } from './module';
+/**
+ * This is used as `bin` entry point to start the language server.
+ */
+export declare function startLanguageServer(): {
+    shared: LikeC4SharedServices;
+    likec4: LikeC4Services;
+};

package/dist/bundled.js

@@ -0,0 +1,40 @@
+import { configureLogger, getConsoleStderrSink } from "@likec4/log";
+import { startLanguageServer as startLanguim } from "langium/lsp";
+import { createConnection, ProposedFeatures } from "vscode-languageserver/node";
+import { LikeC4FileSystem } from "./filesystem/LikeC4FileSystem.js";
+import { getLspConnectionSink, logger } from "./logger.js";
+import { WithMCPServer } from "./mcp/server/WithMCPServer.js";
+import { createLanguageServices } from "./module.js";
+import { ConfigurableLayouter } from "./views/configurable-layouter.js";
+export function startLanguageServer() {
+  const connection = createConnection(ProposedFeatures.all);
+  configureLogger({
+    sinks: {
+      // Name it as console to override internal logger
+      lsp: getLspConnectionSink(connection),
+      console: getConsoleStderrSink()
+    },
+    loggers: [
+      {
+        category: ["likec4"],
+        sinks: ["console", "lsp"]
+      }
+    ]
+  });
+  process.on("uncaughtException", (err) => {
+    logger.error("uncaughtException", { err });
+  });
+  process.on("unhandledRejection", (err) => {
+    logger.error("unhandledRejection", { err });
+  });
+  const services = createLanguageServices(
+    {
+      connection,
+      ...LikeC4FileSystem(false),
+      ...WithMCPServer("sse")
+    },
+    ConfigurableLayouter
+  );
+  startLanguim(services.shared);
+  return services;
+}