@likec4/language-server 1.10.1 → 1.12.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/like-c4.langium

@@ -439,7 +439,10 @@ ViewRuleStyle:
   '}';
 
 ViewRuleAutoLayout:
-  'autoLayout' direction=ViewLayoutDirection;
+  'autoLayout' direction=ViewLayoutDirection (
+    rankSep=Number (
+      nodeSep=Number)?
+    )?;
 
 NotationProperty:
   key='notation' ':'? value=String ';'?
@@ -547,7 +550,7 @@ ElementShape returns string:
   'rectangle' | 'person' | 'browser' | 'mobile' | 'cylinder' | 'storage' | 'queue';
 
 CustomColorValue returns string:
-  Hash (Id | Hex);
+  Hash (Id | Hex | Number);
 
 IconId returns string:
   LIB_ICON;
@@ -599,7 +602,7 @@ hidden terminal NL: /[\r\n]+/;
 //terminal LineStartWithDash: /(?<=([\r?\n][^\S\r\n]*))-/;
 
 // LibIcons
-terminal LIB_ICON: /(aws|gcp|tech):[-\w]*/;
+terminal LIB_ICON: /(aws|azure|gcp|tech):[-\w]*/;
 
 terminal URI_WITH_SCHEMA: /\w+:\/\/\S+/;
 terminal URI_RELATIVE: /\.{0,2}\/[^\/]\S+/;
@@ -620,4 +623,5 @@ terminal String: /"[^"]*"|'[^']*'/;
 // terminal  TagId: HASH LETTER (LETTER | DIGIT | UNDERSCORE | DASH)*;
 // terminal IdTerminal: (LETTER | UNDERSCORE+ (LETTER | DIGIT)) (LETTER | DIGIT | UNDERSCORE | DASH)*;
 terminal IdTerminal:  /[_]*[a-zA-Z][-\w]*/;
-terminal Hex: /[a-zA-Z0-9]+/;
+terminal Number returns number: /\b\d+\b/;
+terminal Hex: /\b[a-zA-Z0-9]+\b/;

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,54 @@
-import { type CompletionProviderOptions, DefaultCompletionProvider } from 'langium/lsp'
+import { type GrammarAST, type MaybePromise } from 'langium'
+import {
+  type CompletionAcceptor,
+  type CompletionContext,
+  type CompletionProviderOptions,
+  DefaultCompletionProvider
+} from 'langium/lsp'
+import { CompletionItemKind, InsertTextFormat } from 'vscode-languageserver-types'
 
 export class LikeC4CompletionProvider extends DefaultCompletionProvider {
   override readonly completionOptions = {
     triggerCharacters: ['.']
   } satisfies CompletionProviderOptions
+
+  protected override completionForKeyword(
+    context: CompletionContext,
+    keyword: GrammarAST.Keyword,
+    acceptor: CompletionAcceptor
+  ): MaybePromise<void> {
+    if (!this.filterKeyword(context, keyword)) {
+      return
+    }
+    if (['views', 'specification', 'model'].includes(keyword.value)) {
+      return acceptor(context, {
+        label: keyword.value,
+        detail: `Insert ${keyword} block`,
+        kind: CompletionItemKind.Module,
+        insertTextFormat: InsertTextFormat.Snippet,
+        insertText: `${keyword} {\n\t$0\n}`
+      })
+    }
+    if (keyword.value === 'dynamic') {
+      return acceptor(context, {
+        label: keyword.value,
+        detail: `Insert dynamic view`,
+        kind: CompletionItemKind.Class,
+        insertTextFormat: InsertTextFormat.Snippet,
+        insertText: [
+          'dynamic view ${1:view_${TM_FILENAME_BASE}_${CURRENT_SECOND}} {',
+          '\ttitle \'${2:Untitled}\'',
+          '\t',
+          '\t$0',
+          '}'
+        ].join('\n')
+      })
+    }
+    acceptor(context, {
+      label: keyword.value,
+      kind: this.getKeywordCompletionItemKind(keyword),
+      detail: 'Keyword',
+      sortText: '1'
+    })
+  }
 }

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/model-parser.ts

@@ -608,9 +608,7 @@ export class LikeC4ModelParser {
       }
     }
     if (ast.isViewRuleAutoLayout(astRule)) {
-      return {
-        autoLayout: toAutoLayout(astRule.direction)
-      }
+      return toAutoLayout(astRule)
     }
     nonexhaustive(astRule)
   }
@@ -849,9 +847,7 @@ export class LikeC4ModelParser {
             return acc
           }
           if (ast.isViewRuleAutoLayout(n)) {
-            acc.push({
-              autoLayout: toAutoLayout(n.direction)
-            })
+            acc.push(toAutoLayout(n))
             return acc
           }
           nonexhaustive(n)

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

