@likec4/language-server 1.46.4 → 1.47.0

package/dist/validation/index.d.ts

@@ -4,7 +4,7 @@ import type { LikeC4Services } from '../module';
 export { LikeC4DocumentValidator } from './DocumentValidator';
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is ast.DynamicViewDisplayVariantProperty | ast.LinkProperty | ast.ViewStringProperty | ast.ElementStringProperty | ast.ElementStyleProperty | ast.IconProperty | ast.MetadataBody | ast.RelationStringProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.HexColor | ast.RGBAColor | ast.DeployedInstance | ast.DeploymentNode | ast.DeploymentViewRulePredicate | ast.DeploymentViewRuleStyle | ast.ViewRuleAutoLayout | ast.DynamicViewGlobalPredicateRef | ast.DynamicViewIncludePredicate | ast.ViewRuleGlobalStyle | ast.ViewRuleStyle | ast.DynamicStepChain | ast.DynamicStepSingle | ast.ElementKindExpression | ast.ElementTagExpression | ast.FqnRefExpr | ast.WildcardExpression | ast.FqnExprWhere | ast.FqnExprWith | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationExprWhere | ast.RelationExprWith | ast.Element | ast.ExtendDeployment | ast.ExtendElement | ast.Imported | ast.DeploymentView | ast.DynamicView | ast.ElementView | ast.ArrowProperty | ast.ColorProperty | ast.LineProperty | ast.PaddingSizeProperty | ast.ShapeSizeProperty | ast.TextSizeProperty | ast.BorderProperty | ast.MultipleProperty | ast.OpacityProperty | ast.ShapeProperty | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGroup | ast.ViewRulePredicate | ast.ViewRuleRank | ast.DynamicViewParallelSteps | ast.SpecificationRelationshipKind | ast.SpecificationRule | ast.ElementRef | ast.DeploymentRelation | ast.Relation | ast.GlobalDynamicPredicateGroup | ast.Globals | ast.GlobalPredicateGroup | ast.GlobalStyle | ast.SpecificationDeploymentNodeKind | ast.SpecificationElementKind | ast.GlobalStyleGroup | ast.SpecificationColor | ast.NavigateToProperty | ast.Tags | ast.ExtendRelation | ast.ImportsFromPoject | ast.SpecificationTag;
+declare const isValidatableAstNode: (n: AstNode) => n is ast.Element | ast.DeployedInstance | ast.DeploymentNode | ast.Tags | ast.ElementKindExpression | ast.ElementTagExpression | ast.FqnRefExpr | ast.WildcardExpression | ast.FqnExprWhere | ast.FqnExprWith | ast.DirectedRelationExpr | ast.InOutRelationExpr | ast.IncomingRelationExpr | ast.OutgoingRelationExpr | ast.RelationExprWhere | ast.RelationExprWith | ast.ImportsFromPoject | ast.Imported | ast.Globals | ast.GlobalPredicateGroup | ast.GlobalDynamicPredicateGroup | ast.GlobalStyle | ast.GlobalStyleGroup | ast.DeploymentViewRulePredicate | ast.DynamicViewIncludePredicate | ast.ViewRulePredicate | ast.DeploymentView | ast.DynamicView | ast.ViewRuleGroup | ast.ElementView | ast.DeploymentViewRuleStyle | ast.ViewRuleRank | ast.ViewRuleStyle | ast.DynamicViewParallelSteps | ast.DynamicStepChain | ast.DynamicStepSingle | ast.ViewRuleAutoLayout | ast.LinkProperty | ast.ViewStringProperty | ast.SpecificationDeploymentNodeKind | ast.SpecificationElementKind | ast.ExtendDeployment | ast.DeploymentRelation | ast.ExtendElement | ast.ExtendRelation | ast.Relation | ast.SpecificationRule | ast.BorderProperty | ast.ColorProperty | ast.IconProperty | ast.MultipleProperty | ast.OpacityProperty | ast.PaddingSizeProperty | ast.ShapeProperty | ast.ShapeSizeProperty | ast.TextSizeProperty | ast.ElementStyleProperty | ast.SpecificationRelationshipKind | ast.ViewRuleGlobalPredicateRef | ast.ViewRuleGlobalStyle | ast.DynamicViewGlobalPredicateRef | ast.ArrowProperty | ast.LineProperty | ast.DynamicViewDisplayVariantProperty | ast.MetadataBody | ast.ElementStringProperty | ast.MetadataAttribute | ast.NotationProperty | ast.NotesProperty | ast.RelationStringProperty | ast.SpecificationElementStringProperty | ast.SpecificationRelationshipStringProperty | ast.NavigateToProperty | ast.ElementRef | ast.SpecificationTag | ast.SpecificationColor | ast.HexColor | ast.RGBAColor;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 export declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/dist/workspace/LangiumDocuments.d.ts

