@likec4/language-services 1.52.0 → 1.54.0

package/dist/_chunks/configureLogger.mjs

@@ -1,7 +1,7 @@
 import { configureLanguageServerLogger } from "@likec4/language-server";
 import { isColorSupported } from "std-env";
 function configureLogger(options) {
-	const opt = options?.configureLogger ?? "console";
+	const opt = options?.configureLogger ?? false;
 	if (opt === false) return;
 	if (opt === "stderr" || options?.mcp === "stdio") {
 		configureLanguageServerLogger({

package/dist/_chunks/createFromSources.mjs

@@ -3,8 +3,10 @@ import { extname } from "pathe";
 import k from "tinyrainbow";
 import { LikeC4ProjectConfigOps, isLikeC4JsonConfig } from "@likec4/config";
 import { URI, UriUtils } from "langium";
-import { entries, map, partition, pipe, prop } from "remeda";
-import { DiagnosticSeverity } from "vscode-languageserver-types";
+import { entries, flatMap, hasAtLeast, join, map, partition, pipe, prop } from "remeda";
+const isErrorDiagnostic = (diagnostic) => {
+	return diagnostic.severity === 1;
+};
 var LikeC4 = class {
 	langium;
 	logger;
@@ -97,8 +99,8 @@ Please specify a project folder`);
 		return await this.languageServices.layoutedModel(projectId);
 	}
 	getErrors() {
-		return this.LangiumDocuments.all.toArray().flatMap((doc) => {
-			return (doc.diagnostics ?? []).filter((d) => d.severity === DiagnosticSeverity.Error).map(({ message, range }) => ({
+		return [...this.LangiumDocuments.userDocuments].flatMap((doc) => {
+			return (doc.diagnostics?.filter(isErrorDiagnostic) ?? []).map(({ message, range }) => ({
 				message,
 				line: range.start.line,
 				range,
@@ -107,8 +109,8 @@ Please specify a project folder`);
 		});
 	}
 	hasErrors() {
-		return this.LangiumDocuments.all.some((doc) => {
-			return doc.diagnostics?.some((d) => d.severity === DiagnosticSeverity.Error) ?? false;
+		return this.LangiumDocuments.userDocuments.some((doc) => {
+			return doc.diagnostics && doc.diagnostics.some(isErrorDiagnostic);
 		});
 	}
 	/**
@@ -116,28 +118,33 @@ Please specify a project folder`);
 	*/
 	printErrors() {
 		let hasErrors = false;
-		for (const doc of this.LangiumDocuments.all) {
-			const errors = doc.diagnostics?.filter((e) => e.severity === 1);
-			if (errors && errors.length > 0) {
-				hasErrors = true;
-				const messages = errors.flatMap((validationError) => {
-					const line = validationError.range.start.line;
-					const messages = validationError.message.split("\n");
-					if (messages.length > 10) {
-						messages.length = 10;
-						messages.push("...");
-					}
-					return messages.map((message, i) => {
-						if (i === 0) return "    " + k.dim(`Line ${line}: `) + k.red(message);
-						return " ".repeat(10) + k.red(message);
-					});
-				}).join("\n");
-				this.logger.error(`Invalid ${doc.uri.fsPath}\n${messages}`);
-			}
+		for (const doc of this.LangiumDocuments.userDocuments) {
+			const errors = doc.diagnostics?.filter(isErrorDiagnostic) ?? [];
+			if (!hasAtLeast(errors, 1)) continue;
+			hasErrors = true;
+			const messages = pipe(errors, flatMap((validationError) => {
+				const line = validationError.range.start.line;
+				const messages = validationError.message.split("\n");
+				if (messages.length > 5) {
+					messages.length = 5;
+					messages.push("...");
+				}
+				return messages.map((message, i) => {
+					if (i === 0) return "    " + k.dim(`Line ${line}: `) + k.red(message);
+					return " ".repeat(10) + k.red(message);
+				});
+			}), join("\n"));
+			this.logger.error(`Invalid ${doc.uri.fsPath}\n${messages}`);
 		}
 		return hasErrors;
 	}
 	/**
+	* Returns the number of parsed documents in the workspace
+	*/
+	documentCount() {
+		return [...this.LangiumDocuments.userDocuments].length;
+	}
+	/**
 	* @returns a function to dispose the listener
 	*/
 	onModelUpdate(listener) {

package/dist/_chunks/options.d.mts

@@ -77,6 +77,10 @@ declare class LikeC4 {
    * @returns true if there are errors
    */
   printErrors(): boolean;
+  /**
+   * Returns the number of parsed documents in the workspace
+   */
+  documentCount(): number;
   /**
    * @returns a function to dispose the listener
    */

package/dist/node/index.d.mts

@@ -3,7 +3,6 @@ import { i as LikeC4Langium, n as InitOptions, r as LikeC4, t as FromWorkspaceOp
 //#region src/node/index.d.ts
 /**
  * Create a LikeC4 instance from a workspace directory
- * The instance is cached in globalThis to avoid creating multiple instances for the same workspace
  *
  * @param path - The workspace directory path
  * @param options - Optional configuration options

package/dist/node/index.mjs

@@ -1,6 +1,5 @@
 import { i as LikeC4, n as handleInitOptions, r as DefaultInitOptions, t as createFromSources } from "../_chunks/createFromSources.mjs";
 import { t as configureLogger$1 } from "../_chunks/configureLogger.mjs";
-import { memoizeProp } from "@likec4/core";
 import { loggable, rootLogger } from "@likec4/log";
 import defu from "defu";
 import { basename, resolve } from "pathe";
@@ -44,46 +43,44 @@ function createLanguageServices$1(opts) {
 }
 /**
 * Create a LikeC4 instance from a workspace directory
-* The instance is cached in globalThis to avoid creating multiple instances for the same workspace
 *
 * @param path - The workspace directory path
 * @param options - Optional configuration options
 * @returns A Promise that resolves to a LikeC4 instance
 */
 async function fromWorkspace(path, options) {
-	configureLogger$1(options);
 	const workspacePath = resolve(path);
 	const workspaceUri = withTrailingSlash(pathToFileURL(workspacePath).toString());
-	return memoizeProp(globalThis, "likec4:" + workspacePath, async () => {
-		const logger = rootLogger.getChild("lang");
-		const langium = createLanguageServices$1(defu(options, {
-			...DefaultInitOptions,
-			useFileSystem: true,
-			manualLayouts: true,
-			watch: false,
-			mcp: false
-		}));
-		const workspace = {
-			name: basename(workspacePath),
-			uri: workspaceUri
-		};
-		const WorkspaceManager = langium.shared.workspace.WorkspaceManager;
-		logger.info(`${k.dim("workspace:")} ${workspacePath}`);
-		WorkspaceManager.initialize({
-			capabilities: {},
-			processId: null,
-			rootUri: null,
-			workspaceFolders: [workspace]
-		});
-		await WorkspaceManager.initializeWorkspace([workspace]);
-		const userDocuments = langium.shared.workspace.LangiumDocuments.userDocuments.toArray();
-		if (userDocuments.length === 0) {
-			logger.error(`no LikeC4 sources found`);
-			if (options?.throwIfInvalid) throw new Error(`no LikeC4 sources found`);
-		}
-		logger.info(`${k.dim("workspace:")} found ${userDocuments.length} source files`);
-		return handleInitOptions(langium, rootLogger, options);
+	const logger = rootLogger.getChild("lang");
+	const opts = defu(options, {
+		...DefaultInitOptions,
+		useFileSystem: true,
+		manualLayouts: true,
+		watch: false,
+		mcp: false
+	});
+	configureLogger$1(opts);
+	const langium = createLanguageServices$1(opts);
+	const workspace = {
+		name: basename(workspacePath),
+		uri: workspaceUri
+	};
+	const WorkspaceManager = langium.shared.workspace.WorkspaceManager;
+	logger.info(`${k.dim("workspace:")} ${workspacePath}`);
+	WorkspaceManager.initialize({
+		capabilities: {},
+		processId: null,
+		rootUri: null,
+		workspaceFolders: [workspace]
 	});
+	await WorkspaceManager.initializeWorkspace([workspace]);
+	const userDocuments = langium.shared.workspace.LangiumDocuments.userDocuments.toArray();
+	if (userDocuments.length === 0) {
+		logger.error(`no LikeC4 sources found`);
+		if (options?.throwIfInvalid) throw new Error(`no LikeC4 sources found`);
+	}
+	logger.info(`${k.dim("workspace:")} found ${userDocuments.length} source files`);
+	return handleInitOptions(langium, rootLogger, options);
 }
 /**
 * Create a LikeC4 instance from the current working directory

package/dist/node/without-mcp/index.d.mts

@@ -3,7 +3,6 @@ import { i as LikeC4Langium, n as InitOptions, r as LikeC4, t as FromWorkspaceOp
 //#region src/node/without-mcp/index.d.ts
 /**
  * Create a LikeC4 instance from a workspace directory
- * The instance is cached in globalThis to avoid creating multiple instances for the same workspace
  *
  * @param path - The workspace directory path
  * @param options - Optional configuration options

package/dist/node/without-mcp/index.mjs

@@ -1,6 +1,5 @@
-import { i as LikeC4, n as handleInitOptions, t as createFromSources } from "../../_chunks/createFromSources.mjs";
+import { i as LikeC4, n as handleInitOptions, r as DefaultInitOptions, t as createFromSources } from "../../_chunks/createFromSources.mjs";
 import { t as configureLogger$1 } from "../../_chunks/configureLogger.mjs";
-import { memoizeProp } from "@likec4/core";
 import { rootLogger } from "@likec4/log";
 import defu from "defu";
 import { basename, resolve } from "pathe";
@@ -33,47 +32,45 @@ function createLanguageServices$1(opts) {
 }
 /**
 * Create a LikeC4 instance from a workspace directory
-* The instance is cached in globalThis to avoid creating multiple instances for the same workspace
 *
 * @param path - The workspace directory path
 * @param options - Optional configuration options
 * @returns A Promise that resolves to a LikeC4 instance
 */
 async function fromWorkspace(path, options) {
-	configureLogger$1(options);
 	const workspacePath = resolve(path);
 	const folderUri = pathToFileURL(workspacePath).toString();
 	const workspaceUri = folderUri.endsWith("/") ? folderUri : folderUri + "/";
-	return memoizeProp(globalThis, "likec4:" + workspacePath, async () => {
-		const logger = rootLogger.getChild("lang");
-		const mergedOptions = defu(options, {
-			useFileSystem: true,
-			manualLayouts: true,
-			watch: false
-		});
-		if (mergedOptions.mcp) throw new Error("MCP server is not supported in this build");
-		const langium = createLanguageServices$1(mergedOptions);
-		const workspace = {
-			name: basename(workspacePath),
-			uri: workspaceUri
-		};
-		const WorkspaceManager = langium.shared.workspace.WorkspaceManager;
-		logger.info(`${k.dim("workspace:")} ${workspacePath}`);
-		WorkspaceManager.initialize({
-			capabilities: {},
-			processId: null,
-			rootUri: null,
-			workspaceFolders: [workspace]
-		});
-		await WorkspaceManager.initializeWorkspace([workspace]);
-		const userDocuments = langium.shared.workspace.LangiumDocuments.userDocuments.toArray();
-		if (userDocuments.length === 0) {
-			logger.error(`no LikeC4 sources found`);
-			throw new Error(`no LikeC4 sources found`);
-		}
-		logger.info(`${k.dim("workspace:")} found ${userDocuments.length} source files`);
-		return handleInitOptions(langium, rootLogger, options);
+	const logger = rootLogger.getChild("lang");
+	const mergedOptions = defu(options, {
+		...DefaultInitOptions,
+		useFileSystem: true,
+		manualLayouts: true,
+		watch: false
+	});
+	configureLogger$1(mergedOptions);
+	if (mergedOptions.mcp) throw new Error("MCP server is not supported in this build");
+	const langium = createLanguageServices$1(mergedOptions);
+	const workspace = {
+		name: basename(workspacePath),
+		uri: workspaceUri
+	};
+	const WorkspaceManager = langium.shared.workspace.WorkspaceManager;
+	logger.info(`${k.dim("workspace:")} ${workspacePath}`);
+	WorkspaceManager.initialize({
+		capabilities: {},
+		processId: null,
+		rootUri: null,
+		workspaceFolders: [workspace]
 	});
+	await WorkspaceManager.initializeWorkspace([workspace]);
+	const userDocuments = langium.shared.workspace.LangiumDocuments.userDocuments.toArray();
+	if (userDocuments.length === 0) {
+		logger.error(`no LikeC4 sources found`);
+		throw new Error(`no LikeC4 sources found`);
+	}
+	logger.info(`${k.dim("workspace:")} found ${userDocuments.length} source files`);
+	return handleInitOptions(langium, rootLogger, options);
 }
 /**
 * Create a LikeC4 instance from the current working directory

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-services",
   "description": "LikeC4 Language Services",
-  "version": "1.52.0",
+  "version": "1.54.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -69,7 +69,7 @@
     "access": "public"
   },
   "dependencies": {
-    "defu": "^6.1.4",
+    "defu": "^6.1.6",
     "remeda": "^2.33.6",
     "langium": "3.5.0",
     "tinyrainbow": "^3.0.3",
@@ -78,24 +78,24 @@
     "std-env": "^3.10.0",
     "type-fest": "^4.41.0",
     "vscode-languageserver-types": "3.17.5",
-    "@likec4/config": "1.52.0",
-    "@likec4/core": "1.52.0",
-    "@likec4/generators": "1.52.0",
+    "@likec4/config": "1.54.0",
+    "@likec4/core": "1.54.0",
+    "@likec4/language-server": "1.54.0",
+    "@likec4/generators": "1.54.0",
+    "@likec4/layouts": "1.54.0",
     "@likec4/icons": "1.46.4",
-    "@likec4/language-server": "1.52.0",
-    "@likec4/layouts": "1.52.0",
-    "@likec4/log": "1.52.0"
+    "@likec4/log": "1.54.0"
   },
   "devDependencies": {
-    "@types/node": "~22.19.11",
-    "obuild": "^0.4.31",
-    "oxlint": "1.43.0",
+    "@types/node": "~22.19.15",
+    "obuild": "0.4.31",
+    "oxlint": "1.55.0",
     "tsx": "4.21.0",
-    "turbo": "2.8.13",
+    "turbo": "2.8.21",
     "typescript": "5.9.3",
-    "vitest": "4.0.18",
+    "vitest": "4.1.0",
     "@likec4/devops": "1.42.0",
-    "@likec4/tsconfig": "1.52.0"
+    "@likec4/tsconfig": "1.54.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",