@likec4/language-server 1.10.1 → 1.12.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.10.1",
+  "version": "1.12.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,8 +112,8 @@
   },
   "dependencies": {
     "@dagrejs/graphlib": "^2.2.4",
-    "@likec4/core": "1.10.1",
-    "@likec4/log": "1.10.1",
+    "@likec4/core": "1.12.0",
+    "@likec4/log": "1.12.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
@@ -118,10 +122,10 @@
     "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.1",
+    "type-fest": "4.26.1",
     "ufo": "^1.5.4",
     "vscode-jsonrpc": "8.2.0",
     "vscode-languageserver": "9.0.1",
@@ -129,20 +133,20 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.10.1",
-    "@likec4/tsconfig": "1.10.1",
-    "@types/node": "^20.16.1",
+    "@likec4/icons": "1.12.0",
+    "@likec4/tsconfig": "1.12.0",
+    "@types/node": "^20.16.5",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
-    "@vitest/coverage-v8": "^2.1.0",
+    "@vitest/coverage-v8": "^2.1.2",
     "execa": "^9.3.1",
     "langium-cli": "3.2.0",
     "npm-run-all2": "^6.2.2",
     "tsx": "~4.9.3",
-    "turbo": "^2.1.1",
+    "turbo": "^2.1.2",
     "typescript": "^5.6.2",
-    "unbuild": "^3.0.0-rc.7",
-    "vitest": "^2.1.0"
+    "unbuild": "^3.0.0-rc.8",
+    "vitest": "^2.1.2"
   },