@@ -8,6 +8,10 @@ export declare class LangiumDocuments extends DefaultLangiumDocuments {
     constructor(services: LikeC4SharedServices);
     addDocument(document: LangiumDocument): void;
     getDocument(uri: URI): LikeC4LangiumDocument | undefined;
+    /**
+     * Returns all known documents, without any filtering.
+     */
+    get allKnownDocuments(): Stream<LangiumDocument>;
     get all(): Stream<LikeC4LangiumDocument>;
     /**
      * Returns all documents, excluding built-in documents and documents excluded by ProjectsManager.

package/dist/workspace/LangiumDocuments.js

@@ -32,16 +32,22 @@ export class LangiumDocuments extends DefaultLangiumDocuments {
     }
     getDocument(uri) {
         const doc = super.getDocument(uri);
-        if (doc && !exclude(doc)) {
-            doc.likec4ProjectId = this.services.workspace.ProjectsManager.belongsTo(doc);
-        }
         if (doc && !isLikeC4LangiumDocument(doc)) {
             throw new Error(`Document ${doc.uri.path} is not a LikeC4 document`);
         }
+        if (doc && !exclude(doc)) {
+            doc.likec4ProjectId = this.services.workspace.ProjectsManager.belongsTo(doc);
+        }
         return doc;
     }
+    /**
+     * Returns all known documents, without any filtering.
+     */
+    get allKnownDocuments() {
+        return stream(this.documentMap.values());
+    }
     get all() {
-        return stream(this.documentMap.values())
+        return this.allKnownDocuments
             .filter((doc) => {
             if (doc.textDocument.languageId === LikeC4LanguageMetaData.languageId) {
                 if (!isLikeC4Builtin(doc.uri)) {
@@ -88,7 +94,7 @@ export class LangiumDocuments extends DefaultLangiumDocuments {
      * Reset the project IDs of all documents.
      */
     resetProjectIds() {
-        super.all.forEach(doc => {
+        this.allKnownDocuments.forEach(doc => {
             if (exclude(doc)) {
                 return;
             }

package/dist/workspace/ProjectsManager.d.ts

@@ -60,6 +60,10 @@ export declare class ProjectsManager {
     get default(): ProjectData;
     get all(): NonEmptyReadonlyArray<scalar.ProjectId>;
     getProject(arg: scalar.ProjectId | LangiumDocument): Project;
+    /**
+     * Returns all projects that include the specified folder, or inside the folder.
+     */
+    findAllProjectsByFolder(folder: URI | string): ProjectData[];
     /**
      * Validates and ensures the project ID.
      * If no project ID is specified, returns default project ID

package/dist/workspace/ProjectsManager.js

@@ -1,12 +1,13 @@
 var _a;
 import { isLikeC4Config, normalizeIncludeConfig, validateProjectConfig, } from '@likec4/config';
-import { BiMap, DefaultMap, invariant, memoizeProp, nonNullable } from '@likec4/core/utils';
-import { wrapError } from '@likec4/log';
+import { BiMap, compareNaturalHierarchically, DefaultMap, invariant, memoizeProp, nonNullable, } from '@likec4/core/utils';
+import { loggable, wrapError } from '@likec4/log';
 import { deepEqual } from 'fast-equals';
-import { interruptAndCheck, URI, WorkspaceCache, } from 'langium';
+import { isOperationCancelled, OperationCancelled, URI, WorkspaceCache, } from 'langium';
 import picomatch from 'picomatch';
-import { hasAtLeast, isNullish, map, pipe, prop, sortBy } from 'remeda';
-import { cleanDoubleSlashes, isRelative, joinRelativeURL, joinURL, parseFilename, withoutProtocol, withTrailingSlash, } from 'ufo';
+import { filter, hasAtLeast, isNullish, map, pipe, prop, sort } from 'remeda';
+import { cleanDoubleSlashes, isRelative, joinRelativeURL, joinURL, parseFilename, withoutProtocol, withoutTrailingSlash, withTrailingSlash, } from 'ufo';
+import { isLikeC4Builtin } from '../likec4lib';
 import { logger as mainLogger } from '../logger';
 const logger = mainLogger.getChild('ProjectsManager');
 function normalizeUri(uri) {
@@ -21,6 +22,11 @@ function normalizeUri(uri) {
         return uri.uri.toString();
     }
 }
+/**
+ * Compare function to ensure consistent order
+ */
+const compare = compareNaturalHierarchically('/', true);
+const compareUri = (a, b) => compare(withoutTrailingSlash(a.path), withoutTrailingSlash(b.path));
 /**
  * Returns a predicate that checks if the given path is included in the project folder.
  */
@@ -72,12 +78,12 @@ export class ProjectsManager {
      */
     #lookupById = new DefaultMap((id) => {
         if (id === _a.DefaultProjectId) {
-            const folderUri = this.getWorkspaceFolder();
+            const folder = ProjectFolder(this.getWorkspaceFolder());
             return {
                 id,
                 config: DefaultProject.config,
-                folder: ProjectFolder(folderUri),
-                folderUri,
+                folder,
+                folderUri: URI.parse(folder),
                 exclude: DefaultProject.exclude,
                 includeConfig: DefaultProject.includeConfig,
             };
@@ -122,19 +128,7 @@ export class ProjectsManager {
     get default() {
         if (!this.#defaultProject) {
             const id = this.defaultProjectId ?? _a.DefaultProjectId;
-            let project = this.#projects.find(p => p.id === id);
-            if (!project) {
-                const folderUri = this.getWorkspaceFolder();
-                project = {
-                    id,
-                    config: DefaultProject.config,
-                    folder: ProjectFolder(folderUri),
-                    folderUri,
-                    exclude: DefaultProject.exclude,
-                    includeConfig: DefaultProject.includeConfig,
-                };
-            }
-            this.#defaultProject = project;
+            this.#defaultProject = this.#lookupById.get(id);
         }
         return this.#defaultProject;
     }
@@ -158,23 +152,7 @@ export class ProjectsManager {
     }
     getProject(arg) {
         const id = typeof arg === 'string' ? arg : (arg.likec4ProjectId || this.belongsTo(arg));
-        if (id === DefaultProject.id) {
-            let folderUri;
-            try {
-                folderUri = this.services.workspace.WorkspaceManager.workspaceUri;
-            }
-            catch (error) {
-                logger.warn('Failed to get workspace URI, using default folder', { error });
-                folderUri = URI.file('/');
-                // ignore - workspace not initialized
-            }
-            return {
-                id: _a.DefaultProjectId,
-                config: DefaultProject.config,
-                folderUri,
-            };
-        }
-        const project = nonNullable(this.#lookupById.get(id), `Project ${id} not found`);
+        const project = this.#lookupById.get(id);
         return {
             id,
             folderUri: project.folderUri,
@@ -182,6 +160,14 @@ export class ProjectsManager {
             ...(project.includePaths && { includePaths: map(project.includePaths, prop('uri')) }),
         };
     }
+    /**
+     * Returns all projects that include the specified folder, or inside the folder.
+     */
+    findAllProjectsByFolder(folder) {
+        const projectFolder = ProjectFolder(folder);
+        const isInsideOrIncludes = (p) => p.folder.startsWith(projectFolder) || projectFolder.startsWith(p.folder);
+        return this.#projects.filter(isInsideOrIncludes);
+    }
     /**
      * Validates and ensures the project ID.
      * If no project ID is specified, returns default project ID
@@ -279,8 +265,11 @@ export class ProjectsManager {
             return await this.registerProject({ config, folderUri }, cancelToken);
         }
         catch (error) {
-            this.services.lsp.Connection?.window.showErrorMessage(`LikeC4: Failed to register project at ${configFile.fsPath}`);
-            throw wrapError(error, `Failed to register project config ${configFile.fsPath}:\n`);
+            if (!isOperationCancelled(error)) {
+                this.services.lsp.Connection?.window.showErrorMessage(`LikeC4: Failed to register project at ${configFile.fsPath}`);
+                throw wrapError(error, `Failed to register project config ${configFile.fsPath}:\n`);
+            }
+            return Promise.reject(error);
         }
     }
     /**
@@ -312,9 +301,7 @@ export class ProjectsManager {
             // if there is any project within subfolder or parent folder
             // we need to reset assigned to documents project IDs
             mustReset = this.#projects.some(p => p.folder.startsWith(folder) || folder.startsWith(p.folder));
-            this.#projects = pipe([...this.#projects, project], sortBy(
-            // sort by folder depth (longest first)
-            [({ folder }) => withoutProtocol(folder).split('/').length, 'desc']));
+            this.#projects = pipe([...this.#projects, project], sort((a, b) => compareUri(a.folderUri, b.folderUri)));
             logger.info `register project ${project.id} folder: ${folder}`;
         }
         else {
@@ -335,8 +322,6 @@ export class ProjectsManager {
             const includeConfig = normalizeIncludeConfig(config.include);
             project.includeConfig = includeConfig;
         }
-        // Reset cached default project
-        this.#defaultProject = undefined;
         if (isNullish(config.exclude)) {
             project.exclude = DefaultProject.exclude;
         }
@@ -396,15 +381,22 @@ export class ProjectsManager {
         else {
             delete project.includePaths;
         }
+        // Reset cached default project
+        this.#defaultProject = undefined;
         this.#projectIdToFolder.set(project.id, folder);
         this.#lookupById.clear();
         // Reset assigned project IDs if no projects reload is active
         if (mustReset && !this.#activeReload) {
             await this.rebuidProject(project.id, cancelToken).catch(error => {
+                if (isOperationCancelled(error)) {
+                    return Promise.reject(error);
+                }
                 logger.warn('Failed to rebuild project {projectId} after config change', {
                     projectId: project.id,
                     error,
                 });
+                // ignore error, we logged it
+                return Promise.resolve();
             });
         }
         return project;
@@ -424,19 +416,25 @@ export class ProjectsManager {
     }
     #activeReload = null;
     async reloadProjects(cancelToken) {
-        try {
-            if (!this.#activeReload) {
-                logger.debug `schedule reload projects`;
-                this.#activeReload = this._reloadProjects(cancelToken);
-            }
-            else {
-                logger.debug `reload projects is already in progress, waiting`;
-            }
-            await this.#activeReload;
+        if (this.#activeReload) {
+            logger.debug `reload projects is already in progress, waiting`;
+            return await this.#activeReload.catch(() => {
+                // ignore errors
+            });
         }
-        finally {
+        logger.debug `schedule reload projects`;
+        this.#activeReload = Promise.resolve()
+            .then(() => this._reloadProjects(cancelToken))
+            .catch(error => {
+            if (!isOperationCancelled(error)) {
+                logger.warn('Failed to reload projects', { error });
+            }
+            return Promise.reject(error);
+        })
+            .finally(() => {
             this.#activeReload = null;
-        }
+        });
+        return await this.#activeReload;
     }
     async _reloadProjects(cancelToken) {
         const folders = this.services.workspace.WorkspaceManager.workspaceFolders;
@@ -464,21 +462,25 @@ export class ProjectsManager {
         if (configFiles.length === 0 && this.#projects.length !== 0) {
             logger.warning('No config files found, but some projects were registered before');
         }
+        // Sort config files hierarchically, ensuring consistent order
+        configFiles.sort(compareUri);
         this.#projects = [];
         this.#projectIdToFolder.clear();
         this.#lookupById.clear();
         for (const uri of configFiles) {
-            if (cancelToken) {
-                await interruptAndCheck(cancelToken);
-            }
-            try {
-                await this.registerConfigFile(uri, cancelToken);
-            }
-            catch (error) {
-                logger.error('Failed to load config file {uri}', { uri: uri.fsPath, error });
+            if (cancelToken?.isCancellationRequested) {
+                break;
             }
+            await this.registerConfigFile(uri, cancelToken).catch(error => {
+                if (!isOperationCancelled(error)) {
+                    logger.warn(loggable(error));
+                }
+            });
         }
         this.reset();
+        if (cancelToken?.isCancellationRequested) {
+            throw OperationCancelled;
+        }
         await this.services.workspace.WorkspaceManager.rebuildAll(cancelToken);
     }
     uniqueProjectId(name) {
@@ -511,9 +513,15 @@ export class ProjectsManager {
         const log = logger.getChild(project.id);
         const folder = project.folder;
         const includePaths = project.includePaths;
-        const docs = this.services.workspace.LangiumDocuments
-            .all
-            .filter(doc => {
+        const allDocs = this.services.workspace.LangiumDocuments
+            .allKnownDocuments
+            .filter(doc => !isLikeC4Builtin(doc.uri))
+            .toArray();
+        // If no documents are found, return early
+        if (allDocs.length === 0) {
+            return;
+        }
+        const docs = pipe(allDocs, filter(doc => {
             if (project.exclude?.(doc.uri.path)) {
                 return false;
             }
@@ -526,25 +534,22 @@ export class ProjectsManager {
             }
             const docdir = withTrailingSlash(joinRelativeURL(docUriStr, '..'));
             return docdir.startsWith(folder) || folder.startsWith(docdir);
-        })
-            .map(d => d.uri)
-            .toArray();
-        if (docs.length > 0) {
-            log.info('rebuild project documents: {docs}', {
-                docs: docs.length,
-            });
-            this.reset();
-            await this.services.workspace.DocumentBuilder
-                .update(docs, [], cancelToken)
-                .catch(error => {
-                log.warn('Failed to rebuild project', {
-                    error,
-                });
-            });
-        }
-        else {
+        }), map(d => d.uri));
+        if (docs.length === 0) {
             log.debug('no documents in project, skipping rebuild');
+            return;
         }
+        log.info('rebuild project documents: {docs}', {
+            docs: docs.length,
+        });
+        this.reset();
+        await this.services.workspace.DocumentBuilder
+            .update(docs, [], cancelToken)
+            .catch(error => {
+            log.warn('Failed to rebuild project', {
+                error,
+            });
+        });
     }
     findProjectForDocument(documentUri) {
         return this.mappingsToProject.get(documentUri, () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.46.4",
+  "version": "1.47.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -34,6 +34,7 @@
       "sources": "./src/index.ts",
       "default": {
         "types": "./dist/index.d.ts",
+        "import": "./dist/index.js",
         "default": "./dist/index.js"
       }
     },
@@ -78,11 +79,11 @@
   "dependencies": {
     "@hpcc-js/wasm-graphviz": "1.17.0",
     "bundle-require": "^5.1.0",
-    "esbuild": "0.27.1"
+    "esbuild": "0.27.2"
   },
   "devDependencies": {
     "@hono/node-server": "^1.19.7",
-    "@modelcontextprotocol/sdk": "^1.22.0",
+    "@modelcontextprotocol/sdk": "^1.25.1",
     "@msgpack/msgpack": "^3.1.2",
     "@smithy/util-base64": "^4.3.0",
     "@types/natural-compare-lite": "^1.4.2",
@@ -93,19 +94,19 @@
     "chokidar": "^5.0.0",
     "defu": "^6.1.4",
     "esm-env": "^1.2.2",
-    "fast-equals": "^5.4.0",
+    "fast-equals": "^6.0.0",
     "fdir": "6.4.0",
-    "fetch-to-node": "^2.1.0",
     "hono": "^4.11.1",
-    "immer": "^11.0.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.33.0",
-    "p-debounce": "4.0.0",
+    "oxlint": "1.35.0",
+    "p-debounce": "5.1.0",
     "p-queue": "8.1.1",
     "p-timeout": "6.1.4",
     "picomatch": "^4.0.3",
@@ -113,7 +114,7 @@
     "remeda": "^2.32.0",
     "strip-indent": "^4.1.1",
     "tsx": "4.21.0",
-    "turbo": "2.6.3",
+    "turbo": "2.7.2",
     "type-fest": "^4.41.0",
     "typescript": "5.9.3",
     "ufo": "1.6.1",
@@ -126,13 +127,13 @@
     "vscode-uri": "3.1.0",
     "which": "^5.0.0",
     "zod": "^3.25.76",
-    "@likec4/config": "1.46.4",
-    "@likec4/core": "1.46.4",
-    "@likec4/devops": "1.42.0",
+    "@likec4/config": "1.47.0",
+    "@likec4/core": "1.47.0",
     "@likec4/icons": "1.46.4",
-    "@likec4/log": "1.46.1",
-    "@likec4/layouts": "1.46.4",
-    "@likec4/tsconfig": "1.46.1"
+    "@likec4/devops": "1.42.0",
+    "@likec4/layouts": "1.47.0",
+    "@likec4/tsconfig": "1.46.1",
+    "@likec4/log": "1.46.1"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",