@likec4/language-server 0.4.0 → 0.6.0

package/dist/validation/relation.js

@@ -0,0 +1,53 @@
+import { resolveRelationPoints } from '../ast';
+import { isSameHierarchy } from '@likec4/core/utils';
+export const relationChecks = (services) => {
+    const fqnIndex = services.likec4.FqnIndex;
+    return (el, accept) => {
+        try {
+            const coupling = resolveRelationPoints(el);
+            const target = fqnIndex.get(coupling.target);
+            if (!target) {
+                return accept('error', 'Invalid target', {
+                    node: el,
+                    property: 'target'
+                });
+            }
+            const source = fqnIndex.get(coupling.source);
+            if (!source) {
+                return accept('error', 'Invalid source', {
+                    node: el
+                });
+            }
+            if (isSameHierarchy(source, target)) {
+                return accept('error', 'Invalid relation (same hierarchy)', {
+                    node: el
+                });
+            }
+        }
+        catch (e) {
+            if (e instanceof Error) {
+                return accept('error', e.message, {
+                    node: el
+                });
+            }
+            accept('error', 'Invalid relation', {
+                node: el
+            });
+        }
+        // const fqn = fqnIndex.get(el)
+        // if (!fqn) {
+        //   accept('error', 'Not indexed', {
+        //     node: el,
+        //     property: 'name',
+        //   })
+        //   return
+        // }
+        // const withSameFqn = fqnIndex.byFqn(fqn)
+        // if (withSameFqn.length > 1) {
+        //   accept('error', `Duplicate element name ${el.name !== fqn ? el.name +' (' + fqn + ')' : el.name}`, {
+        //     node: el,
+        //     property: 'name',
+        //   })
+        // }
+    };
+};

package/dist/validation/specification.js

@@ -2,14 +2,15 @@ import { ast } from '../ast';
 export const elementKindChecks = (services) => {
     const index = services.shared.workspace.IndexManager;
     return (node, accept) => {
-        const sameKinds = index.allElements(ast.ElementKind)
+        const sameKinds = index
+            .allElements(ast.ElementKind)
             .filter(n => n.name === node.name)
             .limit(2)
             .count();
         if (sameKinds > 1) {
             accept('error', `Duplicate element kind '${node.name}'`, {
                 node: node,
-                property: 'name',
+                property: 'name'
             });
         }
     };
@@ -17,14 +18,15 @@ export const elementKindChecks = (services) => {
 export const tagChecks = (services) => {
     const index = services.shared.workspace.IndexManager;
     return (node, accept) => {
-        const sameKinds = index.allElements(ast.Tag)
+        const sameKinds = index
+            .allElements(ast.Tag)
             .filter(n => n.name === node.name)
             .limit(2)
             .count();
         if (sameKinds > 1) {
             accept('error', `Duplicate tag '${node.name}'`, {
                 node: node,
-                property: 'name',
+                property: 'name'
             });
         }
     };

package/dist/validation/view.js

@@ -5,7 +5,8 @@ export const viewChecks = (services) => {
         if (!el.name) {
             return;
         }
-        const anotherViews = index.allElements(ast.View)
+        const anotherViews = index
+            .allElements(ast.View)
             .filter(n => n.name === el.name)
             .limit(2)
             .count();

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@likec4/language-server",
-  "version": "0.4.0",
+  "description": "LikeC4 Language Server",
+  "version": "0.6.0",
+  "license": "MIT",
   "type": "module",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://like-c4.dev",
@@ -10,7 +12,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/likec4/likec4.git"
+    "url": "https://github.com/likec4/likec4.git",
+    "directory": "packages/language-server"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -24,6 +27,11 @@
       "types": "./dist/protocol.d.ts",
       "import": "./dist/protocol.js",
       "require": "./dist/protocol.cjs"
+    },
+    "./builtin": {
+      "types": "./dist/builtin.d.ts",
+      "import": "./dist/builtin.js",
+      "require": "./dist/builtin.cjs"
     }
   },
   "publishConfig": {
@@ -41,6 +49,11 @@
         "types": "./dist/protocol.d.ts",
         "import": "./dist/protocol.js",
         "require": "./dist/protocol.cjs"
+      },
+      "./builtin": {
+        "types": "./dist/builtin.d.ts",
+        "import": "./dist/builtin.js",
+        "require": "./dist/builtin.cjs"
       }
     }
   },
@@ -53,14 +66,14 @@
     "watch:ts": "tsc --watch",
     "generate": "langium generate",
     "build": "run-s 'build:langium' 'build:ts'",
-    "dev": "run-p 'watch:*'",
+    "dev": "run generate && run-p 'watch:*'",
     "lint": "run -T eslint src/ --fix",
-    "clean": "rimraf dist",
+    "clean": "run -T rimraf dist contrib",
     "test": "vitest run",
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.4.0",
+    "@likec4/core": "0.6.0",
     "@mobily/ts-belt": "^3.13.1",
     "langium": "^1.1.0",
     "nanoid": "^4.0.2",
@@ -68,7 +81,7 @@
     "rambdax": "^9.1.0",
     "strip-indent": "^4.0.0",
     "tiny-invariant": "^1.3.1",
-    "type-fest": "^3.7.2",
+    "type-fest": "^3.8.0",
     "vscode-languageserver-protocol": "3.17.2",
     "vscode-uri": "3.0.7"
   },
@@ -77,8 +90,8 @@
     "@types/object-hash": "^3.0.2",
     "langium-cli": "^1.1.0",
     "npm-run-all": "^4.1.5",
-    "typescript": "^5.0.3",
-    "vite": "^4.2.1",
+    "typescript": "^5.0.4",
+    "vite": "^4.2.2",
     "vitest": "^0.30.1"
   }
 }