@likec4/language-server 1.31.0 → 1.32.0

package/dist/references/scope-computation.js

@@ -132,7 +132,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           case ast.isSpecificationTag(spec): {
             if (isTruthy(spec.tag.name)) {
               docExports.push(
-                this.descriptions.createDescription(spec.tag, "#" + spec.tag.name, document)
+                this.descriptions.createDescription(spec.tag, spec.tag.name, document)
               );
             }
             continue;
@@ -140,8 +140,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           case ast.isSpecificationRelationshipKind(spec): {
             if (isTruthy(spec.kind.name)) {
               docExports.push(
-                this.descriptions.createDescription(spec.kind, spec.kind.name, document),
-                this.descriptions.createDescription(spec.kind, "." + spec.kind.name, document)
+                this.descriptions.createDescription(spec.kind, spec.kind.name, document)
               );
             }
             continue;

package/dist/test/testServices.d.ts

@@ -1,3 +1,4 @@
+import type { ComputedLikeC4ModelData } from '@likec4/core';
 import type { LikeC4LangiumDocument } from '../ast';
 export declare function createTestServices(workspace?: string): {
     services: any;
@@ -19,6 +20,20 @@ export declare function createTestServices(workspace?: string): {
     resetState: () => Promise<void>;
     format: (input: string | LikeC4LangiumDocument, uri?: string) => Promise<any>;
 };
+/**
+ * @example
+ * ```ts
+ * const { projects } = await createMultiProjectTestServices({
+ *   project1: {
+ *     doc1: `...`,
+ *     doc2: `...`,
+ *   },
+ *   project2: {
+ *     doc1: `...`,
+ *   },
+ * })
+ * ```
+ */
 export declare function createMultiProjectTestServices<const Projects extends Record<string, Record<string, string>>>(data: Projects): Promise<{
     services: any;
     projects: { readonly [K in keyof Projects]: { readonly [L in keyof Projects[K]]: LikeC4LangiumDocument; }; };

package/dist/test/testServices.js

@@ -104,7 +104,7 @@ export function createTestServices(workspace = "file:///test/workspace") {
     }
     const likec4model = await modelBuilder.buildLikeC4Model();
     if (!likec4model) throw new Error("No model found");
-    return likec4model.$model;
+    return likec4model.$data;
   };
   const buildLikeC4Model = async () => {
     if (langiumDocuments.all.some((doc) => doc.state < DocumentState.Validated)) {

package/dist/validation/relation.js

@@ -34,7 +34,7 @@ export const relationChecks = (services) => {
         });
       }
     }
-    if (isSameHierarchy(FqnRef.toModelFqn(source), FqnRef.toModelFqn(target))) {
+    if (isSameHierarchy(FqnRef.flatten(source), FqnRef.flatten(target))) {
       accept("error", "Invalid parent-child relationship", {
         node: el
       });

package/dist/validation/specification.js

@@ -97,7 +97,7 @@ export const checkDeploymentNodeKind = (services) => {
 export const checkTag = (services) => {
   const index = services.shared.workspace.IndexManager;
   return tryOrLog((node, accept) => {
-    const tagname = "#" + node.name;
+    const tagname = node.name;
     const projectId = projectIdFrom(node);
     const sameTag = index.projectElements(projectId, ast.Tag).filter((n) => n.name === tagname && n.node !== node).head();
     if (sameTag) {

package/dist/view-utils/assignNavigateTo.d.ts

@@ -1,2 +1,2 @@
-import { ComputedView } from '@likec4/core';
+import { type ComputedView } from '@likec4/core';
 export declare function assignNavigateTo<R extends Iterable<ComputedView>>(views: R): R;

package/dist/view-utils/assignNavigateTo.js

@@ -1,9 +1,9 @@
-import { ComputedNode, ComputedView } from "@likec4/core";
+import { isElementView } from "@likec4/core";
 import { find, isNullish } from "remeda";
 export function assignNavigateTo(views) {
   const allElementViews = /* @__PURE__ */ new Map();
   for (const v of views) {
-    if (ComputedView.isElement(v) && v.viewOf && isNullish(v.extends)) {
+    if (isElementView(v) && v.viewOf && isNullish(v.extends)) {
       const viewsOf = allElementViews.get(v.viewOf) ?? [];
       viewsOf.push(v.id);
       allElementViews.set(v.viewOf, viewsOf);
@@ -11,7 +11,7 @@ export function assignNavigateTo(views) {
   }
   for (const { id, nodes } of views) {
     for (const node of nodes) {
-      const modelRef = ComputedNode.modelRef(node);
+      const modelRef = node.modelRef;
       if (node.navigateTo || !modelRef) {
         continue;
       }

package/dist/views/likec4-views.d.ts

@@ -1,4 +1,4 @@
-import type { ComputedView, DiagramView, OverviewGraph, ProjectId, ViewId } from '@likec4/core';
+import type { ComputedView, DiagramView, ProjectId, ViewId } from '@likec4/core';
 import { GraphvizLayouter } from '@likec4/layouts';
 import { CancellationToken } from 'vscode-jsonrpc';
 import type { LikeC4Services } from '../module';
@@ -18,7 +18,6 @@ export interface LikeC4Views {
     layoutView(viewId: ViewId, projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<GraphvizOut | null>;
     diagrams(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<Array<DiagramView>>;
     viewsAsGraphvizOut(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<Array<GraphvizSvgOut>>;
-    overviewGraph(): Promise<OverviewGraph>;
 }
 export declare class DefaultLikeC4Views implements LikeC4Views {
     private services;
@@ -33,6 +32,5 @@ export declare class DefaultLikeC4Views implements LikeC4Views {
     layoutView(viewId: ViewId, projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<GraphvizOut | null>;
     diagrams(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<Array<DiagramView>>;
     viewsAsGraphvizOut(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<Array<GraphvizSvgOut>>;
-    overviewGraph(): Promise<OverviewGraph>;
 }
 export {};

package/dist/views/likec4-views.js

@@ -12,52 +12,62 @@ export class DefaultLikeC4Views {
   cache = /* @__PURE__ */ new WeakMap();
   viewsWithReportedErrors = /* @__PURE__ */ new Set();
   ModelBuilder;
-  queue = new PQueue({ concurrency: 4, timeout: 1e4, throwOnTimeout: true });
+  queue = new PQueue({ concurrency: 2, timeout: 2e4, throwOnTimeout: true });
   get layouter() {
     return this.services.likec4.Layouter;
   }
   async computedViews(projectId, cancelToken = CancellationToken.None) {
     const likeC4Model = await this.ModelBuilder.buildLikeC4Model(projectId, cancelToken);
-    return values(likeC4Model.$model.views);
+    return values(likeC4Model.$data.views);
   }
   async layoutAllViews(projectId, cancelToken = CancellationToken.None) {
-    const views = await this.computedViews(projectId, cancelToken);
+    const likeC4Model = await this.ModelBuilder.buildLikeC4Model(projectId, cancelToken);
+    const views = values(likeC4Model.$data.views);
     if (views.length === 0) {
       return [];
     }
     const logger = rootLogger.getChild(["views", projectId ?? ""]);
     logger.debug`layoutAll: ${views.length} views`;
+    if (this.queue.pending + this.queue.size > 0) {
+      logger.debug`wait for previous layouts to finish`;
+      await this.queue.onIdle();
+    }
+    if (this.layouter.port.concurrency !== this.queue.concurrency) {
+      this.queue.concurrency = this.layouter.port.concurrency;
+      logger.debug`set queue concurrency to ${this.layouter.port.concurrency}`;
+    }
+    const specification = likeC4Model.$data.specification;
     const results = [];
-    const tasks = [];
     for (const view of views) {
-      this.viewsWithReportedErrors.delete(view.id);
-      tasks.push(
-        Promise.resolve().then(async () => {
-          const result = await this.queue.add(async () => {
-            logger.debug`layouting view ${view.id}...`;
-            return await this.layouter.layout(view);
-          });
-          if (!result) {
-            return Promise.reject(new Error(`Failed to layout view ${view.id}`));
-          }
-          logger.debug`done layout view ${view.id}`;
-          this.viewsWithReportedErrors.delete(view.id);
-          this.cache.set(view, result);
-          return result;
-        }).catch((e) => {
-          logger.warn(`fail layout view ${view.id}`, { e });
-          this.cache.delete(view);
-          return Promise.reject(e);
-        })
-      );
-    }
-    for (const task of await Promise.allSettled(tasks)) {
-      if (task.status === "fulfilled") {
-        results.push(task.value);
-      } else {
-        logger.error(loggable(task.reason));
+      let cached = this.cache.get(view);
+      if (cached) {
+        logger.debug`layout ${view.id} from cache`;
+        results.push(cached);
+        continue;
       }
+      if (this.queue.pending > this.queue.concurrency + 4) {
+        await this.queue.onSizeLessThan(this.queue.concurrency + 1);
+      }
+      this.queue.add(async () => {
+        logger.debug`layouting view ${view.id}...`;
+        return await this.layouter.layout({
+          view,
+          specification
+        });
+      }).then((result) => {
+        if (!result) {
+          throw new Error(`Layout queue returned null for view ${view.id}`);
+        }
+        this.viewsWithReportedErrors.delete(view.id);
+        logger.debug`done layout view ${view.id}`;
+        this.cache.set(view, result);
+        results.push(result);
+      }).catch((e) => {
+        logger.error(`Fail layout view ${view.id}`, { e });
+        this.cache.delete(view);
+      });
     }
+    await this.queue.onIdle();
     if (results.length !== views.length) {
       logger.warn`layouted ${results.length} of ${views.length} views`;
     } else if (results.length > 0) {
@@ -80,9 +90,16 @@ export class DefaultLikeC4Views {
     }
     try {
       const start = performance.now();
+      if (this.queue.pending + this.queue.size > 0) {
+        logger.debug`wait for previous layouts to finish`;
+        await this.queue.onIdle();
+      }
       const result = await this.queue.add(async () => {
         logger.debug`layouting view ${view.id}...`;
-        return await this.layouter.layout(view);
+        return await this.layouter.layout({
+          view,
+          specification: model.$data.specification
+        });
       });
       if (!result) {
         throw new Error(`Failed to layout view ${viewId}`);
@@ -111,9 +128,16 @@ export class DefaultLikeC4Views {
     if (cache.has(KEY)) {
       return await Promise.resolve(cache.get(KEY));
     }
-    const views = await this.computedViews(projectId, cancelToken);
+    const likeC4Model = await this.ModelBuilder.buildLikeC4Model(projectId, cancelToken);
+    const views = values(likeC4Model.$data.views);
+    if (views.length === 0) {
+      return [];
+    }
     const tasks = views.map(async (view) => {
-      const { dot, svg } = await this.layouter.svg(view);
+      const { dot, svg } = await this.layouter.svg({
+        view,
+        specification: likeC4Model.$data.specification
+      });
       return {
         id: view.id,
         dot,
@@ -132,15 +156,15 @@ export class DefaultLikeC4Views {
     cache.set(KEY, succeed);
     return succeed;
   }
-  async overviewGraph() {
-    const KEY = "OverviewGraph";
-    const cache = this.services.ValidatedWorkspaceCache;
-    if (cache.has(KEY)) {
-      return await Promise.resolve(cache.get(KEY));
-    }
-    const views = await this.computedViews();
-    const overviewGraph = await this.layouter.layoutOverviewGraph(views);
-    cache.set(KEY, overviewGraph);
-    return overviewGraph;
-  }
+  // async overviewGraph(): Promise<OverviewGraph> {
+  //   const KEY = 'OverviewGraph'
+  //   const cache = this.services.ValidatedWorkspaceCache as WorkspaceCache<string, OverviewGraph>
+  //   if (cache.has(KEY)) {
+  //     return await Promise.resolve(cache.get(KEY)!)
+  //   }
+  //   const views = await this.computedViews()
+  //   const overviewGraph = await this.layouter.layoutOverviewGraph(views)
+  //   cache.set(KEY, overviewGraph)
+  //   return overviewGraph
+  // }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.31.0",
+  "version": "1.32.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -89,21 +89,20 @@
     "access": "public"
   },
   "dependencies": {
-    "@hpcc-js/wasm-graphviz": "1.7.0",
-    "vscode-jsonrpc": "8.2.0",
-    "vscode-uri": "3.1.0"
+    "@hpcc-js/wasm-graphviz": "1.7.0"
   },
   "devDependencies": {
+    "@types/chroma-js": "^3.1.1",
     "@modelcontextprotocol/sdk": "^1.10.2",
-    "express": "^5.1.0",
     "@msgpack/msgpack": "^3.1.1",
     "@smithy/util-base64": "^4.0.0",
-    "@types/express": "^5.0.1",
-    "@types/node": "^20.17.30",
+    "@types/express": "^5.0.2",
+    "@types/node": "^20.19.0",
     "@types/picomatch": "^4.0.0",
-    "picomatch": "^4.0.2",
     "@types/which": "^3.0.4",
+    "chroma-js": "^3.1.2",
     "esm-env": "^1.2.2",
+    "express": "^5.1.0",
     "fast-equals": "^5.2.2",
     "fdir": "^6.4.4",
     "indent-string": "^5.0.0",
@@ -114,27 +113,30 @@
     "p-debounce": "^4.0.0",
     "p-queue": "^8.1.0",
     "p-timeout": "^6.1.4",
+    "picomatch": "^4.0.2",
     "pretty-ms": "^9.2.0",
-    "remeda": "^2.21.3",
+    "remeda": "^2.23.0",
     "strip-indent": "^4.0.0",
-    "tsx": "~4.19.3",
-    "turbo": "^2.5.2",
-    "type-fest": "^4.40.0",
+    "tsx": "~4.19.4",
+    "turbo": "^2.5.4",
+    "type-fest": "^4.41.0",
     "typescript": "^5.8.3",
     "ufo": "^1.6.1",
     "unbuild": "^3.5.0",
     "valibot": "^1.0.0",
-    "zod": "^3.24.3",
-    "vitest": "^3.1.2",
+    "vitest": "^3.2.3",
+    "vscode-jsonrpc": "8.2.0",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
     "vscode-languageserver-types": "3.17.5",
+    "vscode-uri": "3.1.0",
     "which": "^5.0.0",
-    "@likec4/core": "1.31.0",
-    "@likec4/icons": "1.31.0",
-    "@likec4/layouts": "1.31.0",
-    "@likec4/log": "1.31.0",
-    "@likec4/tsconfig": "1.31.0"
+    "zod": "^3.24.3",
+    "@likec4/core": "1.32.0",
+    "@likec4/icons": "1.32.0",
+    "@likec4/layouts": "1.32.0",
+    "@likec4/log": "1.32.0",
+    "@likec4/tsconfig": "1.32.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",