@likec4/language-server 1.28.0 → 1.28.1

package/dist/model/parser/ViewsParser.js

@@ -187,7 +187,7 @@ export function ViewsParser(B) {
     }
     parseViewRuleStyle(astRule) {
       const styleProps = astRule.props.filter(ast.isStyleProperty);
-      const targets = astRule.target;
+      const targets = astRule.targets;
       const notation = astRule.props.find(ast.isNotationProperty);
       return this.parseRuleStyle(styleProps, targets, notation);
     }

package/dist/model-change/changeElementStyle.js

@@ -3,7 +3,6 @@ import { GrammarUtils } from "langium";
 import { entries, filter, findLast, isTruthy, last } from "remeda";
 import { TextEdit } from "vscode-languageserver-types";
 import { ast } from "../ast.js";
-import { isReferenceToLogicalModel } from "../utils/index.js";
 const { findNodeForKeyword, findNodeForProperty } = GrammarUtils;
 const asViewStyleRule = (target, style, indent = 0) => {
   const indentStr = indent > 0 ? " ".repeat(indent) : "";
@@ -16,15 +15,15 @@ const asViewStyleRule = (target, style, indent = 0) => {
   ];
 };
 const isMatchingViewRule = (fqn, index) => (rule) => {
-  if (!ast.isViewRuleStyle(rule)) {
+  if (!ast.isViewRuleStyle(rule) && !ast.isDeploymentViewRuleStyle(rule)) {
     return false;
   }
-  const target = rule.target.value;
-  if (!target || isTruthy(rule.target.prev) || target.$type !== "FqnRefExpr" || !isReferenceToLogicalModel(target.ref)) {
+  const target = rule.targets.value;
+  if (!target || isTruthy(rule.targets.prev) || target.$type !== "FqnRefExpr" || isTruthy(target.selector)) {
     return false;
   }
-  const ref = target.el.ref;
-  const _fqn = ref ? index.getFqn(ref) : null;
+  const ref = target.ref?.value?.ref;
+  const _fqn = ref ? index.resolve(ref) : null;
   return _fqn === fqn;
 };
 export function changeElementStyle(services, {
@@ -40,7 +39,10 @@ export function changeElementStyle(services, {
   invariant(insertPos, "insertPos is not defined");
   const indent = viewCstNode.range.start.character + 2;
   const fqnIndex = services.likec4.FqnIndex;
-  const styleRules = filter(viewAst.body.rules, ast.isViewRuleStyle);
+  const styleRules = filter(
+    viewAst.body.rules,
+    (r) => ast.isViewRuleStyle(r) || ast.isDeploymentViewRuleStyle(r)
+  );
   const viewOf = view.__ === "element" ? view.viewOf : null;
   const existing = [];
   const insert = [];

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

@@ -25,6 +25,7 @@ export declare class DefaultLikeC4Views implements LikeC4Views {
     private cache;
     private viewsWithReportedErrors;
     private ModelBuilder;
+    private queue;
     constructor(services: LikeC4Services);
     get layouter(): GraphvizLayouter;
     computedViews(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<ComputedView[]>;

package/dist/views/likec4-views.js

@@ -1,9 +1,9 @@
 import { loggable } from "@likec4/log";
+import PQueue from "p-queue";
 import prettyMs from "pretty-ms";
 import { values } from "remeda";
 import { CancellationToken } from "vscode-jsonrpc";
 import { logError, logger as rootLogger, logWarnError } from "../logger.js";
-const logger = rootLogger.getChild("Views");
 export class DefaultLikeC4Views {
   constructor(services) {
     this.services = services;
@@ -12,6 +12,7 @@ export class DefaultLikeC4Views {
   cache = /* @__PURE__ */ new WeakMap();
   viewsWithReportedErrors = /* @__PURE__ */ new Set();
   ModelBuilder;
+  queue = new PQueue({ concurrency: 4, timeout: 1e4, throwOnTimeout: true });
   get layouter() {
     return this.services.likec4.Layouter;
   }
@@ -24,19 +25,28 @@ export class DefaultLikeC4Views {
     if (views.length === 0) {
       return [];
     }
+    const logger = rootLogger.getChild(["views", projectId ?? ""]);
     logger.debug`layoutAll: ${views.length} views`;
     const results = [];
     const tasks = [];
     for (const view of views) {
       this.viewsWithReportedErrors.delete(view.id);
       tasks.push(
-        this.layouter.layout(view).then((result) => {
+        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);
-          logWarnError(e);
           return Promise.reject(e);
         })
       );
@@ -44,6 +54,8 @@ export class DefaultLikeC4Views {
     for (const task of await Promise.allSettled(tasks)) {
       if (task.status === "fulfilled") {
         results.push(task.value);
+      } else {
+        logger.error(loggable(task.reason));
       }
     }
     if (results.length !== views.length) {
@@ -56,6 +68,7 @@ export class DefaultLikeC4Views {
   async layoutView(viewId, projectId, cancelToken = CancellationToken.None) {
     const model = await this.ModelBuilder.buildLikeC4Model(projectId, cancelToken);
     const view = model.findView(viewId)?.$view;
+    const logger = rootLogger.getChild(["views", projectId ?? ""]);
     if (!view) {
       logger.warn`layoutView ${viewId} not found`;
       return null;
@@ -67,7 +80,13 @@ export class DefaultLikeC4Views {
     }
     try {
       const start = performance.now();
-      const result = await this.layouter.layout(view);
+      const result = await this.queue.add(async () => {
+        logger.debug`layouting view ${view.id}...`;
+        return await this.layouter.layout(view);
+      });
+      if (!result) {
+        throw new Error(`Failed to layout view ${viewId}`);
+      }
       this.viewsWithReportedErrors.delete(viewId);
       this.cache.set(view, result);
       logger.debug(`layout {viewId} ready in ${prettyMs(performance.now() - start)}`, { viewId });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.28.0",
+  "version": "1.28.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -96,7 +96,8 @@
   "devDependencies": {
     "@msgpack/msgpack": "^3.1.1",
     "@smithy/util-base64": "^4.0.0",
-    "@types/node": "^20.17.28",
+    "@types/node": "^20.17.30",
+    "@types/picomatch": "^4.0.0",
     "@types/which": "^3.0.4",
     "esm-env": "^1.2.2",
     "fast-equals": "^5.2.2",
@@ -107,28 +108,29 @@
     "langium-cli": "3.4.0",
     "natural-compare-lite": "^1.4.0",
     "p-debounce": "^4.0.0",
+    "p-queue": "^8.1.0",
+    "picomatch": "^4.0.2",
+    "p-timeout": "^6.1.4",
     "pretty-ms": "^9.2.0",
     "remeda": "^2.21.2",
-    "@types/picomatch": "^4.0.0",
-    "picomatch": "^4.0.2",
     "strip-indent": "^4.0.0",
     "tsx": "~4.19.3",
     "turbo": "^2.5.0",
     "type-fest": "^4.39.1",
     "typescript": "^5.8.3",
-    "ufo": "^1.5.4",
+    "ufo": "^1.6.1",
     "unbuild": "^3.5.0",
     "valibot": "^1.0.0",
     "vitest": "^3.1.1",
     "vscode-languageserver": "9.0.1",
-    "vscode-languageserver-types": "3.17.5",
     "vscode-languageserver-protocol": "3.17.5",
+    "vscode-languageserver-types": "3.17.5",
     "which": "^5.0.0",
-    "@likec4/core": "1.28.0",
-    "@likec4/icons": "1.28.0",
-    "@likec4/log": "1.28.0",
-    "@likec4/layouts": "1.28.0",
-    "@likec4/tsconfig": "1.28.0"
+    "@likec4/core": "1.28.1",
+    "@likec4/layouts": "1.28.1",
+    "@likec4/tsconfig": "1.28.1",
+    "@likec4/log": "1.28.1",
+    "@likec4/icons": "1.28.1"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",