@likec4/language-server 1.47.0 → 1.49.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.47.0",
+  "version": "1.49.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -21,9 +21,8 @@
     "directory": "packages/language-server"
   },
   "engines": {
-    "node": ">=22.21.1"
+    "node": ">=22.22.0"
   },
-  "engineStrict": true,
   "type": "module",
   "sideEffects": false,
   "bin": {
@@ -32,114 +31,178 @@
   "exports": {
     ".": {
       "sources": "./src/index.ts",
+      "browser": {
+        "sources": "./src/browser/index.ts",
+        "default": {
+          "types": "./dist/browser/index.d.mts",
+          "import": "./dist/browser/index.mjs",
+          "default": "./dist/browser/index.mjs"
+        }
+      },
+      "node": {
+        "sources": "./src/index.ts",
+        "default": {
+          "types": "./dist/index.d.mts",
+          "import": "./dist/index.mjs",
+          "default": "./dist/index.mjs"
+        }
+      },
       "default": {
-        "types": "./dist/index.d.ts",
-        "import": "./dist/index.js",
-        "default": "./dist/index.js"
+        "types": "./dist/index.d.mts",
+        "import": "./dist/index.mjs",
+        "default": "./dist/index.mjs"
+      }
+    },
+    "./bundled": {
+      "sources": "./src/bundled.ts",
+      "default": {
+        "types": "./dist/bundled.d.mts",
+        "import": "./dist/bundled.mjs",
+        "default": "./dist/bundled.mjs"
       }
     },
     "./likec4lib": {
       "sources": "./src/likec4lib.ts",
       "default": {
-        "types": "./dist/likec4lib.d.ts",
-        "import": "./dist/likec4lib.js",
-        "default": "./dist/likec4lib.js"
+        "types": "./dist/likec4lib.d.mts",
+        "import": "./dist/likec4lib.mjs",
+        "default": "./dist/likec4lib.mjs"
       }
     },
     "./browser-worker": {
-      "sources": "./src/browser-worker.ts",
+      "sources": "./src/browser/worker.ts",
       "default": {
-        "types": "./dist/browser-worker.d.ts",
-        "import": "./dist/browser-worker.js",
-        "default": "./dist/browser-worker.js"
+        "types": "./dist/browser/worker.d.mts",
+        "import": "./dist/browser/worker.mjs",
+        "default": "./dist/browser/worker.mjs"
       }
     },
     "./browser": {
-      "sources": "./src/browser.ts",
+      "sources": "./src/browser/index.ts",
       "default": {
-        "types": "./dist/browser.d.ts",
-        "import": "./dist/browser.js",
-        "default": "./dist/browser.js"
+        "types": "./dist/browser/index.d.mts",
+        "import": "./dist/browser/index.mjs",
+        "default": "./dist/browser/index.mjs"
       }
     },
     "./protocol": {
       "sources": "./src/protocol.ts",
       "default": {
-        "types": "./dist/protocol.d.ts",
-        "import": "./dist/protocol.js",
-        "default": "./dist/protocol.js"
+        "types": "./dist/protocol.d.mts",
+        "import": "./dist/protocol.mjs",
+        "default": "./dist/protocol.mjs"
+      }
+    },
+    "./mcp": {
+      "sources": "./src/mcp/index.ts",
+      "default": {
+        "types": "./dist/mcp/index.d.mts",
+        "import": "./dist/mcp/index.mjs",
+        "default": "./dist/mcp/index.mjs"
+      }
+    },
+    "./module": {
+      "sources": "./src/module.ts",
+      "default": {
+        "types": "./dist/module.d.mts",
+        "import": "./dist/module.mjs",
+        "default": "./dist/module.mjs"
+      }
+    },
+    "./filesystem": {
+      "sources": "./src/filesystem/index.ts",
+      "default": {
+        "types": "./dist/filesystem/index.d.mts",
+        "import": "./dist/filesystem/index.mjs",
+        "default": "./dist/filesystem/index.mjs"
       }
     },
-    "./bundled": "./dist/bundled.mjs"
+    "./package.json": "./package.json"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public"
   },
   "dependencies": {
-    "@hpcc-js/wasm-graphviz": "1.17.0",
+    "@hono/mcp": "^0.2.3",
+    "@hono/node-server": "^1.19.9",
+    "hono": "^4.11.9",
+    "@hpcc-js/wasm-graphviz": "1.21.0",
+    "@smithy/util-base64": "^4.3.0",
+    "chokidar": "^5.0.0",
+    "defu": "^6.1.4",
+    "fdir": "6.4.0",
+    "immer": "^11.1.3",
+    "json5": "^2.2.3",
+    "langium": "3.5.0",
+    "nano-spawn": "^2.0.0",
+    "std-env": "^3.10.0",
+    "type-fest": "^4.41.0",
+    "vscode-jsonrpc": "8.2.1",
+    "vscode-languageserver": "9.0.1",
+    "vscode-languageserver-protocol": "3.17.5",
+    "vscode-languageserver-textdocument": "1.0.11",
+    "vscode-languageserver-types": "3.17.5",
+    "vscode-uri": "3.1.0",
+    "which": "^5.0.0",
+    "zod": "^3.25.76",
+    "@likec4/config": "1.49.0",
+    "@likec4/layouts": "1.49.0",
+    "@likec4/core": "1.49.0",
+    "@likec4/log": "1.49.0"
+  },
+  "peerDependencies": {
+    "@modelcontextprotocol/sdk": "^1.26.0",
     "bundle-require": "^5.1.0",
-    "esbuild": "0.27.2"
+    "esbuild": "0.27.3"
+  },
+  "peerDependenciesMeta": {
+    "esbuild": {
+      "optional": true
+    },
+    "bundle-require": {
+      "optional": true
+    },
+    "@modelcontextprotocol/sdk": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "@hono/node-server": "^1.19.7",
-    "@modelcontextprotocol/sdk": "^1.25.1",
+    "@modelcontextprotocol/sdk": "^1.26.0",
     "@msgpack/msgpack": "^3.1.2",
-    "@smithy/util-base64": "^4.3.0",
     "@types/natural-compare-lite": "^1.4.2",
-    "@types/node": "~22.19.3",
+    "@types/node": "~22.19.10",
     "@types/picomatch": "^4.0.2",
     "@types/vscode": "^1.106.1",
     "@types/which": "^3.0.4",
-    "chokidar": "^5.0.0",
-    "defu": "^6.1.4",
-    "esm-env": "^1.2.2",
+    "bundle-require": "^5.1.0",
+    "esbuild": "0.27.3",
     "fast-equals": "^6.0.0",
-    "fdir": "6.4.0",
-    "hono": "^4.11.1",
-    "immer": "^11.1.0",
     "indent-string": "^5.0.0",
-    "json5": "^2.2.3",
-    "langium": "3.5.0",
     "langium-cli": "3.5.2",
-    "nano-spawn": "^2.0.0",
-    "nanoid": "5.1.6",
-    "natural-compare-lite": "^1.4.0",
-    "oxlint": "1.35.0",
+    "obuild": "^0.4.27",
+    "oxlint": "1.43.0",
     "p-debounce": "5.1.0",
     "p-queue": "8.1.1",
     "p-timeout": "6.1.4",
     "picomatch": "^4.0.3",
     "pretty-ms": "^9.3.0",
-    "remeda": "^2.32.0",
+    "remeda": "^2.33.5",
     "strip-indent": "^4.1.1",
     "tsx": "4.21.0",
-    "turbo": "2.7.2",
-    "type-fest": "^4.41.0",
+    "turbo": "2.8.3",
     "typescript": "5.9.3",
-    "ufo": "1.6.1",
-    "unbuild": "3.5.0",
-    "vitest": "4.0.16",
-    "vscode-jsonrpc": "8.2.1",
-    "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.25.76",
-    "@likec4/config": "1.47.0",
-    "@likec4/core": "1.47.0",
-    "@likec4/icons": "1.46.4",
+    "ufo": "1.6.3",
+    "vitest": "4.0.18",
     "@likec4/devops": "1.42.0",
-    "@likec4/layouts": "1.47.0",
-    "@likec4/tsconfig": "1.46.1",
-    "@likec4/log": "1.46.1"
+    "@likec4/tsconfig": "1.49.0",
+    "@likec4/icons": "1.46.4"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",
-    "build": "unbuild",
+    "build": "obuild",
     "pack": "pnpm pack",
-    "pregenerate": "rm -f src/generated/* || true",
+    "pregenerate": "node -e \"const fs=require('fs');const p=require('path');const d='src/generated';if(fs.existsSync(d)){fs.readdirSync(d).forEach(f=>{try{fs.unlinkSync(p.join(d,f))}catch(e){}})}\"",
     "watch:langium": "langium generate --watch",
     "watch:ts": "tsc --watch",
     "generate": "langium generate && tsx scripts/generate-icons.ts",
@@ -153,6 +216,9 @@
     "vitest:ui": "vitest --no-isolate --ui",
     "test:watch": "vitest"
   },
-  "types": "dist/index.d.ts",
-  "module": "dist/index.js"
+  "types": "dist/index.d.mts",
+  "module": "dist/index.mjs",
+  "browser": {
+    "dist/index.mjs": "dist/browser/index.mjs"
+  }
 }

