@likec4/language-server 0.37.1 → 0.41.0

package/dist/model/fqn-index.js

@@ -1,147 +1,123 @@
-import { nameFromFqn, parentFqn } from '@likec4/core';
-import { DONE_RESULT, DocumentState, MultiMap, StreamImpl, stream } from 'langium';
-import { isNil } from 'remeda';
-import { ElementOps, isLikeC4LangiumDocument } from '../ast';
-import { logError, logger } from '../logger';
-import { printDocs } from '../utils';
-import { computeDocumentFqn } from './fqn-computation';
+import { nameFromFqn, parentFqn } from "@likec4/core";
+import { DONE_RESULT, DocumentState, MultiMap, StreamImpl, stream } from "langium";
+import { isNil } from "remeda";
+import { ElementOps, isLikeC4LangiumDocument } from "../ast.js";
+import { logError, logger } from "../logger.js";
+import { printDocs } from "../utils.js";
+import { computeDocumentFqn } from "./fqn-computation.js";
 export function isFqnIndexedDocument(doc) {
-    return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !isNil(doc.c4fqns);
+  return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !isNil(doc.c4fqns);
 }
 export class FqnIndex {
-    langiumDocuments;
-    constructor(services) {
-        this.langiumDocuments = services.shared.workspace.LangiumDocuments;
-        // services.shared.workspace.DocumentBuilder.onUpdate((changed,deleted) => {
-        //   logger.debug('') // empty line to separate batches
-        //   logger.debug(`[DocumentBuilder.onUpdate]`)
-        //   if (changed.length > 0) {
-        //     logger.debug(` changed:\n` + changed.map(u => '  - ' + Utils.basename(u)).join('\n'))
-        //   }
-        //   if (deleted.length > 0) {
-        //     logger.debug(` deleted:\n` + deleted.map(u => '  - ' + Utils.basename(u)).join('\n'))
-        //   }
-        // })
-        services.shared.workspace.DocumentBuilder.onBuildPhase(DocumentState.Changed, (docs, _cancelToken) => {
-            logger.debug(`[FqnIndex] onChanged (${docs.length} docs):\n` + printDocs(docs));
-            for (const doc of docs) {
-                if (isLikeC4LangiumDocument(doc)) {
-                    delete doc.c4fqns;
-                    delete doc.c4Elements;
-                    delete doc.c4Specification;
-                    delete doc.c4Relations;
-                    delete doc.c4Views;
-                }
+  langiumDocuments;
+  constructor(services) {
+    this.langiumDocuments = services.shared.workspace.LangiumDocuments;
+    services.shared.workspace.DocumentBuilder.onBuildPhase(
+      DocumentState.Changed,
+      (docs, _cancelToken) => {
+        logger.debug(`[FqnIndex] onChanged (${docs.length} docs):
+` + printDocs(docs));
+        for (const doc of docs) {
+          if (isLikeC4LangiumDocument(doc)) {
+            delete doc.c4fqns;
+            delete doc.c4Elements;
+            delete doc.c4Specification;
+            delete doc.c4Relations;
+            delete doc.c4Views;
+          }
+        }
+      }
+    );
+    services.shared.workspace.DocumentBuilder.onBuildPhase(
+      DocumentState.IndexedContent,
+      (docs, _cancelToken) => {
+        logger.debug(`[FqnIndex] onIndexedContent ${docs.length}:
+` + printDocs(docs));
+        for (const doc of docs) {
+          if (isLikeC4LangiumDocument(doc)) {
+            try {
+              computeDocumentFqn(doc, services);
+            } catch (e) {
+              logError(e);
             }
+          }
+        }
+      }
+    );
+  }
+  documents() {
+    return this.langiumDocuments.all.filter(isFqnIndexedDocument);
+  }
+  entries(filterByFqn = () => true) {
+    return this.documents().flatMap(
+      (doc) => doc.c4fqns.entries().filter(([fqn]) => filterByFqn(fqn)).map(([fqn, entry]) => {
+        const el = entry.el.deref();
+        if (el) {
+          return { ...entry, fqn, el, doc };
+        }
+        return null;
+      }).nonNullable()
+    );
+  }
+  getFqn(el) {
+    return el.fqn ?? ElementOps.readId(el) ?? null;
+  }
+  byFqn(fqn) {
+    return this.documents().flatMap((doc) => {
+      return doc.c4fqns.get(fqn).flatMap((entry) => {
+        const el = entry.el.deref();
+        if (el) {
+          return [{ fqn, el, doc, path: entry.path, name: entry.name }];
+        }
+        return [];
+      });
+    });
+  }
+  directChildrenOf(parent) {
+    return stream([parent]).flatMap((_parent) => {
+      const children = this.entries((fqn) => parentFqn(fqn) === _parent).map((entry) => [entry.name, entry]).toArray();
+      if (children.length === 0) {
+        return [];
+      }
+      return new MultiMap(children).entriesGroupedByKey().flatMap(([_name, descrs]) => descrs.length === 1 ? descrs : []).iterator();
+    });
+  }
+  /**
+   * Returns descedant elements with unique names in the scope
+   */
+  uniqueDescedants(parent) {
+    return new StreamImpl(
+      () => {
+        const prefix = `${parent}.`;
+        const childrenNames = /* @__PURE__ */ new Set();
+        const descedants = [];
+        const nested = new MultiMap();
+        this.entries((f) => f.startsWith(prefix)).forEach((e) => {
+          const name = nameFromFqn(e.fqn);
+          const entry = { ...e, name };
+          if (parentFqn(e.fqn) === parent) {
+            childrenNames.add(name);
+            nested.add(name, entry);
+          } else {
+            descedants.push(entry);
+          }
         });
-        services.shared.workspace.DocumentBuilder.onBuildPhase(DocumentState.IndexedContent, (docs, _cancelToken) => {
-            logger.debug(`[FqnIndex] onIndexedContent ${docs.length}:\n` + printDocs(docs));
-            for (const doc of docs) {
-                if (isLikeC4LangiumDocument(doc)) {
-                    try {
-                        computeDocumentFqn(doc, services);
-                    }
-                    catch (e) {
-                        logError(e);
-                    }
-                }
-            }
-        });
-    }
-    documents() {
-        return this.langiumDocuments.all.filter(isFqnIndexedDocument);
-    }
-    entries(filterByFqn = () => true) {
-        return this.documents().flatMap(doc => doc.c4fqns
-            .entries()
-            .filter(([fqn]) => filterByFqn(fqn))
-            .map(([fqn, entry]) => {
-            const el = entry.el.deref();
-            if (el) {
-                return { ...entry, fqn, el, doc };
-            }
-            return null;
-        })
-            .nonNullable());
-    }
-    getFqn(el) {
-        return el.fqn ?? ElementOps.readId(el) ?? null;
-        // if (fqn) {
-        //   const doc = getDocument(el)
-        //   if (isFqnIndexedDocument(doc) && doc.c4fqns.has(fqn)) {
-        //     return fqn
-        //   }
-        //   const path = this.services.workspace.AstNodeLocator.getAstNodePath(el)
-        //   logError(`Clean cached FQN ${fqn} at ${path}`)
-        //   ElementOps.writeId(el, null)
-        //   fqn = null
-        // }
-        // return fqn
-    }
-    byFqn(fqn) {
-        return this.documents().flatMap(doc => {
-            return doc.c4fqns.get(fqn).flatMap(entry => {
-                const el = entry.el.deref();
-                if (el) {
-                    return [{ fqn, el, doc, path: entry.path, name: entry.name }];
-                }
-                return [];
-            });
-        });
-    }
-    directChildrenOf(parent) {
-        return stream([parent]).flatMap(_parent => {
-            const children = this.entries(fqn => parentFqn(fqn) === _parent)
-                .map((entry) => [entry.name, entry])
-                .toArray();
-            if (children.length === 0) {
-                return [];
-            }
-            return new MultiMap(children)
-                .entriesGroupedByKey()
-                .flatMap(([_name, descrs]) => (descrs.length === 1 ? descrs : []))
-                .iterator();
-        });
-    }
-    /**
-     * Returns descedant elements with unique names in the scope
-     */
-    uniqueDescedants(parent) {
-        return new StreamImpl(() => {
-            const prefix = `${parent}.`;
-            const childrenNames = new Set();
-            const descedants = [];
-            const nested = new MultiMap();
-            this.entries(f => f.startsWith(prefix)).forEach(e => {
-                const name = nameFromFqn(e.fqn);
-                const entry = { ...e, name };
-                // To keep direct children always
-                if (parentFqn(e.fqn) === parent) {
-                    childrenNames.add(name);
-                    nested.add(name, entry);
-                }
-                else {
-                    descedants.push(entry);
-                }
-            });
-            if (nested.size + descedants.length === 0) {
-                return null;
-            }
-            for (const descedant of descedants) {
-                if (!childrenNames.has(descedant.name)) {
-                    nested.add(descedant.name, descedant);
-                }
-            }
-            return nested
-                .entriesGroupedByKey()
-                .flatMap(([_name, descrs]) => (descrs.length === 1 ? descrs : []))
-                .iterator();
-        }, iterator => {
-            if (iterator) {
-                return iterator.next();
-            }
-            return DONE_RESULT;
-        });
-    }
+        if (nested.size + descedants.length === 0) {
+          return null;
+        }
+        for (const descedant of descedants) {
+          if (!childrenNames.has(descedant.name)) {
+            nested.add(descedant.name, descedant);
+          }
+        }
+        return nested.entriesGroupedByKey().flatMap(([_name, descrs]) => descrs.length === 1 ? descrs : []).iterator();
+      },
+      (iterator) => {
+        if (iterator) {
+          return iterator.next();
+        }
+        return DONE_RESULT;
+      }
+    );
+  }
 }
-//# sourceMappingURL=fqn-index.js.map

package/dist/model/index.js

@@ -1,6 +1,5 @@
-export * from './fqn-computation';
-export * from './fqn-index';
-export * from './model-builder';
-export * from './model-locator';
-export * from './model-parser';
-//# sourceMappingURL=index.js.map
+export * from "./fqn-computation.js";
+export * from "./fqn-index.js";
+export * from "./model-builder.js";
+export * from "./model-locator.js";
+export * from "./model-parser.js";

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

@@ -1,16 +1,21 @@
 import { type ViewID, type c4 } from '@likec4/core';
+import type { URI } from 'langium';
+import { Disposable } from 'vscode-languageserver';
 import type { LikeC4Services } from '../module';
+type ModelParsedListener = (docs: URI[]) => void;
 export declare class LikeC4ModelBuilder {
     private services;
     private langiumDocuments;
-    private readonly cachedModel;
+    private workspaceManager;
+    private listeners;
     constructor(services: LikeC4Services);
-    private cleanCache;
-    private documents;
+    get workspaceUri(): string | null;
     buildRawModel(): c4.LikeC4RawModel | null;
     buildModel(): c4.LikeC4Model | null;
     computeView(viewId: ViewID): c4.ComputedView | null;
-    private scheduledCb;
-    private notifyClient;
+    onModelParsed(callback: ModelParsedListener): Disposable;
+    private documents;
+    private notifyListeners;
 }
+export {};
 //# sourceMappingURL=model-builder.d.ts.map