@likec4/language-server 1.10.0 → 1.11.0

package/dist/shared/{language-server.DBJJUUgF.mjs → language-server.CCOotWDz.mjs}

@@ -1,8 +1,8 @@
 import { AbstractAstReflection, loadGrammarFromJson, DocumentState, AstUtils, GrammarUtils, MultiMap, CstUtils, stream, StreamImpl, DONE_RESULT, interruptAndCheck, Disposable, DefaultScopeComputation, DefaultScopeProvider, EMPTY_STREAM, StreamScope, MapScope, EMPTY_SCOPE, URI, UriUtils, isAstNode, DefaultWorkspaceManager, WorkspaceCache, inject, EmptyFileSystem } from 'langium';
 import { DefaultCompletionProvider, DefaultDocumentHighlightProvider, AstNodeHoverProvider, AbstractSemanticTokenProvider, DefaultWorkspaceSymbolProvider, Formatting, AbstractFormatter, createDefaultModule, createDefaultSharedModule } from 'langium/lsp';
 import { rootLogger, LogLevels, logger as logger$1 } from '@likec4/log';
+import { isError, isNullish, isDefined, clamp, isTruthy, pipe, map, filter, isEmpty, find, values, first, last, unique, hasAtLeast, mapToObj, groupBy, forEach, prop, mapValues, flatMap, reduce, sort, reverse, indexBy, isNumber, isNonNullish, findLast, entries, debounce } from 'remeda';
 import { nonexhaustive, DefaultRelationshipColor, DefaultLineStyle, DefaultArrowType, AsFqn, parentFqn, nameFromFqn, isComputedElementView, isExtendsElementView, invariant, compareNatural, isElementView as isElementView$1, isScopedElementView, computeColorValues, sortByFqnHierarchically, compareRelations, isOrOperator, isNonEmptyArray, isAndOperator, isAncestor, hasAtLeast as hasAtLeast$1, isSameHierarchy } from '@likec4/core';
-import { isNullish, isDefined, clamp, isTruthy, pipe, map, filter, isEmpty, find, values, first, last, unique, hasAtLeast, mapToObj, groupBy, forEach, prop, mapValues, flatMap, reduce, sort, reverse, indexBy, isNumber, isNonNullish, findLast, entries, debounce } from 'remeda';
 import { DiagnosticSeverity, SymbolKind, SemanticTokenTypes, SemanticTokenModifiers, TextEdit, CompletionItemKind } from 'vscode-languageserver-types';
 import indentString from 'indent-string';
 import { decode, encode } from '@msgpack/msgpack';
@@ -13,100 +13,11 @@ import { URI as URI$1 } from 'vscode-uri';
 import stripIndent from 'strip-indent';
 import hash from 'string-hash';
 import { deepEqual } from 'fast-equals';
-import { i as isAcyclic, f as findCycles, p as postorder, L as LikeC4ModelGraph, a as computeView, b as computeDynamicView } from './language-server.DtBRb9os.mjs';
+import { i as isAcyclic, f as findCycles, p as postorder, L as LikeC4ModelGraph, a as computeView, b as computeDynamicView } from './language-server.CbqwHp7Q.mjs';
 import { hasProtocol, hasLeadingSlash, isRelative, withoutLeadingSlash, withoutBase, parsePath } from 'ufo';
 import { Graph } from '@dagrejs/graphlib';
 import { DocumentHighlight, DocumentHighlightKind } from 'vscode-languageserver';
 
