@likec4/language-server 1.10.0 → 1.11.0

package/dist/model-graph/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const LikeC4ModelGraph = require('../shared/language-server.DwyCJvXm.cjs');
+const LikeC4ModelGraph = require('../shared/language-server.DJhoJBWh.cjs');
 
 
 

package/dist/model-graph/index.mjs

@@ -1 +1 @@
-export { L as LikeC4ModelGraph, b as computeDynamicView, c as computeElementView, a as computeView } from '../shared/language-server.DtBRb9os.mjs';
+export { L as LikeC4ModelGraph, b as computeDynamicView, c as computeElementView, a as computeView } from '../shared/language-server.CbqwHp7Q.mjs';

package/dist/protocol.cjs

@@ -6,7 +6,7 @@ const onDidChangeModel = new vscodeJsonrpc.NotificationType("likec4/onDidChangeM
 const fetchModel = new vscodeJsonrpc.RequestType0(
   "likec4/fetchModel"
 );
-const fetchComputedModel = new vscodeJsonrpc.RequestType0(
+const fetchComputedModel = new vscodeJsonrpc.RequestType(
   "likec4/fetchComputedModel"
 );
 const computeView = new vscodeJsonrpc.RequestType(

package/dist/protocol.d.cts

@@ -8,7 +8,9 @@ declare const fetchModel: RequestType0<{
     model: ParsedLikeC4Model | null;
 }, void>;
 type FetchModelRequest = typeof fetchModel;
-declare const fetchComputedModel: RequestType0<{
+declare const fetchComputedModel: RequestType<{
+    cleanCaches?: boolean | undefined;
+}, {
     model: ComputedLikeC4Model | null;
 }, void>;
 type FetchComputedModelRequest = typeof fetchComputedModel;

package/dist/protocol.d.mts

@@ -8,7 +8,9 @@ declare const fetchModel: RequestType0<{
     model: ParsedLikeC4Model | null;
 }, void>;
 type FetchModelRequest = typeof fetchModel;
-declare const fetchComputedModel: RequestType0<{
+declare const fetchComputedModel: RequestType<{
+    cleanCaches?: boolean | undefined;
+}, {
     model: ComputedLikeC4Model | null;
 }, void>;
 type FetchComputedModelRequest = typeof fetchComputedModel;

package/dist/protocol.d.ts

@@ -8,7 +8,9 @@ declare const fetchModel: RequestType0<{
     model: ParsedLikeC4Model | null;
 }, void>;
 type FetchModelRequest = typeof fetchModel;
-declare const fetchComputedModel: RequestType0<{
+declare const fetchComputedModel: RequestType<{
+    cleanCaches?: boolean | undefined;
+}, {
     model: ComputedLikeC4Model | null;
 }, void>;
 type FetchComputedModelRequest = typeof fetchComputedModel;

package/dist/protocol.mjs

@@ -4,7 +4,7 @@ const onDidChangeModel = new NotificationType("likec4/onDidChangeModel");
 const fetchModel = new RequestType0(
   "likec4/fetchModel"
 );
-const fetchComputedModel = new RequestType0(
+const fetchComputedModel = new RequestType(
   "likec4/fetchComputedModel"
 );
 const computeView = new RequestType(

package/dist/shared/{language-server.JWkqVjGv.cjs → language-server.C8lV6gDw.cjs}

@@ -3,8 +3,8 @@
 const langium = require('langium');
 const lsp = require('langium/lsp');
 const log = require('@likec4/log');
-const core = require('@likec4/core');
 const remeda = require('remeda');
+const core = require('@likec4/core');
 const vscodeLanguageserverTypes = require('vscode-languageserver-types');
 const indentString = require('indent-string');
 const msgpack = require('@msgpack/msgpack');
@@ -15,7 +15,7 @@ const vscodeUri = require('vscode-uri');
 const stripIndent = require('strip-indent');
 const hash = require('string-hash');
 const fastEquals = require('fast-equals');
-const LikeC4ModelGraph = require('./language-server.DwyCJvXm.cjs');
+const LikeC4ModelGraph = require('./language-server.DJhoJBWh.cjs');
 const ufo = require('ufo');
 const graphlib = require('@dagrejs/graphlib');
 const vscodeLanguageserver = require('vscode-languageserver');
@@ -26,95 +26,6 @@ const indentString__default = /*#__PURE__*/_interopDefaultCompat(indentString);
 const stripIndent__default = /*#__PURE__*/_interopDefaultCompat(stripIndent);
 const hash__default = /*#__PURE__*/_interopDefaultCompat(hash);
 
-const logger = log.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 = log.LogLevels[level];
-}
-function logErrorToTelemetry(connection) {
-  const reporter = {
-    log: ({ level, ...logObj }, ctx) => {
-      if (level !== log.LogLevels.error && level !== log.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 });
-    }
-  };
-  log.rootLogger.addReporter(reporter);
-  logger.setReporters(log.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 >= log.LogLevels.trace: {
-          connection.tracer.log(message);
-          break;
-        }
-        case level >= log.LogLevels.debug: {
-          connection.console.debug(message);
-          break;
-        }
-        case level >= log.LogLevels.info: {
-          connection.console.info(message);
-          break;
-        }
-        case level >= log.LogLevels.log: {
-          connection.console.log(message);
-          break;
-        }
-        case level >= log.LogLevels.warn: {
-          connection.console.warn(message);
-          break;
-        }
-        case level >= log.LogLevels.fatal: {
-          connection.console.error(message);
-          break;
-        }
-      }
-    }
-  };
-  log.rootLogger.addReporter(reporter);
-  logger.setReporters(log.rootLogger.options.reporters);
-}
-
 const DynamicViewRule = "DynamicViewRule";
 function isDynamicViewRule(item) {
   return reflection.isInstance(item, DynamicViewRule);
@@ -1496,6 +1407,94 @@ const LikeC4GeneratedModule = {
   }
 };
 
+const logger = log.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 = log.LogLevels[level];
+}
+function logErrorToTelemetry(connection) {
+  const reporter = {
+    log: ({ level, ...logObj }, ctx) => {
+      if (level !== log.LogLevels.error && level !== log.LogLevels.fatal) {
+        return;
+      }
+      const tag = logObj.tag || "";
+      const parts = logObj.args.map((arg) => {
+        if (remeda.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 });
+    }
+  };
+  log.rootLogger.addReporter(reporter);
+  logger.setReporters(log.rootLogger.options.reporters);
+}
+function logToLspConnection(connection) {
+  const reporter = {
+    log: ({ level, ...logObj }, ctx) => {
+      const tag = logObj.tag || "";
+      const parts = logObj.args.map((arg) => {
+        if (remeda.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 >= log.LogLevels.debug: {
+          connection.console.debug(message);
+          break;
+        }
+        // case level >= LogLevels.info: {
+        //   connection.console.info(message)
+        //   break
+        // }
+        case level >= log.LogLevels.log: {
+          connection.console.info(message);
+          break;
+        }
+        case level >= log.LogLevels.warn: {
+          connection.console.warn(message);
+          break;
+        }
+        case level >= log.LogLevels.fatal: {
+          connection.console.error(message);
+          break;
+        }
+        default: {
+          connection.console.log(message);
+        }
+      }
+    }
+  };
+  log.rootLogger.setReporters([reporter]);
+  logger.setReporters(log.rootLogger.options.reporters);
+}
+
 function elementRef(node) {
   return node.el.ref;
 }
@@ -1617,7 +1616,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()) {
@@ -2548,8 +2547,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) {
@@ -2943,8 +2940,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);
           }
@@ -2974,8 +2970,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);
     });
   }
