@likec4/language-server 1.5.0 → 1.6.1

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|exclude|extend|extends|gray|green|head|icon|include|indigo|it|kind|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|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"
     },
     {
       "name": "string.quoted.double.likec4",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -26,6 +26,10 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
+    "./likec4lib": {
+      "types": "./dist/likec4lib.d.ts",
+      "default": "./dist/likec4lib.js"
+    },
     "./browser": {
       "types": "./dist/browser/index.d.ts",
       "default": "./dist/browser/index.js"
@@ -51,6 +55,10 @@
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
       },
+      "./likec4lib": {
+        "types": "./dist/likec4lib.d.ts",
+        "default": "./dist/likec4lib.js"
+      },
       "./browser": {
         "types": "./dist/browser/index.d.ts",
         "default": "./dist/browser/index.js"
@@ -71,9 +79,10 @@
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
+    "pregenerate": "rm -f src/generated/*",
     "watch:langium": "langium generate --watch",
     "watch:ts": "tsc --watch",
-    "generate": "langium generate",
+    "generate": "langium generate && tsx scripts/generate-icons.ts",
     "dev": "run-p 'watch:*'",
     "lint": "run -T eslint src/ --fix",
     "clean": "run -T rimraf dist contrib",
@@ -83,7 +92,7 @@
   },
   "dependencies": {
     "@dagrejs/graphlib": "^2.2.2",
-    "@likec4/core": "1.5.0",
+    "@likec4/core": "1.6.1",
     "@total-typescript/ts-reset": "^0.5.1",
     "fast-equals": "^5.0.1",
     "indent-string": "^5.0.0",
@@ -101,15 +110,18 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/tsconfig": "1.5.0",
+    "@likec4/icons": "1.6.1",
+    "@likec4/tsconfig": "1.6.1",
     "@types/node": "^20.14.10",
     "@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",
     "npm-run-all2": "^6.2.2",
+    "tsx": "~4.9.3",
     "typescript": "^5.5.3",
-    "vitest": "~1.6.0"
+    "vitest": "~2.0.3"
   },
   "packageManager": "yarn@4.3.1"
 }

package/src/Rpc.ts

@@ -5,6 +5,7 @@ import type { LikeC4Services } from './module'
 import { nonexhaustive } from '@likec4/core'
 import { Disposable, interruptAndCheck, URI, UriUtils } from 'langium'
 import { isLikeC4LangiumDocument } from './ast'
+import { Scheme } from './likec4lib'
 import {
   buildDocuments,
   changeView,
@@ -69,7 +70,7 @@ export class Rpc implements Disposable {
         const changed = docs.map(d => URI.parse(d))
         const notChanged = (uri: URI) => changed.every(c => !UriUtils.equals(c, uri))
         const deleted = LangiumDocuments.all
-          .filter(d => isLikeC4LangiumDocument(d) && notChanged(d.uri))
+          .filter(d => isLikeC4LangiumDocument(d) && notChanged(d.uri) && d.uri.scheme !== Scheme)
           .map(d => d.uri)
           .toArray()
         logger.debug(

package/src/ast.ts

@@ -8,7 +8,7 @@ import {
 } from '@likec4/core'
 import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium'
 import { AstUtils, DocumentState } from 'langium'
-import { clamp, isNullish } from 'remeda'
+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'
@@ -207,9 +207,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.isCustomElementExpr,
-  ast.isCustomRelationExpr,
-  ast.isViewRulePredicateExpr,
+  ast.isDynamicViewRulePredicateIterator,
+  ast.isCustomElementExpression,
+  ast.isCustomRelationExpression,
+  ast.isElementExpression,
+  ast.isRelationExpression,
   ast.isDynamicViewRulePredicate,
   ast.isDynamicViewStep,
   ast.isViewProperty,
@@ -336,7 +338,10 @@ export function toElementStyle(props?: Array<ast.StyleProperty>) {
         break
       }
       case ast.isIconProperty(prop): {
-        result.icon = prop.value as c4.IconUrl
+        const icon = prop.libicon?.ref?.name ?? prop.value
+        if (isTruthy(icon)) {
+          result.icon = icon as c4.IconUrl
+        }
         break
       }
       case ast.isOpacityProperty(prop): {