@likec4/language-server 1.10.0 → 1.11.0

package/dist/shared/{language-server.DwyCJvXm.cjs → language-server.DJhoJBWh.cjs}

@@ -373,6 +373,16 @@ function sortNodes({
   return sorted;
 }
 
+function uniqueTags(elements) {
+  const tags = remeda.pipe(
+    elements,
+    remeda.flatMap((e) => e.tags ?? []),
+    remeda.unique(),
+    remeda.sort(core.compareNatural)
+  );
+  return core.hasAtLeast(tags, 1) ? tags : null;
+}
+
 const NoFilter = () => true;
 const Identity = (x) => x;
 const filterBy = (pred) => pred === NoFilter ? Identity : remeda.filter(pred);
@@ -885,7 +895,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 = remeda.only(relations) ?? remeda.pipe(
+        relations,
+        remeda.filter((r) => r.source === source && r.target === target),
+        remeda.only()
+      );
       if (!relation) {
         const allprops = remeda.pipe(
           relations,
@@ -942,7 +956,7 @@ class ComputeCtx {
           navigateTo: remeda.only(allprops.navigateTo)
         };
       }
-      const tags = remeda.unique(remeda.flatMap(relations, (r) => r.tags ?? []));
+      const tags = uniqueTags(relations);
       return Object.assign(
         edge,
         this.getEdgeLabel(relation),
@@ -954,7 +968,7 @@ class ComputeCtx {
         relation.head && { head: relation.head },
         relation.tail && { tail: relation.tail },
         relation.navigateTo && { navigateTo: relation.navigateTo },
-        remeda.hasAtLeast(tags, 1) && { tags }
+        tags && { tags }
       );
     });
   }

package/dist/shared/{language-server.CjFzaJwI.d.cts → language-server.Ol32Kygo.d.cts}

@@ -1,15 +1,44 @@
+import { LangiumDocument, ReferenceDescription, MaybePromise, AstNode, Reference, MultiMap, AstNodeDescription, DiagnosticInfo, LangiumDocuments, Stream, Cancellation, Disposable, URI, DefaultScopeComputation, PrecomputedScopes, DefaultScopeProvider, ReferenceInfo, Scope, DefaultWorkspaceManager, WorkspaceCache, Module } from 'langium';
+import { CodeLensProvider, DefaultCompletionProvider, DefaultDocumentHighlightProvider, DocumentLinkProvider, DocumentSymbolProvider, NodeKindProvider as NodeKindProvider$1, AstNodeHoverProvider, AbstractSemanticTokenProvider, SemanticTokenAcceptor, LangiumSharedServices, DefaultWorkspaceSymbolProvider, LangiumServices, PartialLangiumServices, DefaultSharedModuleContext } from 'langium/lsp';
+import { CodeLensParams, CancellationToken, CodeLens, DocumentHighlight, DocumentLinkParams, DocumentLink, WorkspaceFolder } from 'vscode-languageserver';
+import { Diagnostic, DocumentSymbol, SymbolKind, Hover, Location, Range, TextEdit, CompletionItemKind } from 'vscode-languageserver-types';
 import * as c4 from '@likec4/core';
 import { Fqn, ViewID } from '@likec4/core';
-import { AstNode, Reference, LangiumDocument, MultiMap, AstNodeDescription, DiagnosticInfo, ReferenceDescription, MaybePromise, DefaultScopeComputation, PrecomputedScopes, DefaultScopeProvider, ReferenceInfo, Scope, Disposable, DefaultWorkspaceManager, WorkspaceCache, Module, LangiumDocuments, Stream, Cancellation, URI as URI$1 } from 'langium';
 import { SetRequired, ValueOf, ConditionalPick } from 'type-fest';
