@likec4/language-server 1.6.0 → 1.7.0

package/contrib/likec4.tmLanguage.json

@@ -12,7 +12,7 @@
     },
     {
       "name": "keyword.control.likec4",
-      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|autoLayout|blue|border|browser|color|crow|cylinder|dashed|description|diamond|dot|dotted|dynamic|element|element\\.kind|element\\.tag|exclude|extend|extends|gray|green|head|icon|icons|include|indigo|it|likec4lib|line|link|mobile|model|muted|navigateTo|none|normal|odiamond|odot|of|onormal|opacity|open|person|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|specification|storage|style|tag|tail|technology|this|title|vee|view|views|with)\\b"
+      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|and|autoLayout|blue|border|browser|color|crow|cylinder|dashed|description|diamond|dot|dotted|dynamic|element|element\\.kind|element\\.tag|exclude|extend|extends|gray|green|head|icon|icons|include|indigo|is|it|kind|likec4lib|line|link|mobile|model|muted|navigateTo|none|normal|not|odiamond|odot|of|onormal|opacity|open|or|person|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|specification|storage|style|tag|tail|technology|this|title|vee|view|views|where|with)\\b"
     },
     {
       "name": "string.quoted.double.likec4",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -31,16 +31,16 @@
       "default": "./dist/likec4lib.js"
     },
     "./browser": {
-      "types": "./dist/browser/index.d.ts",
-      "default": "./dist/browser/index.js"
+      "types": "./dist/browser.d.ts",
+      "default": "./dist/browser.js"
     },
     "./protocol": {
       "types": "./dist/protocol.d.ts",
       "default": "./dist/protocol.js"
     },
     "./node": {
-      "types": "./dist/node/index.d.ts",
-      "default": "./dist/node/index.js"
+      "types": "./dist/node.d.ts",
+      "default": "./dist/node.js"
     },
     "./model-graph": {
       "types": "./dist/model-graph/index.d.ts",
@@ -60,16 +60,16 @@
         "default": "./dist/likec4lib.js"
       },
       "./browser": {
-        "types": "./dist/browser/index.d.ts",
-        "default": "./dist/browser/index.js"
+        "types": "./dist/browser.d.ts",
+        "default": "./dist/browser.js"
       },
       "./protocol": {
         "types": "./dist/protocol.d.ts",
         "default": "./dist/protocol.js"
       },
       "./node": {
-        "types": "./dist/node/index.d.ts",
-        "default": "./dist/node/index.js"
+        "types": "./dist/node.d.ts",
+        "default": "./dist/node.js"
       },
       "./model-graph": {
         "types": "./dist/model-graph/index.d.ts",
@@ -92,36 +92,40 @@
   },
   "dependencies": {
     "@dagrejs/graphlib": "^2.2.2",
-    "@likec4/core": "1.6.0",
+    "@likec4/core": "1.7.0",
+    "@likec4/log": "1.7.0",
+    "@msgpack/msgpack": "^3.0.0-beta2",
+    "@smithy/util-base64": "^3.0.0",
     "@total-typescript/ts-reset": "^0.5.1",
     "fast-equals": "^5.0.1",
     "indent-string": "^5.0.0",
     "json5": "^2.2.3",
-    "langium": "3.1.2",
+    "langium": "3.1.3",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
     "remeda": "^2.3.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
     "type-fest": "^4.21.0",
-    "ufo": "^1.5.3",
+    "ufo": "^1.5.4",
+    "vscode-jsonrpc": "8.2.0",
     "vscode-languageserver": "9.0.1",
-    "vscode-languageserver-protocol": "3.17.5",
+    "vscode-languageserver-types": "3.17.5",
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.6.0",
-    "@likec4/tsconfig": "1.6.0",
-    "@types/node": "^20.14.10",
+    "@likec4/icons": "1.7.0",
+    "@likec4/tsconfig": "1.7.0",
+    "@types/node": "^20.14.13",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
     "execa": "^9.3.0",
     "glob": "^11.0.0",
-    "langium-cli": "3.1.0",
+    "langium-cli": "3.1.1",
     "npm-run-all2": "^6.2.2",
     "tsx": "~4.9.3",
-    "typescript": "^5.5.3",
-    "vitest": "~2.0.3"
+    "typescript": "^5.5.4",
+    "vitest": "~2.0.5"
   },
   "packageManager": "yarn@4.3.1"
 }

package/src/Rpc.ts

