@likec4/language-server 1.27.3 → 1.28.1

package/dist/model/builder/buildModel.js

@@ -1,6 +1,7 @@
 import {
   computeColorValues,
   DeploymentElement,
+  isGlobalFqn,
   parentFqn,
   sortByFqnHierarchically
 } from "@likec4/core";
@@ -22,7 +23,7 @@ import { logger } from "../../logger.js";
 import { resolveRelativePaths } from "../../view-utils/index.js";
 import { MergedExtends } from "./MergedExtends.js";
 import { MergedSpecification } from "./MergedSpecification.js";
-export function buildModel(docs) {
+export function buildModelData(docs) {
   const c4Specification = new MergedSpecification(docs);
   const customColorDefinitions = mapValues(
     c4Specification.specs.colors,
@@ -58,7 +59,7 @@ export function buildModel(docs) {
     flatMap((d) => map(d.c4Relations, c4Specification.toModelRelation)),
     filter((rel) => {
       if (!rel) return false;
-      if (isNullish(elements[rel.source]) || isNullish(elements[rel.target])) {
+      if (isNullish(elements[rel.source]) && !isGlobalFqn(rel.source) || isNullish(elements[rel.target]) && !isGlobalFqn(rel.target)) {
         logger.debug`Invalid relation ${rel.id}
   source: ${rel.source} resolved: ${!!elements[rel.source]}
   target: ${rel.target} resolved: ${!!elements[rel.target]}\n`;
@@ -176,19 +177,23 @@ export function buildModel(docs) {
     resolveRulesExtendedViews
   );
   return {
-    specification: {
-      tags: Array.from(c4Specification.specs.tags),
-      elements: c4Specification.specs.elements,
-      relationships: c4Specification.specs.relationships,
-      deployments: c4Specification.specs.deployments
+    data: {
+      specification: {
+        tags: Array.from(c4Specification.specs.tags),
+        elements: c4Specification.specs.elements,
+        relationships: c4Specification.specs.relationships,
+        deployments: c4Specification.specs.deployments
+      },
+      elements,
+      relations,
+      globals: c4Specification.globals,
+      views,
+      deployments: {
+        elements: deploymentElements,
+        relations: deploymentRelations
+      },
+      imports: {}
     },
-    elements,
-    relations,
-    globals: c4Specification.globals,
-    views,
-    deployments: {
-      elements: deploymentElements,
-      relations: deploymentRelations
-    }
+    imports: c4Specification.imports
   };
 }

package/dist/model/deployments-index.js

@@ -20,6 +20,7 @@ export class DeploymentsIndex extends FqnIndex {
     if (rootNodes.length === 0) {
       return DocumentFqnIndex.EMPTY;
     }
+    const projectId = document.likec4ProjectId ??= this.projects.belongsTo(document);
     const root = new Array();
     const children = new MultiMap();
     const descendants = new MultiMap();
@@ -29,7 +30,8 @@ export class DeploymentsIndex extends FqnIndex {
     const createAndSaveDescription = (node, name, fqn) => {
       const desc = {
         ...Descriptions.createDescription(node, name, document),
-        id: fqn
+        id: fqn,
+        likec4ProjectId: projectId
       };
       ElementOps.writeId(node, fqn);
       byfqn.set(fqn, desc);
@@ -93,6 +95,6 @@ export class DeploymentsIndex extends FqnIndex {
         logWarnError(e);
       }
     }
-    return new DocumentFqnIndex(root, children, descendants, byfqn, this.projects.belongsTo(document));
+    return new DocumentFqnIndex(root, children, descendants, byfqn, projectId);
   }
 }

package/dist/model/fqn-index.d.ts

@@ -1,11 +1,11 @@
 import { type Fqn, type ProjectId } from '@likec4/core/types';
 import { DefaultWeakMap, MultiMap } from '@likec4/core/utils';
-import { type AstNode, type Stream, WorkspaceCache } from 'langium';
+import { type Stream, WorkspaceCache } from 'langium';
 import { type AstNodeDescriptionWithFqn, type LikeC4LangiumDocument, ast } from '../ast';
 import type { LikeC4Services } from '../module';
 import { ADisposable } from '../utils';
 import { type LangiumDocuments, ProjectsManager } from '../workspace';
-export declare class FqnIndex<AstNd extends AstNode = ast.Element> extends ADisposable {
+export declare class FqnIndex<AstNd = ast.Element> extends ADisposable {
     protected services: LikeC4Services;
     private cachePrefix;
     protected projects: ProjectsManager;
@@ -15,8 +15,10 @@ export declare class FqnIndex<AstNd extends AstNode = ast.Element> extends ADisp
     constructor(services: LikeC4Services, cachePrefix?: string);
     private documents;
     get(document: LikeC4LangiumDocument): DocumentFqnIndex;
+    resolve(reference: ast.Referenceable): Fqn;
     getFqn(el: AstNd): Fqn;
     byFqn(projectId: ProjectId, fqn: Fqn): Stream<AstNodeDescriptionWithFqn>;
+    rootElements(projectId: ProjectId): Stream<AstNodeDescriptionWithFqn>;
     directChildrenOf(projectId: ProjectId, parent: Fqn): Stream<AstNodeDescriptionWithFqn>;
     /**
      * Returns descedant elements with unique names in the scope

package/dist/model/fqn-index.js

@@ -29,11 +29,10 @@ export class FqnIndex extends ADisposable {
     this.onDispose(
       services.shared.workspace.DocumentBuilder.onDocumentPhase(
         DocumentState.IndexedContent,
-        async (doc, _cancelToken) => {
+        (doc) => {
           if (isLikeC4LangiumDocument(doc)) {
             this.documentCache.set(doc, this.createDocumentIndex(doc));
           }
-          return await Promise.resolve();
         }
       )
     );
@@ -53,6 +52,15 @@ export class FqnIndex extends ADisposable {
     }
     return this.documentCache.get(document);
   }
+  resolve(reference) {
+    if (reference.$type === "Imported") {
+      return this.getFqn(reference.imported.ref);
+    }
+    if (reference.$type === "Element") {
+      return this.getFqn(reference);
+    }
+    return this.services.likec4.DeploymentsIndex.getFqn(reference);
+  }
   getFqn(el) {
     invariant(ast.isElement(el) || ast.isDeploymentElement(el));
     let id = ElementOps.readId(el);
@@ -66,12 +74,25 @@ export class FqnIndex extends ADisposable {
     return nonNullable(ElementOps.readId(el), "Element fqn must be set, invalid state");
   }
   byFqn(projectId, fqn) {
-    return stream(this.workspaceCache.get(`${this.cachePrefix}:${projectId}:${fqn}`, () => {
+    return stream(this.workspaceCache.get(`${this.cachePrefix}:${projectId}:fqn:${fqn}`, () => {
       return this.documents(projectId).toArray().flatMap((doc) => {
         return this.get(doc).byFqn(fqn);
       });
     }));
   }
+  rootElements(projectId) {
+    return stream(
+      this.workspaceCache.get(`${this.cachePrefix}:${projectId}:rootElements`, () => {
+        const allchildren = this.documents(projectId).reduce((map, doc) => {
+          this.get(doc).rootElements().forEach((desc) => {
+            map.set(desc.name, desc);
+          });
+          return map;
+        }, new MultiMap());
+        return uniqueByName(allchildren).sort((a, b) => compareNatural(a.name, b.name));
+      })
+    );
+  }
   directChildrenOf(projectId, parent) {
     return stream(
       this.workspaceCache.get(`${this.cachePrefix}:${projectId}:directChildrenOf:${parent}`, () => {
@@ -118,6 +139,7 @@ export class FqnIndex extends ADisposable {
     if (rootElements.length === 0) {
       return DocumentFqnIndex.EMPTY;
     }
+    const projectId = document.likec4ProjectId ??= this.projects.belongsTo(document);
     const root = new Array();
     const children = new MultiMap();
     const descendants = new MultiMap();
@@ -126,7 +148,8 @@ export class FqnIndex extends ADisposable {
     const createAndSaveDescription = (node, name, fqn) => {
       const desc = {
         ...Descriptions.createDescription(node, name, document),
-        id: fqn
+        id: fqn,
+        likec4ProjectId: projectId
       };
       ElementOps.writeId(node, fqn);
       byfqn.set(fqn, desc);
@@ -184,7 +207,7 @@ export class FqnIndex extends ADisposable {
         logWarnError(e);
       }
     }
-    return new DocumentFqnIndex(root, children, descendants, byfqn, this.projects.belongsTo(document));
+    return new DocumentFqnIndex(root, children, descendants, byfqn, projectId);
   }
 }
 function uniqueByName(multimap) {

package/dist/model/model-builder.d.ts

@@ -18,7 +18,6 @@ export declare class DefaultLikeC4ModelBuilder extends ADisposable implements Li
     private listeners;
     private cache;
     private DocumentBuilder;
-    private LangiumDocuments;
     private mutex;
     constructor(services: LikeC4Services);
     /**
@@ -26,7 +25,8 @@ export declare class DefaultLikeC4ModelBuilder extends ADisposable implements Li
      * This method is internal and should to be called only when all documents are known to be parsed.
      * Otherwise, the model may be incomplete.
      */
-    private unsafeSyncParseModel;
+    private unsafeSyncParseModelData;
+    private unsafeSyncJoinedModelData;
     parseModel(projectId?: c4.ProjectId | undefined, cancelToken?: CancellationToken): Promise<c4.ParsedLikeC4ModelData | null>;
     private previousViews;
     /**

package/dist/model/model-builder.js

@@ -12,7 +12,9 @@ import {
 import prettyMs from "pretty-ms";
 import {
   filter,
+  flatMap,
   groupBy,
+  hasAtLeast,
   isNot,
   mapToObj,
   pipe,
@@ -24,7 +26,8 @@ import { isLikeC4Builtin } from "../likec4lib.js";
 import { logger as mainLogger, logWarnError } from "../logger.js";
 import { ADisposable } from "../utils/index.js";
 import { assignNavigateTo } from "../view-utils/index.js";
-import { buildModel } from "./builder/buildModel.js";
+import { buildModelData } from "./builder/buildModel.js";
+const parsedWithoutImportsCacheKey = (projectId) => `parsed-without-imports-${projectId}`;
 const parsedModelCacheKey = (projectId) => `parsed-model-${projectId}`;
 const computedModelCacheKey = (projectId) => `computed-model-${projectId}`;
 const logger = mainLogger.getChild("ModelBuilder");
@@ -34,7 +37,6 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
   listeners = [];
   cache;
   DocumentBuilder;
-  LangiumDocuments;
   mutex;
   constructor(services) {
     super();
@@ -42,7 +44,6 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
     this.parser = services.likec4.ModelParser;
     this.cache = services.ValidatedWorkspaceCache;
     this.DocumentBuilder = services.shared.workspace.DocumentBuilder;
-    this.LangiumDocuments = services.shared.workspace.LangiumDocuments;
     this.mutex = services.shared.workspace.WorkspaceLock;
     this.onDispose(
       this.DocumentBuilder.onUpdate((_changed, deleted) => {
@@ -69,20 +70,57 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
    * This method is internal and should to be called only when all documents are known to be parsed.
    * Otherwise, the model may be incomplete.
    */
-  unsafeSyncParseModel(projectId) {
+  unsafeSyncParseModelData(projectId) {
     const cache = this.cache;
     const log = logger.getChild(["project", projectId]);
-    if (cache.has(parsedModelCacheKey(projectId))) {
-      log.debug("unsafeSyncParseModel from cache");
+    const key = parsedWithoutImportsCacheKey(projectId);
+    if (cache.has(key)) {
+      log.debug`unsafeSyncBuildModelData from cache, project ${projectId}`;
     }
-    return cache.get(parsedModelCacheKey(projectId), () => {
-      const docs = this.documents(projectId);
-      if (docs.length === 0) {
-        logger.debug(`no documents to build model - project ${projectId}`);
+    return cache.get(key, () => {
+      try {
+        const docs = this.documents(projectId);
+        if (docs.length === 0) {
+          logger.debug`no documents to build model, project ${projectId}`;
+          return null;
+        }
+        log.debug`unsafeSyncBuildModelData, project ${projectId}`;
+        return buildModelData(docs);
+      } catch (e) {
+        logWarnError(e);
         return null;
       }
-      log.debug("unsafeSyncParseModel from documents");
-      return buildModel(docs);
+    });
+  }
+  unsafeSyncJoinedModelData(projectId) {
+    const cache = this.cache;
+    const key = parsedModelCacheKey(projectId);
+    return cache.get(key, () => {
+      const result = this.unsafeSyncParseModelData(projectId);
+      if (!result) {
+        return null;
+      }
+      if (result.imports.size > 0) {
+        logger.debug`processing imports of ${projectId}`;
+        const imports = [...result.imports.associations()].reduce((acc, [projectId2, fqns]) => {
+          const anotherProject = this.unsafeSyncParseModelData(projectId2);
+          if (anotherProject) {
+            const imported = pipe(
+              [...fqns],
+              flatMap((fqn) => anotherProject.data.elements[fqn] ?? [])
+            );
+            if (hasAtLeast(imported, 1)) {
+              acc[projectId2] = imported;
+            }
+          }
+          return acc;
+        }, {});
+        return {
+          ...result.data,
+          imports
+        };
+      }
+      return result.data;
     });
   }
   async parseModel(projectId, cancelToken = CancellationToken.None) {
@@ -91,14 +129,14 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
     const cache = this.cache;
     const cached = cache.get(parsedModelCacheKey(project));
     if (cached) {
-      log.debug("parseModel from cache");
+      log.debug`parseModel from cache, project ${project}`;
       return cached;
     }
     const t0 = performance.now();
     return await this.mutex.read(async () => {
       await interruptAndCheck(cancelToken);
-      const result = this.unsafeSyncParseModel(project);
-      log.debug(`parseModel in ${prettyMs(performance.now() - t0)}`);
+      const result = this.unsafeSyncJoinedModelData(project);
+      log.debug(`parseModel, project ${project} in ${prettyMs(performance.now() - t0)}`);
       return result;
     });
   }
@@ -112,7 +150,7 @@ export class DefaultLikeC4ModelBuilder extends ADisposable {
     const cache = this.cache;
     const viewsCache = this.cache;
     return cache.get(computedModelCacheKey(projectId), () => {
-      const parsed = this.unsafeSyncParseModel(projectId);
+      const parsed = this.unsafeSyncJoinedModelData(projectId);
       if (!parsed) {
         return LikeC4Model.EMPTY;
       }

package/dist/model/model-locator.js

@@ -1,3 +1,4 @@
+import { splitGlobalFqn } from "@likec4/core";
 import { AstUtils, GrammarUtils } from "langium";
 import { isString } from "remeda";
 import { ast } from "../ast.js";
@@ -50,8 +51,9 @@ export class LikeC4ModelLocator {
     return doc.c4Elements.find((e) => e.id === fqn) ?? null;
   }
   locateElement(fqn, projectId) {
-    const _projectId = this.projects.ensureProjectId(projectId);
-    const entry = this.fqnIndex.byFqn(_projectId, fqn).head();
+    let [_projectId, _fqn] = splitGlobalFqn(fqn);
+    _projectId ??= this.projects.ensureProjectId(projectId);
+    const entry = this.fqnIndex.byFqn(_projectId, _fqn).head();
     const docsegment = entry?.nameSegment ?? entry?.selectionSegment;
     if (!entry || !docsegment) {
       return null;
@@ -62,8 +64,9 @@ export class LikeC4ModelLocator {
     };
   }
   locateDeploymentElement(fqn, projectId) {
-    const _projectId = this.projects.ensureProjectId(projectId);
-    const entry = this.deploymentsIndex.byFqn(_projectId, fqn).head();
+    let [_projectId, _fqn] = splitGlobalFqn(fqn);
+    _projectId ??= this.projects.ensureProjectId(projectId);
+    const entry = this.deploymentsIndex.byFqn(_projectId, _fqn).head();
     const docsegment = entry?.nameSegment ?? entry?.selectionSegment;
     if (!entry || !docsegment) {
       return null;