@likec4/language-server 1.7.4 → 1.8.1

package/contrib/likec4.tmLanguage.json

@@ -12,7 +12,7 @@
     },
     {
       "name": "keyword.control.likec4",
-      "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"
+      "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|kind|likec4lib|line|link|metadata|mobile|model|muted|navigateTo|none|normal|not|notation|odiamond|odot|of|onormal|opacity|open|or|person|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|specification|storage|style|tag|tail|technology|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.7.4",
+  "version": "1.8.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -91,9 +91,9 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@dagrejs/graphlib": "^2.2.3",
-    "@likec4/core": "1.7.4",
-    "@likec4/log": "1.7.4",
+    "@dagrejs/graphlib": "^2.2.4",
+    "@likec4/core": "1.8.1",
+    "@likec4/log": "1.8.1",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "@total-typescript/ts-reset": "^0.5.1",
@@ -103,7 +103,7 @@
     "langium": "3.1.3",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
-    "remeda": "^2.3.0",
+    "remeda": "^2.11.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
     "type-fest": "^4.21.0",
@@ -114,12 +114,12 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.7.4",
-    "@likec4/tsconfig": "1.7.4",
-    "@types/node": "^20.14.14",
+    "@likec4/icons": "1.8.1",
+    "@likec4/tsconfig": "1.8.1",
+    "@types/node": "^20.16.1",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
-    "execa": "^9.3.0",
+    "execa": "^9.3.1",
     "glob": "^11.0.0",
     "langium-cli": "3.1.1",
     "npm-run-all2": "^6.2.2",

package/src/ast.ts

@@ -8,7 +8,7 @@ import {
 } from '@likec4/core'
 import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium'
 import { DocumentState } from 'langium'
-import { clamp, isNullish, isTruthy } from 'remeda'
+import { clamp, isDefined, isNullish, isTruthy } from 'remeda'
 import type { ConditionalPick, SetRequired, ValueOf } from 'type-fest'
 import type { Diagnostic } from 'vscode-languageserver-types'
 import { DiagnosticSeverity } from 'vscode-languageserver-types'
@@ -42,10 +42,16 @@ type ParsedElementStyle = {
 }
 
 export interface ParsedAstSpecification {
-  kinds: Record<c4.ElementKind, ParsedElementStyle>
+  kinds: Record<c4.ElementKind, {
+    technology?: string
+    notation?: string
+    style: ParsedElementStyle
+  }>
   relationships: Record<
     c4.RelationshipKind,
     {
+      technology?: string
+      notation?: string
       color?: c4.ThemeColor
       line?: c4.RelationshipLineType
       head?: c4.RelationshipArrowType
@@ -62,8 +68,9 @@ export interface ParsedAstElement {
   description?: string
   technology?: string
   tags?: c4.NonEmptyArray<c4.Tag>
-  links?: c4.NonEmptyArray<string>
+  links?: c4.NonEmptyArray<ParsedLink>
   style: ParsedElementStyle
+  metadata?: { [key: string]: string }
 }
 
 export interface ParsedAstRelation {
@@ -80,7 +87,8 @@ export interface ParsedAstRelation {
   line?: c4.RelationshipLineType
   head?: c4.RelationshipArrowType
   tail?: c4.RelationshipArrowType
-  links?: c4.NonEmptyArray<string>
+  links?: c4.NonEmptyArray<ParsedLink>
+  metadata?: { [key: string]: string }
 }
 
 export interface ParsedAstElementView {
@@ -92,7 +100,7 @@ export interface ParsedAstElementView {
   title: string | null
   description: string | null
   tags: c4.NonEmptyArray<c4.Tag> | null
-  links: c4.NonEmptyArray<string> | null
+  links: c4.NonEmptyArray<ParsedLink> | null
   rules: c4.ViewRule[]
   manualLayout?: c4.ViewManualLayout
 }
@@ -104,7 +112,7 @@ export interface ParsedAstDynamicView {
   title: string | null
   description: string | null
   tags: c4.NonEmptyArray<c4.Tag> | null
-  links: c4.NonEmptyArray<string> | null
+  links: c4.NonEmptyArray<ParsedLink> | null
   steps: c4.DynamicViewStep[]
   rules: Array<c4.DynamicViewRule>
   manualLayout?: c4.ViewManualLayout
@@ -121,6 +129,11 @@ export const ViewOps = {
   }
 }
 
+export interface ParsedLink {
+  title?: string
+  url: string
+}
+
 export const ElementOps = {
   writeId(node: ast.Element, id: c4.Fqn | null) {
     if (isNullish(id)) {
@@ -309,7 +322,7 @@ export function resolveRelationPoints(node: ast.Relation): {
   if (!target) {
     throw new RelationRefError('Invalid reference to target')
   }
-  if (ast.isExplicitRelation(node)) {
+  if (isDefined(node.source)) {
     const source = elementRef(node.source)
     if (!source) {
       throw new RelationRefError('Invalid reference to source')
@@ -319,6 +332,9 @@ export function resolveRelationPoints(node: ast.Relation): {
       target
     }
   }
+  if (!ast.isElementBody(node.$container)) {
+    throw new RelationRefError('Invalid container for sourceless relation')
+  }
   return {
     source: node.$container.$container,
     target
@@ -338,15 +354,21 @@ export function toElementStyle(props?: Array<ast.StyleProperty>) {
   for (const prop of props) {
     switch (true) {
       case ast.isBorderProperty(prop): {
-        result.border = prop.value
+        if (isTruthy(prop.value)) {
+          result.border = prop.value
+        }
         break
       }
       case ast.isColorProperty(prop): {
-        result.color = prop.value
+        if (isTruthy(prop.value)) {
+          result.color = prop.value
+        }
         break
       }
       case ast.isShapeProperty(prop): {
-        result.shape = prop.value
+        if (isTruthy(prop.value)) {
+          result.shape = prop.value
+        }
         break
       }
       case ast.isIconProperty(prop): {
@@ -368,7 +390,7 @@ export function toElementStyle(props?: Array<ast.StyleProperty>) {
   return result
 }
 
-export function toRelationshipStyle(props?: ast.SpecificationRelationshipKind['props']) {
+export function toRelationshipStyle(props?: ast.RelationshipStyleProperty[]) {
   const result = {} as {
     color?: c4.ThemeColor
     line?: c4.RelationshipLineType
@@ -411,7 +433,7 @@ export function toRelationshipStyle(props?: ast.SpecificationRelationshipKind['p
 export function toRelationshipStyleExcludeDefaults(
   props?: ast.SpecificationRelationshipKind['props']
 ) {
-  const { color, line, head, tail } = toRelationshipStyle(props)
+  const { color, line, head, tail } = toRelationshipStyle(props?.filter(ast.isRelationshipStyleProperty))
   return {
     ...(color && color !== DefaultRelationshipColor ? { color } : {}),
     ...(line && line !== DefaultLineStyle ? { line } : {}),