@@ -27,7 +27,7 @@ export class Rpc implements Disposable {
     const modelEditor = this.services.likec4.ModelChanges
     const connection = this.services.shared.lsp.Connection
     if (!connection) {
-      logger.warn(`[ServerRpc] no connection, not initializing`)
+      logger.info(`[ServerRpc] no connection, not initializing`)
       return
     }
     logger.info(`[ServerRpc] init`)

package/src/ast.ts

@@ -7,11 +7,11 @@ import {
   RelationRefError
 } from '@likec4/core'
 import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium'
-import { AstUtils, DocumentState } from 'langium'
+import { DocumentState } from 'langium'
 import { clamp, isNullish, isTruthy } from 'remeda'
 import type { ConditionalPick, SetRequired, ValueOf } from 'type-fest'
-import type { Diagnostic } from 'vscode-languageserver-protocol'
-import { DiagnosticSeverity } from 'vscode-languageserver-protocol'
+import type { Diagnostic } from 'vscode-languageserver-types'
+import { DiagnosticSeverity } from 'vscode-languageserver-types'
 import { elementRef } from './elementRef'
 import type { LikeC4Grammar } from './generated/ast'
 import * as ast from './generated/ast'
@@ -74,6 +74,8 @@ export interface ParsedAstRelation {
   kind?: c4.RelationshipKind
   tags?: c4.NonEmptyArray<c4.Tag>
   title: string
+  description?: string
+  technology?: string
   color?: c4.ThemeColor
   line?: c4.RelationshipLineType
   head?: c4.RelationshipArrowType
@@ -207,12 +209,11 @@ function validatableAstNodeGuards<const Predicates extends Guard<AstNode>[]>(
   return (n: AstNode): n is Guarded<Predicates[number]> => predicates.some(p => p(n))
 }
 const isValidatableAstNode = validatableAstNodeGuards([
-  ast.isDynamicViewRulePredicateIterator,
-  ast.isCustomElementExpression,
-  ast.isCustomRelationExpression,
+  ast.isDynamicViewPredicateIterator,
+  ast.isElementPredicateWith,
+  ast.isRelationPredicateWith,
   ast.isElementExpression,
   ast.isRelationExpression,
-  ast.isDynamicViewRulePredicate,
   ast.isDynamicViewStep,
   ast.isViewProperty,
   ast.isStyleProperty,
@@ -239,12 +240,23 @@ const isValidatableAstNode = validatableAstNodeGuards([
 ])
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>
 
+const findInvalidContainer = (node: LikeC4AstNode): ValidatableAstNode | undefined => {
+  let nd = node as LikeC4AstNode['$container']
+  while (nd) {
+    if (isValidatableAstNode(nd)) {
+      return nd
+    }
+    nd = nd.$container
+  }
+  return
+}
+
 export function checksFromDiagnostics(doc: LikeC4LangiumDocument) {
   const errors = doc.diagnostics?.filter(d => d.severity === DiagnosticSeverity.Error) ?? []
   const invalidNodes = new WeakSet(
     errors.flatMap(d => {
-      return AstUtils.getContainerOfType(d.node, isValidatableAstNode) ?? []
-    }) ?? []
+      return findInvalidContainer(d.node) ?? []
+    })
   )
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isValid = (n: ValidatableAstNode) => !invalidNodes.has(n)
@@ -447,3 +459,16 @@ export function toAstViewLayoutDirection(c4: c4.ViewRuleAutoLayout['autoLayout']
       nonexhaustive(c4)
   }
 }
+
+export function elementExpressionFromPredicate(predicate: ast.ElementPredicate): ast.ElementExpression {
+  if (ast.isElementExpression(predicate)) {
+    return predicate
+  }
+  if (ast.isElementPredicateWhere(predicate)) {
+    return predicate.subject
+  }
+  if (ast.isElementPredicateWith(predicate)) {
+    return elementExpressionFromPredicate(predicate.subject)
+  }
+  nonexhaustive(predicate)
+}

package/src/{browser/index.ts → browser.ts}

@@ -1,6 +1,7 @@
 import { startLanguageServer as startLanguim } from 'langium/lsp'
 import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser'
-import { createLanguageServices } from '../module'
+import { logToLspConnection } from './logger'
+import { createLanguageServices } 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
@@ -21,6 +22,8 @@ export function startLanguageServer() {
   // Start the language server with the shared services
   startLanguim(services.shared)
 
+  logToLspConnection(connection)
+
   return {
     ...services,
     connection,