@likec4/language-server 1.43.0 → 1.45.0

package/dist/workspace/WorkspaceManager.js

@@ -0,0 +1,98 @@
+import { invariant } from '@likec4/core';
+import { DefaultWorkspaceManager } from 'langium';
+import { hasAtLeast } from 'remeda';
+import { URI } from 'vscode-uri';
+import * as BuiltIn from '../likec4lib';
+import { logger, logWarnError } from '../logger';
+export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
+    services;
+    documentFactory;
+    fileSystemProvider;
+    initialBuildOptions = {
+        eagerLinking: true,
+        validation: true,
+    };
+    constructor(services) {
+        super(services);
+        this.services = services;
+        this.documentFactory = services.workspace.LangiumDocumentFactory;
+        this.fileSystemProvider = services.workspace.FileSystemProvider;
+    }
+    /**
+     * First load all project config files, then load all documents in the workspace.
+     */
+    async performStartup(folders) {
+        this.folders ??= folders;
+        const configFiles = [];
+        for (const folder of folders) {
+            try {
+                const uri = URI.parse(folder.uri);
+                const found = await this.fileSystemProvider.scanProjectFiles(uri);
+                configFiles.push(...found);
+                this.services.workspace.FileSystemWatcher.watch(uri.fsPath);
+            }
+            catch (error) {
+                logWarnError(error);
+            }
+        }
+        // Project config files
+        const projects = this.services.workspace.ProjectsManager;
+        for (const entry of configFiles) {
+            try {
+                await projects.registerConfigFile(entry.uri);
+            }
+            catch (error) {
+                logWarnError(error);
+            }
+        }
+        return await super.performStartup(folders);
+    }
+    /**
+     * Load all additional documents that shall be visible in the context of the given workspace
+     * folders and add them to the collector. This can be used to include built-in libraries of
+     * your language, which can be either loaded from provided files or constructed in memory.
+     */
+    async loadAdditionalDocuments(folders, collector) {
+        collector(this.documentFactory.fromString(BuiltIn.Content, URI.parse(BuiltIn.Uri)));
+        await super.loadAdditionalDocuments(folders, collector);
+    }
+    /**
+     * Determine whether the given folder entry shall be included while indexing the workspace.
+     */
+    includeEntry(_workspaceFolder, entry, selector) {
+        if (this.services.workspace.ProjectsManager.isConfigFile(entry.uri)) {
+            return false;
+        }
+        if (entry.isFile) {
+            return !this.services.workspace.ProjectsManager.isExcluded(entry.uri);
+        }
+        return super.includeEntry(_workspaceFolder, entry, selector);
+    }
+    workspace() {
+        if (this.folders && hasAtLeast(this.folders, 1)) {
+            return this.folders[0];
+        }
+        return null;
+    }
+    async rebuildAll(cancelToken) {
+        if (!cancelToken) {
+            return await this.services.workspace.WorkspaceLock.write(async (ct) => {
+                await this.rebuildAll(ct);
+            });
+        }
+        const docs = this.services.workspace.LangiumDocuments.all.map(d => d.uri).toArray();
+        logger.info('invalidate and rebuild all {docs} documents', { docs: docs.length });
+        this.services.workspace.Cache.clear();
+        await this.documentBuilder.update(docs, [], cancelToken);
+    }
+    get workspaceUri() {
+        const workspace = this.workspace();
+        invariant(workspace, 'Workspace not initialized');
+        return URI.parse(workspace.uri);
+    }
+    get workspaceURL() {
+        const workspace = this.workspace();
+        invariant(workspace, 'Workspace not initialized');
+        return new URL(workspace.uri);
+    }
+}

package/dist/workspace/index.js

@@ -0,0 +1,5 @@
+export * from './AstNodeDescriptionProvider';
+export * from './IndexManager';
+export * from './LangiumDocuments';
+export * from './ProjectsManager';
+export * from './WorkspaceManager';