-const logger = rootLogger.withTag("lsp");
-function logError(err) {
-  logger.error(err);
-}
-function logWarnError(err) {
-  if (err instanceof Error) {
-    logger.warn(err.stack ?? err.message);
-    return;
-  }
-  logger.warn(err);
-}
-function setLogLevel(level) {
-  logger.level = LogLevels[level];
-}
-function logErrorToTelemetry(connection) {
-  const reporter = {
-    log: ({ level, ...logObj }, ctx) => {
-      if (level !== LogLevels.error && level !== LogLevels.fatal) {
-        return;
-      }
-      const tag = logObj.tag || "";
-      const parts = logObj.args.map((arg) => {
-        if (arg && typeof arg.stack === "string") {
-          return arg.message + "\n" + arg.stack;
-        }
-        if (typeof arg === "string") {
-          return arg;
-        }
-        return String(arg);
-      });
-      if (tag) {
-        parts.unshift(`[${tag}]`);
-      }
-      const message = parts.join(" ");
-      connection.telemetry.logEvent({ eventName: "error", error: message });
-    }
-  };
-  rootLogger.addReporter(reporter);
-  logger.setReporters(rootLogger.options.reporters);
-}
-function logToLspConnection(connection) {
-  const reporter = {
-    log: ({ level, ...logObj }, ctx) => {
-      const tag = logObj.tag || "";
-      const parts = logObj.args.map((arg) => {
-        if (arg && typeof arg.stack === "string") {
-          return arg.message + "\n" + arg.stack;
-        }
-        if (typeof arg === "string") {
-          return arg;
-        }
-        return String(arg);
-      });
-      if (tag) {
-        parts.unshift(`[${tag}]`);
-      }
-      const message = parts.join(" ");
-      switch (true) {
-        case level >= LogLevels.trace: {
-          connection.tracer.log(message);
-          break;
-        }
-        case level >= LogLevels.debug: {
-          connection.console.debug(message);
-          break;
-        }
-        case level >= LogLevels.info: {
-          connection.console.info(message);
-          break;
-        }
-        case level >= LogLevels.log: {
-          connection.console.log(message);
-          break;
-        }
-        case level >= LogLevels.warn: {
-          connection.console.warn(message);
-          break;
-        }
-        case level >= LogLevels.fatal: {
-          connection.console.error(message);
-          break;
-        }
-      }
-    }
-  };
-  rootLogger.addReporter(reporter);
-  logger.setReporters(rootLogger.options.reporters);
-}
-
 const DynamicViewRule = "DynamicViewRule";
 function isDynamicViewRule(item) {
   return reflection.isInstance(item, DynamicViewRule);
@@ -1488,6 +1399,94 @@ const LikeC4GeneratedModule = {
   }
 };
 
+const logger = rootLogger.withTag("lsp");
+function logError(err) {
+  logger.error(err);
+}
+function logWarnError(err) {
+  if (err instanceof Error) {
+    logger.warn(err.stack ?? err.message);
+    return;
+  }
+  logger.warn(err);
+}
+function setLogLevel(level) {
+  logger.level = LogLevels[level];
+}
+function logErrorToTelemetry(connection) {
+  const reporter = {
+    log: ({ level, ...logObj }, ctx) => {
+      if (level !== LogLevels.error && level !== LogLevels.fatal) {
+        return;
+      }
+      const tag = logObj.tag || "";
+      const parts = logObj.args.map((arg) => {
+        if (isError(arg)) {
+          return arg.stack ?? arg.message;
+        }
+        if (typeof arg === "string") {
+          return arg;
+        }
+        return "" + arg;
+      });
+      if (tag) {
+        parts.unshift(`[${tag}]`);
+      }
+      const message = parts.join(" ");
+      connection.telemetry.logEvent({ eventName: "error", error: message });
+    }
+  };
+  rootLogger.addReporter(reporter);
+  logger.setReporters(rootLogger.options.reporters);
+}
+function logToLspConnection(connection) {
+  const reporter = {
+    log: ({ level, ...logObj }, ctx) => {
+      const tag = logObj.tag || "";
+      const parts = logObj.args.map((arg) => {
+        if (isError(arg)) {
+          return arg.stack ?? arg.message;
+        }
+        if (typeof arg === "string") {
+          return arg;
+        }
+        return "" + arg;
+      });
+      if (tag) {
+        parts.unshift(`[${tag}]`);
+      }
+      const message = parts.join(" ");
+      switch (true) {
+        case level >= LogLevels.debug: {
+          connection.console.debug(message);
+          break;
+        }
+        // case level >= LogLevels.info: {
+        //   connection.console.info(message)
+        //   break
+        // }
+        case level >= LogLevels.log: {
+          connection.console.info(message);
+          break;
+        }
+        case level >= LogLevels.warn: {
+          connection.console.warn(message);
+          break;
+        }
+        case level >= LogLevels.fatal: {
+          connection.console.error(message);
+          break;
+        }
+        default: {
+          connection.console.log(message);
+        }
+      }
+    }
+  };
+  rootLogger.setReporters([reporter]);
+  logger.setReporters(rootLogger.options.reporters);
+}
+
 function elementRef(node) {
   return node.el.ref;
 }