-import { Diagnostic, DocumentSymbol, SymbolKind, Hover, Location, Range, TextEdit, CompletionItemKind } from 'vscode-languageserver-types';
-import { CodeLensProvider, DefaultCompletionProvider, DefaultDocumentHighlightProvider, DocumentLinkProvider, DocumentSymbolProvider, NodeKindProvider as NodeKindProvider$1, AstNodeHoverProvider, AbstractSemanticTokenProvider, SemanticTokenAcceptor, LangiumSharedServices, DefaultWorkspaceSymbolProvider, LangiumServices, PartialLangiumServices, DefaultSharedModuleContext } from 'langium/lsp';
-import { CodeLensParams, CancellationToken, CodeLens, DocumentHighlight, DocumentLinkParams, DocumentLink, WorkspaceFolder } from 'vscode-languageserver';
 import { ChangeViewRequestParams } from '../protocol.cjs';
-import { URI } from 'vscode-uri';
+import { URI as URI$1 } from 'vscode-uri';
+import * as _likec4_log from '@likec4/log';
+import { LogLevels } from '@likec4/log';
+
+declare class LikeC4CodeLensProvider implements CodeLensProvider {
+    private services;
+    constructor(services: LikeC4Services);
+    provideCodeLens(doc: LangiumDocument, _params: CodeLensParams, cancelToken?: CancellationToken): Promise<CodeLens[] | undefined>;
+}
+
+declare class LikeC4CompletionProvider extends DefaultCompletionProvider {
+    readonly completionOptions: {
+        triggerCharacters: string[];
+    };
+}
+
+declare class LikeC4DocumentHighlightProvider extends DefaultDocumentHighlightProvider {
+    /**
+     * Override this method to determine the highlight kind of the given reference.
+     */
+    protected createDocumentHighlight(reference: ReferenceDescription): DocumentHighlight;
+}
+
+declare class LikeC4DocumentLinkProvider implements DocumentLinkProvider {
+    private services;
+    constructor(services: LikeC4Services);
+    getDocumentLinks(doc: LangiumDocument, _params: DocumentLinkParams): MaybePromise<DocumentLink[]>;
+    resolveLink(doc: LangiumDocument, link: string): string;
+    relativeLink(doc: LangiumDocument, link: string): string | null;
+}
 
 /******************************************************************************
- * This file was generated by langium-cli 3.1.1.
+ * This file was generated by langium-cli 3.2.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
@@ -923,7 +952,7 @@ interface ParsedLikeC4LangiumDocument extends Omit<LangiumDocument<LikeC4Grammar
 }
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isLikeC4View | typeof isRelation | typeof isExtendElement | typeof isElement | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
+declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isExtendElement | typeof isElement | typeof isLikeC4View | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;
@@ -931,33 +960,6 @@ declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
 };
 type ChecksFromDiagnostics = ReturnType<typeof checksFromDiagnostics>;
 
-declare class LikeC4CodeLensProvider implements CodeLensProvider {
-    private services;
-    constructor(services: LikeC4Services);
-    provideCodeLens(doc: LangiumDocument, _params: CodeLensParams, cancelToken?: CancellationToken): Promise<CodeLens[] | undefined>;
-}
-
-declare class LikeC4CompletionProvider extends DefaultCompletionProvider {
-    readonly completionOptions: {
-        triggerCharacters: string[];
-    };
-}
-
-declare class LikeC4DocumentHighlightProvider extends DefaultDocumentHighlightProvider {
-    /**
-     * Override this method to determine the highlight kind of the given reference.
-     */
-    protected createDocumentHighlight(reference: ReferenceDescription): DocumentHighlight;
-}
-
-declare class LikeC4DocumentLinkProvider implements DocumentLinkProvider {
-    private services;
-    constructor(services: LikeC4Services);
-    getDocumentLinks(doc: LangiumDocument, _params: DocumentLinkParams): MaybePromise<DocumentLink[]>;
-    resolveLink(doc: LangiumDocument, link: string): string;
-    relativeLink(doc: LangiumDocument, link: string): string | null;
-}
-
 declare class LikeC4DocumentSymbolProvider implements DocumentSymbolProvider {
     private services;
     protected readonly nodeKindProvider: NodeKindProvider$1;
@@ -989,6 +991,111 @@ declare class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider
     private highlightView;
 }
 
