@likec4/language-server 1.36.1 → 1.38.0

package/dist/LikeC4LanguageServices.d.ts

@@ -1,8 +1,7 @@
 import { type DiagramView, type NonEmptyArray, type ProjectId } from '@likec4/core';
 import { LikeC4Model } from '@likec4/core/model';
-import { URI } from 'langium';
+import { type LangiumDocument, URI } from 'langium';
 import { type Range } from 'vscode-languageserver-types';
-import type { ProjectConfig } from './config';
 import type { LikeC4ModelBuilder } from './model';
 import type { LikeC4Services } from './module';
 import type { Locate } from './protocol';
@@ -13,13 +12,30 @@ export interface LikeC4LanguageServices {
     readonly builder: LikeC4ModelBuilder;
     readonly workspaceUri: URI;
     readonly projectsManager: ProjectsManager;
+    /**
+     * Returns all projects with relevant documents
+     */
     projects(): NonEmptyArray<{
         id: ProjectId;
         folder: URI;
-        config: ProjectConfig;
-        documents: NonEmptyArray<URI> | null;
+        title: string;
+        documents: ReadonlyArray<URI>;
     }>;
-    diagrams(): Promise<DiagramView[]>;
+    /**
+     * Returns project by ID
+     * If no project ID is specified, returns default project
+     */
+    project(projectId?: ProjectId): {
+        id: ProjectId;
+        folder: URI;
+        title: string;
+        documents: ReadonlyArray<URI>;
+    };
+    /**
+     * Returns diagrams (i.e. views with layout computed) for the specified project
+     * If no project is specified, returns diagrams for default project
+     */
+    diagrams(project?: ProjectId | undefined): Promise<DiagramView[]>;
     computedModel(project?: ProjectId | undefined): Promise<LikeC4Model.Computed>;
     layoutedModel(project?: ProjectId | undefined): Promise<LikeC4Model.Layouted>;
     getErrors(): Array<{
@@ -28,11 +44,21 @@ export interface LikeC4LanguageServices {
         range: Range;
         sourceFsPath: string;
     }>;
+    /**
+     * Notifies the language server about changes in the workspace
+     */
     notifyUpdate(update: {
         changed?: string;
         removed?: string;
     }): Promise<boolean>;
+    /**
+     * Returns the location of the specified element, relation, view or deployment element
+     */
     locate(params: Locate.Params): Locate.Res;
+    /**
+     * Checks if the specified document should be excluded from processing.
+     */
+    isExcluded(doc: LangiumDocument): boolean;
 }
 /**
  * Public Language Services
@@ -47,9 +73,15 @@ export declare class DefaultLikeC4LanguageServices implements LikeC4LanguageServ
     projects(): NonEmptyArray<{
         id: ProjectId;
         folder: URI;
-        config: ProjectConfig;
-        documents: NonEmptyArray<URI> | null;
+        title: string;
+        documents: ReadonlyArray<URI>;
     }>;
+    project(projectId?: ProjectId): {
+        id: ProjectId;
+        folder: URI;
+        title: string;
+        documents: ReadonlyArray<URI>;
+    };
     /**
      * Diagram is a computed view, layouted using Graphviz
      * Used in React components
@@ -80,4 +112,8 @@ export declare class DefaultLikeC4LanguageServices implements LikeC4LanguageServ
         removed?: string;
     }): Promise<boolean>;
     locate(params: Locate.Params): Locate.Res;
+    /**
+     * Checks if the specified document should be excluded from processing.
+     */
+    isExcluded(doc: LangiumDocument): boolean;
 }

package/dist/LikeC4LanguageServices.js

@@ -1,10 +1,13 @@
-import { nonexhaustive } from "@likec4/core";
+import {
+  nonexhaustive
+} from "@likec4/core";
 import { LikeC4Model } from "@likec4/core/model";
 import { loggable } from "@likec4/log";
 import { URI } from "langium";
 import { entries, hasAtLeast, indexBy, map, pipe, prop } from "remeda";
 import { DiagnosticSeverity } from "vscode-languageserver-types";