@@ -1609,7 +1608,7 @@ function checksFromDiagnostics(doc) {
   };
 }
 function* streamModel(doc, isValid) {
-  const traverseStack = doc.parseResult.value.models.flatMap((m) => isValid(m) ? m.elements : []);
+  const traverseStack = doc.parseResult.value.models.flatMap((m) => m.elements);
   const relations = [];
   let el;
   while (el = traverseStack.shift()) {
@@ -2540,8 +2539,6 @@ class FqnIndex {
   }
 }
 
-const printDocs = (docs) => docs.map((d) => "  - " + d.uri.toString(true)).join("\n");
-
 function assignNavigateTo(views) {
   const allElementViews = /* @__PURE__ */ new Map();
   for (const v of views) {
@@ -2935,8 +2932,7 @@ class LikeC4ModelBuilder {
       async (docs, _cancelToken) => {
         let parsed = [];
         try {
-          logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)
-${printDocs(docs)}`);
+          logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)`);
           for (const doc of parser.parse(docs)) {
             parsed.push(doc.uri);
           }
@@ -2966,8 +2962,7 @@ ${printDocs(docs)}`);
         logger.debug("[ModelBuilder] No documents to build model from");
         return null;
       }
-      logger.debug(`[ModelBuilder] buildModel from ${docs.length} docs:
-${printDocs(docs)}`);
+      logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)`);
       return buildModel(this.services, docs);
     });
   }
@@ -3024,14 +3019,14 @@ ${printDocs(docs)}`);
     if (cache.has(CACHE_KEY_COMPUTED_MODEL)) {
       return cache.get(CACHE_KEY_COMPUTED_MODEL);
     }
-    const model = await this.buildModel(cancelToken);
-    if (!model) {
-      return null;
-    }
     return await this.services.shared.workspace.WorkspaceLock.read(async () => {
       if (cancelToken) {
         await interruptAndCheck(cancelToken);
       }
+      const model = this.unsafeSyncBuildModel();
+      if (!model) {
+        return null;
+      }
       return this.unsafeSyncBuildComputedModel(model);
     });
   }
@@ -3041,17 +3036,17 @@ ${printDocs(docs)}`);
     if (cache.has(cacheKey)) {
       return cache.get(cacheKey);
     }
