@likec4/language-server 1.46.3 → 1.46.4

package/dist/references/scope-provider.js

@@ -54,8 +54,7 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
         }
     }
     // we need lazy resolving here
-    *genUniqueDescedants(of) {
-        const element = of();
+    *genUniqueDescedants(element) {
         if (!element) {
             return;
         }
@@ -83,7 +82,7 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
             };
         }
         // we make extended element resolvable inside ExtendElementBody
-        yield* this.genUniqueDescedants(() => elementRef(element));
+        yield* this.genUniqueDescedants(elementRef(element));
     }
     *genScopeElementView({ viewOf, extends: ext }) {
         if (viewOf) {
@@ -92,7 +91,7 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
             if (viewOf.modelElement.value.$nodeDescription) {
                 yield viewOf.modelElement.value.$nodeDescription;
             }
-            yield* this.genUniqueDescedants(() => elementRef(viewOf));
+            yield* this.genUniqueDescedants(elementRef(viewOf));
             return;
         }
         if (ext) {
@@ -115,10 +114,10 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
         if (deploymentNode.value.$nodeDescription) {
             yield deploymentNode.value.$nodeDescription;
         }
-        yield* this.genUniqueDescedants(() => {
-            const target = deploymentNode.value.ref;
-            return target && ast.isDeploymentNode(target) ? target : undefined;
-        });
+        const target = deploymentNode.value.ref;
+        if (target && ast.isDeploymentNode(target)) {
+            yield* this.genUniqueDescedants(target);
+        }
     }
     streamForFqnRef(projectId, container, context) {
         const parent = container.parent;
@@ -130,25 +129,23 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
             return EMPTY_STREAM;
         }
         if (ast.isImported(parentRef)) {
-            return stream(this.genUniqueDescedants(() => {
-                return parentRef.imported.ref;
-            }));
+            return stream(this.genUniqueDescedants(parentRef.imported.ref));
         }
         if (ast.isDeploymentNode(parentRef)) {
-            return stream(this.genUniqueDescedants(() => parentRef));
+            return stream(this.genUniqueDescedants(parentRef));
         }
         if (ast.isDeployedInstance(parentRef)) {
-            // if (ast.isElement(target)) {
-            return stream(this.genUniqueDescedants(() => {
-                const target = parentRef.target.modelElement.value.ref;
-                if (ast.isImported(target)) {
-                    return target.imported.ref;
-                }
-                return ast.isElement(target) ? target : undefined;
-            }));
+            const target = parentRef.target.modelElement.value.ref;
+            // dprint-ignore
+            const resolvedTarget = ast.isImported(target)
+                ? target.imported.ref
+                : ast.isElement(target)
+                    ? target
+                    : undefined;
+            return stream(this.genUniqueDescedants(resolvedTarget));
         }
         if (ast.isElement(parentRef)) {
-            return stream(this.genUniqueDescedants(() => parentRef));
+            return stream(this.genUniqueDescedants(parentRef));
         }
         return nonexhaustive(parentRef);
     }

package/dist/workspace/IndexManager.js

@@ -16,8 +16,10 @@ export class IndexManager extends DefaultIndexManager {
         let documentUris = stream(this.symbolIndex.keys());
         return documentUris
             .filter(uri => {
-            return (!uris || uris.has(uri)) && (projects.belongsTo(uri) === projectId ||
-                projects.isIncluded(projectId, uri));
+            if (uris && !uris.has(uri)) {
+                return false;
+            }
+            return projects.isIncluded(projectId, uri);
         })
             .flatMap(uri => this.getFileDescriptions(uri, nodeType));
     }

package/dist/workspace/LangiumDocuments.js

@@ -1,6 +1,6 @@
 import { compareNaturalHierarchically } from '@likec4/core/utils';
 import { DefaultLangiumDocuments, stream } from 'langium';
