@likec4/language-server 1.31.0 → 1.32.1

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.1",
   "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": {
-    "@modelcontextprotocol/sdk": "^1.10.2",
-    "express": "^5.1.0",
+    "@types/chroma-js": "^3.1.1",
+    "@modelcontextprotocol/sdk": "^1.12.1",
     "@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.20.1",
+    "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.1",
+    "@likec4/icons": "1.32.1",
+    "@likec4/layouts": "1.32.1",
+    "@likec4/tsconfig": "1.32.1",
+    "@likec4/log": "1.32.1"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",
@@ -146,7 +148,7 @@
     "generate": "langium generate && tsx scripts/generate-icons.ts",
     "dev": "run-p \"watch:*\"",
     "lint": "run -T eslint src/ --fix",
-    "clean": "rm -r -f dist contrib",
+    "clean": "pnpm rimraf dist contrib lib src/generated src/generated-lib",
     "test": "vitest run --no-isolate",
     "test-dbg": "vitest run --no-isolate -t formating",
     "vitest:ui": "vitest --no-isolate --ui",