-import { logger as mainLogger } from "./logger.js";
+import { isLikeC4LangiumDocument } from "./ast.js";
+import { logger as mainLogger, logWarnError } from "./logger.js";
 import { ProjectsManager } from "./workspace/index.js";
 const logger = mainLogger.getChild("LikeC4LanguageServices");
 export class DefaultLikeC4LanguageServices {
@@ -27,11 +30,11 @@ export class DefaultLikeC4LanguageServices {
       entries(),
       map(([projectId, docs]) => {
         const id = projectId;
-        const { folder: folder2, config: config2 } = projectsManager.getProject(id);
+        const { folderUri: folderUri2, config: config2 } = projectsManager.getProject(id);
         return {
           id,
-          folder: folder2,
-          config: config2,
+          folder: folderUri2,
+          title: config2.title ?? config2.name,
           documents: map(docs, prop("uri"))
         };
       })
@@ -39,14 +42,33 @@ export class DefaultLikeC4LanguageServices {
     if (hasAtLeast(projectsWithDocs, 1)) {
       return projectsWithDocs;
     }
-    const { folder, config } = projectsManager.getProject(ProjectsManager.DefaultProjectId);
+    const { folderUri, config } = projectsManager.getProject(ProjectsManager.DefaultProjectId);
+    const documents = map(
+      this.services.shared.workspace.LangiumDocuments.projectDocuments(ProjectsManager.DefaultProjectId).toArray(),
+      prop("uri")
+    );
     return [{
       id: ProjectsManager.DefaultProjectId,
-      folder,
-      config,
-      documents: null
+      folder: folderUri,
+      title: config.title ?? config.name,
+      documents
     }];
   }
+  project(projectId) {
+    projectId = this.projectsManager.ensureProjectId(projectId);
+    const projectsManager = this.services.shared.workspace.ProjectsManager;
+    const { folderUri, config } = projectsManager.getProject(projectId);
+    const documents = map(
+      this.services.shared.workspace.LangiumDocuments.projectDocuments(projectId).toArray(),
+      prop("uri")
+    );
+    return {
+      id: projectId,
+      folder: folderUri,
+      title: config.title ?? config.name,
+      documents
+    };
+  }
   /**
    * Diagram is a computed view, layouted using Graphviz
    * Used in React components
@@ -98,13 +120,20 @@ export class DefaultLikeC4LanguageServices {
     if (!changed && !removed) {
       return false;
     }
+    const _changed = changed ? URI.file(changed) : void 0;
+    const _removed = removed ? URI.file(removed) : void 0;
+    const pm = this.services.shared.workspace.ProjectsManager;
+    if (_changed && pm.isConfigFile(_changed) || _removed && pm.isConfigFile(_removed)) {
+      await pm.reloadProjects();
+      return true;
+    }
     const mutex = this.services.shared.workspace.WorkspaceLock;
     try {
       let completed = false;
       await mutex.write(async (token) => {
         await this.services.shared.workspace.DocumentBuilder.update(
-          changed ? [URI.file(changed)] : [],
-          removed ? [URI.file(removed)] : [],
+          _changed ? [_changed] : [],
+          _removed ? [_removed] : [],
           token
         );
         completed = !token.isCancellationRequested;
@@ -132,4 +161,15 @@ export class DefaultLikeC4LanguageServices {
         nonexhaustive(params);
     }
   }
+  /**
+   * Checks if the specified document should be excluded from processing.
+   */
+  isExcluded(doc) {
+    try {
+      return !isLikeC4LangiumDocument(doc) || this.services.shared.workspace.ProjectsManager.checkIfExcluded(doc);
+    } catch (e) {
+      logWarnError(e);
+      return false;
+    }
+  }
 }

package/dist/Rpc.js

@@ -5,7 +5,7 @@ import {
 } from "@likec4/core";
 import { LikeC4Model } from "@likec4/core/model";
 import { Disposable, interruptAndCheck, URI, UriUtils } from "langium";
-import { DiagnosticSeverity } from "vscode-languageserver";
+import { DiagnosticSeverity } from "vscode-languageserver-protocol";
 import {
   BuildDocuments,
   ChangeView,
@@ -20,6 +20,7 @@ import {
   GetDocumentTags,
   LayoutView,
   Locate,
+  ReloadProjects,
   ValidateLayout
 } from "./protocol.js";
 import { ADisposable } from "./utils/index.js";
@@ -46,14 +47,14 @@ export class Rpc extends ADisposable {
     const notifyModelParsed = funnel(
       () => {
         logger.debug`sendNotification ${"onDidChangeModel"}`;
-        connection.sendNotification(DidChangeModelNotification.type, "").catch((e) => {
-          logger.warn(`[ServerRpc] error sending onDidChangeModel: ${e}`);
-          return Promise.resolve();
+        connection.sendNotification(DidChangeModelNotification.type, "").catch((error) => {
+          logger.warn(`[ServerRpc] error sending onDidChangeModel:`, { error });
+          return;
         });
       },
       {
         triggerAt: "end",
-        minQuietPeriodMs: 100,
+        minQuietPeriodMs: 150,
         maxBurstDurationMs: 500,
         minGapMs: 300
       }
@@ -106,9 +107,24 @@ export class Rpc extends ADisposable {
         logger.debug`received request ${"FetchProjects"}`;
         const docsByProject = LangiumDocuments.groupedByProject();
         return {
-          projects: mapValues(docsByProject, (docs) => map(docs, (d) => d.uri.toString()))
+          projects: mapValues(docsByProject, (docs, projectId) => {
+            const {
+              folderUri,
+              config
+            } = projects.getProject(projectId);
+            return {
+              folder: folderUri.toString(),
+              config,
+              docs: map(docs, (d) => d.uri.toString())
+            };
+          })
         };
       }),
+      connection.onRequest(ReloadProjects.req, async (cancelToken) => {
+        logger.debug`received request ${"ReloadProjects"}`;
+        await projects.reloadProjects(cancelToken);
+        return;
+      }),
       connection.onRequest(FetchViewsFromAllProjects.req, async (cancelToken) => {
         logger.debug`received request ${"FetchViewsFromAllProjects"}`;
         const promises = projects.all.map(async (projectId) => {

package/dist/browser.d.ts

@@ -2,7 +2,7 @@ import { type LikeC4Services, type LikeC4SharedServices } from './module';
 export { logger as lspLogger } from './logger';
 export type { DocumentParser, LikeC4ModelBuilder, LikeC4ModelLocator, LikeC4ModelParser } from './model';
 export type { LikeC4LanguageServices } from './LikeC4LanguageServices';
-export { createCustomLanguageServices, createLanguageServices, LikeC4Module } from './module';
+export { createLanguageServices } from './module';
 export type { LikeC4Services, LikeC4SharedServices } from './module';
 export type { LikeC4Views } from './views';
 export declare function startLanguageServer(port: MessagePort | DedicatedWorkerGlobalScope): {

package/dist/browser.js

@@ -3,7 +3,7 @@ import { startLanguageServer as startLanguim } from "langium/lsp";
 import { BrowserMessageReader, BrowserMessageWriter, createConnection } from "vscode-languageserver/browser";
 import { createLanguageServices } from "./module.js";
 export { logger as lspLogger } from "./logger.js";
-export { createCustomLanguageServices, createLanguageServices, LikeC4Module } from "./module.js";
+export { createLanguageServices } from "./module.js";
 export function startLanguageServer(port) {
   const messageReader = new BrowserMessageReader(port);
   const messageWriter = new BrowserMessageWriter(port);