@likec4/language-server 1.32.0 → 1.32.2

package/dist/utils/index.js

@@ -1,3 +1,4 @@
+import prettyMs from "pretty-ms";
 import { logger } from "../logger.js";
 export * from "./disposable.js";
 export * from "./elementRef.js";
@@ -12,3 +13,21 @@ export function safeCall(fn) {
     return void 0;
   }
 }
+export function performanceNow() {
+  try {
+    return performance.now();
+  } catch (e) {
+    return Date.now();
+  }
+}
+export function performanceMark() {
+  const t0 = performanceNow();
+  return {
+    get ms() {
+      return performanceNow() - t0;
+    },
+    get pretty() {
+      return prettyMs(performanceNow() - t0);
+    }
+  };
+}

package/dist/validation/index.d.ts

@@ -3,7 +3,7 @@ import { type LikeC4LangiumDocument, ast } from '../ast';
 import type { LikeC4Services } from '../module';
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.ElementKindExpression | ast.ElementTagExpression | ast.FqnRefExpr | ast.WildcardExpression | ast.FqnExprWhere | ast.FqnExprWith | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationExprWhere | ast.RelationExprWith | ast.Element | ast.ExtendDeployment | ast.ExtendElement | ast.Imported | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.PaddingSizeProperty | ast.ShapeSizeProperty | ast.TextSizeProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.ViewStringProperty | ast.BorderProperty | ast.MultipleProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ViewRulePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.ElementRef | ast.DeploymentRelation | ast.Tags | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.Relation | ast.SpecificationElementKind | ast.Globals | ast.GlobalPredicateGroup | ast.GlobalStyleGroup | ast.ImportsFromPoject | ast.SpecificationRule | ast.SpecificationTag;
+declare const isValidatableAstNode: (n: AstNode) => n is ast.HexColor | ast.RGBAColor | ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.LinkProperty | ast.MetadataBody | ast.ElementKindExpression | ast.ElementTagExpression | ast.FqnRefExpr | ast.WildcardExpression | ast.FqnExprWhere | ast.FqnExprWith | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationExprWhere | ast.RelationExprWith | ast.Element | ast.ExtendDeployment | ast.ExtendElement | ast.Imported | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.RelationStringProperty | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.PaddingSizeProperty | ast.ShapeSizeProperty | ast.TextSizeProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.ViewStringProperty | ast.BorderProperty | ast.MultipleProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ViewRulePredicate | ast.SpecificationRelationshipKind | ast.GlobalStyle | ast.SpecificationColor | ast.NavigateToProperty | ast.DynamicViewStep | ast.ElementRef | ast.DeploymentRelation | ast.Tags | ast.SpecificationDeploymentNodeKind | ast.DynamicViewParallelSteps | ast.GlobalDynamicPredicateGroup | ast.Relation | ast.SpecificationElementKind | ast.Globals | ast.GlobalPredicateGroup | ast.GlobalStyleGroup | ast.SpecificationTag | ast.ImportsFromPoject | ast.SpecificationRule;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 export declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/dist/validation/index.js

@@ -13,7 +13,12 @@ import { dynamicViewStep } from "./dynamic-view-step.js";
 import { checkElement } from "./element.js";
 import { checkElementRef } from "./element-ref.js";
 import { checkImported, checkImportsFromPoject } from "./imports.js";