package/likec4lib/package.json

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.43.0",
+  "version": "1.45.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -34,39 +34,39 @@
       "sources": "./src/index.ts",
       "default": {
         "types": "./dist/index.d.ts",
-        "default": "./dist/index.mjs"
+        "default": "./dist/index.js"
       }
     },
     "./likec4lib": {
       "sources": "./src/likec4lib.ts",
       "default": {
         "types": "./dist/likec4lib.d.ts",
-        "import": "./dist/likec4lib.mjs",
-        "default": "./dist/likec4lib.mjs"
+        "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.mjs",
-        "default": "./dist/browser-worker.mjs"
+        "import": "./dist/browser-worker.js",
+        "default": "./dist/browser-worker.js"
       }
     },
     "./browser": {
       "sources": "./src/browser.ts",
       "default": {
         "types": "./dist/browser.d.ts",
-        "import": "./dist/browser.mjs",
-        "default": "./dist/browser.mjs"
+        "import": "./dist/browser.js",
+        "default": "./dist/browser.js"
       }
     },
     "./protocol": {
       "sources": "./src/protocol.ts",
       "default": {
         "types": "./dist/protocol.d.ts",
-        "import": "./dist/protocol.mjs",
-        "default": "./dist/protocol.mjs"
+        "import": "./dist/protocol.js",
+        "default": "./dist/protocol.js"
       }
     },
     "./bundled": "./dist/bundled.mjs"
@@ -76,15 +76,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@hpcc-js/wasm-graphviz": "1.12.0",
+    "@hpcc-js/wasm-graphviz": "1.15.0",
     "bundle-require": "^5.1.0",
-    "esbuild": "0.25.11"
+    "esbuild": "0.27.0"
   },
   "devDependencies": {
-    "@hono/node-server": "^1.19.5",
-    "@modelcontextprotocol/sdk": "^1.17.5",
+    "@hono/node-server": "^1.19.6",
+    "@modelcontextprotocol/sdk": "^1.20.1",
     "@msgpack/msgpack": "^3.1.2",
-    "@smithy/util-base64": "^4.0.0",
+    "@smithy/util-base64": "^4.3.0",
     "@types/natural-compare-lite": "^1.4.2",
     "@types/node": "~20.19.22",
     "@types/picomatch": "^4.0.2",
@@ -93,16 +93,18 @@
     "chokidar": "^4.0.3",
     "defu": "^6.1.4",
     "esm-env": "^1.2.2",
-    "fast-equals": "^5.3.2",
+    "fast-equals": "^5.3.3",
     "fdir": "6.4.0",
     "fetch-to-node": "^2.1.0",
-    "hono": "^4.10.1",
+    "hono": "^4.10.6",
+    "immer": "^10.2.0",
     "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.24.0",
+    "oxlint": "1.29.0",
     "p-debounce": "4.0.0",
     "p-queue": "8.1.1",
     "p-timeout": "6.1.4",
@@ -111,12 +113,12 @@
     "remeda": "^2.32.0",
     "strip-indent": "^4.1.1",
     "tsx": "4.20.6",
-    "turbo": "2.5.8",
+    "turbo": "2.6.1",
     "type-fest": "^4.41.0",
     "typescript": "5.9.3",
     "ufo": "1.6.1",
     "unbuild": "3.5.0",
-    "vitest": "3.2.4",
+    "vitest": "4.0.13",
     "vscode-jsonrpc": "8.2.1",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
@@ -124,13 +126,13 @@
     "vscode-uri": "3.1.0",
     "which": "^5.0.0",
     "zod": "^3.25.76",
-    "@likec4/core": "1.43.0",
-    "@likec4/config": "1.43.0",
-    "@likec4/icons": "1.43.0",
-    "@likec4/layouts": "1.43.0",
-    "@likec4/log": "1.43.0",
-    "@likec4/tsconfig": "1.43.0",
-    "@likec4/devops": "1.42.0"
+    "@likec4/config": "1.45.0",
+    "@likec4/core": "1.45.0",
+    "@likec4/devops": "1.42.0",
+    "@likec4/icons": "1.45.0",
+    "@likec4/layouts": "1.45.0",
+    "@likec4/log": "1.45.0",
+    "@likec4/tsconfig": "1.45.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",
@@ -151,5 +153,5 @@
     "test:watch": "vitest"
   },
   "types": "dist/index.d.ts",