-import { groupBy, prop } from 'remeda';
+import { hasAtLeast } from 'remeda';
 import { isLikeC4LangiumDocument } from '../ast';
 import { LikeC4LanguageMetaData } from '../generated/module';
 import { isLikeC4Builtin } from '../likec4lib';
@@ -66,12 +66,23 @@ export class LangiumDocuments extends DefaultLangiumDocuments {
      */
     projectDocuments(projectId) {
         const projects = this.services.workspace.ProjectsManager;
-        return this.allExcludingBuiltin.filter(doc => {
-            return doc.likec4ProjectId === projectId || projects.isIncluded(projectId, doc.uri);
+        return this.all.filter(doc => {
+            if (isLikeC4Builtin(doc.uri)) {
+                return false;
+            }
+            return projects.isIncluded(projectId, doc.uri);
         });
     }
     groupedByProject() {
-        return groupBy(this.allExcludingBuiltin.toArray(), prop('likec4ProjectId'));
+        return this.services.workspace.ProjectsManager
+            .all
+            .reduce((acc, projectId) => {
+            const docs = this.projectDocuments(projectId).toArray();
+            if (hasAtLeast(docs, 1)) {
+                acc[projectId] = docs;
+            }
+            return acc;
+        }, {});
     }
     /**
      * Reset the project IDs of all documents.

package/dist/workspace/ProjectsManager.d.ts

@@ -2,6 +2,7 @@ import { type IncludeConfig, type LikeC4ProjectConfig, type LikeC4ProjectConfigI
 import type { NonEmptyArray, NonEmptyReadonlyArray } from '@likec4/core';
 import type { ProjectId, scalar } from '@likec4/core/types';
 import { type Cancellation, type LangiumDocument, URI, WorkspaceCache } from 'langium';
+import picomatch from 'picomatch';
 import type { Tagged } from 'type-fest';
 import type { LikeC4SharedServices } from '../module';
 /**
@@ -15,7 +16,7 @@ interface ProjectData {
     config: LikeC4ProjectConfig;
     folder: ProjectFolder;
     folderUri: URI;
-    exclude?: (path: string) => boolean;
+    exclude?: picomatch.Matcher;
     /**
      * Resolved include paths with both URI and folder string representations.
      * These are additional directories that are part of this project.
@@ -75,10 +76,11 @@ export declare class ProjectsManager {
      */
     isExcluded(document: LangiumDocument | URI | string): boolean;
     /**
-     * Checks if the specified document is included by the project.
+     * Checks if the specified document is included by the project:
+     * - if the document belongs to the project and is not excluded
+     * - if the document is included by the project
      */
     isIncluded(projectId: ProjectId, document: LangiumDocument | URI | string): boolean;
-    includedInProjects(document: LangiumDocument | URI | string): ProjectId[];
     /**
      * Checks if it is a config file and it is not excluded by default exclude pattern
      *

package/dist/workspace/ProjectsManager.js

@@ -1,11 +1,12 @@
+var _a;
 import { isLikeC4Config, normalizeIncludeConfig, validateProjectConfig, } from '@likec4/config';
-import { BiMap, invariant, memoizeProp, nonNullable } from '@likec4/core/utils';
+import { BiMap, DefaultMap, invariant, memoizeProp, nonNullable } from '@likec4/core/utils';
 import { wrapError } from '@likec4/log';
 import { deepEqual } from 'fast-equals';
 import { interruptAndCheck, URI, WorkspaceCache, } from 'langium';
 import picomatch from 'picomatch';
-import { filter, hasAtLeast, isNullish, map, pipe, prop, sortBy } from 'remeda';
-import { joinRelativeURL, parseFilename, withoutProtocol, withTrailingSlash, } from 'ufo';
+import { hasAtLeast, isNullish, map, pipe, prop, sortBy } from 'remeda';
+import { cleanDoubleSlashes, isRelative, joinRelativeURL, joinURL, parseFilename, withoutProtocol, withTrailingSlash, } from 'ufo';
 import { logger as mainLogger } from '../logger';
 const logger = mainLogger.getChild('ProjectsManager');
 function normalizeUri(uri) {
@@ -66,6 +67,23 @@ export class ProjectsManager {
      * This ensures that the most specific project is used for a document.
      */
     #projects = [];
+    /**
+     * This is a cached lookup for performance.
+     */
+    #lookupById = new DefaultMap((id) => {
+        if (id === _a.DefaultProjectId) {
+            const folderUri = this.getWorkspaceFolder();
+            return {
+                id,
+                config: DefaultProject.config,
+                folder: ProjectFolder(folderUri),
+                folderUri,
+                exclude: DefaultProject.exclude,
+                includeConfig: DefaultProject.includeConfig,
+            };
+        }
+        return nonNullable(this.#projects.find(p => p.id === id), `Project ${id} not found`);
+    });
     #excludedDocuments = new WeakMap();
     constructor(services) {
         this.services = services;
@@ -85,14 +103,14 @@ export class ProjectsManager {
         if (this.#projects.length > 1) {
             return undefined;
         }
-        return this.#projects[0]?.id ?? ProjectsManager.DefaultProjectId;
+        return this.#projects[0]?.id ?? _a.DefaultProjectId;
     }
     set defaultProjectId(id) {
         if (id === this.#defaultProjectId) {
             return;
         }
         this.#defaultProject = undefined;
-        if (!id || id === ProjectsManager.DefaultProjectId) {
+        if (!id || id === _a.DefaultProjectId) {
             logger.debug `reset default project ID`;
             this.#defaultProjectId = undefined;
             return;
@@ -103,7 +121,7 @@ export class ProjectsManager {
     }
     get default() {
         if (!this.#defaultProject) {
-            const id = this.defaultProjectId ?? ProjectsManager.DefaultProjectId;
+            const id = this.defaultProjectId ?? _a.DefaultProjectId;
             let project = this.#projects.find(p => p.id === id);
             if (!project) {
                 const folderUri = this.getWorkspaceFolder();
@@ -151,12 +169,12 @@ export class ProjectsManager {
                 // ignore - workspace not initialized
             }
             return {
-                id: ProjectsManager.DefaultProjectId,
+                id: _a.DefaultProjectId,
                 config: DefaultProject.config,
                 folderUri,
             };
         }
-        const project = nonNullable(this.#projects.find(p => p.id === id), `Project "${id}" not found`);
+        const project = nonNullable(this.#lookupById.get(id), `Project ${id} not found`);
         return {
             id,
             folderUri: project.folderUri,
@@ -170,8 +188,8 @@ export class ProjectsManager {
      * If there are multiple projects and default project is not set, throws an error
      */
     ensureProjectId(projectId) {
-        if (projectId === ProjectsManager.DefaultProjectId) {
-            return this.defaultProjectId ?? ProjectsManager.DefaultProjectId;
+        if (projectId === _a.DefaultProjectId) {
+            return this.defaultProjectId ?? _a.DefaultProjectId;
         }
         if (projectId) {
             invariant(this.#projectIdToFolder.has(projectId), `Project ID ${projectId} is not registered`);
@@ -196,7 +214,11 @@ export class ProjectsManager {
         if (typeof document === 'string' || URI.isUri(document)) {
             let docUriAsString = normalizeUri(document);
             const project = this.findProjectForDocument(docUriAsString);
-            return !!project.exclude && project.exclude(withoutProtocol(docUriAsString));
+            if (!project.exclude) {
+                return false;
+            }
+            const input = withoutProtocol(docUriAsString);
+            return project.exclude(input);
         }
         let isExcluded = this.#excludedDocuments.get(document);
         if (isExcluded === undefined) {
@@ -206,24 +228,23 @@ export class ProjectsManager {
         return isExcluded;
     }
     /**
-     * Checks if the specified document is included by the project.
+     * Checks if the specified document is included by the project:
+     * - if the document belongs to the project and is not excluded
+     * - if the document is included by the project
      */
     isIncluded(projectId, document) {
-        if (typeof document === 'string' || URI.isUri(document)) {
-            let project = this.#projects.find(p => p.id === projectId);
-            if (!project || !project.includePaths) {
-                return false;
-            }
-            return project.includePaths.some(isParentFolderFor(document));
+        if (typeof document !== 'string' && !URI.isUri(document)) {
+            return this.isIncluded(projectId, document.uri);
         }
-        return this.isIncluded(projectId, document.uri);
-    }
-    includedInProjects(document) {
-        if (typeof document === 'string' || URI.isUri(document)) {
-            let docUriAsString = normalizeUri(document);
-            return pipe(this.#projects, filter(p => !!p.includePaths && p.includePaths.some(isParentFolderFor(docUriAsString))), map(p => p.id));
+        const belongsTo = this.belongsTo(document);
+        if (belongsTo === projectId) {
+            return !this.isExcluded(document);
+        }
+        let includePaths = this.#lookupById.get(projectId)?.includePaths;
+        if (!includePaths) {
+            return false;
         }
-        return this.includedInProjects(document.uri);
+        return includePaths.some(isParentFolderFor(document));
     }
     /**
      * Checks if it is a config file and it is not excluded by default exclude pattern
@@ -320,7 +341,16 @@ export class ProjectsManager {
             project.exclude = DefaultProject.exclude;
         }
         else if (hasAtLeast(config.exclude, 1)) {
-            project.exclude = picomatch(config.exclude, { dot: true });
+            const patterns = map(config.exclude, p => {
+                if (!isRelative(p) && !p.startsWith('**')) {
+                    p = joinURL('**', p);
+                }
+                return cleanDoubleSlashes(joinRelativeURL(project.folderUri.path, p));
+            });
+            project.exclude = picomatch(patterns, {
+                contains: true,
+                dot: true,
+            });
         }
         // Resolve include paths relative to project folder
         if (project.includeConfig.paths && hasAtLeast(project.includeConfig.paths, 1)) {
@@ -367,6 +397,7 @@ export class ProjectsManager {
             delete project.includePaths;
         }
         this.#projectIdToFolder.set(project.id, folder);
+        this.#lookupById.clear();
         // Reset assigned project IDs if no projects reload is active
         if (mustReset && !this.#activeReload) {
             await this.rebuidProject(project.id, cancelToken).catch(error => {
@@ -435,6 +466,7 @@ export class ProjectsManager {
         }
         this.#projects = [];
         this.#projectIdToFolder.clear();
+        this.#lookupById.clear();
         for (const uri of configFiles) {
             if (cancelToken) {
                 await interruptAndCheck(cancelToken);
@@ -466,6 +498,7 @@ export class ProjectsManager {
         this.services.workspace.LangiumDocuments.resetProjectIds();
         this.documentBelongsTo.clear();
         this.mappingsToProject.clear();
+        this.#lookupById.clear();
         this.#excludedDocuments = new WeakMap();
     }
     async rebuidProject(projectId, cancelToken) {
@@ -569,3 +602,4 @@ export class ProjectsManager {
         }
     }
 }
+_a = ProjectsManager;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.46.3",
+  "version": "1.46.4",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -126,12 +126,12 @@
     "vscode-uri": "3.1.0",
     "which": "^5.0.0",
     "zod": "^3.25.76",
-    "@likec4/core": "1.46.3",
+    "@likec4/config": "1.46.4",
+    "@likec4/core": "1.46.4",
     "@likec4/devops": "1.42.0",
-    "@likec4/config": "1.46.3",
-    "@likec4/icons": "1.46.1",
-    "@likec4/layouts": "1.46.3",
+    "@likec4/icons": "1.46.4",
     "@likec4/log": "1.46.1",
+    "@likec4/layouts": "1.46.4",
     "@likec4/tsconfig": "1.46.1"
   },
   "scripts": {

package/lib/package.json

@@ -1,159 +0,0 @@
-{
-    "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"
-    }
-}