-import { iconPropertyRuleChecks, notesPropertyRuleChecks, opacityPropertyRuleChecks } from "./property-checks.js";
+import {
+  colorLiteralRuleChecks,
+  iconPropertyRuleChecks,
+  notesPropertyRuleChecks,
+  opacityPropertyRuleChecks
+} from "./property-checks.js";
 import { checkRelationBody, relationChecks } from "./relation.js";
 import {
   checkDeploymentNodeKind,
@@ -82,7 +87,8 @@ const isValidatableAstNode = validatableAstNodeGuards([
   ast.isSpecificationDeploymentNodeKind,
   ast.isSpecificationTag,
   ast.isSpecificationColor,
-  ast.isSpecificationRule
+  ast.isSpecificationRule,
+  ast.isColorLiteral
 ]);
 const findInvalidContainer = (node) => {
   let nd = node;
@@ -147,7 +153,8 @@ export function registerValidationChecks(services) {
     IncomingRelationExpr: checkIncomingRelationExpr(services),
     OutgoingRelationExpr: checkOutgoingRelationExpr(services),
     ImportsFromPoject: checkImportsFromPoject(services),
-    Imported: checkImported(services)
+    Imported: checkImported(services),
+    ColorLiteral: colorLiteralRuleChecks(services)
   });
   const connection = services.shared.lsp.Connection;
   if (connection) {

package/dist/validation/property-checks.d.ts

@@ -4,3 +4,4 @@ import type { LikeC4Services } from '../module';
 export declare const opacityPropertyRuleChecks: (_: LikeC4Services) => ValidationCheck<ast.OpacityProperty>;
 export declare const iconPropertyRuleChecks: (_: LikeC4Services) => ValidationCheck<ast.IconProperty>;
 export declare const notesPropertyRuleChecks: (_: LikeC4Services) => ValidationCheck<ast.NotesProperty>;
+export declare const colorLiteralRuleChecks: (_: LikeC4Services) => ValidationCheck<ast.ColorLiteral>;

package/dist/validation/property-checks.js

@@ -1,4 +1,6 @@
+import { nonexhaustive } from "@likec4/core";
 import { AstUtils } from "langium";
+import { isNumber, isString } from "remeda";
 import { ast } from "../ast.js";
 import { tryOrLog } from "./_shared.js";
 export const opacityPropertyRuleChecks = (_) => {
@@ -43,3 +45,63 @@ export const notesPropertyRuleChecks = (_) => {
     }
   };
 };
+export const colorLiteralRuleChecks = (_) => {
+  return (node, accept) => {
+    if (node.$type === "HexColor") {
+      if (node.hex === void 0) {
+        accept("error", `Invalid HEX`, {
+          node,
+          property: "hex"
+        });
+        return;
+      }
+      const length = isNumber(node.hex) ? node.hex.toString().length : node.hex.length;
+      if (length !== 6 && length !== 3 && length !== 8) {
+        accept("error", `Invalid value "${node.$cstNode?.text}", must be 3, 6 or 8 characters long`, {
+          node,
+          property: "hex"
+        });
+      }
+      return;
+    }
+    if (node.$type === "RGBAColor") {
+      if (!isNumber(node.red) || node.red < 0 || node.red > 255) {
+        accept("error", `Invalid value, must be between 0 and 255`, {
+          node,
+          property: "red"
+        });
+      }
+      if (!isNumber(node.green) || node.green < 0 || node.green > 255) {
+        accept("error", `Invalid value, must be between 0 and 255`, {
+          node,
+          property: "green"
+        });
+      }
+      if (!isNumber(node.blue) || node.blue < 0 || node.blue > 255) {
+        accept("error", `Invalid value, must be between 0 and 255`, {
+          node,
+          property: "blue"
+        });
+      }
+      if (isNumber(node.alpha)) {
+        if (node.alpha < 0 || node.alpha > 1) {
+          accept("error", `Invalid value, must be between 0 and 1`, {
+            node,
+            property: "alpha"
+          });
+        }
+      }
+      if (isString(node.alpha)) {
+        const alpha = parseFloat(node.alpha);
+        if (alpha < 0 || alpha > 100) {
+          accept("error", `Invalid value, must be between 0% and 100%`, {
+            node,
+            property: "alpha"
+          });
+        }
+      }
+      return;
+    }
+    nonexhaustive(node);
+  };
+};

package/dist/views/configurable-layouter.d.ts

@@ -1,7 +1,7 @@
-import { GraphvizLayouter } from '@likec4/layouts';
+import { QueueGraphvizLayoter } from '@likec4/layouts';
 import type { LikeC4Services } from '../module';
 export declare const ConfigurableLayouter: {
     likec4: {
-        Layouter(services: LikeC4Services): GraphvizLayouter;
+        Layouter(services: LikeC4Services): QueueGraphvizLayoter;
     };
 };

package/dist/views/configurable-layouter.js

@@ -1,4 +1,4 @@
-import { GraphvizLayouter, GraphvizWasmAdapter } from "@likec4/layouts";
+import { GraphvizWasmAdapter, QueueGraphvizLayoter } from "@likec4/layouts";
 import { GraphvizBinaryAdapter } from "@likec4/layouts/graphviz/binary";
 import { isEmpty } from "remeda";
 import which from "which";
@@ -16,7 +16,9 @@ export const ConfigurableLayouter = {
     Layouter(services) {
       logger.debug("Creating ConfigurableLayouter");
       const wasmAdapter = new GraphvizWasmAdapter();
-      const layouter = new GraphvizLayouter(wasmAdapter);
+      const layouter = new QueueGraphvizLayoter({
+        graphviz: wasmAdapter
+      });
       const langId = services.LanguageMetaData.languageId;
       services.shared.workspace.ConfigurationProvider.onConfigurationSectionUpdate((update) => {
         logger.debug("Configuration update: {update}", { update });

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

@@ -1,5 +1,5 @@
 import type { ComputedView, DiagramView, ProjectId, ViewId } from '@likec4/core';
-import { GraphvizLayouter } from '@likec4/layouts';
+import { type QueueGraphvizLayoter, GraphvizLayouter } from '@likec4/layouts';
 import { CancellationToken } from 'vscode-jsonrpc';
 import type { LikeC4Services } from '../module';
 export type GraphvizOut = {
@@ -24,9 +24,8 @@ export declare class DefaultLikeC4Views implements LikeC4Views {
     private cache;
     private viewsWithReportedErrors;
     private ModelBuilder;
-    private queue;
     constructor(services: LikeC4Services);
-    get layouter(): GraphvizLayouter;
+    get layouter(): QueueGraphvizLayoter;
     computedViews(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<ComputedView[]>;
     layoutAllViews(projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<Array<Readonly<GraphvizOut>>>;
     layoutView(viewId: ViewId, projectId?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<GraphvizOut | null>;

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";
+import { performanceMark } from "../utils/index.js";
+const viewsLogger = rootLogger.getChild("views");
 export class DefaultLikeC4Views {
   constructor(services) {
     this.services = services;
@@ -12,7 +12,6 @@ export class DefaultLikeC4Views {
   cache = /* @__PURE__ */ new WeakMap();
   viewsWithReportedErrors = /* @__PURE__ */ new Set();
   ModelBuilder;
-  queue = new PQueue({ concurrency: 2, timeout: 2e4, throwOnTimeout: true });
   get layouter() {
     return this.services.likec4.Layouter;
   }
@@ -26,16 +25,10 @@ export class DefaultLikeC4Views {
     if (views.length === 0) {
       return [];
     }
-    const logger = rootLogger.getChild(["views", projectId ?? ""]);
+    const m0 = performanceMark();
+    const logger = projectId ? viewsLogger.getChild(projectId) : viewsLogger;
     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 tasks = [];
     const specification = likeC4Model.$data.specification;
     const results = [];
     for (const view of views) {
@@ -45,40 +38,36 @@ export class DefaultLikeC4Views {
         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}`);
+      tasks.push({
+        view,
+        specification
+      });
+    }
+    if (tasks.length > 0) {
+      await this.layouter.batchLayout({
+        batch: tasks,
+        onSuccess: (task, result) => {
+          this.viewsWithReportedErrors.delete(task.view.id);
+          this.cache.set(task.view, result);
+          results.push(result);
+        },
+        onError: (task, error) => {
+          logger.warn(`Fail layout view ${task.view.id}`, { error });
+          this.cache.delete(task.view);
         }
-        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`;
+      logger.warn`layouted ${results.length} of ${views.length} views in ${m0.pretty}`;
     } else if (results.length > 0) {
-      logger.debug`layouted all ${results.length} views`;
+      logger.debug`layouted all ${results.length} views in ${m0.pretty}`;
     }
     return results;
   }
   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 ?? ""]);
+    const logger = projectId ? viewsLogger.getChild(projectId) : viewsLogger;
     if (!view) {
       logger.warn`layoutView ${viewId} not found`;
       return null;
@@ -89,24 +78,14 @@ export class DefaultLikeC4Views {
       return await Promise.resolve(cached);
     }
     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,
-          specification: model.$data.specification
-        });
+      const m0 = performanceMark();
+      const result = await this.layouter.layout({
+        view,
+        specification: model.$data.specification
       });
-      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 });
+      logger.debug(`layout {viewId} ready in ${m0.pretty}`, { viewId });
       return result;
     } catch (e) {
       if (!this.viewsWithReportedErrors.has(viewId)) {

package/dist/workspace/ProjectsManager.d.ts

@@ -50,7 +50,6 @@ export declare class ProjectsManager {
      * Checks if the provided file system entry is a valid project config file.
      *
      * @param entry The file system entry to check
-     * @returns {boolean} Returns true if the entry is a valid config file, false otherwise.
      */
     loadConfigFile(entry: FileSystemNode): Promise<Project | undefined>;
     registerProject(configFile: URI): Promise<Project>;

package/dist/workspace/ProjectsManager.js

@@ -1,4 +1,5 @@
 import { BiMap, invariant, nonNullable } from "@likec4/core";
+import { loggable } from "@likec4/log";
 import { URI, WorkspaceCache } from "langium";
 import picomatch from "picomatch/posix";
 import { hasAtLeast, isNullish, map, pipe, prop, sortBy } from "remeda";
@@ -9,7 +10,7 @@ import {
   withoutProtocol,
   withProtocol
 } from "ufo";
-import { parseConfigJson } from "../config/index.js";
+import { parseConfigJson, validateConfig } from "../config/index.js";
 import { logger as mainLogger } from "../logger.js";
 const logger = mainLogger.getChild("ProjectsManager");
 export class ProjectsManager {
@@ -115,14 +116,23 @@ export class ProjectsManager {
    * Checks if the provided file system entry is a valid project config file.
    *
    * @param entry The file system entry to check
-   * @returns {boolean} Returns true if the entry is a valid config file, false otherwise.
    */
   async loadConfigFile(entry) {
     if (entry.isDirectory) {
       return void 0;
     }
     if (this.isConfigFile(entry)) {
-      return await this.registerProject(entry.uri);
+      try {
+        return await this.registerProject(entry.uri);
+      } catch (error) {
+        this.services.lsp.Connection?.window.showErrorMessage(
+          `LikeC4: Failed to register project at ${entry.uri.toString()}
+
+${loggable(error)}`
+        );
+        logger.error("Failed to register project at {uri}", { uri: entry.uri.toString(), error });
+        return void 0;
+      }
     }
     return void 0;
   }
@@ -135,7 +145,8 @@ export class ProjectsManager {
       const folderUri2 = configFile.with({ path });
       return this.registerProject({ config: config2, folderUri: folderUri2 });
     }
-    const { config, folderUri } = opts;
+    const config = validateConfig(opts.config);
+    const { folderUri } = opts;
     let id = config.name;
     let i = 1;
     while (this.projectIdToFolder.has(id)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.32.0",
+  "version": "1.32.2",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -93,11 +93,11 @@
   },
   "devDependencies": {
     "@types/chroma-js": "^3.1.1",
-    "@modelcontextprotocol/sdk": "^1.10.2",
+    "@modelcontextprotocol/sdk": "^1.12.1",
     "@msgpack/msgpack": "^3.1.1",
     "@smithy/util-base64": "^4.0.0",
     "@types/express": "^5.0.2",
-    "@types/node": "^20.19.0",
+    "@types/node": "~20.19.0",
     "@types/picomatch": "^4.0.0",
     "@types/which": "^3.0.4",
     "chroma-js": "^3.1.2",
@@ -117,26 +117,26 @@
     "pretty-ms": "^9.2.0",
     "remeda": "^2.23.0",
     "strip-indent": "^4.0.0",
-    "tsx": "~4.19.4",
-    "turbo": "^2.5.4",
+    "tsx": "4.19.4",
+    "turbo": "2.5.4",
     "type-fest": "^4.41.0",
-    "typescript": "^5.8.3",
+    "typescript": "5.8.3",
     "ufo": "^1.6.1",
-    "unbuild": "^3.5.0",
-    "valibot": "^1.0.0",
-    "vitest": "^3.2.3",
+    "unbuild": "3.5.0",
+    "valibot": "^1.1.0",
+    "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",
-    "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"
+    "zod": "^3.25.64",
+    "@likec4/icons": "1.32.2",
+    "@likec4/core": "1.32.2",
+    "@likec4/tsconfig": "1.32.2",
+    "@likec4/layouts": "1.32.2",
+    "@likec4/log": "1.32.2"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",
@@ -148,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",