@likec4/language-services 1.49.0 → 1.51.0

package/dist/_chunks/configureLogger.mjs

@@ -0,0 +1,19 @@
+import { configureLanguageServerLogger } from "@likec4/language-server";
+import { isColorSupported } from "std-env";
+function configureLogger(options) {
+	const opt = options?.configureLogger ?? "console";
+	if (opt === false) return;
+	if (opt === "stderr" || options?.mcp === "stdio") {
+		configureLanguageServerLogger({
+			useStdErr: true,
+			colors: false,
+			logLevel: options?.logLevel
+		});
+		return;
+	}
+	configureLanguageServerLogger({
+		colors: isColorSupported,
+		logLevel: options?.logLevel
+	});
+}
+export { configureLogger as t };

package/dist/_chunks/createFromSources.mjs

@@ -1,5 +1,4 @@
 import { loggable, rootLogger } from "@likec4/log";
-import defu from "defu";
 import { extname } from "pathe";
 import k from "tinyrainbow";
 import { LikeC4ProjectConfigOps, isLikeC4JsonConfig } from "@likec4/config";
@@ -13,12 +12,21 @@ var LikeC4 = class {
 		this.langium = langium;
 		this.logger = logger;
 	}
+	/**
+	* File system path to the workspace root
+	*/
 	get workspace() {
 		return this.langium.shared.workspace.WorkspaceManager.workspaceUri.fsPath;
 	}
+	/**
+	* URI of the workspace root
+	*/
 	get workspaceURI() {
 		return this.langium.shared.workspace.WorkspaceManager.workspaceUri;
 	}
+	/**
+	* URL of the workspace root
+	*/
 	get workspaceURL() {
 		return this.langium.shared.workspace.WorkspaceManager.workspaceURL;
 	}
@@ -47,14 +55,32 @@ Please specify a project folder`);
 			throw new Error(`Multiple projects found`);
 		}
 	}
+	/**
+	* Diagram is a computed view, layouted using Graphviz
+	* If diagram has manual layout, it will be used.
+	* Used in React components
+	*/
 	async diagrams(project) {
 		const projectId = this.projectsManager.ensureProjectId(project);
 		return await this.viewsService.diagrams(projectId);
 	}
+	/**
+	* Builds LikeC4Model from all documents
+	* Only computes view predicates {@link ComputedView} - i.e. no layout
+	* Not ready for rendering, but enough to traverse
+	*
+	* Sync version does not read manual layouts
+	* Use {@link computedModel} for a version that includes manual layouts
+	*/
 	syncComputedModel(project) {
 		const projectId = this.projectsManager.ensureProjectId(project);
 		return this.modelBuilder.unsafeSyncComputeModel(projectId);
 	}
+	/**
+	* 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.modelBuilder.computeModel(projectId);
@@ -62,6 +88,10 @@ Please specify a project folder`);
 	projects() {
 		return map(this.languageServices.projects(), prop("id"));
 	}
+	/**
+	* Same as {@link computedModel()}, but also applies layout
+	* Ready for rendering
+	*/
 	async layoutedModel(project) {
 		const projectId = this.projectsManager.ensureProjectId(project);
 		return await this.languageServices.layoutedModel(projectId);
@@ -81,6 +111,9 @@ Please specify a project folder`);
 			return doc.diagnostics?.some((d) => d.severity === DiagnosticSeverity.Error) ?? false;
 		});
 	}
+	/**
+	* @returns true if there are errors
+	*/
 	printErrors() {
 		let hasErrors = false;
 		for (const doc of this.LangiumDocuments.all) {
@@ -104,6 +137,9 @@ Please specify a project folder`);
 		}
 		return hasErrors;
 	}
