@likec4/language-server 1.46.0 → 1.46.2

package/dist/lsp/SemanticTokenProvider.js

@@ -1,4 +1,4 @@
-import { invariant, isAnyOf, nonNullable } from '@likec4/core/utils';
+import { isAnyOf, nonNullable } from '@likec4/core/utils';
 import { AbstractSemanticTokenProvider, } from 'langium/lsp';
 import { isTruthy } from 'remeda';
 import { SemanticTokenModifiers, SemanticTokenTypes } from 'vscode-languageserver-types';
@@ -109,13 +109,19 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             }
         });
         when(isAnyOf(ast.isFqnRef, ast.isStrictFqnRef), mark => {
-            mark.property('value').readonly.definition.variable();
+            const text = mark.node.$cstNode?.text ?? '';
+            if (text !== '' && text !== 'this' && text !== 'it') {
+                mark.property('value').readonly.definition.variable();
+            }
             if (!mark.node.parent) {
                 stopHighlight();
             }
         });
         when(ast.isStrictFqnElementRef, mark => {
-            mark.property('el').readonly.definition.variable();
+            const text = mark.node.el.$refText ?? '';
+            if (text !== '') {
+                mark.property('el').readonly.definition.variable();
+            }
             if (!mark.node.parent) {
                 stopHighlight();
             }
@@ -165,34 +171,35 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         });
     }
     highlightElement(node, acceptor) {
-        try {
-            if (isAnyOf(ast.isElement, ast.isDeploymentNode, ast.isDeployedInstance)(node)) {
-                return this.highlightNameAndKind(node);
-            }
-            if (ast.isLikeC4View(node)) {
-                return this.highlightView(node);
-            }
-            if (ast.isAnyProperty(node) &&
-                !isAnyOf(ast.isMetadataProperty, ast.isElementStyleProperty, ast.isRelationStyleProperty)(node)) {
-                invariant(node.key);
-                acceptor({
-                    node,
-                    property: 'key',
-                    type: SemanticTokenTypes.property,
-                });
-            }
-            for (const { predicate, highlightFn } of this.rules) {
-                if (predicate(node)) {
-                    highlightFn(this.mark(node));
-                    break;
-                }
-            }
+        if (isAnyOf(ast.isElement, ast.isDeploymentNode, ast.isDeployedInstance)(node)) {
+            return this.highlightNameAndKind(node);
+        }
+        if (ast.isLikeC4View(node)) {
+            return this.highlightView(node);
+        }
+        if (ast.isAnyProperty(node) &&
+            !isAnyOf(ast.isMetadataProperty, ast.isElementStyleProperty, ast.isRelationStyleProperty)(node) &&
+            isTruthy(node.key)) {
+            acceptor({
+                node,
+                property: 'key',
+                type: SemanticTokenTypes.property,
+            });
         }
-        catch (error) {
-            if (error === PRUNE) {
-                return 'prune';
+        let m;
+        for (const { predicate, highlightFn } of this.rules) {
+            if (predicate(node)) {
+                try {
+                    m ??= this.mark(node);
+                    highlightFn(m);
+                }
+                catch (error) {
+                    if (error === PRUNE) {
+                        return 'prune';
+                    }
+                    logger.warn(`Error highlighting node of type ${node._type}`, { error });
+                }
             }
-            logger.warn(`Error highlighting node of type ${node._type}`, { error });
         }
     }
     highlightNameAndKind(node) {

package/dist/model/parser/SpecificationParser.js

@@ -79,7 +79,7 @@ export function SpecificationParser(B) {
                         continue;
                     }
                     c4Specification.colors[colorName] = {
-                        color: nonNullable(this.parseColorLiteral(color), `Color "${colorName}" is not valid: ${color}`),
+                        color: nonNullable(this.parseColorLiteral(color), `Color "${colorName}" is not valid`),
                     };
                 }
                 catch (e) {

package/dist/workspace/IndexManager.js

@@ -13,9 +13,18 @@ export class IndexManager extends DefaultIndexManager {
     }
     projectElements(projectId, nodeType, uris) {
         const projects = this.services.workspace.ProjectsManager;
+        const project = projects.getProject(projectId);
+        const includePathStrings = project.includePaths?.map(uri => {
+            const path = uri.toString();
+            return path.endsWith('/') ? path : path + '/';
+        }) ?? [];
         let documentUris = stream(this.symbolIndex.keys());
         return documentUris
-            .filter(uri => projects.belongsTo(uri) === projectId && (!uris || uris.has(uri)))
+            .filter(uri => {
+            const belongsToProject = projects.belongsTo(uri) === projectId;
+            const inIncludePath = includePathStrings.some(includePath => uri.startsWith(includePath));
+            return (belongsToProject || inIncludePath) && (!uris || uris.has(uri));
+        })
             .flatMap(uri => this.getFileDescriptions(uri, nodeType));
     }
 }

package/dist/workspace/LangiumDocuments.js

@@ -64,7 +64,25 @@ export class LangiumDocuments extends DefaultLangiumDocuments {
         });
     }
     projectDocuments(projectId) {
-        return this.allExcludingBuiltin.filter(doc => doc.likec4ProjectId === projectId);
+        const projects = this.services.workspace.ProjectsManager;
+        const project = projects.getProject(projectId);
+        const projectFolder = project.folderUri.toString() + (project.folderUri.path.endsWith('/') ? '' : '/');
+        const includePathStrings = project.includePaths?.map(uri => {
+            const path = uri.toString();
+            return path.endsWith('/') ? path : path + '/';
+        }) ?? [];
+        return this.allExcludingBuiltin.filter(doc => {
+            const docUri = doc.uri.toString();
+            // Always include documents from the project's own folder
+            if (docUri.startsWith(projectFolder)) {
+                return true;
+            }
+            // Check for addtional documents when the config has the `include:paths` property set.
+            if (includePathStrings.length > 0) {
+                return includePathStrings.some(includePath => docUri.startsWith(includePath));
+            }
+            return false;
+        });
     }
     groupedByProject() {
         return groupBy(this.allExcludingBuiltin.toArray(), prop('likec4ProjectId'));

package/lib/package.json

@@ -0,0 +1,159 @@
+{
+    "name": "@likec4/language-server",
+    "description": "LikeC4 Language Server",
+    "version": "1.45.0",
+    "license": "MIT",
+    "bugs": "https://github.com/likec4/likec4/issues",
+    "homepage": "https://likec4.dev",
+    "author": "Denis Davydkov <denis@davydkov.com>",
+    "files": [
+        "bin",
+        "dist",
+        "**/package.json",
+        "!**/__mocks__/",
+        "!**/__tests__/",
+        "!**/*.spec.*",
+        "!**/*.map"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/likec4/likec4.git",
+        "directory": "packages/language-server"
+    },
+    "engines": {
+        "node": "^20.19.0 || >=22.18.0"
+    },
+    "engineStrict": true,
+    "type": "module",
+    "sideEffects": false,
+    "bin": {
+        "likec4-language-server": "./bin/likec4-language-server.mjs"
+    },
+    "exports": {
+        ".": {
+            "sources": "./src/index.ts",
+            "default": {
+                "types": "./dist/index.d.ts",
+                "default": "./dist/index.js"
+            }
+        },
+        "./likec4lib": {
+            "sources": "./src/likec4lib.ts",
+            "default": {
+                "types": "./dist/likec4lib.d.ts",
+                "import": "./dist/likec4lib.js",
+                "default": "./dist/likec4lib.js"
+            }
+        },
+        "./browser-worker": {
+            "sources": "./src/browser-worker.ts",
+            "default": {
+                "types": "./dist/browser-worker.d.ts",
+                "import": "./dist/browser-worker.js",
+                "default": "./dist/browser-worker.js"
+            }
+        },
+        "./browser": {
+            "sources": "./src/browser.ts",
+            "default": {
+                "types": "./dist/browser.d.ts",
+                "import": "./dist/browser.js",
+                "default": "./dist/browser.js"
+            }
+        },
+        "./protocol": {
+            "sources": "./src/protocol.ts",
+            "default": {
+                "types": "./dist/protocol.d.ts",
+                "import": "./dist/protocol.js",
+                "default": "./dist/protocol.js"
+            }
+        },
+        "./bundled": "./dist/bundled.mjs"
+    },
+    "publishConfig": {
+        "registry": "https://registry.npmjs.org",
+        "access": "public",
+        "types": "dist/index.d.ts",
+        "module": "dist/index.js"
+    },
+    "scripts": {
+        "typecheck": "tsc -b --verbose",
+        "build": "unbuild",
+        "prepack": "likec4ops prepack",
+        "pack": "pnpm pack",
+        "postpack": "cp likec4-language-server-$npm_package_version.tgz package.tgz || true",
+        "pregenerate": "rm -f src/generated/* || true",
+        "watch:langium": "langium generate --watch",
+        "watch:ts": "tsc --watch",
+        "generate": "langium generate && tsx scripts/generate-icons.ts",
+        "dev": "run-p \"watch:*\"",
+        "lint": "oxlint --type-aware",
+        "lint:fix": "oxlint --type-aware --fix",
+        "lint:package": "pnpx publint ./package.tgz",
+        "clean": "likec4ops clean contrib src/generated src/generated-lib",
+        "test": "vitest run --no-isolate",
+        "test-dbg": "vitest run --no-isolate -t formating",
+        "vitest:ui": "vitest --no-isolate --ui",
+        "test:watch": "vitest"
+    },
+    "dependencies": {
+        "@hpcc-js/wasm-graphviz": "catalog:utils",
+        "bundle-require": "catalog:utils",
+        "esbuild": "catalog:esbuild"
+    },
+    "devDependencies": {
+        "@hono/node-server": "catalog:hono",
+        "@likec4/config": "workspace:*",
+        "@likec4/core": "workspace:*",
+        "@likec4/devops": "workspace:*",
+        "@likec4/icons": "workspace:*",
+        "@likec4/layouts": "workspace:*",
+        "@likec4/log": "workspace:*",
+        "@likec4/tsconfig": "workspace:*",
+        "@modelcontextprotocol/sdk": "catalog:mcp",
+        "@msgpack/msgpack": "^3.1.2",
+        "@smithy/util-base64": "^4.3.0",
+        "@types/natural-compare-lite": "catalog:utils",
+        "@types/node": "catalog:",
+        "@types/picomatch": "catalog:utils",
+        "@types/vscode": "catalog:vscode",
+        "@types/which": "^3.0.4",
+        "chokidar": "catalog:utils",
+        "defu": "catalog:utils",
+        "esm-env": "catalog:utils",
+        "fast-equals": "catalog:utils",
+        "fdir": "catalog:utils",
+        "fetch-to-node": "^2.1.0",
+        "hono": "catalog:hono",
+        "immer": "catalog:utils",
+        "indent-string": "^5.0.0",
+        "json5": "catalog:utils",
+        "langium": "catalog:langium",
+        "langium-cli": "catalog:langium",
+        "nano-spawn": "catalog:utils",
+        "natural-compare-lite": "catalog:utils",
+        "oxlint": "catalog:",
+        "p-debounce": "catalog:utils",
+        "p-queue": "catalog:utils",
+        "p-timeout": "catalog:utils",
+        "picomatch": "catalog:utils",
+        "pretty-ms": "^9.2.0",
+        "remeda": "catalog:utils",
+        "strip-indent": "catalog:utils",
+        "tsx": "catalog:",
+        "turbo": "catalog:",
+        "type-fest": "catalog:utils",
+        "typescript": "catalog:",
+        "ufo": "catalog:utils",
+        "unbuild": "catalog:",
+        "vitest": "catalog:vitest",
+        "vscode-jsonrpc": "catalog:vscode",
+        "vscode-languageserver": "catalog:vscode",
+        "vscode-languageserver-protocol": "catalog:vscode",
+        "vscode-languageserver-types": "catalog:vscode",
+        "vscode-uri": "catalog:vscode",
+        "which": "^5.0.0",
+        "zod": "catalog:utils"
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.46.0",
+  "version": "1.46.2",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -21,7 +21,7 @@
     "directory": "packages/language-server"
   },
   "engines": {
-    "node": "^20.19.0 || >=22.18.0"
+    "node": ">=22.21.1"
   },
   "engineStrict": true,
   "type": "module",
@@ -78,10 +78,10 @@
   "dependencies": {
     "@hpcc-js/wasm-graphviz": "1.16.0",
     "bundle-require": "^5.1.0",
-    "esbuild": "0.27.0"
+    "esbuild": "0.27.1"
   },
   "devDependencies": {
-    "@hono/node-server": "^1.19.6",
+    "@hono/node-server": "^1.19.7",
     "@modelcontextprotocol/sdk": "^1.22.0",
     "@msgpack/msgpack": "^3.1.2",
     "@smithy/util-base64": "^4.3.0",
@@ -96,15 +96,15 @@
     "fast-equals": "^5.3.3",
     "fdir": "6.4.0",
     "fetch-to-node": "^2.1.0",
-    "hono": "^4.10.7",
-    "immer": "^10.2.0",
+    "hono": "^4.11.1",
+    "immer": "^11.0.1",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
     "langium": "3.5.0",
     "langium-cli": "3.5.2",
     "nano-spawn": "^1.0.3",
     "natural-compare-lite": "^1.4.0",
-    "oxlint": "1.31.0",
+    "oxlint": "1.33.0",
     "p-debounce": "4.0.0",
     "p-queue": "8.1.1",
     "p-timeout": "6.1.4",
@@ -118,7 +118,7 @@
     "typescript": "5.9.3",
     "ufo": "1.6.1",
     "unbuild": "3.5.0",
-    "vitest": "4.0.15",
+    "vitest": "4.0.16",
     "vscode-jsonrpc": "8.2.1",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
@@ -126,13 +126,13 @@
     "vscode-uri": "3.1.0",
     "which": "^5.0.0",
     "zod": "^3.25.76",
-    "@likec4/config": "1.46.0",
-    "@likec4/core": "1.46.0",
-    "@likec4/devops": "1.42.0",
-    "@likec4/icons": "1.46.0",
-    "@likec4/layouts": "1.46.0",
-    "@likec4/log": "1.46.0",
-    "@likec4/tsconfig": "1.46.0"
+    "@likec4/config": "1.46.2",
+    "@likec4/layouts": "1.46.2",
+    "@likec4/log": "1.46.1",
+    "@likec4/icons": "1.46.1",
+    "@likec4/core": "1.46.2",
+    "@likec4/tsconfig": "1.46.1",
+    "@likec4/devops": "1.42.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",