@@ -175,7 +175,11 @@ export class ComputeCtx {
 
     return calcViewLayoutHash({
       ...view,
-      autoLayout: autoLayoutRule?.autoLayout ?? 'TB',
+      autoLayout: {
+        direction: autoLayoutRule?.direction ?? 'TB',
+        ...(autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep }),
+        ...(autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }),
+      },
       nodes: map(nodes, omit(['notation'])),
       edges: applyCustomRelationProperties(rules, nodes, sortedEdges),
       ...(elementNotations.length > 0 && {

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

@@ -200,7 +200,11 @@ export class DynamicViewComputeCtx {
 
     return calcViewLayoutHash({
       ...view,
-      autoLayout: autoLayoutRule?.autoLayout ?? 'LR',
+      autoLayout: {
+        direction: autoLayoutRule?.direction ?? 'LR',
+        ...(autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep }),
+        ...(autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }),
+      },
       nodes: map(nodes, omit(['notation'])),
       edges,
       ...(elementNotations.length > 0 && {

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/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/src/test/testServices.ts

@@ -72,7 +72,7 @@ export function createTestServices(workspace = 'file:///test/workspace') {
   const format = async (input: string | LikeC4LangiumDocument, uri?: string) => {
     const document = typeof input === 'string' ? await parse(input, uri) : input
     await services.shared.workspace.WorkspaceLock.write(async (_cancelToken) => {
-      await documentBuilder.build([document], { validation: false })
+      await documentBuilder.build([document], { validation: true })
     })
 
     const edits = await services.lsp.Formatter?.formatDocument(

package/src/view-utils/manual-layout.ts

@@ -1,4 +1,4 @@
-import type { ViewManualLayout } from '@likec4/core'
+import { isAutoLayoutDirection, type ViewManualLayout } from '@likec4/core'
 import { decode, encode } from '@msgpack/msgpack'
 import { fromBase64, toBase64 } from '@smithy/util-base64'
 import { mapValues } from 'remeda'
@@ -28,10 +28,13 @@ function pack({
 function unpack({
   nodes,
   edges,
+  autoLayout,
   ...rest
 }: ReturnType<typeof pack>): ViewManualLayout {
   return {
     ...rest,
+    /// Try to parse the old format for backward compatibility
+    autoLayout: isAutoLayoutDirection(autoLayout) ? { direction: autoLayout } : autoLayout,
     nodes: mapValues(nodes, ({ b, c, ...n }) => ({
       x: b[0],
       y: b[1],
@@ -85,4 +88,4 @@ export function deserializeFromComment(comment: string): ViewManualLayout {
     .join('')
   const decodedb64 = fromBase64(b64)
   return unpack(decode(decodedb64) as any) as ViewManualLayout
-}
+}

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.Bfc-5M8A.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,19 +0,0 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.BGy3FJPJ.cjs';
-import * as vscode_languageserver_lib_common_inlineCompletion_proposed from 'vscode-languageserver/lib/common/inlineCompletion.proposed';
-import * as vscode_languageserver from 'vscode-languageserver';
-import '@likec4/core';
-import 'langium';
-import 'type-fest';
-import 'vscode-languageserver-types';
-import 'langium/lsp';
-import './protocol.cjs';
-import 'vscode-jsonrpc';
-import 'vscode-uri';
-
-declare function startLanguageServer(): {
-    connection: vscode_languageserver._Connection<vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver._>;
-    shared: LikeC4SharedServices;
-    likec4: LikeC4Services;
-};
-
-export { startLanguageServer };

package/dist/node.d.mts

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

package/dist/node.d.ts

@@ -1,19 +0,0 @@
-import { i as LikeC4SharedServices, a as LikeC4Services } from './shared/language-server.CnVuAxDh.js';
-import * as vscode_languageserver_lib_common_inlineCompletion_proposed from 'vscode-languageserver/lib/common/inlineCompletion.proposed';
-import * as vscode_languageserver from 'vscode-languageserver';
-import '@likec4/core';
-import 'langium';
-import 'type-fest';
-import 'vscode-languageserver-types';
-import 'langium/lsp';
-import './protocol.js';
-import 'vscode-jsonrpc';
-import 'vscode-uri';
-
-declare function startLanguageServer(): {
-    connection: vscode_languageserver._Connection<vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver._, vscode_languageserver_lib_common_inlineCompletion_proposed.InlineCompletionFeatureShape, vscode_languageserver._>;
-    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.BFBeyvV8.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
-  }
-}