@likec4/language-server 1.16.0 → 1.17.0

package/dist/shared/{language-server.Bd3NZ8uH.cjs → language-server.N8HLDQqz.cjs}

@@ -1048,7 +1048,13 @@ class ComputeCtx {
         ...autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep },
         ...autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }
       },
-      nodes: remeda.map(nodes, remeda.omit(["notation"])),
+      nodes: remeda.map(nodes, (n) => {
+        delete n.notation;
+        if (n.icon === "none") {
+          delete n.icon;
+        }
+        return n;
+      }),
       edges: applyCustomRelationProperties(rules, nodes, sortedEdges),
       ...elementNotations.length > 0 && {
         notation: {
@@ -1618,7 +1624,13 @@ class DynamicViewComputeCtx {
         ...autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep },
         ...autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }
       },
-      nodes: remeda.map(nodes, remeda.omit(["notation"])),
+      nodes: remeda.map(nodes, (n) => {
+        delete n.notation;
+        if (n.icon === "none") {
+          delete n.icon;
+        }
+        return n;
+      }),
       edges,
       ...elementNotations.length > 0 && {
         notation: {

package/dist/shared/{language-server.DwyQ1FtY.d.ts → language-server.PEjk7U9s.d.ts}

@@ -423,7 +423,7 @@ interface IconProperty extends AstNode {
     readonly $type: 'IconProperty';
     key: 'icon';
     libicon?: Reference<LibIcon>;
-    value?: Uri;
+    value?: 'none' | Uri;
 }
 declare const IconProperty = "IconProperty";
 interface IncludePredicate extends AstNode {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -112,8 +112,8 @@
   },
   "dependencies": {
     "@dagrejs/dagre": "^1.1.4",
-    "@likec4/core": "1.16.0",
-    "@likec4/log": "1.16.0",
+    "@likec4/core": "1.17.0",
+    "@likec4/log": "1.17.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
@@ -133,12 +133,12 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.16.0",
-    "@likec4/tsconfig": "1.16.0",
+    "@likec4/icons": "1.17.0",
+    "@likec4/tsconfig": "1.17.0",
     "@types/node": "^20.16.14",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
-    "@vitest/coverage-v8": "^2.1.4",
+    "@vitest/coverage-v8": "^2.1.5",
     "execa": "^9.3.1",
     "langium-cli": "3.2.0",
     "npm-run-all2": "^6.2.6",
@@ -146,7 +146,7 @@
     "turbo": "^2.2.3",
     "typescript": "^5.6.3",
     "unbuild": "^3.0.0-rc.11",
-    "vitest": "^2.1.4"
+    "vitest": "^2.1.5"
   },
   "packageManager": "yarn@4.5.1"
 }

package/src/LikeC4FileSystem.ts

@@ -0,0 +1,36 @@
+import { type FileSystemNode, URI, UriUtils } from 'langium'
+import { NodeFileSystemProvider } from 'langium/node'
+import { lstatSync, readlinkSync } from 'node:fs'
+import { readdir } from 'node:fs/promises'
+import { dirname, resolve } from 'node:path'
+
+export const LikeC4FileSystem = {
+  fileSystemProvider: () => new SymLinkTraversingFileSystemProvider()
+}
+
+/**
+ * A file system provider that follows symbolic links.
+ * @see https://github.com/likec4/likec4/pull/1213
+ */
+class SymLinkTraversingFileSystemProvider extends NodeFileSystemProvider {
+  override async readDirectory(folderPath: URI): Promise<FileSystemNode[]> {
+    const dirents = await readdir(folderPath.fsPath, { withFileTypes: true })
+    return dirents.map(dirent => (this.followUri(UriUtils.joinPath(folderPath, dirent.name))))
+  }
+
+  followUri(uri: URI): FileSystemNode {
+    const directoryPath = dirname(uri.fsPath)
+    const stat = lstatSync(uri.fsPath)
+    if (stat.isSymbolicLink()) {
+      const resolved_link = readlinkSync(uri.fsPath)
+      const linked_path = resolve(directoryPath, resolved_link)
+      return this.followUri(URI.file(linked_path))
+    } else {
+      return {
+        isFile: stat.isFile(),
+        isDirectory: stat.isDirectory(),
+        uri
+      }
+    }
+  }
+}

package/src/Rpc.ts

@@ -43,8 +43,8 @@ export class Rpc implements Disposable {
       },
       {
         timing: 'both',
-        waitMs: 300,
-        maxWaitMs: 600
+        waitMs: 250,
+        maxWaitMs: 500
       }
     )
 

package/src/generated/ast.ts

@@ -958,7 +958,7 @@ export interface IconProperty extends AstNode {
     readonly $type: 'IconProperty';
     key: 'icon';
     libicon?: Reference<LibIcon>;
-    value?: Uri;
+    value?: 'none' | Uri;
 }
 
 export const IconProperty = 'IconProperty';