@likec4/language-server 1.10.0 → 1.11.0

package/src/index.ts

@@ -1,4 +1,25 @@
-export { setLogLevel } from './logger'
+import { startLanguageServer as startLanguim } from 'langium/lsp'
+import { NodeFileSystem } from 'langium/node'
+import { createConnection, ProposedFeatures } from 'vscode-languageserver/node'
+import { createLanguageServices } from './module'
+
+export { logger as lspLogger, setLogLevel } from './logger'
 export type * from './model'
-export { createCustomLanguageServices, createLanguageServices, LikeC4Module } from './module'
 export type * from './module'
+export { createCustomLanguageServices, createLanguageServices, LikeC4Module } from './module'
+
+export function startLanguageServer() {
+  /* browser specific setup code */
+  const connection = createConnection(ProposedFeatures.all)
+
+  // Inject the shared services and language-specific services
+  const services = createLanguageServices({ connection, ...NodeFileSystem })
+
+  // Start the language server with the shared services
+  startLanguim(services.shared)
+
+  return {
+    ...services,
+    connection
+  }
+}

package/src/likec4lib.ts

@@ -1,6 +1,6 @@
 import { LibIcons } from './generated-lib/icons'
 
 export const Scheme = 'likec4builtin'
-export const Uri = `${Scheme}:///likec4/lib/icons.c4`
+export const Uri = `${Scheme}:///likec4/lib/icons.c4` as const
 
 export { LibIcons as Content }

package/src/logger.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { type ConsolaReporter, LogLevels, rootLogger as root } from '@likec4/log'
+import { isError } from 'remeda'
 import type { Connection } from 'vscode-languageserver'
 
 export const logger = root.withTag('lsp')
