@likec4/language-server 0.54.0 → 0.57.0

package/dist/Rpc.js

@@ -1,16 +1,9 @@
-import { logError, logger } from "./logger.js";
 import debounceFunction from "debounce-fn";
+import { logError, logger } from "./logger.js";
 import { nonexhaustive } from "@likec4/core";
 import { URI, UriUtils } from "langium";
 import { isLikeC4LangiumDocument } from "./ast.js";
-import {
-  buildDocuments,
-  computeView,
-  fetchModel,
-  fetchRawModel,
-  locate,
-  onDidChangeModel
-} from "./protocol.js";
+import { buildDocuments, computeView, fetchModel, fetchRawModel, locate, onDidChangeModel } from "./protocol.js";
 export class Rpc {
   constructor(services) {
     this.services = services;
@@ -32,7 +25,7 @@ export class Rpc {
         {
           before: true,
           after: true,
-          wait: 400,
+          wait: 250,
           maxWait: 1e3
         }
       )

package/dist/browser/index.d.ts

@@ -0,0 +1,9 @@
+import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver/browser';
+export declare function startLanguageServer(): {
+    connection: import("vscode-languageserver/browser").Connection;
+    messageReader: BrowserMessageReader;
+    messageWriter: BrowserMessageWriter;
+    shared: import("../module").LikeC4SharedServices;
+    likec4: import("../module").LikeC4Services;
+};
+//# sourceMappingURL=index.d.ts.map

package/dist/browser/index.js

@@ -0,0 +1,16 @@
+import { EmptyFileSystem, startLanguageServer as startLanguim } from "langium";
+import { BrowserMessageReader, BrowserMessageWriter, createConnection } from "vscode-languageserver/browser";
+import { createLanguageServices } from "../module.js";
+export function startLanguageServer() {
+  const messageReader = new BrowserMessageReader(self);
+  const messageWriter = new BrowserMessageWriter(self);
+  const connection = createConnection(messageReader, messageWriter);
+  const services = createLanguageServices({ connection, ...EmptyFileSystem });
+  startLanguim(services.shared);
+  return {
+    ...services,
+    connection,
+    messageReader,
+    messageWriter
+  };
+}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export { logger } from './logger';
-export { createLanguageServices } from './module';
-export type { LikeC4Services } from './module';
+export { createCustomLanguageServices, createLanguageServices, LikeC4Module } from './module';
+export type { LanguageServicesContext, LikeC4Services, LikeC4SharedServices } from './module';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,2 +1,2 @@
 export { logger } from "./logger.js";
-export { createLanguageServices } from "./module.js";
+export { createCustomLanguageServices, createLanguageServices, LikeC4Module } from "./module.js";

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

@@ -1,6 +1,6 @@
 import type { Fqn } from '@likec4/core';
 import type { LangiumDocuments, Stream } from 'langium';
-import type { FqnIndexedDocument, ast } from '../ast';
+import type { ast, FqnIndexedDocument } from '../ast';
 import type { LikeC4Services } from '../module';
 export interface FqnIndexEntry {
     fqn: Fqn;

package/dist/model/fqn-index.js

@@ -1,8 +1,8 @@
 import { nameFromFqn, parentFqn } from "@likec4/core";
-import { DONE_RESULT, DocumentState, MultiMap, StreamImpl, stream } from "langium";
+import { DocumentState, DONE_RESULT, MultiMap, stream, StreamImpl } from "langium";
 import { ElementOps, isFqnIndexedDocument, isLikeC4LangiumDocument } from "../ast.js";
 import { logError, logger } from "../logger.js";
-import { printDocs } from "../utils.js";
+import { printDocs } from "../utils/printDocs.js";
 import { computeDocumentFqn } from "./fqn-computation.js";
 const True = () => true;
 export class FqnIndex {

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

@@ -1,4 +1,4 @@
-import { type ViewID, type c4 } from '@likec4/core';
+import { type c4, type ViewID } from '@likec4/core';
 import type { URI } from 'langium';
 import { Disposable } from 'vscode-languageserver';
 import type { LikeC4Services } from '../module';
@@ -9,6 +9,7 @@ export declare class LikeC4ModelBuilder {
     private listeners;
     constructor(services: LikeC4Services);
     buildRawModel(): c4.LikeC4RawModel | null;
+    private previousViews;
     buildModel(): c4.LikeC4Model | null;
     computeView(viewId: ViewID): c4.ComputedView | null;
     onModelParsed(callback: ModelParsedListener): Disposable;

package/dist/model/model-builder.js

@@ -3,13 +3,13 @@ import {
   isStrictElementView,
   parentFqn
 } from "@likec4/core";
-import { LikeC4ModelGraph, computeView } from "@likec4/graph";
+import { computeView, LikeC4ModelGraph } from "@likec4/graph";
 import { DocumentState } from "langium";
 import * as R from "remeda";
 import { Disposable } from "vscode-languageserver";
 import { isParsedLikeC4LangiumDocument } from "../ast.js";
-import { logError, logWarnError, logger } from "../logger.js";
-import { printDocs } from "../utils.js";
+import { logError, logger, logWarnError } from "../logger.js";
+import { printDocs } from "../utils/printDocs.js";
 import { assignNavigateTo, resolveRelativePaths, resolveRulesExtendedViews } from "../view-utils/index.js";
 function buildModel(services, docs) {
   const c4Specification = {
@@ -20,9 +20,7 @@ function buildModel(services, docs) {
     Object.assign(c4Specification.kinds, spec.kinds), Object.assign(c4Specification.relationships, spec.relationships);
   });
   const resolveLinks = (doc, links) => {
-    return links.map(
-      (l) => services.lsp.DocumentLinkProvider.resolveLink(doc, l)
-    );
+    return links.map((l) => services.lsp.DocumentLinkProvider.resolveLink(doc, l));
   };
   const toModelElement = (doc) => {
     return ({ astPath, tags, links, ...parsed }) => {
@@ -168,7 +166,7 @@ ${printDocs(docs)}`);
         if (parsed.length > 0) {
           this.notifyListeners(parsed);
         }
-        return Promise.resolve();
+        return await Promise.resolve();
       }
     );
     logger.debug(`[ModelBuilder] Created`);
@@ -193,57 +191,74 @@ ${printDocs(docs)}`);
       }
     });
   }
+  previousViews = {};
   buildModel() {
     const cache = this.services.WorkspaceCache;
+    const viewsCache = this.services.WorkspaceCache;
     return cache.get(MODEL_CACHE, () => {
       const model = this.buildRawModel();
       if (!model) {
         return null;
       }
       const index = new LikeC4ModelGraph(model);
-      const views = [];
+      const allViews = [];
       for (const view of R.values(model.views)) {
         const result = computeView(view, index);
         if (!result.isSuccess) {
           logWarnError(result.error);
           continue;
         }
-        views.push(result.view);
+        allViews.push(result.view);
       }
-      assignNavigateTo(views);
+      assignNavigateTo(allViews);
+      const views = R.mapToObj(allViews, (v) => {
+        const previous = this.previousViews[v.id];
+        const view = previous && R.equals(v, previous) ? previous : v;
+        viewsCache.set(computedViewKey(v.id), view);
+        return [v.id, view];
+      });
+      this.previousViews = { ...views };
       return {
         elements: model.elements,
         relations: model.relations,
-        views: R.mapToObj(views, (v) => [v.id, v])
+        views
       };
     });
   }
   computeView(viewId) {
-    const model = this.buildRawModel();
-    const view = model?.views[viewId];
-    if (!view) {
-      logger.warn(`[ModelBuilder] Cannot find view ${viewId}`);
-      return null;
-    }
-    const index = new LikeC4ModelGraph(model);
-    const result = computeView(view, index);
-    if (!result.isSuccess) {
-      logError(result.error);
-      return null;
-    }
-    const allElementViews = R.values(model.views).filter(
-      (v) => isStrictElementView(v) && v.id !== viewId
-    );
-    const computedView = result.view;
-    computedView.nodes.forEach((node) => {
-      if (!node.navigateTo) {
-        const navigateTo = R.find(allElementViews, (v) => v.viewOf === node.id);
-        if (navigateTo) {
-          node.navigateTo = navigateTo.id;
+    const cache = this.services.WorkspaceCache;
+    return cache.get(computedViewKey(viewId), () => {
+      const model = this.buildRawModel();
+      const view = model?.views[viewId];
+      if (!view) {
+        logger.warn(`[ModelBuilder] Cannot find view ${viewId}`);
+        return null;
+      }
+      const index = new LikeC4ModelGraph(model);
+      const result = computeView(view, index);
+      if (!result.isSuccess) {
+        logError(result.error);
+        return null;
+      }
+      const allElementViews = R.values(model.views).filter(
+        (v) => isStrictElementView(v) && v.id !== viewId
+      );
+      let computedView = result.view;
+      computedView.nodes.forEach((node) => {
+        if (!node.navigateTo) {
+          const navigateTo = R.find(allElementViews, (v) => v.viewOf === node.id);
+          if (navigateTo) {
+            node.navigateTo = navigateTo.id;
+          }
         }
+      });
+      const previous = this.previousViews[viewId];
+      if (previous) {
+        computedView = R.equals(computedView, previous) ? previous : computedView;
       }
+      this.previousViews[viewId] = computedView;
+      return computedView;
     });
-    return computedView;
   }
   onModelParsed(callback) {
     this.listeners.push(callback);
@@ -267,3 +282,6 @@ ${printDocs(docs)}`);
     }
   }
 }
+function computedViewKey(viewId) {
+  return `computed-view-${viewId}`;
+}

package/dist/module.d.ts

@@ -1,8 +1,8 @@
-import { WorkspaceCache, type DefaultSharedModuleContext, type LangiumServices, type LangiumSharedServices, type Module, type PartialLangiumServices } from 'langium';
-import { Rpc } from './Rpc';
+import { type DefaultSharedModuleContext, type LangiumServices, type LangiumSharedServices, type Module, type PartialLangiumServices, WorkspaceCache } from 'langium';
 import { LikeC4CodeLensProvider, LikeC4DocumentHighlightProvider, LikeC4DocumentLinkProvider, LikeC4DocumentSymbolProvider, LikeC4HoverProvider, LikeC4SemanticTokenProvider } from './lsp';
 import { FqnIndex, LikeC4ModelBuilder, LikeC4ModelLocator, LikeC4ModelParser } from './model';
 import { LikeC4ScopeComputation, LikeC4ScopeProvider } from './references';
+import { Rpc } from './Rpc';
 import { LikeC4WorkspaceManager, NodeKindProvider, WorkspaceSymbolProvider } from './shared';
 interface LikeC4AddedSharedServices {
     lsp: {
@@ -42,7 +42,12 @@ export interface LikeC4AddedServices {
 }
 export type LikeC4Services = LangiumServices & LikeC4AddedServices;
 export declare const LikeC4Module: Module<LikeC4Services, PartialLangiumServices & LikeC4AddedServices>;
-type LanguageServicesContext = Partial<DefaultSharedModuleContext>;
+export type LanguageServicesContext = Partial<DefaultSharedModuleContext>;
+export declare function createCustomLanguageServices<I1, I2, I3, I extends I1 & I2 & I3 & LikeC4Services>(context: LanguageServicesContext, module: Module<I, I1>, module2?: Module<I, I2>, module3?: Module<I, I3>): {
+    shared: LikeC4SharedServices;
+    likec4: I;
+};
+export declare function createSharedServices(context?: LanguageServicesContext): LikeC4SharedServices;
 export declare function createLanguageServices(context?: LanguageServicesContext): {
     shared: LikeC4SharedServices;
     likec4: LikeC4Services;

package/dist/module.js

@@ -1,12 +1,11 @@
-import { serializeError } from "@likec4/core";
+import { normalizeError } from "@likec4/core";
 import {
-  EmptyFileSystem,
-  WorkspaceCache,
   createDefaultModule,
   createDefaultSharedModule,
-  inject
+  EmptyFileSystem,
+  inject,
+  WorkspaceCache
 } from "langium";
-import { Rpc } from "./Rpc.js";
 import { LikeC4GeneratedModule, LikeC4GeneratedSharedModule } from "./generated/module.js";
 import { logger } from "./logger.js";
 import {
@@ -19,6 +18,7 @@ import {
 } from "./lsp/index.js";
 import { FqnIndex, LikeC4ModelBuilder, LikeC4ModelLocator, LikeC4ModelParser } from "./model/index.js";
 import { LikeC4ScopeComputation, LikeC4ScopeProvider } from "./references/index.js";
+import { Rpc } from "./Rpc.js";
 import { LikeC4WorkspaceManager, NodeKindProvider, WorkspaceSymbolProvider } from "./shared/index.js";
 import { registerValidationChecks } from "./validation/index.js";
 const LikeC4SharedModule = {
@@ -55,8 +55,24 @@ export const LikeC4Module = {
     ScopeProvider: bind(LikeC4ScopeProvider)
   }
 };
-export function createLanguageServices(context) {
-  const connection = context?.connection;
+export function createCustomLanguageServices(context, module, module2, module3) {
+  const shared = createSharedServices(context);
+  const modules = [
+    createDefaultModule({ shared }),
+    LikeC4GeneratedModule,
+    LikeC4Module,
+    module,
+    module2,
+    module3
+  ].reduce(_merge, {});
+  const likec4 = inject(modules);
+  shared.ServiceRegistry.register(likec4);
+  registerValidationChecks(likec4);
+  likec4.Rpc.init();
+  return { shared, likec4 };
+}
+export function createSharedServices(context = {}) {
+  const connection = context.connection;
   if (connection) {
     const original = logger.error.bind(logger);
     logger.error = (arg) => {
@@ -65,23 +81,41 @@ export function createLanguageServices(context) {
         connection.telemetry.logEvent({ eventName: "error", error: arg });
         return;
       }
-      const { message, error } = serializeError(arg);
+      const error = normalizeError(arg);
       original(error);
-      connection.telemetry.logEvent({ eventName: "error", error: message });
+      connection.telemetry.logEvent({ eventName: "error", error: error.stack ?? error.message });
     };
   }
   const moduleContext = {
     ...EmptyFileSystem,
     ...context
   };
-  const shared = inject(
+  return inject(
     createDefaultSharedModule(moduleContext),
     LikeC4GeneratedSharedModule,
     LikeC4SharedModule
   );
+}
+export function createLanguageServices(context = {}) {
+  const shared = createSharedServices(context);
   const likec4 = inject(createDefaultModule({ shared }), LikeC4GeneratedModule, LikeC4Module);
   shared.ServiceRegistry.register(likec4);
   registerValidationChecks(likec4);
   likec4.Rpc.init();
   return { shared, likec4 };
 }
+function _merge(target, source) {
+  if (source) {
+    for (const [key, value2] of Object.entries(source)) {
+      if (value2 !== void 0) {
+        const value1 = target[key];
+        if (value1 !== null && value2 !== null && typeof value1 === "object" && typeof value2 === "object") {
+          target[key] = _merge(value1, value2);
+        } else {
+          target[key] = value2;
+        }
+      }
+    }
+  }
+  return target;
+}

package/dist/node/index.d.ts

@@ -0,0 +1,6 @@
+export declare function startLanguageServer(): {
+    connection: import("vscode-languageserver/node")._Connection<import("vscode-languageserver/node")._, import("vscode-languageserver/node")._, import("vscode-languageserver/node")._, import("vscode-languageserver/node")._, import("vscode-languageserver/node")._, import("vscode-languageserver/node")._, import("vscode-languageserver/lib/common/inlineCompletion.proposed").InlineCompletionFeatureShape, import("vscode-languageserver/node")._>;
+    shared: import("../module").LikeC4SharedServices;
+    likec4: import("../module").LikeC4Services;
+};
+//# sourceMappingURL=index.d.ts.map

package/dist/node/index.js

@@ -0,0 +1,13 @@
+import { startLanguageServer as startLanguim } from "langium";
+import { NodeFileSystem } from "langium/node";
+import { createConnection, ProposedFeatures } from "vscode-languageserver/node";
+import { createLanguageServices } from "../module.js";
+export function startLanguageServer() {
+  const connection = createConnection(ProposedFeatures.all);
+  const services = createLanguageServices({ connection, ...NodeFileSystem });
+  startLanguim(services.shared);
+  return {
+    ...services,
+    connection
+  };
+}

package/dist/test/testServices.d.ts

@@ -1,15 +1,16 @@
+import { type Diagnostic } from 'vscode-languageserver-protocol';
 import type { LikeC4LangiumDocument } from '../ast';
 export declare function createTestServices(workspace?: string): {
     services: import("../module").LikeC4Services;
     parse: (input: string, uri?: string) => Promise<LikeC4LangiumDocument>;
     validate: (input: string | LikeC4LangiumDocument, uri?: string) => Promise<{
         document: LikeC4LangiumDocument;
-        diagnostics: (import("vscode-languageserver-types").Diagnostic & import("langium").DiagnosticInfo<import("../ast").LikeC4AstNode>)[];
+        diagnostics: (Diagnostic & import("langium").DiagnosticInfo<import("../ast").LikeC4AstNode>)[];
         warnings: string[];
         errors: string[];
     }>;
     validateAll: () => Promise<{
-        diagnostics: import("vscode-languageserver-types").Diagnostic[];
+        diagnostics: Diagnostic[];
         errors: string[];
         warnings: string[];
     }>;

package/dist/test/testServices.js

@@ -42,12 +42,8 @@ export function createTestServices(workspace = "file:///test/workspace") {
     const document = typeof input === "string" ? await parse(input, uri) : input;
     await documentBuilder.build([document], { validation: true });
     const diagnostics = document.diagnostics ?? [];
-    const warnings = diagnostics.flatMap(
-      (d) => d.severity === DiagnosticSeverity.Warning ? d.message : []
-    );
-    const errors = diagnostics.flatMap(
-      (d) => d.severity === DiagnosticSeverity.Error ? d.message : []
-    );
+    const warnings = diagnostics.flatMap((d) => d.severity === DiagnosticSeverity.Warning ? d.message : []);
+    const errors = diagnostics.flatMap((d) => d.severity === DiagnosticSeverity.Error ? d.message : []);
     return {
       document,
       diagnostics,
@@ -55,22 +51,30 @@ export function createTestServices(workspace = "file:///test/workspace") {
       errors
     };
   };
+  let previousPromise = Promise.resolve();
   const validateAll = async () => {
-    const docs = langiumDocuments.all.toArray();
-    assert.ok(docs.length > 0, "no documents to validate");
-    await documentBuilder.build(docs, { validation: true });
-    const diagnostics = docs.flatMap((doc) => doc.diagnostics ?? []);
-    const warnings = diagnostics.flatMap(
-      (d) => d.severity === DiagnosticSeverity.Warning ? d.message : []
-    );
-    const errors = diagnostics.flatMap(
-      (d) => d.severity === DiagnosticSeverity.Error ? d.message : []
-    );
-    return {
-      diagnostics,
-      errors,
-      warnings
-    };
+    const currentPromise = previousPromise.then(async () => {
+      const docs = langiumDocuments.all.toArray();
+      assert.ok(docs.length > 0, "no documents to validate");
+      await documentBuilder.build(docs, { validation: true });
+      const diagnostics = docs.flatMap((doc) => doc.diagnostics ?? []);
+      const warnings = diagnostics.flatMap((d) => d.severity === DiagnosticSeverity.Warning ? d.message : []);
+      const errors = diagnostics.flatMap((d) => d.severity === DiagnosticSeverity.Error ? d.message : []);
+      return {
+        diagnostics,
+        errors,
+        warnings
+      };
+    }).catch((e) => {
+      console.error(e);
+      return Promise.resolve({
+        diagnostics: [],
+        errors: [],
+        warnings: []
+      });
+    });
+    previousPromise = currentPromise;
+    return await currentPromise;
   };
   const buildModel = async () => {
     await validateAll();

package/dist/{utils.d.ts → utils/printDocs.d.ts}

@@ -1,4 +1,3 @@
 import type { LangiumDocument } from 'langium';
 export declare const printDocs: (docs: LangiumDocument[]) => string;
-export declare function queueMicrotask(cb: () => void): Promise<void>;
-//# sourceMappingURL=utils.d.ts.map
+//# sourceMappingURL=printDocs.d.ts.map

package/dist/{utils.js → utils/printDocs.js}

@@ -1,4 +1 @@
 export const printDocs = (docs) => docs.map((d) => "  - " + d.uri.toString(true)).join("\n");
-export function queueMicrotask(cb) {
-  return Promise.resolve().then(cb);
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.54.0",
+  "version": "0.57.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -10,7 +10,7 @@
     "dist",
     "contrib",
     "!**/__mocks__/",
-    "!**/__test__/",
+    "!**/__tests__/",
     "!**/*.spec.*",
     "!**/*.map"
   ],
@@ -24,6 +24,14 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
+    },
+    "./browser": {
+      "types": "./dist/browser/index.d.ts",
+      "default": "./dist/browser/index.js"
+    },
+    "./node": {
+      "types": "./dist/node/index.d.ts",
+      "default": "./dist/node/index.js"
     }
   },
   "publishConfig": {
@@ -33,6 +41,14 @@
       ".": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
+      },
+      "./browser": {
+        "types": "./dist/browser/index.d.ts",
+        "default": "./dist/browser/index.js"
+      },
+      "./node": {
+        "types": "./dist/node/index.d.ts",
+        "default": "./dist/node/index.js"
       }
     }
   },
@@ -50,32 +66,32 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@likec4/core": "0.54.0",
-    "@likec4/graph": "0.54.0",
+    "@likec4/core": "0.57.0",
+    "@likec4/graph": "0.57.0",
     "debounce-fn": "^6.0.0",
     "langium": "^2.1.3",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
     "rambdax": "^9.1.1",
-    "remeda": "^1.30.0",
+    "remeda": "^1.40.1",
     "strip-indent": "^4.0.0",
-    "type-fest": "^4.8.3",
+    "type-fest": "^4.10.2",
     "ufo": "^1.3.2",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@types/node": "^20.10.4",
+    "@types/node": "^20.11.17",
     "@types/object-hash": "^3.0.6",
     "execa": "^8.0.1",
     "langium-cli": "^2.1.0",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all2": "^5.0.2",
     "typescript": "^5.3.3",
     "unbuild": "^2.0.0",
-    "vitest": "^1.1.3"
+    "vitest": "^1.2.2"
   },
-  "packageManager": "yarn@4.0.2",
+  "packageManager": "yarn@4.1.0",
   "volta": {
     "extends": "../../package.json"
   }