+	/**
+	* @returns a function to dispose the listener
+	*/
 	onModelUpdate(listener) {
 		const sib = this.modelBuilder.onModelParsed(() => listener());
 		return () => {
@@ -117,20 +153,27 @@ Please specify a project folder`);
 		await this.dispose();
 	}
 };
+const DefaultInitOptions = {
+	printErrors: true,
+	throwIfInvalid: false,
+	graphviz: "wasm",
+	mcp: false,
+	configureLogger: false,
+	logLevel: void 0
+};
 const validationErrorsToError = (likec4) => /* @__PURE__ */ new Error(`Invalid model:\n${likec4.getErrors().map((e) => `  ${e.sourceFsPath}:${e.line} ${e.message.slice(0, 200)}`).join("\n")}`);
 async function handleInitOptions(langium, logger = rootLogger, options) {
 	const likec4 = new LikeC4(langium, logger);
-	const opts = defu(options, {
-		printErrors: true,
-		throwIfInvalid: false
-	});
-	if (opts.throwIfInvalid === true && likec4.hasErrors()) {
+	if ((options?.throwIfInvalid ?? DefaultInitOptions.throwIfInvalid) === true && likec4.hasErrors()) {
 		await likec4.dispose();
 		return Promise.reject(validationErrorsToError(likec4));
 	}
-	if (opts.printErrors !== false && likec4.hasErrors()) likec4.printErrors();
+	if ((options?.printErrors ?? DefaultInitOptions.printErrors) && likec4.hasErrors()) likec4.printErrors();
 	return likec4;
 }
+/**
+* Runtime-agnostic factory function to create a LikeC4 instance from sources
+*/
 async function createFromSources(langium, logger, sources, initOptions) {
 	const uri = URI.from({
 		scheme: "virtual",
@@ -169,4 +212,4 @@ async function createFromSources(langium, logger, sources, initOptions) {
 	await langium.shared.workspace.DocumentBuilder.build(docs, { validation: true });
 	return handleInitOptions(langium, logger, initOptions);
 }
-export { handleInitOptions as n, LikeC4 as r, createFromSources as t };
+export { LikeC4 as i, handleInitOptions as n, DefaultInitOptions as r, createFromSources as t };

package/dist/_chunks/options.d.mts

@@ -1,7 +1,7 @@
 import { Logger } from "@likec4/log";
+import { LikeC4LanguageServices, LikeC4ModelBuilder, LikeC4Services, LikeC4SharedServices, LikeC4Views, ProjectsManager } from "@likec4/language-server";
 import { LikeC4Model } from "@likec4/core/model";
 import { LayoutedView, NonEmptyArray, ProjectId } from "@likec4/core/types";
-import { LikeC4LanguageServices, LikeC4ModelBuilder, LikeC4Services, LikeC4SharedServices, LikeC4Views, ProjectsManager } from "@likec4/language-server";
 
 //#region src/common/LikeC4.d.ts
 interface LikeC4Langium {
@@ -86,7 +86,7 @@ declare class LikeC4 {
 }
 //#endregion
 //#region src/common/options.d.ts
-type InitOptions = {
+interface InitOptions {
   /**
    * By default, if LikeC4 model is invalid, errors are printed to the console.
    * Disable this behavior by setting this option to false.
@@ -115,7 +115,22 @@ type InitOptions = {
   mcp?: false | 'stdio' | {
     port: number;
   };
-};
+  /**
+   * Whether to configure the logger.
+   *
+   * - `false` - don't configure the logger
+   * - `'console'` - configure the logger with console sink
+   * - `'stderr'` - configure the logger with stderr (for LSP or MCP)
+   *
+   * @default false
+   */
+  configureLogger?: false | 'console' | 'stderr';
+  /**
+   * The log level to use.
+   * Applied if {@link configureLogger} is not `false`
+   */
+  logLevel?: 'trace' | 'debug' | 'info' | 'warning' | 'error' | undefined;
+}
 type FromWorkspaceOptions = InitOptions & {
   /**
    * Whether to read and use manual layouts from the workspace.

package/dist/browser/index.mjs

@@ -1,12 +1,38 @@
 import { t as createFromSources } from "../_chunks/createFromSources.mjs";
 import { configureLogger, getConsoleSink, getTextFormatter, rootLogger } from "@likec4/log";
 import { createLanguageServices } from "@likec4/language-server/browser";
+/**
+* Create a LikeC4 instance from a workspace directory
+* @param _workspace - The workspace directory path
+* @param options - Optional configuration options
+* @returns A Promise that resolves to a LikeC4 instance
+*/
 async function fromWorkspace(_workspace, _options) {
 	throw new Error(`fromWorkspace is not yet implemented in the browser environment. use fromSources`);
 }
+/**
+* Create a LikeC4 instance from the current working directory
+* @param options - Optional configuration options
+* @returns A Promise that resolves to a LikeC4 instance
+*/
 async function fromWorkdir(_options) {
 	throw new Error(`fromWorkdir is not yet implemented in the browser environment, use fromSources`);
 }
+/**
+* Create a LikeC4 instance from a record of source files
+*
+* @example
+* ```ts
+* const likec4 = await fromSources({
+*   'likec4.config.json': '...', // optional, stringified LikeC4Config
+*   'model.c4': 'model { ... }',
+*   'path/views.c4': 'views { ... }',
+* })
+* ```
+*
+* @param sources - A record of file paths to source content
+* @returns A Promise that resolves to a LikeC4 instance
+*/
 async function fromSources(sources) {
 	configureLogger({
 		sinks: { console: getConsoleSink({ formatter: getTextFormatter({ format: ({ level, category, message }) => {
@@ -21,6 +47,12 @@ async function fromSources(sources) {
 	const logger = rootLogger.getChild("lang");
 	return await createFromSources(createLanguageServices(), logger, sources, {});
 }
+/**
+* Create a LikeC4 instance from a single source string
+* @param source - The LikeC4 source code
+
+* @returns A Promise that resolves to a LikeC4 instance
+*/
 async function fromSource(source) {
 	return fromSources({ "source.c4": source });
 }

package/dist/node/index.mjs

@@ -1,14 +1,16 @@
-import { n as handleInitOptions, r as LikeC4, 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 { configureLogger, getConsoleStderrSink, loggable, rootLogger } from "@likec4/log";
+import { loggable, rootLogger } from "@likec4/log";
 import defu from "defu";
 import { basename, resolve } from "pathe";
 import k from "tinyrainbow";
+import { withTrailingSlash } from "ufo";
 import { pathToFileURL } from "url";
 import { WithFileSystem, WithLikeC4ManualLayouts } from "@likec4/language-server/filesystem";
 import { WithMCPServer } from "@likec4/language-server/mcp";
-import { NoFileSystem, NoLikeC4ManualLayouts, createLanguageServices } from "@likec4/language-server/module";
-import { GraphvizWasmAdapter, QueueGraphvizLayoter } from "@likec4/layouts";
+import { NoFileSystem, NoLikeC4ManualLayouts, WithGraphviz, createLanguageServices } from "@likec4/language-server/module";
+import { GraphvizWasmAdapter } from "@likec4/layouts";
 import { GraphvizBinaryAdapter } from "@likec4/layouts/graphviz/binary";
 function createLanguageServices$1(opts) {
 	const logger = rootLogger.getChild("lang");
@@ -19,15 +21,6 @@ function createLanguageServices$1(opts) {
 		graphviz: "wasm",
 		mcp: false
 	});
-	if (options.mcp === "stdio") configureLogger({
-		reset: true,
-		sinks: { console: getConsoleStderrSink() },
-		loggers: [{
-			category: "likec4",
-			sinks: ["console"],
-			lowestLevel: "warning"
-		}]
-	});
 	const useDotBin = options.graphviz === "binary";
 	logger.info(`${k.dim("layout")} ${useDotBin ? "binary" : "wasm"}`);
 	const langium = createLanguageServices({
@@ -38,8 +31,9 @@ function createLanguageServices$1(opts) {
 			...NoFileSystem,
 			...NoLikeC4ManualLayouts
 		},
-		...options.mcp ? WithMCPServer(options.mcp === "stdio" ? "stdio" : options.mcp) : {}
-	}, { likec4: { Layouter: () => new QueueGraphvizLayoter({ graphviz: useDotBin ? new GraphvizBinaryAdapter() : new GraphvizWasmAdapter() }) } });
+		...options.mcp ? WithMCPServer(options.mcp === "stdio" ? "stdio" : options.mcp) : {},
+		...WithGraphviz(useDotBin ? new GraphvizBinaryAdapter() : new GraphvizWasmAdapter())
+	});
 	if (typeof options.mcp === "object" && options.mcp.port) langium.likec4.mcp.Server.start(options.mcp.port).catch((e) => {
 		logger.error(loggable(e));
 	});
@@ -48,11 +42,22 @@ function createLanguageServices$1(opts) {
 	});
 	return langium;
 }
+/**
+* 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,
@@ -60,7 +65,7 @@ async function fromWorkspace(path, options) {
 		}));
 		const workspace = {
 			name: basename(workspacePath),
-			uri: pathToFileURL(workspacePath).toString()
+			uri: workspaceUri
 		};
 		const WorkspaceManager = langium.shared.workspace.WorkspaceManager;
 		logger.info(`${k.dim("workspace:")} ${workspacePath}`);
@@ -80,18 +85,47 @@ async function fromWorkspace(path, options) {
 		return handleInitOptions(langium, rootLogger, options);
 	});
 }
+/**
+* Create a LikeC4 instance from the current working directory
+* @param options - Optional configuration options
+* @returns A Promise that resolves to a LikeC4 instance
+*/
 async function fromWorkdir(options) {
 	return fromWorkspace(".", options);
 }
+/**
+* Create a LikeC4 instance from a record of source files
+*
+* @example
+* ```ts
+* const likec4 = await fromSources({
+*   'likec4.config.json': '...', // optional, stringified LikeC4Config
+*   'model.c4': 'model { ... }',
+*   'path/views.c4': 'views { ... }',
+* })
+* ```
+*
+* @param sources - A record of file paths to source content
+* @param options - Optional configuration options
+* @returns A Promise that resolves to a LikeC4 instance
+*/
 async function fromSources(sources, options) {
+	configureLogger$1(options);
 	const logger = rootLogger.getChild("lang");
 	return await createFromSources(createLanguageServices$1(defu(options, {
+		...DefaultInitOptions,
 		useFileSystem: false,
 		watch: false,
 		manualLayouts: false,
 		mcp: false
 	})), logger, sources, options);
 }
+/**
+* Create a LikeC4 instance from a single source string
+* @param source - The LikeC4 source code
+* @param options - Optional configuration options
+* @returns A Promise that resolves to a LikeC4 instance
+*/
 async function fromSource(source, options) {
 	return fromSources({ "source.c4": source }, options);
 }

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

@@ -1,4 +1,5 @@
-import { n as handleInitOptions, r as LikeC4, t as createFromSources } from "../../_chunks/createFromSources.mjs";
+import { i as LikeC4, n as handleInitOptions, 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";
@@ -6,8 +7,8 @@ import { basename, resolve } from "pathe";
 import k from "tinyrainbow";
 import { pathToFileURL } from "url";
 import { WithFileSystem, WithLikeC4ManualLayouts } from "@likec4/language-server/filesystem";
-import { NoFileSystem, NoLikeC4ManualLayouts, createLanguageServices } from "@likec4/language-server/module";
-import { GraphvizWasmAdapter, QueueGraphvizLayoter } from "@likec4/layouts";
+import { NoFileSystem, NoLikeC4ManualLayouts, WithGraphviz, createLanguageServices } from "@likec4/language-server/module";
+import { GraphvizWasmAdapter } from "@likec4/layouts";
 import { GraphvizBinaryAdapter } from "@likec4/layouts/graphviz/binary";
 function createLanguageServices$1(opts) {
 	const logger = rootLogger.getChild("lang");
@@ -19,16 +20,30 @@ function createLanguageServices$1(opts) {
 	});
 	const useDotBin = options.graphviz === "binary";
 	logger.info(`${k.dim("layout")} ${useDotBin ? "binary" : "wasm"}`);
-	return createLanguageServices({ ...options.useFileSystem ? {
-		...WithFileSystem(options.watch),
-		...options.manualLayouts ? WithLikeC4ManualLayouts : NoLikeC4ManualLayouts
-	} : {
-		...NoFileSystem,
-		...NoLikeC4ManualLayouts
-	} }, { likec4: { Layouter: () => new QueueGraphvizLayoter({ graphviz: useDotBin ? new GraphvizBinaryAdapter() : new GraphvizWasmAdapter() }) } });
+	return createLanguageServices({
+		...options.useFileSystem ? {
+			...WithFileSystem(options.watch),
+			...options.manualLayouts ? WithLikeC4ManualLayouts : NoLikeC4ManualLayouts
+		} : {
+			...NoFileSystem,
+			...NoLikeC4ManualLayouts
+		},
+		...WithGraphviz(useDotBin ? new GraphvizBinaryAdapter() : new GraphvizWasmAdapter())
+	});
 }
+/**
+* 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, {
@@ -40,7 +55,7 @@ async function fromWorkspace(path, options) {
 		const langium = createLanguageServices$1(mergedOptions);
 		const workspace = {
 			name: basename(workspacePath),
-			uri: pathToFileURL(workspacePath).toString()
+			uri: workspaceUri
 		};
 		const WorkspaceManager = langium.shared.workspace.WorkspaceManager;
 		logger.info(`${k.dim("workspace:")} ${workspacePath}`);
@@ -60,10 +75,32 @@ async function fromWorkspace(path, options) {
 		return handleInitOptions(langium, rootLogger, options);
 	});
 }
+/**
+* Create a LikeC4 instance from the current working directory
+* @param options - Optional configuration options
+* @returns A Promise that resolves to a LikeC4 instance
+*/
 async function fromWorkdir(options) {
 	return fromWorkspace(".", options);
 }
+/**
+* Create a LikeC4 instance from a record of source files
+*
+* @example
+* ```ts
+* const likec4 = await fromSources({
+*   'likec4.config.json': '...', // optional, stringified LikeC4Config
+*   'model.c4': 'model { ... }',
+*   'path/views.c4': 'views { ... }',
+* })
+* ```
+*
+* @param sources - A record of file paths to source content
+* @param options - Optional configuration options
+* @returns A Promise that resolves to a LikeC4 instance
+*/
 async function fromSources(sources, options) {
+	configureLogger$1(options);
 	const logger = rootLogger.getChild("lang");
 	return await createFromSources(createLanguageServices$1(defu(options, {
 		useFileSystem: false,
@@ -71,6 +108,12 @@ async function fromSources(sources, options) {
 		manualLayouts: false
 	})), logger, sources, options);
 }
+/**
+* Create a LikeC4 instance from a single source string
+* @param source - The LikeC4 source code
+* @param options - Optional configuration options
+* @returns A Promise that resolves to a LikeC4 instance
+*/
 async function fromSource(source, options) {
 	return fromSources({ "source.c4": source }, options);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-services",
   "description": "LikeC4 Language Services",
-  "version": "1.49.0",
+  "version": "1.51.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -70,31 +70,32 @@
   },
   "dependencies": {
     "defu": "^6.1.4",
-    "remeda": "^2.33.5",
+    "remeda": "^2.33.6",
     "langium": "3.5.0",
-    "tinyrainbow": "^2.0.0",
+    "tinyrainbow": "^3.0.3",
     "pathe": "^2.0.3",
+    "ufo": "1.6.3",
     "std-env": "^3.10.0",
     "type-fest": "^4.41.0",
     "vscode-languageserver-types": "3.17.5",
-    "@likec4/config": "1.49.0",
-    "@likec4/generators": "1.49.0",
+    "@likec4/config": "1.51.0",
+    "@likec4/generators": "1.51.0",
+    "@likec4/core": "1.51.0",
     "@likec4/icons": "1.46.4",
-    "@likec4/core": "1.49.0",
-    "@likec4/language-server": "1.49.0",
-    "@likec4/layouts": "1.49.0",
-    "@likec4/log": "1.49.0"
+    "@likec4/layouts": "1.51.0",
+    "@likec4/language-server": "1.51.0",
+    "@likec4/log": "1.51.0"
   },
   "devDependencies": {
-    "@types/node": "~22.19.10",
-    "obuild": "^0.4.27",
+    "@types/node": "~22.19.11",
+    "obuild": "^0.4.31",
     "oxlint": "1.43.0",
     "tsx": "4.21.0",
-    "turbo": "2.8.3",
+    "turbo": "2.8.12",
     "typescript": "5.9.3",
     "vitest": "4.0.18",
     "@likec4/devops": "1.42.0",
-    "@likec4/tsconfig": "1.49.0"
+    "@likec4/tsconfig": "1.51.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",