@@ -28,13 +29,13 @@ export function logErrorToTelemetry(connection: Connection): void {
       }
       const tag = logObj.tag || ''
       const parts = logObj.args.map((arg) => {
-        if (arg && typeof arg.stack === 'string') {
-          return arg.message + '\n' + arg.stack
+        if (isError(arg)) {
+          return arg.stack ?? arg.message
         }
         if (typeof arg === 'string') {
           return arg
         }
-        return String(arg)
+        return '' + arg
       })
       if (tag) {
         parts.unshift(`[${tag}]`)
@@ -52,33 +53,29 @@ export function logToLspConnection(connection: Connection): void {
     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 (isError(arg)) {
+          return arg.stack ?? arg.message
         }
         if (typeof arg === 'string') {
           return arg
         }
-        return String(arg)
+        return '' + 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.info: {
+        //   connection.console.info(message)
+        //   break
+        // }
         case level >= LogLevels.log: {
-          connection.console.log(message)
+          connection.console.info(message)
           break
         }
         case level >= LogLevels.warn: {
@@ -89,9 +86,12 @@ export function logToLspConnection(connection: Connection): void {
           connection.console.error(message)
           break
         }
+        default: {
+          connection.console.log(message)
+        }
       }
     }
   }
-  root.addReporter(reporter)
+  root.setReporters([reporter])
   logger.setReporters(root.options.reporters)
 }

package/src/lsp/CompletionProvider.ts

@@ -1,7 +1,7 @@
 import { type CompletionProviderOptions, DefaultCompletionProvider } from 'langium/lsp'
 
 export class LikeC4CompletionProvider extends DefaultCompletionProvider {
-  readonly completionOptions = {
+  override readonly completionOptions = {
     triggerCharacters: ['.']
   } satisfies CompletionProviderOptions
 }

package/src/model/model-builder.ts

@@ -315,7 +315,7 @@ export class LikeC4ModelBuilder {
       async (docs, _cancelToken) => {
         let parsed = [] as URI[]
         try {
-          logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)\n${printDocs(docs)}`)
+          logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)`)
           for (const doc of parser.parse(docs)) {
             parsed.push(doc.uri)
           }
@@ -344,7 +344,7 @@ export class LikeC4ModelBuilder {
         logger.debug('[ModelBuilder] No documents to build model from')
         return null
       }
-      logger.debug(`[ModelBuilder] buildModel from ${docs.length} docs:\n${printDocs(docs)}`)
+      logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)`)
       return buildModel(this.services, docs)
     })
   }
@@ -408,14 +408,14 @@ export class LikeC4ModelBuilder {
     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)
     })
   }
@@ -429,17 +429,17 @@ export class LikeC4ModelBuilder {
     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(view) ? computeView(view, index) : computeDynamicView(view, index)
         if (!result.isSuccess) {

package/src/model-graph/compute-view/compute.ts

@@ -30,7 +30,7 @@ import {
   parentFqn,
   whereOperatorAsPredicate
 } from '@likec4/core'
-import { filter, flatMap, hasAtLeast, isNonNull, isTruthy, map, omit, only, pipe, reduce, sort, unique } from 'remeda'
+import { filter, hasAtLeast, isNonNull, isTruthy, map, omit, only, pipe, reduce, sort, unique } from 'remeda'
 import { calcViewLayoutHash } from '../../view-utils/view-hash'
 import type { LikeC4ModelGraph } from '../LikeC4ModelGraph'
 import { applyCustomElementProperties } from '../utils/applyCustomElementProperties'
@@ -39,6 +39,7 @@ import { applyViewRuleStyles } from '../utils/applyViewRuleStyles'
 import { buildComputeNodes } from '../utils/buildComputeNodes'
 import { buildElementNotations } from '../utils/buildElementNotations'
 import { sortNodes } from '../utils/sortNodes'
+import { uniqueTags } from '../utils/uniqueTags'
 import {
   type ElementPredicateFn,
   excludeElementKindOrTag,
@@ -218,7 +219,11 @@ export class ComputeCtx {
         tags?: NonEmptyArray<Tag>
         navigateTo?: ViewID | undefined
       } | undefined
-      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()
+      )
 
       // This edge represents mutliple relations
       // We use label if only it is the same for all relations
@@ -279,7 +284,7 @@ export class ComputeCtx {
         }
       }
 
-      const tags = unique(flatMap(relations, r => r.tags ?? []))
+      const tags = uniqueTags(relations)
 
       return Object.assign(
         edge,
@@ -292,7 +297,7 @@ export class ComputeCtx {
         relation.head && { head: relation.head },
         relation.tail && { tail: relation.tail },
         relation.navigateTo && { navigateTo: relation.navigateTo },
-        hasAtLeast(tags, 1) && { tags }
+        tags && { tags }
       )
     })
   }

package/src/model-graph/utils/applyCustomRelationProperties.ts

@@ -1,6 +1,6 @@
 import type { ComputedEdge, ComputedNode, Element, ViewRule } from '@likec4/core'
 import { Expr, nonexhaustive } from '@likec4/core'
-import { isEmpty, isNullish, omitBy } from 'remeda'
+import { isNullish, omitBy } from 'remeda'
 import { elementExprToPredicate } from './elementExpressionToPredicate'
 
 function relationExpressionToPredicates(

package/src/model-graph/utils/uniqueTags.test.ts

@@ -0,0 +1,42 @@
+import { compareNatural } from '@likec4/core'
+import { describe, expect, it } from 'vitest'
+import { uniqueTags } from './uniqueTags'
+
+describe('uniqueTags function', () => {
+  it('returns unique tags from an array of elements', () => {
+    const input = [
+      { tags: ['tag1', 'tag2', 'tag3'] },
+      { tags: ['tag2', 'tag3', 'tag4'] },
+      { tags: ['tag3', 'tag4', 'tag5'] }
+    ] as const
+    const result = uniqueTags(input)
+    expect(result).toEqual(['tag1', 'tag2', 'tag3', 'tag4', 'tag5'])
+  })
+
+  it('should return unique tags naturally sorted', () => {
+    const input = [
+      { tags: ['tag1', 'tag20', 'tag30'] },
+      { tags: ['tag2', 'tag23', 'tag34'] },
+      { tags: ['tag3'] }
+    ] as const
+    const result = uniqueTags(input)
+    expect(result).toEqual([
+      'tag1',
+      'tag2',
+      'tag3',
+      'tag20',
+      'tag23',
+      'tag30',
+      'tag34'
+    ].sort(compareNatural))
+  })
+
+  it('returns null if the tags array is null', () => {
+    const input = [
+      { tags: null },
+      {}
+    ]
+    const result = uniqueTags(input)
+    expect(result).toBeNull()
+  })
+})

package/src/model-graph/utils/uniqueTags.ts

@@ -0,0 +1,19 @@
+import { compareNatural, hasAtLeast, type NonEmptyReadonlyArray, type Tag } from '@likec4/core'
+import { flatMap, pipe, sort, unique } from 'remeda'
+import type { LiteralUnion } from 'type-fest'
+
+/**
+ * Extracts unique tags from an array of elements.
+ * and sort in natural order; returns null if no tags are present.
+ */
+export function uniqueTags<T extends { tags?: NonEmptyReadonlyArray<LiteralUnion<Tag, string>> | null }>(
+  elements: ReadonlyArray<T>
+) {
+  const tags = pipe(
+    elements,
+    flatMap(e => e.tags ?? []),
+    unique(),
+    sort(compareNatural)
+  )
+  return hasAtLeast(tags, 1) ? tags : null
+}

package/src/protocol.ts

@@ -21,7 +21,11 @@ export const fetchModel = new RequestType0<{ model: ParsedLikeC4Model | null },
 )
 export type FetchModelRequest = typeof fetchModel
 
-export const fetchComputedModel = new RequestType0<{ model: ComputedLikeC4Model | null }, void>(
+export const fetchComputedModel = new RequestType<
+  { cleanCaches?: boolean | undefined },
+  { model: ComputedLikeC4Model | null },
+  void
+>(
   'likec4/fetchComputedModel'
 )
 export type FetchComputedModelRequest = typeof fetchComputedModel

package/src/shared/WorkspaceManager.ts

@@ -23,8 +23,8 @@ export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
     folders: WorkspaceFolder[],
     collector: (document: LangiumDocument) => void
   ): Promise<void> {
-    await super.loadAdditionalDocuments(folders, collector)
     collector(this.documentFactory.fromString(BuiltIn.Content, URI.parse(BuiltIn.Uri)))
+    await super.loadAdditionalDocuments(folders, collector)
   }
 
   public workspace() {

package/dist/node.cjs

@@ -1,18 +0,0 @@
-'use strict';
-
-const lsp = require('langium/lsp');
-const node$1 = require('langium/node');
-const node = require('vscode-languageserver/node');
-const module$1 = require('./shared/language-server.JWkqVjGv.cjs');
-
-function startLanguageServer() {
-  const connection = node.createConnection(node.ProposedFeatures.all);
-  const services = module$1.createLanguageServices({ connection, ...node$1.NodeFileSystem });
-  lsp.startLanguageServer(services.shared);
-  return {
-    ...services,
-    connection
-  };
-}
-
-exports.startLanguageServer = startLanguageServer;

package/dist/node.d.cts

@@ -1,20 +0,0 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.CjFzaJwI.cjs';
-import * as vscode_languageserver_lib_common_inlineCompletion_proposed from 'vscode-languageserver/lib/common/inlineCompletion.proposed';
-import * as vscode_languageserver_node from 'vscode-languageserver/node';
-import '@likec4/core';
-import 'langium';
-import 'type-fest';
-import 'vscode-languageserver-types';
-import 'langium/lsp';
-import 'vscode-languageserver';
-import './protocol.cjs';
-import 'vscode-jsonrpc';
-import 'vscode-uri';
-
-declare function startLanguageServer(): {
-    connection: vscode_languageserver_node._Connection<vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver_node._>;
-    shared: LikeC4SharedServices;
-    likec4: LikeC4Services;
-};
-
-export { startLanguageServer };

package/dist/node.d.mts

@@ -1,20 +0,0 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.D-84I33F.mjs';
-import * as vscode_languageserver_lib_common_inlineCompletion_proposed from 'vscode-languageserver/lib/common/inlineCompletion.proposed';
-import * as vscode_languageserver_node from 'vscode-languageserver/node';
-import '@likec4/core';
-import 'langium';
-import 'type-fest';
-import 'vscode-languageserver-types';
-import 'langium/lsp';
-import 'vscode-languageserver';
-import './protocol.mjs';
-import 'vscode-jsonrpc';
-import 'vscode-uri';
-
-declare function startLanguageServer(): {
-    connection: vscode_languageserver_node._Connection<vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver_node._>;
-    shared: LikeC4SharedServices;
-    likec4: LikeC4Services;
-};
-
-export { startLanguageServer };

package/dist/node.d.ts

@@ -1,20 +0,0 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.CtKHXJDD.js';
-import * as vscode_languageserver_lib_common_inlineCompletion_proposed from 'vscode-languageserver/lib/common/inlineCompletion.proposed';
-import * as vscode_languageserver_node from 'vscode-languageserver/node';
-import '@likec4/core';
-import 'langium';
-import 'type-fest';
-import 'vscode-languageserver-types';
-import 'langium/lsp';
-import 'vscode-languageserver';
-import './protocol.js';
-import 'vscode-jsonrpc';
-import 'vscode-uri';
-
-declare function startLanguageServer(): {
-    connection: vscode_languageserver_node._Connection<vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_node._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver_node._>;
-    shared: LikeC4SharedServices;
-    likec4: LikeC4Services;
-};
-
-export { startLanguageServer };

package/dist/node.mjs

@@ -1,16 +0,0 @@
-import { startLanguageServer as startLanguageServer$1 } from 'langium/lsp';
-import { NodeFileSystem } from 'langium/node';
-import { createConnection, ProposedFeatures } from 'vscode-languageserver/node';
-import { a as createLanguageServices } from './shared/language-server.DBJJUUgF.mjs';
-
-function startLanguageServer() {
-  const connection = createConnection(ProposedFeatures.all);
-  const services = createLanguageServices({ connection, ...NodeFileSystem });
-  startLanguageServer$1(services.shared);
-  return {
-    ...services,
-    connection
-  };
-}
-
-export { startLanguageServer };

package/src/node.ts

@@ -1,20 +0,0 @@
-import { startLanguageServer as startLanguim } from 'langium/lsp'
-import { NodeFileSystem } from 'langium/node'
-import { createConnection, ProposedFeatures } from 'vscode-languageserver/node'
-import { createLanguageServices } from './module'
-
-export function startLanguageServer() {
-  /* browser specific setup code */
-  const connection = createConnection(ProposedFeatures.all)
-
-  // Inject the shared services and language-specific services
-  const services = createLanguageServices({ connection, ...NodeFileSystem })
-
-  // Start the language server with the shared services
-  startLanguim(services.shared)
-
-  return {
-    ...services,
-    connection
-  }
-}