+declare function computeDocumentFqn(document: LikeC4LangiumDocument, services: LikeC4Services): void;
+
+interface FqnIndexEntry {
+    fqn: Fqn;
+    name: string;
+    el: Element;
+    doc: FqnIndexedDocument;
+    path: string;
+}
+declare class FqnIndex {
+    private services;
+    protected langiumDocuments: LangiumDocuments;
+    constructor(services: LikeC4Services);
+    get documents(): Stream<FqnIndexedDocument>;
+    private entries;
+    getFqn(el: Element): Fqn | null;
+    byFqn(fqn: Fqn): Stream<AstNodeDescription>;
+    directChildrenOf(parent: Fqn): Stream<AstNodeDescription>;
+    /**
+     * Returns descedant elements with unique names in the scope
+     */
+    uniqueDescedants(parent: Fqn): Stream<AstNodeDescription>;
+}
+
+type ModelParsedListener$1 = (docs: URI[]) => void;
+declare class LikeC4ModelBuilder {
+    private services;
+    private langiumDocuments;
+    private listeners;
+    constructor(services: LikeC4Services);
+    /**
+     * WARNING:
+     * This method is internal and should to be called only when all documents are known to be parsed.
+     * Otherwise, the model may be incomplete.
+     */
+    unsafeSyncBuildModel(): c4.ParsedLikeC4Model | null;
+    buildModel(cancelToken?: Cancellation.CancellationToken): Promise<c4.ParsedLikeC4Model | null>;
+    private previousViews;
+    /**
+     * WARNING:
+     * This method is internal and should to be called only when all documents are known to be parsed.
+     * Otherwise, the model may be incomplete.
+     */
+    unsafeSyncBuildComputedModel(model: c4.ParsedLikeC4Model): c4.ComputedLikeC4Model;
+    buildComputedModel(cancelToken?: Cancellation.CancellationToken): Promise<c4.ComputedLikeC4Model | null>;
+    computeView(viewId: ViewID, cancelToken?: Cancellation.CancellationToken): Promise<c4.ComputedView | null>;
+    onModelParsed(callback: ModelParsedListener$1): Disposable;
+    private documents;
+    private notifyListeners;
+}
+
+declare class LikeC4ModelLocator {
+    private services;
+    private fqnIndex;
+    private langiumDocuments;
+    constructor(services: LikeC4Services);
+    private documents;
+    getParsedElement(astNode: Element): ParsedAstElement | null;
+    locateElement(fqn: c4.Fqn, _prop?: string): Location | null;
+    locateRelation(relationId: c4.RelationID): Location | null;
+    locateViewAst(viewId: c4.ViewID): {
+        doc: ParsedLikeC4LangiumDocument;
+        view: ParsedAstView;
+        viewAst: LikeC4View;
+    };
+    locateView(viewId: c4.ViewID): Location | null;
+}
+
+type ModelParsedListener = () => void;
+type IsValidFn = ChecksFromDiagnostics['isValid'];
+declare class LikeC4ModelParser {
+    private services;
+    private fqnIndex;
+    constructor(services: LikeC4Services);
+    parse(doc: LangiumDocument | LangiumDocument[]): ParsedLikeC4LangiumDocument[];
+    protected parseLikeC4Document(_doc: FqnIndexedDocument): ParsedLikeC4LangiumDocument;
+    private parseSpecification;
+    private parseModel;
+    private parseElement;
+    private parseRelation;
+    private parseViews;
+    private parseViewRulePredicate;
+    private parsePredicate;
+    private parseElementExpressionsIterator;
+    private parseElementPredicate;
+    private parseElementExpr;
+    private parseElementPredicateWith;
+    private parseElementPredicateWhere;
+    private parseRelationPredicate;
+    private parseRelationPredicateWhere;
+    private parseRelationPredicateWith;
+    private parseRelationExpr;
+    private parseViewRule;
+    private parseViewManualLaout;
+    private parseDynamicParallelSteps;
+    private parseDynamicStep;
+    private parseElementView;
+    private parseDynamicElementView;
+    protected resolveFqn(node: Element | ExtendElement): c4.Fqn;
+    private getAstNodePath;
+    private getMetadata;
+    private convertTags;
+    private convertLinks;
+}
+
 declare class LikeC4ModelChanges {
     private services;
     private locator;
@@ -1059,7 +1166,7 @@ declare class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
      */
     protected loadAdditionalDocuments(folders: WorkspaceFolder[], collector: (document: LangiumDocument) => void): Promise<void>;
     workspace(): WorkspaceFolder;
-    get workspaceUri(): URI;
+    get workspaceUri(): URI$1;
     get workspaceURL(): URL;
 }
 
