@likec4/language-server 1.38.0 → 1.39.0

package/dist/workspace/ProjectsManager.js

@@ -1,4 +1,5 @@
-import { BiMap, delay, invariant, memoizeProp, nonNullable } from "@likec4/core";
+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 {
@@ -10,23 +11,25 @@ import PQueue from "p-queue";
 import picomatch from "picomatch";
 import { hasAtLeast, isNullish, isTruthy, map, pickBy, pipe, prop, sortBy } from "remeda";
 import {
-  hasProtocol,
   joinRelativeURL,
-  normalizeURL,
   parseFilename,
   withoutProtocol,
-  withProtocol,
   withTrailingSlash
 } from "ufo";
-import { parseConfigJson, validateConfig } from "../config/index.js";
 import { logger as mainLogger } from "../logger.js";
 const logger = mainLogger.getChild("ProjectsManager");
-export function ProjectFolder(folder) {
-  if (URI.isUri(folder)) {
-    folder = folder.toString();
+function normalizeUri(uri) {
+  if (URI.isUri(uri)) {
+    return uri.toString();
+  } else if (typeof uri === "string") {
+    return uri.startsWith("file://") ? uri : URI.file(uri).toString();
+  } else {
+    return uri.uri.toString();
   }
-  folder = hasProtocol(folder) ? folder : withProtocol(folder, "file://");
-  return withTrailingSlash(normalizeURL(folder));
+}
+export function ProjectFolder(folder) {
+  folder = normalizeUri(folder);
+  return withTrailingSlash(folder);
 }
 export class ProjectsManager {
   constructor(services) {
@@ -38,11 +41,19 @@ export class ProjectsManager {
    * that are not part of a specific project.
    */
   static DefaultProjectId = "default";
-  static ConfigFileNames = [
-    ".likec4rc",
-    ".likec4.config.json",
-    "likec4.config.json"
-  ];
+  static DefaultProject = {
+    id: ProjectsManager.DefaultProjectId,
+    config: {
+      name: ProjectsManager.DefaultProjectId,
+      exclude: ["**/node_modules/**"]
+    },
+    exclude: picomatch("**/node_modules/**", { dot: true })
+  };
+  /**
+   * Configured default project ID.
+   * (it is used in CLI and Vite plugin)
+   */
+  #defaultProjectId = void 0;
   /**
    * The mapping between project config files and project IDs.
    */
@@ -54,36 +65,56 @@ export class ProjectsManager {
    */
   _projects = [];
   excludedDocuments = /* @__PURE__ */ new WeakMap();
-  defaultGlobalProject = {
-    id: ProjectsManager.DefaultProjectId,
-    config: {
-      name: ProjectsManager.DefaultProjectId,
-      exclude: ["**/node_modules/**"]
-    },
-    exclude: picomatch("**/node_modules/**", { dot: true })
-  };
+  get defaultGlobalProject() {
+    return ProjectsManager.DefaultProject;
+  }
   reloadProjectsLimiter = new PQueue({
     concurrency: 1,
     timeout: 2e4
   });
   /**
    * Returns:
+   *  - configured default project ID if set
    *  - the default project ID if there are no projects.
    *  - the ID of the only project
    *  - undefined if there are multiple projects.
    */
   get defaultProjectId() {
+    if (this.#defaultProjectId) {
+      return this.#defaultProjectId;
+    }
     if (this._projects.length > 1) {
       return void 0;
     }
     return this._projects[0]?.id ?? ProjectsManager.DefaultProjectId;
   }
+  set defaultProjectId(id) {
+    if (id === this.#defaultProjectId) {
+      return;
+    }
+    if (!id || id === ProjectsManager.DefaultProjectId) {
+      logger.debug`reset default project ID`;
+      this.#defaultProjectId = void 0;
+      return;
+    }
+    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)) {
-      return [
+      const ids = [
         ...map(this._projects, prop("id")),
         ProjectsManager.DefaultProjectId
       ];
+      if (this.#defaultProjectId) {
+        const idx = ids.findIndex((p) => p === this.#defaultProjectId);
+        if (idx > 0) {
+          const [defaultProject] = ids.splice(idx, 1);
+          return [defaultProject, ...ids];
+        }
+      }
+      return ids;
     }
     return [ProjectsManager.DefaultProjectId];
   }
@@ -113,6 +144,11 @@ export class ProjectsManager {
       config
     };
   }
+  /**
+   * Validates and ensures the project ID.
+   * If no project ID is specified, returns default project ID
+   * 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;
@@ -129,9 +165,12 @@ export class ProjectsManager {
   hasMultipleProjects() {
     return this._projects.length > 1;
   }
+  /**
+   * Checks if the specified document should be excluded from processing.
+   */
   checkIfExcluded(document) {
     if (typeof document === "string" || URI.isUri(document)) {
-      let docUriAsString = typeof document === "string" ? document : document.toString();
+      let docUriAsString = normalizeUri(document);
       const project = this.findProjectForDocument(docUriAsString);
       return project.exclude ? project.exclude(withoutProtocol(docUriAsString)) : false;
     }
@@ -149,7 +188,7 @@ export class ProjectsManager {
    */
   isConfigFile(entry) {
     const filename = parseFilename(entry.toString(), { strict: false })?.toLowerCase();
-    const isConfigFile = !!filename && ProjectsManager.ConfigFileNames.includes(filename);
+    const isConfigFile = !!filename && isLikeC4Config(filename);
     if (isConfigFile) {
       if (this.defaultGlobalProject.exclude(entry.path)) {
         logger.debug`exclude config file ${entry.path}`;
@@ -176,22 +215,25 @@ export class ProjectsManager {
 
 ${loggable(error)}`
         );
-        logger.error("Failed to register project at {uri}", { uri: entry.uri.toString(), error });
+        logger.warn("Failed to register project at {uri}", { uri: entry.uri.toString(), error });
         return void 0;
       }
     }
     return void 0;
   }
+  /**
+   * Registers (or reloads) likec4 project by config file or config object.
+   * If there is some project registered at same folder, it will be reloaded.
+   */
   async registerProject(opts) {
     if (URI.isUri(opts)) {
       const configFile = opts;
-      const cfg = await this.services.workspace.FileSystemProvider.readFile(configFile);
-      const config2 = parseConfigJson(cfg);
+      const config2 = 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 config = pickBy(validateConfig(opts.config), isTruthy);
+    const config = pickBy(validateProjectConfig(opts.config), isTruthy);
     const { folderUri } = opts;
     const folder = ProjectFolder(folderUri);
     let project = this._projects.find((p) => p.folder === folder);
@@ -244,14 +286,7 @@ ${loggable(error)}`
     return project;
   }
   belongsTo(document) {
-    let documentUri;
-    if (typeof document === "string") {
-      documentUri = hasProtocol(document) ? document : withProtocol(document, "file://");
-    } else if (URI.isUri(document)) {
-      documentUri = document.toString();
-    } else {
-      documentUri = document.uri.toString();
-    }
+    const documentUri = normalizeUri(document);
     return this.findProjectForDocument(documentUri).id;
   }
   async reloadProjects(token) {
@@ -282,7 +317,7 @@ ${loggable(error)}`
             }
           }
         } catch (error) {
-          logger.error("Failed to load config file", { error });
+          logger.error("Failed to scanProjectFiles, {folder}", { folder: folder.uri, error });
         }
       }
       if (configFiles.length === 0 && this._projects.length !== 0) {
@@ -292,15 +327,13 @@ ${loggable(error)}`
       this.projectIdToFolder.clear();
       for (const entry of configFiles) {
         try {
-          await this.registerProject(entry.uri);
+          await this.loadConfigFile(entry);
         } catch (error) {
-          logger.error("Failed to load config file", { error });
+          logger.error("Failed to load config file {uri}", { uri: entry.uri.toString(), error });
         }
       }
       this.resetProjectIds();
-      const docs = this.services.workspace.LangiumDocuments.all.map((d) => d.uri).toArray();
-      logger.info("invalidate and rebuild documents {docs}", { docs: docs.length });
-      await this.services.workspace.DocumentBuilder.update(docs, []);
+      await this.rebuidDocuments();
     });
   }
   uniqueProjectId(name) {
@@ -312,10 +345,18 @@ ${loggable(error)}`
     return id;
   }
   resetProjectIds() {
+    if (this.#defaultProjectId && !this.projectIdToFolder.has(this.#defaultProjectId)) {
+      this.#defaultProjectId = void 0;
+    }
     this.mappingsToProject.clear();
     this.excludedDocuments = /* @__PURE__ */ new WeakMap();
     this.services.workspace.LangiumDocuments.resetProjectIds();
   }
+  async rebuidDocuments() {
+    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, []);
+  }
   findProjectForDocument(documentUri) {
     return this.mappingsToProject.get(documentUri, () => {
       const project = this._projects.find(({ folder }) => documentUri.startsWith(folder));

package/dist/workspace/WorkspaceManager.js

@@ -1,8 +1,9 @@
-import { hasAtLeast, invariant } from "@likec4/core";
+import { invariant } from "@likec4/core";
 import { DefaultWorkspaceManager } from "langium";
+import { hasAtLeast } from "remeda";
 import { URI } from "vscode-uri";
 import * as BuiltIn from "../likec4lib.js";
-import { logError } from "../logger.js";
+import { logWarnError } from "../logger.js";
 export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
   constructor(services) {
     super(services);
@@ -29,7 +30,7 @@ export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
         configFiles.push(...found);
         this.services.workspace.FileSystemWatcher.watch(uri.fsPath);
       } catch (error) {
-        logError(error);
+        logWarnError(error);
       }
     }
     const projects = this.services.workspace.ProjectsManager;
@@ -37,7 +38,7 @@ export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
       try {
         await projects.loadConfigFile(entry);
       } catch (error) {
-        logError(error);
+        logWarnError(error);
       }
     }
     return await super.performStartup(folders);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.38.0",
+  "version": "1.39.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -20,7 +20,7 @@
     "directory": "packages/language-server"
   },
   "engines": {
-    "node": ">=20.19.3"
+    "node": ">=20.19.4"
   },
   "engineStrict": true,
   "type": "module",
@@ -42,14 +42,6 @@
         "default": "./dist/browser.js"
       }
     },
-    "./config": {
-      "sources": "./src/config/index.ts",
-      "default": {
-        "types": "./dist/config/index.d.ts",
-        "import": "./dist/config/index.js",
-        "default": "./dist/config/index.js"
-      }
-    },
     "./likec4lib": {
       "sources": "./src/likec4lib.ts",
       "default": {
@@ -89,26 +81,29 @@
     "access": "public"
   },
   "dependencies": {
-    "@hpcc-js/wasm-graphviz": "1.11.0"
+    "@hpcc-js/wasm-graphviz": "1.12.0",
+    "bundle-n-require": "^1.1.2",
+    "esbuild": "0.25.9"
   },
   "devDependencies": {
-    "@types/chroma-js": "^3.1.1",
-    "@types/natural-compare-lite": "^1.4.2",
-    "@types/vscode": "^1.84.0",
-    "@modelcontextprotocol/sdk": "^1.17.2",
+    "@hono/node-server": "^1.19.1",
+    "@modelcontextprotocol/sdk": "^1.17.4",
     "@msgpack/msgpack": "^3.1.2",
     "@smithy/util-base64": "^4.0.0",
-    "@hono/node-server": "^1.14.4",
-    "@types/node": "~20.19.2",
+    "@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",
-    "hono": "^4.9.0",
     "fast-equals": "^5.2.2",
     "fdir": "6.4.6",
+    "fetch-to-node": "^2.1.0",
+    "hono": "^4.9.6",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
     "langium": "3.5.0",
@@ -119,16 +114,14 @@
     "p-timeout": "6.1.4",
     "picomatch": "^4.0.3",
     "pretty-ms": "^9.2.0",
-    "fetch-to-node": "^2.1.0",
     "remeda": "^2.23.1",
     "strip-indent": "^4.0.0",
     "tsx": "4.20.3",
-    "turbo": "2.5.5",
+    "turbo": "2.5.6",
     "type-fest": "^4.41.0",
     "typescript": "5.9.2",
     "ufo": "1.6.1",
     "unbuild": "3.5.0",
-    "valibot": "^1.1.0",
     "vitest": "3.2.4",
     "vscode-jsonrpc": "8.2.1",
     "vscode-languageserver": "9.0.1",
@@ -136,18 +129,19 @@
     "vscode-languageserver-types": "3.17.5",
     "vscode-uri": "3.1.0",
     "which": "^5.0.0",
-    "zod": "3.25.67",
-    "@likec4/log": "1.38.0",
-    "@likec4/icons": "1.38.0",
-    "@likec4/core": "1.38.0",
-    "@likec4/tsconfig": "1.38.0",
-    "@likec4/layouts": "1.38.0"
+    "zod": "3.25.76",
+    "@likec4/core": "1.39.0",
+    "@likec4/config": "1.39.0",
+    "@likec4/layouts": "1.39.0",
+    "@likec4/log": "1.39.0",
+    "@likec4/icons": "1.39.0",
+    "@likec4/tsconfig": "1.39.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",
     "build": "unbuild",
     "pack": "pnpm pack",
-    "pregenerate": "rm -f src/generated/*",
+    "pregenerate": "rm -f src/generated/* || true",
     "watch:langium": "langium generate --watch",
     "watch:ts": "tsc --watch",
     "generate": "langium generate && tsx scripts/generate-icons.ts",

package/dist/config/index.d.ts

@@ -1 +0,0 @@
-export { parseConfigJson, ProjectConfig, validateConfig } from './schema';

package/dist/config/index.js

@@ -1 +0,0 @@
-export { parseConfigJson, ProjectConfig, validateConfig } from "./schema.js";

package/dist/config/schema.d.ts

@@ -1,10 +0,0 @@
-import * as v from 'valibot';
-export declare const ProjectConfig: v.ObjectSchema<{
-    readonly name: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.NonEmptyAction<string, "Project name cannot be empty">, v.ExcludesAction<string, "default", "Project name cannot be \"default\"">, v.ExcludesAction<string, ".", "Project name cannot contain \".\", try to use A-z, 0-9, _ and -">, v.ExcludesAction<string, "@", "Project name cannot contain \"@\", try to use A-z, 0-9, _ and -">, v.ExcludesAction<string, "#", "Project name cannot contain \"#\", try to use A-z, 0-9, _ and -">, v.DescriptionAction<string, "Project name, must be unique in the workspace">]>;
-    readonly title: v.OptionalSchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.NonEmptyAction<string, "Project title cannot be empty if specified">, v.DescriptionAction<string, "A human readable title for the project">]>, undefined>;
-    readonly contactPerson: v.OptionalSchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.NonEmptyAction<string, "Contact person cannot be empty if specified">, v.DescriptionAction<string, "A person who has been involved in creating or maintaining this project">]>, undefined>;
-    readonly exclude: v.OptionalSchema<v.SchemaWithPipe<readonly [v.ArraySchema<v.StringSchema<undefined>, undefined>, v.DescriptionAction<string[], "List of file patterns to exclude from the project, default is [\"**/node_modules/**\"]">]>, undefined>;
-}, undefined>;
-export type ProjectConfig = v.InferOutput<typeof ProjectConfig>;
-export declare function parseConfigJson(config: string): ProjectConfig;
-export declare function validateConfig(config: unknown): ProjectConfig;

package/dist/config/schema.js

@@ -1,39 +0,0 @@
-import JSON5 from "json5";
-import * as v from "valibot";
-export const ProjectConfig = v.object({
-  name: v.pipe(
-    v.string(),
-    v.nonEmpty("Project name cannot be empty"),
-    v.excludes("default", 'Project name cannot be "default"'),
-    v.excludes(".", 'Project name cannot contain ".", try to use A-z, 0-9, _ and -'),
-    v.excludes("@", 'Project name cannot contain "@", try to use A-z, 0-9, _ and -'),
-    v.excludes("#", 'Project name cannot contain "#", try to use A-z, 0-9, _ and -'),
-    v.description("Project name, must be unique in the workspace")
-  ),
-  title: v.optional(
-    v.pipe(
-      v.string(),
-      v.nonEmpty("Project title cannot be empty if specified"),
-      v.description("A human readable title for the project")
-    )
-  ),
-  contactPerson: v.optional(
-    v.pipe(
-      v.string(),
-      v.nonEmpty("Contact person cannot be empty if specified"),
-      v.description("A person who has been involved in creating or maintaining this project")
-    )
-  ),
-  exclude: v.optional(
-    v.pipe(
-      v.array(v.string()),
-      v.description('List of file patterns to exclude from the project, default is ["**/node_modules/**"]')
-    )
-  )
-});
-export function parseConfigJson(config) {
-  return validateConfig(JSON5.parse(config));
-}
-export function validateConfig(config) {
-  return v.parse(ProjectConfig, config);
-}