-  "packageManager": "yarn@4.4.1"
+  "packageManager": "yarn@4.5.0"
 }

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())) {
@@ -455,27 +455,41 @@ export function toColor(astNode: ast.ColorProperty): c4.Color | undefined {
 }
 
 export function toAutoLayout(
-  direction: ast.ViewLayoutDirection
-): c4.ViewRuleAutoLayout['autoLayout'] {
-  switch (direction) {
+  rule: ast.ViewRuleAutoLayout
+): c4.ViewRuleAutoLayout {
+  const rankSep = rule.rankSep
+  const nodeSep = rule.nodeSep
+
+  let direction: c4.ViewRuleAutoLayout['direction'];
+  switch (rule.direction) {
     case 'TopBottom': {
-      return 'TB'
+      direction = 'TB'
+      break
     }
     case 'BottomTop': {
-      return 'BT'
+      direction = 'BT'
+      break
     }
     case 'LeftRight': {
-      return 'LR'
+      direction = 'LR'
+      break
     }
     case 'RightLeft': {
-      return 'RL'
+      direction = 'RL'
+      break
     }
     default:
-      nonexhaustive(direction)
+      nonexhaustive(rule.direction)
+  }
+
+  return {
+    direction,
+    ...(nodeSep && { nodeSep }),
+    ...(rankSep && { rankSep })
   }
 }
 
-export function toAstViewLayoutDirection(c4: c4.ViewRuleAutoLayout['autoLayout']): ast.ViewLayoutDirection {
+export function toAstViewLayoutDirection(c4: c4.ViewRuleAutoLayout['direction']): ast.ViewLayoutDirection {
   switch (c4) {
     case 'TB': {
       return 'TopBottom'

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

@@ -56,10 +56,18 @@ export class LikeC4Formatter extends AbstractFormatter {
     })
 
     this.on(node, ast.isDynamicViewStep, (n, f) => {
-      f.properties('source').append(FormattingOptions.oneSpace)
-      f.keywords(']->').prepend(FormattingOptions.noSpace)
-      f.keywords('-[').append(FormattingOptions.noSpace)
-      f.properties('target', 'title').prepend(FormattingOptions.oneSpace)
+      f.keywords('->', '<-').surround(FormattingOptions.oneSpace)
+
+      const kind = f.property('kind')
+      kind.nodes[0]?.text.startsWith('.') && kind.surround(FormattingOptions.oneSpace)
+      f.keywords(']->')
+        .prepend(FormattingOptions.noSpace)
+        .append(FormattingOptions.oneSpace)
+      f.keywords('-[')
+        .prepend(FormattingOptions.oneSpace)
+        .append(FormattingOptions.noSpace)
+
+      f.properties('title').prepend(FormattingOptions.oneSpace)
     })
 
     this.on(node, ast.isDirectedRelationExpression)
@@ -110,6 +118,7 @@ export class LikeC4Formatter extends AbstractFormatter {
       || ast.isCustomElementProperties(node)
       || ast.isCustomRelationProperties(node)
       || ast.isElementStyleProperty(node)
+      || ast.isDynamicViewParallelSteps(node)
     ) {
       const formatter = this.getNodeFormatter(node)
       const openBrace = formatter.keywords('{')
@@ -216,8 +225,11 @@ export class LikeC4Formatter extends AbstractFormatter {
   }
 
   protected formatAutolayoutProperty(node: AstNode) {
-    this.on(node, ast.isViewRuleAutoLayout)
-      ?.keyword('autoLayout').append(FormattingOptions.oneSpace)
+    this.on(node, ast.isViewRuleAutoLayout, (n, f) => {
+      f.keyword('autoLayout').append(FormattingOptions.oneSpace)
+      f.property('rankSep').prepend(FormattingOptions.oneSpace)
+      f.property('nodeSep').prepend(FormattingOptions.oneSpace)
+    })
   }
 
   protected formatMetadataProperty(node: AstNode) {
@@ -287,7 +299,7 @@ export class LikeC4Formatter extends AbstractFormatter {
     this.on(node, ast.isViewRuleStyle)
       ?.keyword('style').append(FormattingOptions.oneSpace)
 
-      this.on(node, ast.isElementExpressionsIterator)
+    this.on(node, ast.isElementExpressionsIterator)
       ?.keyword(',')
       .prepend(FormattingOptions.noSpace)
       .append(FormattingOptions.oneSpace)

package/src/generated/ast.ts

@@ -12,7 +12,7 @@ export const LikeC4Terminals = {
     LINE_COMMENT: /\/\/[^\n\r]*/,
     WS: /[\t ]+/,
     NL: /[\r\n]+/,
-    LIB_ICON: /(aws|gcp|tech):[-\w]*/,
+    LIB_ICON: /(aws|azure|gcp|tech):[-\w]*/,
     URI_WITH_SCHEMA: /\w+:\/\/\S+/,
     URI_RELATIVE: /\.{0,2}\/[^\/]\S+/,
     DotUnderscore: /\b\._/,
@@ -25,7 +25,8 @@ export const LikeC4Terminals = {
     Percent: /\b\d+%/,
     String: /"[^"]*"|'[^']*'/,
     IdTerminal: /[_]*[a-zA-Z][-\w]*/,
-    Hex: /[a-zA-Z0-9]+/,
+    Number: /\b\d+\b/,
+    Hex: /\b[a-zA-Z0-9]+\b/,
 };
 
 export type LikeC4TerminalNames = keyof typeof LikeC4Terminals;
@@ -205,7 +206,7 @@ export function isElementShape(item: unknown): item is ElementShape {
 export type IconId = string;
 
 export function isIconId(item: unknown): item is IconId {
-    return (typeof item === 'string' && (/(aws|gcp|tech):[-\w]*/.test(item)));
+    return (typeof item === 'string' && (/(aws|azure|gcp|tech):[-\w]*/.test(item)));
 }
 
 export type Id = 'element' | 'model' | ArrowType | ElementShape | LineOptions | ThemeColor | string;
@@ -1347,6 +1348,8 @@ export interface ViewRuleAutoLayout extends AstNode {
     readonly $container: DynamicViewBody | ElementViewBody;
     readonly $type: 'ViewRuleAutoLayout';
     direction: ViewLayoutDirection;
+    nodeSep?: number;
+    rankSep?: number;
 }
 
 export const ViewRuleAutoLayout = 'ViewRuleAutoLayout';
@@ -2441,7 +2444,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: ViewRuleAutoLayout,
                     properties: [
-                        { name: 'direction' }
+                        { name: 'direction' },
+                        { name: 'nodeSep' },
+                        { name: 'rankSep' }
                     ]
                 };
             }