@likec4/language-server 1.46.4 → 1.47.0

package/dist/LikeC4LanguageServices.d.ts

@@ -1,5 +1,6 @@
 import type { LikeC4ProjectConfig } from '@likec4/config';
-import { type DiagramView, type NonEmptyArray, type ProjectId, type UnknownComputed, type UnknownLayouted } from '@likec4/core';
+import { type LayoutedView, type NonEmptyArray, type ProjectId, type UnknownComputed, type UnknownLayouted } from '@likec4/core';
+import { type LayoutedProjectsView } from '@likec4/core/compute-view';
 import { LikeC4Model } from '@likec4/core/model';
 import { URI } from 'langium';
 import type { CancellationToken } from 'vscode-jsonrpc';
@@ -27,8 +28,7 @@ export interface LikeC4LanguageServices {
         config: Readonly<LikeC4ProjectConfig>;
     }>;
     /**
-     * Returns project by ID
-     * If no project ID is specified, returns default project
+     * Returns project by ID, returns default project if no ID is specified
      */
     project(projectId?: ProjectId): {
         id: ProjectId;
@@ -38,13 +38,31 @@ export interface LikeC4LanguageServices {
         config: Readonly<LikeC4ProjectConfig>;
     };
     /**
-     * Returns diagrams (i.e. views with layout computed) for the specified project
-     * if diagram has manual layout, it will be used
-     * If no project is specified, returns diagrams for default project
+     * Computes and layouts projects overview - a special diagram
+     * that shows all projects and their relationships
+     */
+    projectsOverview(cancelToken?: CancellationToken): Promise<LayoutedProjectsView>;
+    /**
+     * Returns {@link LikeC4Model} of the specified project, with computed views {@link ComputedView}
+     * Not ready for rendering, but enough to traverse model. Much faster than {@link layoutedModel}
+     *
+     * If no {@link project} is specified, returns for default project
      */
-    diagrams(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<DiagramView[]>;
     computedModel(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownComputed>>;
+    /**
+     * Returns {@link LikeC4Model} of the specified project, with layouted views {@link LayoutedView}
+     * Ready for rendering. Applies manual layouts if available.
+     *
+     * If no {@link project} is specified, returns for default project
+     */
     layoutedModel(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownLayouted>>;
+    /**
+     * Returns diagrams (i.e. layouted views {@link LayoutedView}) for the specified project
+     * Applies manual layouts if available.
+     *
+     * If no {@link project} is specified, returns diagrams for default project
+     */
+    diagrams(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LayoutedView[]>;
     getErrors(): Array<{
         message: string;
         line: number;
@@ -82,22 +100,10 @@ export declare class DefaultLikeC4LanguageServices implements LikeC4LanguageServ
         documents: ReadonlyArray<URI>;
         config: LikeC4ProjectConfig;
     };
-    /**
-     * Diagram is a computed view, layouted using Graphviz
-     * If diagram has manual layout, it will be used.
-     */
-    diagrams(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<DiagramView[]>;
-    /**
-     * Builds LikeC4Model from all documents
-     * Only computes view predicates {@link ComputedView} - i.e. no layout
-     * Not ready for rendering, but enough to traverse
-     */
+    diagrams(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LayoutedView<UnknownLayouted>[]>;
     computedModel(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownComputed>>;
-    /**
-     * Same as {@link computedModel()}, but also applies layout
-     * Ready for rendering
-     */
     layoutedModel(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownLayouted>>;
+    projectsOverview(cancelToken?: CancellationToken): Promise<LayoutedProjectsView>;
     getErrors(): Array<{
         message: string;
         line: number;

package/dist/LikeC4LanguageServices.js

@@ -1,4 +1,5 @@
 import { nonexhaustive, } from '@likec4/core';
+import { computeProjectsView } from '@likec4/core/compute-view';
 import { LikeC4Model } from '@likec4/core/model';
 import { loggable } from '@likec4/log';
 import { URI } from 'langium';
@@ -75,27 +76,14 @@ export class DefaultLikeC4LanguageServices {
             config,
         };
     }
-    /**
-     * Diagram is a computed view, layouted using Graphviz
-     * If diagram has manual layout, it will be used.
-     */
     async diagrams(project, cancelToken) {
         const projectId = this.projectsManager.ensureProjectId(project);
         return await this.views.diagrams(projectId, cancelToken);
     }
-    /**
-     * Builds LikeC4Model from all documents
-     * Only computes view predicates {@link ComputedView} - i.e. no layout
-     * Not ready for rendering, but enough to traverse
-     */
     async computedModel(project, cancelToken) {
         const projectId = this.projectsManager.ensureProjectId(project);
         return await this.builder.computeModel(projectId, cancelToken);
     }
-    /**
-     * Same as {@link computedModel()}, but also applies layout
-     * Ready for rendering
-     */
     async layoutedModel(project, cancelToken) {
         const projectId = this.projectsManager.ensureProjectId(project);
         const model = await this.builder.computeModel(projectId, cancelToken);
@@ -109,6 +97,26 @@ export class DefaultLikeC4LanguageServices {
             views: pipe(layouted, map(prop('diagram')), indexBy(prop('id'))),
         });
     }
+    async projectsOverview(cancelToken) {
+        const allProjects = this.services.shared.workspace.ProjectsManager.all;
+        const models = [];
+        for (const project of allProjects) {
+            const model = await this.builder.computeModel(project, cancelToken);
+            if (cancelToken?.isCancellationRequested) {
+                throw new Error('Operation cancelled');
+            }
+            if (model === LikeC4Model.EMPTY) {
+                logger.debug(`Project ${project} is empty, skipping`);
+                continue;
+            }
+            models.push(model);
+        }
+        if (!hasAtLeast(models, 1)) {
+            throw new Error('No models found');
+        }
+        const projectsView = computeProjectsView(models);
+        return await this.views.layouter.layoutProjectsView(projectsView);
+    }
     getErrors() {
         const docs = this.services.shared.workspace.LangiumDocuments.allExcludingBuiltin.toArray();
         return docs.flatMap(doc => {
@@ -145,10 +153,12 @@ export class DefaultLikeC4LanguageServices {
             }
             this.services.Rpc.dispose();
             this.services.likec4.ModelBuilder.dispose();
-            logger.debug('LikeC4LanguageServices disposed');
         }
         catch (e) {
             logger.error(loggable(e));
         }
+        finally {
+            logger.debug('LikeC4LanguageServices disposed');
+        }
     }
 }

package/dist/Rpc.js

@@ -112,7 +112,13 @@ export class Rpc extends ADisposable {
             return;
         }), connection.onRequest(RegisterProject.req, async (params, cancelToken) => {
             logger.debug `received request ${'RegisterProject'}`;
-            const project = await projects.registerProject(params, cancelToken);
+            let project;
+            if ('configUri' in params) {
+                project = await projects.registerConfigFile(URI.parse(params.configUri), cancelToken);
+            }
+            else {
+                project = await projects.registerProject(params, cancelToken);
+            }
             return { id: project.id };
         }), connection.onRequest(FetchViewsFromAllProjects.req, async (cancelToken) => {
             logger.debug `received request ${'FetchViewsFromAllProjects'}`;

package/dist/ast.d.ts

@@ -173,7 +173,7 @@ export declare const ViewOps: {
     readId(node: ast.LikeC4View): c4.ViewId | undefined;
 };
 export declare const ElementOps: {
-    writeId(node: ast.Element | ast.DeploymentElement, id: c4.Fqn | null): ast.DeploymentElement | ast.Element;
+    writeId(node: ast.Element | ast.DeploymentElement, id: c4.Fqn | null): ast.Element | ast.DeploymentElement;
     readId(node: ast.Element | ast.DeploymentElement): c4.Fqn<string> | undefined;
 };
 export interface AstNodeDescriptionWithFqn extends AstNodeDescription {

package/dist/browser.d.ts

@@ -1,5 +1,4 @@
 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 { createLanguageServices } from './module';

package/dist/browser.js

@@ -2,7 +2,6 @@ import { configureLogger, getConsoleSink, getTextFormatter } from '@likec4/log';
 import { startLanguageServer as startLanguim } from 'langium/lsp';
 import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser';
 import { createLanguageServices } from './module';
-export { logger as lspLogger } from './logger';
 export { createLanguageServices } from './module';
 export function startLanguageServer(port) {
     /* browser specific setup code */