@likec4/language-server 1.4.0 → 1.6.0

package/README.md

@@ -1,5 +1,5 @@
 # `@likec4/language-server`
 
-[docs](https://docs.likec4.dev/) | [playground](https://playground.likec4.dev/) | [demo](https://template.likec4.dev/view/cloud)
+[docs](https://likec4.dev/) | [playground](https://playground.likec4.dev/) | [demo](https://template.likec4.dev/view/cloud)
 
 Language Server Protocol (LSP) based on [languim](https://github.com/languim/languim) library.

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|dotted|dynamic|element|exclude|extend|extends|gray|green|head|icon|include|indigo|it|kind|line|link|mobile|model|muted|navigateTo|none|normal|odiamond|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.4.0",
+  "version": "1.6.0",
   "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,45 +79,49 @@
   },
   "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",
     "test": "vitest run --no-isolate",
+    "vitest:ui": "vitest --no-isolate --ui",
     "test:watch": "vitest"
   },
   "dependencies": {
     "@dagrejs/graphlib": "^2.2.2",
-    "@likec4/core": "1.4.0",
+    "@likec4/core": "1.6.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.0",
+    "langium": "3.1.2",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
-    "rambdax": "^9.1.1",
-    "remeda": "^1.61.0",
+    "remeda": "^2.3.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
-    "type-fest": "^4.18.2",
+    "type-fest": "^4.21.0",
     "ufo": "^1.5.3",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/tsconfig": "1.4.0",
-    "@types/node": "^20.14.2",
+    "@likec4/icons": "1.6.0",
+    "@likec4/tsconfig": "1.6.0",
+    "@types/node": "^20.14.10",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
-    "execa": "^9.1.0",
+    "execa": "^9.3.0",
+    "glob": "^11.0.0",
     "langium-cli": "3.1.0",
-    "npm-run-all2": "^6.1.2",
-    "typescript": "^5.4.5",
-    "vitest": "~1.5.3"
+    "npm-run-all2": "^6.2.2",
+    "tsx": "~4.9.3",
+    "typescript": "^5.5.3",
+    "vitest": "~2.0.3"
   },
-  "packageManager": "yarn@4.3.0"
+  "packageManager": "yarn@4.3.1"
 }

package/src/Rpc.ts

@@ -3,8 +3,9 @@ import { logError, logger } from './logger'
 import type { LikeC4Services } from './module'
 
 import { nonexhaustive } from '@likec4/core'
-import { Disposable, URI, UriUtils } from 'langium'
+import { Disposable, interruptAndCheck, URI, UriUtils } from 'langium'
 import { isLikeC4LangiumDocument } from './ast'
+import { Scheme } from './likec4lib'
 import {
   buildDocuments,
   changeView,
@@ -46,6 +47,8 @@ export class Rpc implements Disposable {
       }
     )
 
+    let isFirstBuild = true
+
     this.disposables.push(
       Disposable.create(() => {
         notifyModelParsed.cancel()
@@ -67,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(
@@ -75,6 +78,26 @@ export class Rpc implements Disposable {
   changed (total ${changed.length}):${docs.map(d => '\n    - ' + d).join('')}
   deleted (total ${deleted.length}):${deleted.map(d => '\n    - ' + d.toString()).join('\n')}`
         )
+
+        if (!isFirstBuild && (changed.length + deleted.length) > 0) {
+          await Promise.allSettled(
+            [...changed, ...deleted].map(async d => {
+              const uri = d.toString()
+              logger.debug(`clear diagnostics for ${uri}`)
+              try {
+                await connection.sendDiagnostics({
+                  uri,
+                  diagnostics: []
+                })
+              } catch (e) {
+                // Ignore
+                logger.warn(`error clearing diagnostics for ${uri}: ${e}`)
+              }
+            })
+          )
+          await interruptAndCheck(cancelToken)
+        }
+        isFirstBuild = false
         await DocumentBuilder.update(changed, deleted, cancelToken)
       }),
       connection.onRequest(locate, params => {

package/src/ast.ts

@@ -6,9 +6,9 @@ import {
   nonexhaustive,
   RelationRefError
 } from '@likec4/core'
-import type { AstNode, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium'
+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'
@@ -133,10 +133,8 @@ export const ElementOps = {
   }
 }
 
-export interface DocFqnIndexEntry {
-  name: string
-  el: WeakRef<ast.Element>
-  path: string
+export interface DocFqnIndexAstNodeDescription extends AstNodeDescription {
+  fqn: c4.Fqn
 }
 
 // export type LikeC4AstNode = ast.LikeC4AstType[keyof ast.LikeC4AstType]
@@ -150,14 +148,14 @@ export interface LikeC4DocumentProps {
   c4Relations?: ParsedAstRelation[]
   c4Views?: ParsedAstView[]
   // Fqn -> Element
-  c4fqns?: MultiMap<c4.Fqn, DocFqnIndexEntry>
+  c4fqnIndex?: MultiMap<c4.Fqn, DocFqnIndexAstNodeDescription>
 }
 
 export interface LikeC4LangiumDocument
   extends Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>, LikeC4DocumentProps
 {}
 export interface FqnIndexedDocument
-  extends Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>, SetRequired<LikeC4DocumentProps, 'c4fqns'>
+  extends Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>, SetRequired<LikeC4DocumentProps, 'c4fqnIndex'>
 {}
 
 // export type ParsedLikeC4LangiumDocument = SetRequired<FqnIndexedDocument, keyof  LikeC4DocumentProps>
@@ -166,7 +164,7 @@ export interface ParsedLikeC4LangiumDocument
 {}
 
 export function cleanParsedModel(doc: LikeC4LangiumDocument) {
-  const props: Required<Omit<LikeC4DocumentProps, 'c4fqns' | 'diagnostics'>> = {
+  const props: Required<Omit<LikeC4DocumentProps, 'c4fqnIndex' | 'diagnostics'>> = {
     c4Specification: {
       kinds: {},
       relationships: {}
@@ -179,7 +177,7 @@ export function cleanParsedModel(doc: LikeC4LangiumDocument) {
 }
 
 export function isFqnIndexedDocument(doc: LangiumDocument): doc is FqnIndexedDocument {
-  return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !!doc.c4fqns
+  return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !!doc.c4fqnIndex
 }
 
 export function isLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument {
@@ -196,7 +194,7 @@ export function isParsedLikeC4LangiumDocument(
     && !!doc.c4Elements
     && !!doc.c4Relations
     && !!doc.c4Views
-    && !!doc.c4fqns
+    && !!doc.c4fqnIndex
   )
 }
 
@@ -209,15 +207,18 @@ function validatableAstNodeGuards<const Predicates extends Guard<AstNode>[]>(
   return (n: AstNode): n is Guarded<Predicates[number]> => predicates.some(p => p(n))
 }
 const isValidatableAstNode = validatableAstNodeGuards([
-  ast.isCustomElementExprBody,
-  ast.isViewRulePredicateExpr,
+  ast.isDynamicViewRulePredicateIterator,
+  ast.isCustomElementExpression,
+  ast.isCustomRelationExpression,
+  ast.isElementExpression,
+  ast.isRelationExpression,
   ast.isDynamicViewRulePredicate,
+  ast.isDynamicViewStep,
   ast.isViewProperty,
   ast.isStyleProperty,
   ast.isTags,
   ast.isViewRule,
   ast.isDynamicViewRule,
-  ast.isDynamicViewStep,
   ast.isElementViewBody,
   ast.isDynamicViewBody,
   ast.isLikeC4View,
@@ -337,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): {