package/protocol/package.json

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

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023-2025 Denis Davydkov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/LikeC4LanguageServices.d.ts

@@ -1,115 +0,0 @@
-import type { LikeC4ProjectConfig } from '@likec4/config';
-import { type LayoutedView, type NonEmptyArray, type ProjectId, type UnknownComputed, type UnknownLayouted } from '@likec4/core';
-import { type LayoutedProjectsView } from '@likec4/core/compute-view';
-import { LikeC4Model } from '@likec4/core/model';
-import { URI } from 'langium';
-import type { CancellationToken } from 'vscode-jsonrpc';
-import type { Range } from 'vscode-languageserver-types';
-import type { LikeC4ModelBuilder } from './model';
-import type { LikeC4ModelChanges } from './model-change/ModelChanges';
-import type { LikeC4Services } from './module';
-import type { Locate } from './protocol';
-import type { LikeC4Views } from './views/LikeC4Views';
-import { ProjectsManager } from './workspace';
-export interface LikeC4LanguageServices {
-    readonly views: LikeC4Views;
-    readonly builder: LikeC4ModelBuilder;
-    readonly workspaceUri: URI;
-    readonly projectsManager: ProjectsManager;
-    readonly editor: LikeC4ModelChanges;
-    /**
-     * Returns all projects with relevant documents
-     */
-    projects(): NonEmptyArray<{
-        id: ProjectId;
-        folder: URI;
-        title: string;
-        documents: ReadonlyArray<URI>;
-        config: Readonly<LikeC4ProjectConfig>;
-    }>;
-    /**
-     * Returns project by ID, returns default project if no ID is specified
-     */
-    project(projectId?: ProjectId): {
-        id: ProjectId;
-        folder: URI;
-        title: string;
-        documents: ReadonlyArray<URI>;
-        config: Readonly<LikeC4ProjectConfig>;
-    };
-    /**
-     * Computes and layouts projects overview - a special diagram
-     * that shows all projects and their relationships
-     */
-    projectsOverview(cancelToken?: CancellationToken): Promise<LayoutedProjectsView>;
-    /**
-     * Returns {@link LikeC4Model} of the specified project, with computed views {@link ComputedView}
-     * Not ready for rendering, but enough to traverse model. Much faster than {@link layoutedModel}
-     *
-     * If no {@link project} is specified, returns for default project
-     */
-    computedModel(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownComputed>>;
-    /**
-     * Returns {@link LikeC4Model} of the specified project, with layouted views {@link LayoutedView}
-     * Ready for rendering. Applies manual layouts if available.
-     *
-     * If no {@link project} is specified, returns for default project
-     */
-    layoutedModel(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownLayouted>>;
-    /**
-     * Returns diagrams (i.e. layouted views {@link LayoutedView}) for the specified project
-     * Applies manual layouts if available.
-     *
-     * If no {@link project} is specified, returns diagrams for default project
-     */
-    diagrams(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LayoutedView[]>;
-    getErrors(): Array<{
-        message: string;
-        line: number;
-        range: Range;
-        sourceFsPath: string;
-    }>;
-    /**
-     * Returns the location of the specified element, relation, view or deployment element
-     */
-    locate(params: Locate.Params): Locate.Res;
-    dispose(): Promise<void>;
-}
-/**
- * Public Language Services
- */
-export declare class DefaultLikeC4LanguageServices implements LikeC4LanguageServices {
-    private services;
-    readonly builder: LikeC4ModelBuilder;
-    readonly editor: LikeC4ModelChanges;
-    readonly projectsManager: ProjectsManager;
-    constructor(services: LikeC4Services);
-    get views(): LikeC4Views;
-    get workspaceUri(): URI;
-    projects(): NonEmptyArray<{
-        id: ProjectId;
-        folder: URI;
-        title: string;
-        documents: ReadonlyArray<URI>;
-        config: LikeC4ProjectConfig;
-    }>;
-    project(projectId?: ProjectId): {
-        id: ProjectId;
-        folder: URI;
-        title: string;
-        documents: ReadonlyArray<URI>;
-        config: LikeC4ProjectConfig;
-    };
-    diagrams(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LayoutedView<UnknownLayouted>[]>;
-    computedModel(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownComputed>>;
-    layoutedModel(project?: ProjectId | undefined, cancelToken?: CancellationToken): Promise<LikeC4Model<UnknownLayouted>>;
-    projectsOverview(cancelToken?: CancellationToken): Promise<LayoutedProjectsView>;
-    getErrors(): Array<{
-        message: string;
-        line: number;
-        range: Range;
-        sourceFsPath: string;
-    }>;
-    locate(params: Locate.Params): Locate.Res;
-    dispose(): Promise<void>;
-}

package/dist/LikeC4LanguageServices.js

@@ -1,164 +0,0 @@
-import { nonexhaustive, } from '@likec4/core';
-import { computeProjectsView } from '@likec4/core/compute-view';
-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 { logger as mainLogger } from './logger';
-import { ProjectsManager } from './workspace';
-const logger = mainLogger.getChild('LanguageServices');
-/**
- * Public Language Services
- */
-export class DefaultLikeC4LanguageServices {
-    services;
-    builder;
-    editor;
-    projectsManager;
-    constructor(services) {
-        this.services = services;
-        this.builder = services.likec4.ModelBuilder;
-        this.projectsManager = services.shared.workspace.ProjectsManager;
-        this.editor = services.likec4.ModelChanges;
-    }
-    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, config } = projectsManager.getProject(id);
-            return {
-                id,
-                folder: folderUri,
-                title: config.title ?? config.name,
-                documents: map(docs, prop('uri')),
-                config,
-            };
-        }));
-        // if there are multiple projects and default project is set, ensure it is first
-        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,
-        };
-    }
-    async diagrams(project, cancelToken) {
-        const projectId = this.projectsManager.ensureProjectId(project);
-        return await this.views.diagrams(projectId, cancelToken);
-    }
-    async computedModel(project, cancelToken) {
-        const projectId = this.projectsManager.ensureProjectId(project);
-        return await this.builder.computeModel(projectId, cancelToken);
-    }
-    async layoutedModel(project, cancelToken) {
-        const projectId = this.projectsManager.ensureProjectId(project);
-        const model = await this.builder.computeModel(projectId, cancelToken);
-        if (!model) {
-            throw new Error('Failed to compute model, empty project?');
-        }
-        const layouted = await this.views.layoutAllViews(projectId, cancelToken);
-        return LikeC4Model.create({
-            ...model.$data,
-            _stage: 'layouted',
-            views: pipe(layouted, map(prop('diagram')), indexBy(prop('id'))),
-        });
-    }
-    async projectsOverview(cancelToken) {
-        const allProjects = this.services.shared.workspace.ProjectsManager.all;
-        const models = [];
-        for (const project of allProjects) {
-            const model = await this.builder.computeModel(project, cancelToken);
-            if (cancelToken?.isCancellationRequested) {
-                throw new Error('Operation cancelled');
-            }
-            if (model === LikeC4Model.EMPTY) {
-                logger.debug(`Project ${project} is empty, skipping`);
-                continue;
-            }
-            models.push(model);
-        }
-        if (!hasAtLeast(models, 1)) {
-            throw new Error('No models found');
-        }
-        const projectsView = computeProjectsView(models);
-        return await this.views.layouter.layoutProjectsView(projectsView);
-    }
-    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,
-            }));
-        });
-    }
-    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);
-        }
-    }
-    async dispose() {
-        try {
-            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();
-        }
-        catch (e) {
-            logger.error(loggable(e));
-        }
-        finally {
-            logger.debug('LikeC4LanguageServices disposed');
-        }
-    }
-}

package/dist/Rpc.d.ts

@@ -1,9 +0,0 @@
-import type { LikeC4Services } from './module';
-import { DidRequestOpenViewNotification } from './protocol';
-import { ADisposable } from './utils';
-export declare class Rpc extends ADisposable {
-    private services;
-    constructor(services: LikeC4Services);
-    init(): void;
-    openView(params: DidRequestOpenViewNotification.Params): Promise<void>;
-}