-    const model = await this.buildModel(cancelToken);
-    const view = model?.views[viewId];
-    if (!view) {
-      logger.warn(`[ModelBuilder] Cannot find view ${viewId}`);
-      return null;
-    }
     return await this.services.shared.workspace.WorkspaceLock.read(async () => {
       if (cancelToken) {
         await interruptAndCheck(cancelToken);
       }
       return cache.get(cacheKey, () => {
+        const model = this.unsafeSyncBuildModel();
+        const view = model?.views[viewId];
+        if (!view) {
+          logger.warn(`[ModelBuilder] Cannot find view ${viewId}`);
+          return null;
+        }
         const index = new LikeC4ModelGraph(model);
         const result = isElementView$1(view) ? computeView(view, index) : computeDynamicView(view, index);
         if (!result.isSuccess) {
@@ -4737,14 +4732,16 @@ class Rpc {
     const LangiumDocuments = this.services.shared.workspace.LangiumDocuments;
     const DocumentBuilder = this.services.shared.workspace.DocumentBuilder;
     const notifyModelParsed = debounce(
-      () => void connection.sendNotification(onDidChangeModel, "").catch((e) => {
-        logger.error(`[ServerRpc] error sending onDidChangeModel: ${e}`);
-        return Promise.resolve();
-      }),
+      () => {
+        connection.sendNotification(onDidChangeModel, "").catch((e) => {
+          logger.error(`[ServerRpc] error sending onDidChangeModel: ${e}`);
+          return Promise.resolve();
+        });
+      },
       {
         timing: "both",
-        waitMs: 350,
-        maxWaitMs: 1e3
+        waitMs: 300,
+        maxWaitMs: 600
       }
     );
     let isFirstBuild = true;
@@ -4753,7 +4750,10 @@ class Rpc {
         notifyModelParsed.cancel();
       }),
       modelBuilder.onModelParsed(() => notifyModelParsed.call()),
-      connection.onRequest(fetchComputedModel, async (cancelToken) => {
+      connection.onRequest(fetchComputedModel, async ({ cleanCaches }, cancelToken) => {
+        if (cleanCaches) {
+          this.services.WorkspaceCache.clear();
+        }
         const model = await modelBuilder.buildComputedModel(cancelToken);
         return { model };
       }),
@@ -4929,8 +4929,8 @@ class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
    * your language, which can be either loaded from provided files or constructed in memory.
    */
   async loadAdditionalDocuments(folders, collector) {
-    await super.loadAdditionalDocuments(folders, collector);
     collector(this.documentFactory.fromString(LibIcons, URI$1.parse(Uri)));
+    await super.loadAdditionalDocuments(folders, collector);
   }
   workspace() {
     if (this.folders && hasAtLeast$1(this.folders, 1)) {
@@ -5450,7 +5450,8 @@ class LikeC4Formatter extends AbstractFormatter {
   }
   formatRelation(node) {
     this.on(node, isRelation, (n, f) => {
-      f.property("source").append(FormattingOptions.oneSpace);
+      const sourceNodes = n?.source?.$cstNode ? [n?.source?.$cstNode] : [];
+      f.cst(sourceNodes).append(FormattingOptions.oneSpace);
       f.keywords("]->").prepend(FormattingOptions.noSpace);
       f.keywords("-[").append(FormattingOptions.noSpace);
       f.properties("target", "title", "technology", "tags").prepend(FormattingOptions.oneSpace);
@@ -5468,7 +5469,7 @@ class LikeC4Formatter extends AbstractFormatter {
       f.keywords("-[").append(FormattingOptions.noSpace);
     });
     this.on(node, isIncomingRelationExpression)?.keywords("->").append(FormattingOptions.oneSpace);
-    this.on(node, isInOutRelationExpression)?.property("inout").append(FormattingOptions.oneSpace);
+    this.on(node, isInOutRelationExpression)?.keyword("->").prepend(FormattingOptions.oneSpace);
   }
   removeIndentFromTopLevelStatements(node) {
     if (isModel(node) || isSpecificationRule(node) || isModelViews(node) || isLikeC4Lib(node)) {
@@ -5734,4 +5735,4 @@ function _merge(target, source) {
   return target;
 }
 
-export { LikeC4Module as L, createLanguageServices as a, createCustomLanguageServices as c, setLogLevel as s };
+export { LikeC4Module as L, createCustomLanguageServices as a, createLanguageServices as c, logger as l, setLogLevel as s };

package/dist/shared/{language-server.DtBRb9os.mjs → language-server.CbqwHp7Q.mjs}

@@ -1,5 +1,5 @@
-import { Expr, whereOperatorAsPredicate, parentFqn, nonexhaustive, isViewRuleStyle, compareByFqnHierarchically, DefaultThemeColor, DefaultElementShape, compareRelations, invariant, nonNullable, isAncestor, isViewRulePredicate, ancestorsFqn, isViewRuleAutoLayout, isScopedElementView, commonAncestor, StepEdgeId, isDynamicViewParallelSteps, isDynamicViewIncludeRule, DefaultRelationshipColor, DefaultLineStyle, DefaultArrowType, isSameHierarchy } from '@likec4/core';
-import { pipe, map, pick, mapToObj, isTruthy, isNullish, omitBy, isEmpty, filter, anyPass, isDefined, groupBy, prop, mapValues, piped, unique, entries, flatMap, sortBy, sort, difference, allPass, omit, hasAtLeast, reduce, only, isNonNull, isString, isArray } from 'remeda';
+import { Expr, whereOperatorAsPredicate, parentFqn, nonexhaustive, isViewRuleStyle, compareByFqnHierarchically, DefaultThemeColor, DefaultElementShape, compareRelations, invariant, nonNullable, compareNatural, hasAtLeast, isAncestor, isViewRulePredicate, ancestorsFqn, isViewRuleAutoLayout, isScopedElementView, commonAncestor, StepEdgeId, isDynamicViewParallelSteps, isDynamicViewIncludeRule, DefaultRelationshipColor, DefaultLineStyle, DefaultArrowType, isSameHierarchy } from '@likec4/core';
+import { pipe, map, pick, mapToObj, isTruthy, isNullish, omitBy, isEmpty, filter, anyPass, isDefined, groupBy, prop, mapValues, piped, unique, entries, flatMap, sortBy, sort, difference, allPass, omit, hasAtLeast as hasAtLeast$1, only, reduce, isNonNull, isString, isArray } from 'remeda';
 import graphlib, { Graph } from '@dagrejs/graphlib';
 import objectHash from 'object-hash';
 
@@ -366,6 +366,16 @@ function sortNodes({
   return sorted;
 }
 
+function uniqueTags(elements) {
+  const tags = pipe(
+    elements,
+    flatMap((e) => e.tags ?? []),
+    unique(),
+    sort(compareNatural)
+  );
+  return hasAtLeast(tags, 1) ? tags : null;
+}
+
 const NoFilter = () => true;
 const Identity = (x) => x;
 const filterBy = (pred) => pred === NoFilter ? Identity : filter(pred);
@@ -865,7 +875,7 @@ class ComputeCtx {
   }
   computeEdges() {
     return this.ctxEdges.map((e) => {
-      invariant(hasAtLeast(e.relations, 1), "Edge must have at least one relation");
+      invariant(hasAtLeast$1(e.relations, 1), "Edge must have at least one relation");
       const relations = sort(e.relations, compareRelations);
       const source = e.source.id;
       const target = e.target.id;
@@ -878,7 +888,11 @@ class ComputeCtx {
         relations: relations.map((r) => r.id)
       };
       let relation;
-      relation = relations.length === 1 ? relations[0] : relations.find((r) => r.source === source && r.target === target);
+      relation = only(relations) ?? pipe(
+        relations,
+        filter((r) => r.source === source && r.target === target),
+        only()
+      );
       if (!relation) {
         const allprops = pipe(
           relations,
@@ -935,7 +949,7 @@ class ComputeCtx {
           navigateTo: only(allprops.navigateTo)
         };
       }
-      const tags = unique(flatMap(relations, (r) => r.tags ?? []));
+      const tags = uniqueTags(relations);
       return Object.assign(
         edge,
         this.getEdgeLabel(relation),
@@ -947,7 +961,7 @@ class ComputeCtx {
         relation.head && { head: relation.head },
         relation.tail && { tail: relation.tail },
         relation.navigateTo && { navigateTo: relation.navigateTo },
-        hasAtLeast(tags, 1) && { tags }
+        tags && { tags }
       );
     });
   }
@@ -969,7 +983,7 @@ class ComputeCtx {
   }
   addEdges(edges) {
     for (const e of edges) {
-      if (!hasAtLeast(e.relations, 1)) {
+      if (!hasAtLeast$1(e.relations, 1)) {
         continue;
       }
       const existing = this.ctxEdges.find(
@@ -1357,8 +1371,8 @@ class DynamicViewComputeCtx {
       filter(isTruthy),
       unique()
     );
-    const tags = hasAtLeast(alltags, 1) ? alltags : null;
-    const relations = hasAtLeast(relationships, 1) ? map(relationships, (r) => r.id) : null;
+    const tags = hasAtLeast$1(alltags, 1) ? alltags : null;
+    const relations = hasAtLeast$1(relationships, 1) ? map(relationships, (r) => r.id) : null;
     const relation = only(relationships) || relationships.find((r) => r.source === source.id && r.target === target.id);
     const title = isTruthy(relation?.title) ? relation.title : pipe(
       relationships,