@@ -1117,107 +1224,7 @@ declare function createLanguageServices(context?: LanguageServicesContext): {
     likec4: LikeC4Services;
 };
 
-interface FqnIndexEntry {
-    fqn: Fqn;
-    name: string;
-    el: Element;
-    doc: FqnIndexedDocument;
-    path: string;
-}
-declare class FqnIndex {
-    private services;
-    protected langiumDocuments: LangiumDocuments;
-    constructor(services: LikeC4Services);
-    get documents(): Stream<FqnIndexedDocument>;
-    private entries;
-    getFqn(el: Element): Fqn | null;
-    byFqn(fqn: Fqn): Stream<AstNodeDescription>;
-    directChildrenOf(parent: Fqn): Stream<AstNodeDescription>;
-    /**
-     * Returns descedant elements with unique names in the scope
-     */
-    uniqueDescedants(parent: Fqn): Stream<AstNodeDescription>;
-}
-
-type ModelParsedListener$1 = (docs: URI$1[]) => void;
-declare class LikeC4ModelBuilder {
-    private services;
-    private langiumDocuments;
-    private listeners;
-    constructor(services: LikeC4Services);
-    /**
-     * WARNING:
-     * This method is internal and should to be called only when all documents are known to be parsed.
-     * Otherwise, the model may be incomplete.
-     */
-    unsafeSyncBuildModel(): c4.ParsedLikeC4Model | null;
-    buildModel(cancelToken?: Cancellation.CancellationToken): Promise<c4.ParsedLikeC4Model | null>;
-    private previousViews;
-    /**
-     * WARNING:
-     * This method is internal and should to be called only when all documents are known to be parsed.
-     * Otherwise, the model may be incomplete.
-     */
-    unsafeSyncBuildComputedModel(model: c4.ParsedLikeC4Model): c4.ComputedLikeC4Model;
-    buildComputedModel(cancelToken?: Cancellation.CancellationToken): Promise<c4.ComputedLikeC4Model | null>;
-    computeView(viewId: ViewID, cancelToken?: Cancellation.CancellationToken): Promise<c4.ComputedView | null>;
-    onModelParsed(callback: ModelParsedListener$1): Disposable;
-    private documents;
-    private notifyListeners;
-}
-
-declare class LikeC4ModelLocator {
-    private services;
-    private fqnIndex;
-    private langiumDocuments;
-    constructor(services: LikeC4Services);
-    private documents;
-    getParsedElement(astNode: Element): ParsedAstElement | null;
-    locateElement(fqn: c4.Fqn, _prop?: string): Location | null;
-    locateRelation(relationId: c4.RelationID): Location | null;
-    locateViewAst(viewId: c4.ViewID): {
-        doc: ParsedLikeC4LangiumDocument;
-        view: ParsedAstView;
-        viewAst: LikeC4View;
-    };
-    locateView(viewId: c4.ViewID): Location | null;
-}
-
-type ModelParsedListener = () => void;
-type IsValidFn = ChecksFromDiagnostics['isValid'];
-declare class LikeC4ModelParser {
-    private services;
-    private fqnIndex;
-    constructor(services: LikeC4Services);
-    parse(doc: LangiumDocument | LangiumDocument[]): ParsedLikeC4LangiumDocument[];
-    protected parseLikeC4Document(_doc: FqnIndexedDocument): ParsedLikeC4LangiumDocument;
-    private parseSpecification;
-    private parseModel;
-    private parseElement;
-    private parseRelation;
-    private parseViews;
-    private parseViewRulePredicate;
-    private parsePredicate;
-    private parseElementExpressionsIterator;
-    private parseElementPredicate;
-    private parseElementExpr;
-    private parseElementPredicateWith;
-    private parseElementPredicateWhere;
-    private parseRelationPredicate;
-    private parseRelationPredicateWhere;
-    private parseRelationPredicateWith;
-    private parseRelationExpr;
-    private parseViewRule;
-    private parseViewManualLaout;
-    private parseDynamicParallelSteps;
-    private parseDynamicStep;
-    private parseElementView;
-    private parseDynamicElementView;
-    protected resolveFqn(node: Element | ExtendElement): c4.Fqn;
-    private getAstNodePath;
-    private getMetadata;
-    private convertTags;
-    private convertLinks;
-}
+declare const logger: _likec4_log.ConsolaInstance;
+declare function setLogLevel(level: keyof typeof LogLevels): void;
 