-  "module": "dist/index.mjs"
+  "module": "dist/index.js"
 }

package/protocol/package.json

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

package/dist/LikeC4LanguageServices.mjs

@@ -1,197 +0,0 @@
-import {
-  nonexhaustive
-} from "@likec4/core";
-import { LikeC4Model } from "@likec4/core/model";
-import { loggable } from "@likec4/log";
-import { URI } from "langium";
-import { entries, hasAtLeast, indexBy, map, pipe, prop } from "remeda";
-import { DiagnosticSeverity } from "vscode-languageserver-types";
-import { isLikeC4LangiumDocument } from "./ast.mjs";
-import { logger as mainLogger, logWarnError } from "./logger.mjs";
-import { ProjectsManager } from "./workspace/index.mjs";
-const logger = mainLogger.getChild("LanguageServices");
-export class DefaultLikeC4LanguageServices {
-  constructor(services) {
-    this.services = services;
-    this.builder = services.likec4.ModelBuilder;
-    this.projectsManager = services.shared.workspace.ProjectsManager;
-  }
-  builder;
-  projectsManager;
-  get views() {
-    return this.services.likec4.Views;
-  }
-  get workspaceUri() {
-    return this.services.shared.workspace.WorkspaceManager.workspaceUri;
-  }
-  projects() {
-    const projectsManager = this.services.shared.workspace.ProjectsManager;
-    const projectsWithDocs = pipe(
-      this.services.shared.workspace.LangiumDocuments.groupedByProject(),
-      entries(),
-      map(([projectId, docs]) => {
-        const id = projectId;
-        const { folderUri: folderUri2, config: config2 } = projectsManager.getProject(id);
-        return {
-          id,
-          folder: folderUri2,
-          title: config2.title ?? config2.name,
-          documents: map(docs, prop("uri")),
-          config: config2
-        };
-      })
-    );
-    if (hasAtLeast(projectsWithDocs, 2) && projectsManager.defaultProjectId) {
-      const idx = projectsWithDocs.findIndex((p) => p.id === projectsManager.defaultProjectId);
-      if (idx > 0) {
-        const [defaultProject] = projectsWithDocs.splice(idx, 1);
-        return [defaultProject, ...projectsWithDocs];
-      }
-      return projectsWithDocs;
-    }
-    if (hasAtLeast(projectsWithDocs, 1)) {
-      return projectsWithDocs;
-    }
-    const { folderUri, config } = projectsManager.getProject(ProjectsManager.DefaultProjectId);
-    const documents = map(
-      this.services.shared.workspace.LangiumDocuments.projectDocuments(ProjectsManager.DefaultProjectId).toArray(),
-      prop("uri")
-    );
-    return [{
-      id: ProjectsManager.DefaultProjectId,
-      folder: folderUri,
-      title: config.title ?? config.name,
-      documents,
-      config
-    }];
-  }
-  project(projectId) {
-    projectId = this.projectsManager.ensureProjectId(projectId);
-    const projectsManager = this.services.shared.workspace.ProjectsManager;
-    const { folderUri, config } = projectsManager.getProject(projectId);
-    const documents = map(
-      this.services.shared.workspace.LangiumDocuments.projectDocuments(projectId).toArray(),
-      prop("uri")
-    );
-    return {
-      id: projectId,
-      folder: folderUri,
-      title: config.title ?? config.name,
-      documents,
-      config
-    };
-  }
-  /**
-   * Diagram is a computed view, layouted using Graphviz
-   * Used in React components
-   */
-  async diagrams() {
-    return await this.views.diagrams();
-  }
-  /**
-   * Builds LikeC4Model from all documents
-   * Only computes view predicates {@link ComputedView} - i.e. no layout
-   * Not ready for rendering, but enough to traverse
-   */
-  async computedModel(project) {
-    const projectId = this.projectsManager.ensureProjectId(project);
-    return await this.builder.buildLikeC4Model(projectId);
-  }
-  /**
-   * Same as {@link computedModel()}, but also applies layout
-   * Ready for rendering
-   */
-  async layoutedModel(project) {
-    const projectId = this.projectsManager.ensureProjectId(project);
-    const parsed = await this.builder.parseModel(projectId);
-    if (!parsed) {
-      throw new Error("Failed to parse model");
-    }
-    const diagrams = await this.views.diagrams(projectId);
-    return LikeC4Model.create({
-      ...parsed.$data,
-      _stage: "layouted",
-      views: indexBy(diagrams, prop("id"))
-    });
-  }
-  getErrors() {
-    const docs = this.services.shared.workspace.LangiumDocuments.allExcludingBuiltin.toArray();
-    return docs.flatMap((doc) => {
-      return (doc.diagnostics ?? []).filter((d) => d.severity === DiagnosticSeverity.Error).map(({ message, range }) => ({
-        message,
-        line: range.start.line,
-        range,
-        sourceFsPath: doc.uri.fsPath
-      }));
-    });
-  }
-  /**
-   * TODO Replace with watcher
-   */
-  async notifyUpdate({ changed, removed }) {
-    if (!changed && !removed) {
-      return false;
-    }
-    const _changed = changed ? URI.file(changed) : void 0;
-    const _removed = removed ? URI.file(removed) : void 0;
-    const pm = this.services.shared.workspace.ProjectsManager;
-    if (_changed && pm.isConfigFile(_changed) || _removed && pm.isConfigFile(_removed)) {
-      await pm.reloadProjects();
-      return true;
-    }
-    const mutex = this.services.shared.workspace.WorkspaceLock;
-    try {
-      let completed = false;
-      await mutex.write(async (token) => {
-        await this.services.shared.workspace.DocumentBuilder.update(
-          _changed ? [_changed] : [],
-          _removed ? [_removed] : [],
-          token
-        );
-        completed = !token.isCancellationRequested;
-      });
-      return completed;
-    } catch (e) {
-      logger.error(loggable(e));
-      return false;
-    }
-  }
-  locate(params) {
-    switch (true) {
-      case "element" in params:
-        return this.services.likec4.ModelLocator.locateElement(params.element, params.projectId);
-      case "relation" in params:
-        return this.services.likec4.ModelLocator.locateRelation(params.relation, params.projectId);
-      case "view" in params:
-        return this.services.likec4.ModelLocator.locateView(params.view, params.projectId);
-      case "deployment" in params:
-        return this.services.likec4.ModelLocator.locateDeploymentElement(
-          params.deployment,
-          params.projectId
-        );
-      default:
-        nonexhaustive(params);
-    }
-  }
-  /**
-   * Checks if the specified document should be excluded from processing.
-   */
-  isExcluded(doc) {
-    try {
-      return !isLikeC4LangiumDocument(doc) || this.services.shared.workspace.ProjectsManager.checkIfExcluded(doc);
-    } catch (e) {
-      logWarnError(e);
-      return false;
-    }
-  }
-  async dispose() {
-    logger.debug("disposing LikeC4LanguageServices");
-    await this.services.shared.workspace.FileSystemWatcher.dispose();
-    if (this.services.mcp.Server.isStarted) {
-      await this.services.mcp.Server.stop();
-    }
-    this.services.Rpc.dispose();
-    this.services.likec4.ModelBuilder.dispose();
-    logger.debug("LikeC4LanguageServices disposed");
-  }
-}