@likec4/language-server 0.5.0 → 0.6.0

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { createLanguageServices } from './module';
+export type { LikeC4Services } from './module';
 export { LikeC4LanguageMetaData as LanguageMetaData } from './generated/module';
 export { Rpc } from './protocol';

package/dist/index.js

@@ -1,6 +1,5 @@
 // import { type DefaultSharedModuleContext, startLanguageServer as startLangiumLanguageServer } from 'langium'
 export { createLanguageServices } from './module';
-// export type { C4XServices }
 // export type { C4XModel } from './c4x-model'
 // export type { C4XLangiumDocument } from './ast'
 // export {

package/dist/lsp/DocumentSymbolProvider.d.ts

@@ -3,7 +3,6 @@
  * This program and the accompanying materials are made available under the
  * terms of the MIT License, which is available in the project root.
  ******************************************************************************/
-/// <reference types="react" />
 import { type DocumentSymbolProvider, type MaybePromise } from 'langium';
 import { type DocumentSymbol } from 'vscode-languageserver-protocol';
 import { type LikeC4LangiumDocument, ast } from '../ast';

package/dist/lsp/SemanticTokenProvider.js

@@ -15,17 +15,8 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
                 property: 'el',
                 type: isElementRefHead(node) ? SemanticTokenTypes.variable : SemanticTokenTypes.property
             });
-            // acceptor({
-            //   node,
-            //   property: 'el',
-            //   type: SemanticTokenTypes.variable,
-            // })
             return;
         }
-        //   if (ast.isSpec(node)) {
-        //     keyword('spec')
-        //     return
-        //   }
         if (ast.isWildcardExpression(node)) {
             acceptor({
                 node,
@@ -56,21 +47,6 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             }
             return;
         }
-        //   if (ast.isDynamicViewStep(node)) {
-        //     keyword(node.isReverse ? '<-' : '->')
-        //     if (hasTitle(node)) {
-        //       acceptor({
-        //         node,
-        //         property: 'title',
-        //         type: SemanticTokenTypes.string
-        //       })
-        //     }
-        //     return
-        //   }
-        //   if (ast.isStyleProperties(node)) {
-        //     keyword('style')
-        //     return
-        //   }
         if (ast.isElementKind(node)) {
             acceptor({
                 node,
@@ -122,7 +98,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             });
             return;
         }
-        if (ast.isColorProperty(node) || ast.isShapeProperty(node)) {
+        if (ast.isAStyleProperty(node)) {
             acceptor({
                 node,
                 property: 'key',
@@ -135,36 +111,34 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             });
             return;
         }
-        if (ast.isElementProperty(node) || ast.isRelationProperty(node) || ast.isViewProperty(node)) {
+        if (ast.isAnyStringProperty(node)) {
             acceptor({
                 node,
                 property: 'key',
                 type: SemanticTokenTypes.keyword
             });
-            if ('value' in node) {
-                acceptor({
-                    node,
-                    property: 'value',
-                    type: SemanticTokenTypes.string
-                });
-            }
-            return;
-        }
-        if (ast.isModel(node)) {
-            keyword('model');
-            return;
-        }
-        if (ast.isModelViews(node)) {
-            keyword('views');
+            acceptor({
+                node,
+                property: 'value',
+                type: SemanticTokenTypes.string
+            });
             return;
         }
+        // if (ast.isModel(node)) {
+        //   keyword('model')
+        //   return
+        // }
+        // if (ast.isModelViews(node)) {
+        //   keyword('views')
+        //   return
+        // }
         if (ast.isElement(node)) {
             return this.highlightAstElement(node, acceptor);
         }
-        if (ast.isExtendElement(node)) {
-            keyword('extend');
-            return;
-        }
+        // if (ast.isExtendElement(node)) {
+        //   keyword('extend')
+        //   return
+        // }
         //   if (ast.isElementProperty(node) || ast.isRelationProperty(node) || ast.isViewProperty(node)) {
         //     acceptor({
         //       node,
@@ -188,19 +162,19 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         //     keyword('steps')
         //     return
         //   }
-        if (ast.isViewRuleAutoLayout(node)) {
-            keyword('autoLayout');
-            return;
-        }
-        if (ast.isViewRuleStyle(node)) {
-            keyword('style');
-            return;
-        }
-        if (ast.isViewRuleExpression(node)) {
-            keyword(node.isInclude ? 'include' : 'exclude');
-            return;
-        }
-        //
+        // if (ast.isViewRuleAutoLayout(node)) {
+        //   keyword('autoLayout')
+        //   return
+        // }
+        // if (ast.isViewRuleStyle(node)) {
+        //   keyword('style')
+        //   return
+        // }
+        // if (ast.isViewRuleExpression(node)) {
+        //   keyword(node.isInclude ? 'include' : 'exclude')
+        //   return
+        // }
+        // //
     }
     highlightAstElement(node, acceptor) {
         acceptor({

package/dist/model/model-builder.js

@@ -6,6 +6,7 @@ import { DocumentState, getDocument, interruptAndCheck } from 'langium';
 import objectHash from 'object-hash';
 import { clone, isNil, mergeDeepRight, omit, reduce } from 'rambdax';
 import invariant from 'tiny-invariant';
+import { toAutoLayout } from '../ast';
 import { ElementViewOps, ast, c4hash, cleanParsedModel, isLikeC4LangiumDocument, isParsedLikeC4LangiumDocument, resolveRelationPoints, streamModel, toElementStyle } from '../ast';
 import { elementRef, strictElementRefFqn } from '../elementRef';
 import { logger } from '../logger';
@@ -277,7 +278,7 @@ export class LikeC4ModelBuilder {
         }
         if (ast.isViewRuleAutoLayout(astNode)) {
             return {
-                autoLayout: astNode.direction
+                autoLayout: toAutoLayout(astNode.direction)
             };
         }
         failExpectedNever(astNode);

package/dist/validation/element.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { ValidationCheck } from 'langium';
 import type { ast } from '../ast';
 import type { LikeC4Services } from '../module';

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@likec4/language-server",
-  "version": "0.5.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",
@@ -70,7 +73,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.5.0",
+    "@likec4/core": "0.6.0",
     "@mobily/ts-belt": "^3.13.1",
     "langium": "^1.1.0",
     "nanoid": "^4.0.2",
@@ -88,7 +91,7 @@
     "langium-cli": "^1.1.0",
     "npm-run-all": "^4.1.5",
     "typescript": "^5.0.4",
-    "vite": "^4.2.1",
+    "vite": "^4.2.2",
     "vitest": "^0.30.1"
   }
 }