-export { type FqnIndexEntry as F, type IsValidFn as I, type LikeC4LangiumDocument as L, type ModelParsedListener as M, type LikeC4Services as a, createLanguageServices as b, createCustomLanguageServices as c, LikeC4Module as d, FqnIndex as e, LikeC4ModelBuilder as f, LikeC4ModelLocator as g, LikeC4ModelParser as h, type LikeC4SharedServices as i, type LikeC4AddedServices as j, type LanguageServicesContext as k, createSharedServices as l };
+export { type FqnIndexEntry as F, type IsValidFn as I, type LikeC4SharedServices as L, type ModelParsedListener as M, type LikeC4Services as a, createLanguageServices as b, createCustomLanguageServices as c, LikeC4Module as d, computeDocumentFqn as e, FqnIndex as f, LikeC4ModelBuilder as g, LikeC4ModelLocator as h, LikeC4ModelParser as i, type LikeC4AddedServices as j, type LanguageServicesContext as k, createSharedServices as l, logger as m, setLogLevel as s };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -24,9 +24,16 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+      "browser": {
+        "types": "./dist/browser.d.ts",
+        "import": "./dist/browser.mjs",
+        "require": "./dist/browser.cjs"
+      },
+      "default": {
+        "types": "./dist/index.d.ts",
+        "import": "./dist/index.mjs",
+        "require": "./dist/index.cjs"
+      }
     },
     "./likec4lib": {
       "types": "./dist/likec4lib.d.ts",
@@ -43,11 +50,6 @@
       "import": "./dist/protocol.mjs",
       "require": "./dist/protocol.cjs"
     },