@@ -3032,14 +3027,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 langium.interruptAndCheck(cancelToken);
       }
+      const model = this.unsafeSyncBuildModel();
+      if (!model) {
+        return null;
+      }
       return this.unsafeSyncBuildComputedModel(model);
     });
   }
@@ -3049,17 +3044,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 langium.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.LikeC4ModelGraph(model);
         const result = core.isElementView(view) ? LikeC4ModelGraph.computeView(view, index) : LikeC4ModelGraph.computeDynamicView(view, index);
         if (!result.isSuccess) {
@@ -4745,14 +4740,16 @@ class Rpc {
     const LangiumDocuments = this.services.shared.workspace.LangiumDocuments;
     const DocumentBuilder = this.services.shared.workspace.DocumentBuilder;
     const notifyModelParsed = remeda.debounce(
-      () => void connection.sendNotification(protocol.onDidChangeModel, "").catch((e) => {
-        logger.error(`[ServerRpc] error sending onDidChangeModel: ${e}`);
-        return Promise.resolve();
-      }),
+      () => {
+        connection.sendNotification(protocol.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;
@@ -4761,7 +4758,10 @@ class Rpc {
         notifyModelParsed.cancel();
       }),
       modelBuilder.onModelParsed(() => notifyModelParsed.call()),
-      connection.onRequest(protocol.fetchComputedModel, async (cancelToken) => {
+      connection.onRequest(protocol.fetchComputedModel, async ({ cleanCaches }, cancelToken) => {
+        if (cleanCaches) {
+          this.services.WorkspaceCache.clear();
+        }
         const model = await modelBuilder.buildComputedModel(cancelToken);
         return { model };
       }),
@@ -4937,8 +4937,8 @@ class LikeC4WorkspaceManager extends langium.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(likec4lib.Content, vscodeUri.URI.parse(likec4lib.Uri)));
+    await super.loadAdditionalDocuments(folders, collector);
   }
   workspace() {
     if (this.folders && core.hasAtLeast(this.folders, 1)) {
@@ -5458,7 +5458,8 @@ class LikeC4Formatter extends lsp.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);
@@ -5476,7 +5477,7 @@ class LikeC4Formatter extends lsp.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)) {
@@ -5745,4 +5746,5 @@ function _merge(target, source) {
 exports.LikeC4Module = LikeC4Module;
 exports.createCustomLanguageServices = createCustomLanguageServices;
 exports.createLanguageServices = createLanguageServices;
+exports.logger = logger;
 exports.setLogLevel = setLogLevel;