@likec4/language-server 1.41.0 → 1.42.1

package/dist/workspace/ProjectsManager.mjs

@@ -1,15 +1,16 @@
-import { isLikeC4Config, validateProjectConfig } from "@likec4/config";
+import {
+  isLikeC4Config,
+  validateProjectConfig
+} from "@likec4/config";
 import { BiMap, delay, invariant, memoizeProp, nonNullable } from "@likec4/core/utils";
-import { loggable } from "@likec4/log";
 import { deepEqual } from "fast-equals";
 import {
   interruptAndCheck,
   URI,
   WorkspaceCache
 } from "langium";
-import PQueue from "p-queue";
 import picomatch from "picomatch";
-import { hasAtLeast, isNullish, isTruthy, map, pickBy, pipe, prop, sortBy } from "remeda";
+import { hasAtLeast, isNullish, map, pipe, prop, sortBy } from "remeda";
 import {
   joinRelativeURL,
   parseFilename,
@@ -31,6 +32,14 @@ export function ProjectFolder(folder) {
   folder = normalizeUri(folder);
   return withTrailingSlash(folder);
 }
+const DefaultProject = {
+  id: "default",
+  config: {
+    name: "default",
+    exclude: ["**/node_modules/**"]
+  },
+  exclude: picomatch("**/node_modules/**", { dot: true })
+};
 export class ProjectsManager {
   constructor(services) {
     this.services = services;
@@ -40,15 +49,7 @@ export class ProjectsManager {
    * The global project ID used for all documents
    * that are not part of a specific project.
    */
-  static DefaultProjectId = "default";
-  static DefaultProject = {
-    id: ProjectsManager.DefaultProjectId,
-    config: {
-      name: ProjectsManager.DefaultProjectId,
-      exclude: ["**/node_modules/**"]
-    },
-    exclude: picomatch("**/node_modules/**", { dot: true })
-  };
+  static DefaultProjectId = DefaultProject.id;
   /**
    * Configured default project ID.
    * (it is used in CLI and Vite plugin)
@@ -57,21 +58,14 @@ export class ProjectsManager {
   /**
    * The mapping between project config files and project IDs.
    */
-  projectIdToFolder = new BiMap();
+  #projectIdToFolder = new BiMap();
   /**
    * Registered projects.
    * Sorted descending by the number of segments in the folder path.
    * This ensures that the most specific project is used for a document.
    */
-  _projects = [];
-  excludedDocuments = /* @__PURE__ */ new WeakMap();
-  get defaultGlobalProject() {
-    return ProjectsManager.DefaultProject;
-  }
-  reloadProjectsLimiter = new PQueue({
-    concurrency: 1,
-    timeout: 2e4
-  });
+  #projects = [];
+  #excludedDocuments = /* @__PURE__ */ new WeakMap();
   /**
    * Returns:
    *  - configured default project ID if set
@@ -83,10 +77,10 @@ export class ProjectsManager {
     if (this.#defaultProjectId) {
       return this.#defaultProjectId;
     }
-    if (this._projects.length > 1) {
+    if (this.#projects.length > 1) {
       return void 0;
     }
-    return this._projects[0]?.id ?? ProjectsManager.DefaultProjectId;
+    return this.#projects[0]?.id ?? ProjectsManager.DefaultProjectId;
   }
   set defaultProjectId(id) {
     if (id === this.#defaultProjectId) {
@@ -97,15 +91,15 @@ export class ProjectsManager {
       this.#defaultProjectId = void 0;
       return;
     }
-    invariant(this._projects.find((p) => p.id === id), `Project "${id}" not found`);
+    invariant(this.#projects.find((p) => p.id === id), `Project "${id}" not found`);
     logger.debug`set default project ID to ${id}`;
     this.#defaultProjectId = id;
   }
   get all() {
-    if (hasAtLeast(this._projects, 1)) {
+    if (hasAtLeast(this.#projects, 1)) {
       const ids = [
-        ...map(this._projects, prop("id")),
-        ProjectsManager.DefaultProjectId
+        ...map(this.#projects, prop("id")),
+        DefaultProject.id
       ];
       if (this.#defaultProjectId) {
         const idx = ids.findIndex((p) => p === this.#defaultProjectId);
@@ -116,11 +110,11 @@ export class ProjectsManager {
       }
       return ids;
     }
-    return [ProjectsManager.DefaultProjectId];
+    return [DefaultProject.id];
   }
   getProject(arg) {
     const id = typeof arg === "string" ? arg : arg.likec4ProjectId || this.belongsTo(arg);
-    if (id === ProjectsManager.DefaultProjectId) {
+    if (id === DefaultProject.id) {
       let folderUri2;
       try {
         folderUri2 = this.services.workspace.WorkspaceManager.workspaceUri;
@@ -130,14 +124,14 @@ export class ProjectsManager {
       }
       return {
         id: ProjectsManager.DefaultProjectId,
-        config: this.defaultGlobalProject.config,
+        config: DefaultProject.config,
         folderUri: folderUri2
       };
     }
     const {
       config,
       folderUri
-    } = nonNullable(this._projects.find((p) => p.id === id), `Project "${id}" not found`);
+    } = nonNullable(this.#projects.find((p) => p.id === id), `Project "${id}" not found`);
     return {
       id,
       folderUri,
@@ -154,16 +148,16 @@ export class ProjectsManager {
       return this.defaultProjectId ?? ProjectsManager.DefaultProjectId;
     }
     if (projectId) {
-      invariant(this.projectIdToFolder.has(projectId), `Project ID ${projectId} is not registered`);
+      invariant(this.#projectIdToFolder.has(projectId), `Project ID ${projectId} is not registered`);
       return projectId;
     }
     return nonNullable(
       this.defaultProjectId,
-      () => `Specify exact project, known: [${[...this.projectIdToFolder.keys()].join(", ")}]`
+      () => `Specify exact project, known: [${[...this.#projectIdToFolder.keys()].join(", ")}]`
     );
   }
   hasMultipleProjects() {
-    return this._projects.length > 1;
+    return this.#projects.length > 1;
   }
   /**
    * Checks if the specified document should be excluded from processing.
@@ -174,10 +168,10 @@ export class ProjectsManager {
       const project = this.findProjectForDocument(docUriAsString);
       return project.exclude ? project.exclude(withoutProtocol(docUriAsString)) : false;
     }
-    let isExcluded = this.excludedDocuments.get(document);
+    let isExcluded = this.#excludedDocuments.get(document);
     if (isExcluded === void 0) {
       isExcluded = this.checkIfExcluded(document.uri);
-      this.excludedDocuments.set(document, isExcluded);
+      this.#excludedDocuments.set(document, isExcluded);
     }
     return isExcluded;
   }
@@ -190,7 +184,7 @@ export class ProjectsManager {
     const filename = parseFilename(entry.toString(), { strict: false })?.toLowerCase();
     const isConfigFile = !!filename && isLikeC4Config(filename);
     if (isConfigFile) {
-      if (this.defaultGlobalProject.exclude(entry.path)) {
+      if (DefaultProject.exclude(entry.path)) {
         logger.debug`exclude config file ${entry.path}`;
         return false;
       }
@@ -202,20 +196,15 @@ export class ProjectsManager {
    *
    * @param entry The file system entry to check
    */
-  async loadConfigFile(entry) {
-    if (entry.isDirectory) {
-      return void 0;
-    }
-    if (this.isConfigFile(entry.uri)) {
+  async registerConfigFile(configFile) {
+    if (this.isConfigFile(configFile)) {
       try {
-        return await this.registerProject(entry.uri);
+        return await this.registerProject(configFile);
       } catch (error) {
         this.services.lsp.Connection?.window.showErrorMessage(
-          `LikeC4: Failed to register project at ${entry.uri.toString()}
-
-${loggable(error)}`
+          `LikeC4: Failed to register project at ${configFile.fsPath}`
         );
-        logger.warn("Failed to register project at {uri}", { uri: entry.uri.toString(), error });
+        logger.warn("Failed to register project at {uri}", { uri: configFile.fsPath, error });
         return void 0;
       }
     }
@@ -228,22 +217,28 @@ ${loggable(error)}`
   async registerProject(opts) {
     if (URI.isUri(opts)) {
       const configFile = opts;
-      const config2 = await this.services.workspace.FileSystemProvider.loadProjectConfig(configFile);
+      const config = await this.services.workspace.FileSystemProvider.loadProjectConfig(configFile);
       const path = joinRelativeURL(configFile.path, "..");
-      const folderUri2 = configFile.with({ path });
-      return await this.registerProject({ config: config2, folderUri: folderUri2 });
+      const folderUri = configFile.with({ path });
+      return this._registerProject({ config, folderUri });
     }
-    const config = pickBy(validateProjectConfig(opts.config), isTruthy);
-    const { folderUri } = opts;
-    const folder = ProjectFolder(folderUri);
-    let project = this._projects.find((p) => p.folder === folder);
+    return this._registerProject(opts);
+  }
+  /**
+   * Registers (or reloads) likec4 project by config file or config object.
+   * If there is some project registered at same folder, it will be reloaded.
+   */
+  _registerProject(opts) {
+    const config = validateProjectConfig(opts.config);
+    const folder = ProjectFolder(opts.folderUri);
+    let project = this.#projects.find((p) => p.folder === folder);
     if (project && deepEqual(project.config, config)) {
       return project;
     }
-    let mustReset = !!project && !deepEqual(project.config, config);
+    let mustReset = false;
     let id;
     if (!project) {
-      if (this.projectIdToFolder.has(config.name)) {
+      if (this.#projectIdToFolder.has(config.name)) {
         logger.warn`Project "${config.name}" already exists, generating unique ID`;
       }
       id = this.uniqueProjectId(config.name);
@@ -253,17 +248,18 @@ ${loggable(error)}`
         folder,
         folderUri: URI.parse(folder)
       };
-      mustReset = this._projects.some((p) => p.folder.startsWith(folder) || folder.startsWith(p.folder));
-      this._projects = pipe(
-        [...this._projects, project],
+      mustReset = this.#projects.some((p) => p.folder.startsWith(folder) || folder.startsWith(p.folder));
+      this.#projects = pipe(
+        [...this.#projects, project],
         sortBy(
           [({ folder: folder2 }) => withoutProtocol(folder2).split("/").length, "desc"]
         )
       );
       logger.info`register project ${project.id} folder: ${folder}`;
     } else {
+      mustReset = true;
       if (project.config.name !== config.name) {
-        this.projectIdToFolder.delete(project.id);
+        this.#projectIdToFolder.delete(project.id);
         logger.info`unregister project ${project.id} folder: ${folder}`;
         id = this.uniqueProjectId(config.name);
         project.id = id;
@@ -275,11 +271,11 @@ ${loggable(error)}`
       project.config = config;
     }
     if (isNullish(config.exclude)) {
-      project.exclude = this.defaultGlobalProject.exclude;
+      project.exclude = DefaultProject.exclude;
     } else if (hasAtLeast(config.exclude, 1)) {
       project.exclude = picomatch(config.exclude, { dot: true });
     }
-    this.projectIdToFolder.set(project.id, folder);
+    this.#projectIdToFolder.set(project.id, folder);
     if (mustReset) {
       this.resetProjectIds();
     }
@@ -289,24 +285,14 @@ ${loggable(error)}`
     const documentUri = normalizeUri(document);
     return this.findProjectForDocument(documentUri).id;
   }
-  async reloadProjects(token) {
+  async reloadProjects() {
     const folders = this.services.workspace.WorkspaceManager.workspaceFolders;
     if (!folders) {
       logger.warn("No workspace folders found");
       return;
     }
-    if (this.reloadProjectsLimiter.size + this.reloadProjectsLimiter.pending > 0) {
-      logger.debug`reload projects is already queued`;
-      return;
-    }
-    this.reloadProjectsLimiter.add(async () => {
-      await delay(100);
-    });
-    this.reloadProjectsLimiter.add(async () => {
-      if (token) {
-        await interruptAndCheck(token);
-      }
-      logger.debug`reload projects`;
+    logger.debug`schedule reload projects`;
+    await this.services.workspace.WorkspaceLock.write(async (cancelToken) => {
       const configFiles = [];
       for (const folder of folders) {
         try {
@@ -320,47 +306,50 @@ ${loggable(error)}`
           logger.error("Failed to scanProjectFiles, {folder}", { folder: folder.uri, error });
         }
       }
-      if (configFiles.length === 0 && this._projects.length !== 0) {
+      if (configFiles.length === 0 && this.#projects.length !== 0) {
         logger.warning("No config files found, but some projects were registered before");
       }
-      this._projects = [];
-      this.projectIdToFolder.clear();
+      await delay(150);
+      await interruptAndCheck(cancelToken);
+      logger.debug`start reload projects`;
+      this.#projects = [];
+      this.#projectIdToFolder.clear();
       for (const entry of configFiles) {
         try {
-          await this.loadConfigFile(entry);
+          await this.registerConfigFile(entry.uri);
         } catch (error) {
           logger.error("Failed to load config file {uri}", { uri: entry.uri.toString(), error });
         }
       }
       this.resetProjectIds();
-      await this.rebuidDocuments();
+      await this.rebuidDocuments(cancelToken);
     });
   }
   uniqueProjectId(name) {
     let id = name;
     let i = 1;
-    while (this.projectIdToFolder.has(id)) {
+    while (this.#projectIdToFolder.has(id)) {
       id = `${name}-${i++}`;
     }
     return id;
   }
   resetProjectIds() {
-    if (this.#defaultProjectId && !this.projectIdToFolder.has(this.#defaultProjectId)) {
+    if (this.#defaultProjectId && !this.#projectIdToFolder.has(this.#defaultProjectId)) {
       this.#defaultProjectId = void 0;
     }
     this.mappingsToProject.clear();
-    this.excludedDocuments = /* @__PURE__ */ new WeakMap();
+    this.#excludedDocuments = /* @__PURE__ */ new WeakMap();
     this.services.workspace.LangiumDocuments.resetProjectIds();
   }
-  async rebuidDocuments() {
+  async rebuidDocuments(cancelToken) {
     const docs = this.services.workspace.LangiumDocuments.all.map((d) => d.uri).toArray();
     logger.info("invalidate and rebuild all {docs} documents", { docs: docs.length });
-    await this.services.workspace.DocumentBuilder.update(docs, []);
+    await this.services.workspace.DocumentBuilder.update(docs, [], cancelToken);
   }
   findProjectForDocument(documentUri) {
     return this.mappingsToProject.get(documentUri, () => {
-      const project = this._projects.find(({ folder }) => documentUri.startsWith(folder));
-      return project ?? this.defaultGlobalProject;
+      const project = this.#projects.find(({ folder }) => documentUri.startsWith(folder));
+      return project ?? DefaultProject;
     });
   }
   // The mapping between document URIs and their corresponding project ID

package/dist/workspace/WorkspaceManager.mjs

@@ -36,7 +36,7 @@ export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
     const projects = this.services.workspace.ProjectsManager;
     for (const entry of configFiles) {
       try {
-        await projects.loadConfigFile(entry);
+        await projects.registerConfigFile(entry.uri);
       } catch (error) {
         logWarnError(error);
       }

package/likec4lib/package.json

@@ -0,0 +1,4 @@
+{
+  "types": "../dist/likec4lib.d.ts",
+  "module": "../dist/likec4lib.mjs"
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.41.0",
+  "version": "1.42.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -9,6 +9,7 @@
   "files": [
     "bin",
     "dist",
+    "**/package.json",
     "!**/__mocks__/",
     "!**/__tests__/",
     "!**/*.spec.*",
@@ -20,7 +21,7 @@
     "directory": "packages/language-server"
   },
   "engines": {
-    "node": ">=20.19.4"
+    "node": "^20.19.0 || >=22.18.0"
   },
   "engineStrict": true,
   "type": "module",
@@ -31,17 +32,9 @@
   "exports": {
     ".": {
       "sources": "./src/index.ts",
-      "node": {
-        "sources": "./src/index.ts",
+      "default": {
         "types": "./dist/index.d.ts",
-        "import": "./dist/index.mjs",
         "default": "./dist/index.mjs"
-      },
-      "default": {
-        "sources": "./src/browser.ts",
-        "types": "./dist/browser.d.ts",
-        "import": "./dist/browser.mjs",
-        "default": "./dist/browser.mjs"
       }
     },
     "./likec4lib": {
@@ -88,38 +81,37 @@
     "esbuild": "0.25.9"
   },
   "devDependencies": {
-    "@hono/node-server": "^1.19.1",
+    "@hono/node-server": "^1.19.3",
     "@modelcontextprotocol/sdk": "^1.17.5",
     "@msgpack/msgpack": "^3.1.2",
     "@smithy/util-base64": "^4.0.0",
-    "@types/chroma-js": "^3.1.1",
     "@types/natural-compare-lite": "^1.4.2",
     "@types/node": "~20.19.11",
     "@types/picomatch": "^4.0.2",
     "@types/vscode": "^1.84.0",
     "@types/which": "^3.0.4",
     "chokidar": "^4.0.3",
-    "chroma-js": "^3.1.2",
     "defu": "^6.1.4",
     "esm-env": "^1.2.2",
     "fast-equals": "^5.2.2",
     "fdir": "6.4.0",
     "fetch-to-node": "^2.1.0",
-    "hono": "^4.9.6",
+    "hono": "^4.9.8",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
     "langium": "3.5.0",
     "langium-cli": "3.5.2",
     "natural-compare-lite": "^1.4.0",
+    "oxlint": "1.18.0",
     "p-debounce": "4.0.0",
     "p-queue": "8.1.1",
     "p-timeout": "6.1.4",
     "picomatch": "^4.0.3",
     "pretty-ms": "^9.2.0",
-    "remeda": "^2.30.0",
+    "remeda": "^2.31.1",
     "strip-indent": "^4.0.0",
-    "tsx": "4.20.5",
-    "turbo": "2.5.6",
+    "tsx": "4.20.6",
+    "turbo": "2.5.8",
     "type-fest": "^4.41.0",
     "typescript": "5.9.2",
     "ufo": "1.6.1",
@@ -131,13 +123,14 @@
     "vscode-languageserver-types": "3.17.5",
     "vscode-uri": "3.1.0",
     "which": "^5.0.0",
-    "zod": "3.25.76",
-    "@likec4/core": "1.41.0",
-    "@likec4/config": "1.41.0",
-    "@likec4/layouts": "1.41.0",
-    "@likec4/log": "1.41.0",
-    "@likec4/icons": "1.41.0",
-    "@likec4/tsconfig": "1.41.0"
+    "zod": "^3.25.76",
+    "@likec4/core": "1.42.1",
+    "@likec4/config": "1.42.1",
+    "@likec4/icons": "1.42.1",
+    "@likec4/log": "1.42.1",
+    "@likec4/layouts": "1.42.1",
+    "@likec4/tsconfig": "1.42.1",
+    "@likec4/devops": "1.42.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",
@@ -148,12 +141,15 @@
     "watch:ts": "tsc --watch",
     "generate": "langium generate && tsx scripts/generate-icons.ts",
     "dev": "run-p \"watch:*\"",
-    "lint": "run -T eslint src/ --fix",
+    "lint": "oxlint --type-aware",
+    "lint:fix": "oxlint --type-aware --fix",
     "lint:package": "pnpx publint ./package.tgz",
-    "clean": "pnpm rimraf dist contrib lib src/generated src/generated-lib",
+    "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"
-  }
+  },
+  "types": "dist/index.d.ts",
+  "module": "dist/index.mjs"
 }

package/protocol/package.json

@@ -0,0 +1,4 @@
+{
+  "types": "../dist/protocol.d.ts",
+  "module": "../dist/protocol.mjs"
+}

package/dist/view-utils/resolve-relative-paths.d.ts

@@ -1,2 +0,0 @@
-import type { LikeC4View } from '@likec4/core';
-export declare function resolveRelativePaths(views: LikeC4View[]): LikeC4View[];

package/dist/view-utils/resolve-relative-paths.mjs

@@ -1,78 +0,0 @@
-import { compareNatural, invariant } from "@likec4/core/utils";
-import { filter, hasAtLeast, isTruthy, map, pipe, unique } from "remeda";
-import { parsePath } from "ufo";
-function commonAncestorPath(views, sep = "/") {
-  const uniqURIs = pipe(
-    views,
-    map((v) => v.docUri),
-    filter(isTruthy),
-    unique()
-  );
-  if (uniqURIs.length === 0) return "";
-  if (uniqURIs.length === 1) {
-    const parts2 = parsePath(uniqURIs[0]).pathname.split(sep);
-    if (parts2.length <= 1) return sep;
-    parts2.pop();
-    return parts2.join(sep) + sep;
-  }
-  invariant(hasAtLeast(uniqURIs, 2), "Expected at least 2 unique URIs");
-  const [baseUri, ...tail] = uniqURIs;
-  const parts = parsePath(baseUri).pathname.split(sep);
-  let endOfPrefix = parts.length;
-  for (const uri of tail) {
-    if (uri === baseUri) {
-      continue;
-    }
-    const compare = parsePath(uri).pathname.split(sep);
-    for (let i = 0; i < endOfPrefix; i++) {
-      if (compare[i] !== parts[i]) {
-        endOfPrefix = i;
-      }
-    }
-    if (endOfPrefix === 0) return "";
-  }
-  const prefix = parts.slice(0, endOfPrefix).join(sep);
-  return prefix.endsWith(sep) ? prefix : prefix + sep;
-}
-export function resolveRelativePaths(views) {
-  const sep = "/";
-  const commonPrefix = commonAncestorPath(views, sep);
-  return views.map((view) => {
-    if (!view.docUri) {
-      return {
-        view,
-        parts: []
-      };
-    }
-    let path = parsePath(view.docUri).pathname;
-    if (commonPrefix.length > 0) {
-      invariant(
-        path.startsWith(commonPrefix),
-        `Expect path "${path}" to start with common prefix: "${commonPrefix}"`
-      );
-      path = path.slice(commonPrefix.length);
-    } else {
-      path = path.includes(sep) ? path.slice(path.lastIndexOf(sep) + 1) : path;
-    }
-    return {
-      view,
-      parts: path.split(sep)
-    };
-  }).sort((a, b) => {
-    if (a.parts.length !== b.parts.length) {
-      return a.parts.length - b.parts.length;
-    }
-    for (let i = 0; i < a.parts.length; i++) {
-      const compare = compareNatural(a.parts[i], b.parts[i]);
-      if (compare !== 0) {
-        return compare;
-      }
-    }
-    return 0;
-  }).map(({ parts, view }) => {
-    return {
-      ...view,
-      relativePath: parts.join(sep)
-    };
-  });
-}