-    "./node": {
-      "types": "./dist/node.d.ts",
-      "import": "./dist/node.mjs",
-      "require": "./dist/node.cjs"
-    },
     "./model-graph": {
       "types": "./dist/model-graph/index.d.ts",
       "import": "./dist/model-graph/index.mjs",
@@ -59,9 +61,16 @@
     "access": "public",
     "exports": {
       ".": {
-        "types": "./dist/index.d.ts",
-        "import": "./dist/index.mjs",
-        "require": "./dist/index.cjs"
+        "browser": {
+          "types": "./dist/browser.d.ts",
+          "import": "./dist/browser.mjs",
+          "require": "./dist/browser.cjs"
+        },
+        "default": {
+          "types": "./dist/index.d.ts",
+          "import": "./dist/index.mjs",
+          "require": "./dist/index.cjs"
+        }
       },
       "./likec4lib": {
         "types": "./dist/likec4lib.d.ts",
@@ -78,11 +87,6 @@
         "import": "./dist/protocol.mjs",
         "require": "./dist/protocol.cjs"
       },
-      "./node": {
-        "types": "./dist/node.d.ts",
-        "import": "./dist/node.mjs",
-        "require": "./dist/node.cjs"
-      },
       "./model-graph": {
         "types": "./dist/model-graph/index.d.ts",
         "import": "./dist/model-graph/index.mjs",
@@ -100,7 +104,7 @@
     "generate": "langium generate && tsx scripts/generate-icons.ts",
     "dev": "run-p 'watch:*'",
     "lint": "run -T eslint src/ --fix",
-    "clean": "run -T rimraf dist contrib",
+    "clean": "rm -r -f dist contrib",
     "test": "vitest run --no-isolate",
     "test-dbg": "vitest run --no-isolate -t formating",
     "vitest:ui": "vitest --no-isolate --ui",
@@ -108,20 +112,20 @@
   },
   "dependencies": {
     "@dagrejs/graphlib": "^2.2.4",
-    "@likec4/core": "1.10.0",
-    "@likec4/log": "1.10.0",
+    "@likec4/core": "1.11.0",
+    "@likec4/log": "1.11.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
-    "langium": "3.1.3",
+    "langium": "3.2.0",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
-    "remeda": "^2.11.0",
+    "remeda": "^2.14.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
-    "type-fest": "^4.26.0",
+    "type-fest": "4.26.1",
     "ufo": "^1.5.4",
     "vscode-jsonrpc": "8.2.0",
     "vscode-languageserver": "9.0.1",
@@ -129,19 +133,20 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.10.0",
-    "@likec4/tsconfig": "1.10.0",
+    "@likec4/icons": "1.11.0",
+    "@likec4/tsconfig": "1.11.0",
     "@types/node": "^20.16.1",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
+    "@vitest/coverage-v8": "^2.1.1",
     "execa": "^9.3.1",
-    "langium-cli": "3.1.1",
+    "langium-cli": "3.2.0",
     "npm-run-all2": "^6.2.2",
     "tsx": "~4.9.3",
     "turbo": "^2.1.1",
-    "typescript": "^5.5.4",
+    "typescript": "^5.6.2",
     "unbuild": "^3.0.0-rc.7",
-    "vitest": "~2.0.5"
+    "vitest": "^2.1.1"
   },
-  "packageManager": "yarn@4.3.1"
+  "packageManager": "yarn@4.4.1"
 }

package/src/Rpc.ts

@@ -35,15 +35,16 @@ export class Rpc implements Disposable {
     const DocumentBuilder = this.services.shared.workspace.DocumentBuilder
 
     const notifyModelParsed = debounce(
-      () =>
-        void connection.sendNotification(onDidChangeModel, '').catch(e => {
+      () => {
+        connection.sendNotification(onDidChangeModel, '').catch(e => {
           logger.error(`[ServerRpc] error sending onDidChangeModel: ${e}`)
           return Promise.resolve()
-        }),
+        })
+      },
       {
         timing: 'both',
-        waitMs: 350,
-        maxWaitMs: 1000
+        waitMs: 300,
+        maxWaitMs: 600
       }
     )
 
@@ -54,7 +55,10 @@ export class Rpc implements Disposable {
         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 }
       }),

package/src/ast.ts

@@ -288,7 +288,7 @@ export type ChecksFromDiagnostics = ReturnType<typeof checksFromDiagnostics>
 export type IsValidFn = ChecksFromDiagnostics['isValid']
 
 export function* streamModel(doc: LikeC4LangiumDocument, isValid: IsValidFn) {
-  const traverseStack = doc.parseResult.value.models.flatMap(m => (isValid(m) ? m.elements : []))
+  const traverseStack = doc.parseResult.value.models.flatMap(m => m.elements)
   const relations = [] as ast.Relation[]
   let el
   while ((el = traverseStack.shift())) {

package/src/browser.ts

@@ -2,6 +2,11 @@ import { startLanguageServer as startLanguim } from 'langium/lsp'
 import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser'
 import { createLanguageServices } from './module'
 
+export { setLogLevel } from './logger'
+export type * from './model'
+export type * from './module'
+export { createCustomLanguageServices, createLanguageServices, LikeC4Module } from './module'
+
 // This is an example copied as is from here:
 // https://github.com/microsoft/vscode-extension-samples/blob/main/lsp-web-extension-sample/server/src/browserServerMain.ts
 // the only addition is the following line:

package/src/formatting/LikeC4Formatter.ts

@@ -46,7 +46,9 @@ export class LikeC4Formatter extends AbstractFormatter {
 
   protected formatRelation(node: AstNode) {
     this.on(node, ast.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)
 
@@ -73,7 +75,7 @@ export class LikeC4Formatter extends AbstractFormatter {
       ?.keywords('->').append(FormattingOptions.oneSpace)
 
     this.on(node, ast.isInOutRelationExpression)
-      ?.property('inout').append(FormattingOptions.oneSpace)
+      ?.keyword('->').prepend(FormattingOptions.oneSpace)
   }
 
   protected removeIndentFromTopLevelStatements(node: AstNode) {