@likec4/language-server 0.2.1 → 0.4.0

package/dist/ast.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import * as ast from './generated/ast';
 import type { LangiumDocument } from 'langium';
 import type { LikeC4Document } from './generated/ast';

package/dist/generated/ast.d.ts

@@ -21,9 +21,10 @@ export type ThemeColor = 'muted' | 'primary' | 'secondary';
 export type View = ElementView;
 export declare const View = "View";
 export declare function isView(item: unknown): item is View;
-export type ViewRule = ViewRuleExpression | ViewRuleStyle;
+export type ViewRule = ViewRuleAutoLayout | ViewRuleExpression | ViewRuleStyle;
 export declare const ViewRule = "ViewRule";
 export declare function isViewRule(item: unknown): item is ViewRule;
+export type ViewRuleLayoutDirection = 'BT' | 'LR' | 'RL' | 'TB';
 export interface ColorProperty extends AstNode {
     readonly $container: ElementStyleProperty | SpecificationElementKindStyle | ViewRuleStyle;
     readonly $type: 'ColorProperty';
@@ -38,7 +39,7 @@ export interface Element extends AstNode {
     body?: ElementBody;
     kind: Reference<ElementKind>;
     name: Name;
-    title?: string;
+    props: Array<string>;
 }
 export declare const Element = "Element";
 export declare function isElement(item: unknown): item is Element;
@@ -262,6 +263,13 @@ export interface ViewProperty extends AstNode {
 }
 export declare const ViewProperty = "ViewProperty";
 export declare function isViewProperty(item: unknown): item is ViewProperty;
+export interface ViewRuleAutoLayout extends AstNode {
+    readonly $container: ElementView;
+    readonly $type: 'ViewRuleAutoLayout';
+    direction: ViewRuleLayoutDirection;
+}
+export declare const ViewRuleAutoLayout = "ViewRuleAutoLayout";
+export declare function isViewRuleAutoLayout(item: unknown): item is ViewRuleAutoLayout;
 export interface ViewRuleExpression extends AstNode {
     readonly $container: ElementView;
     readonly $type: 'ViewRuleExpression';
@@ -333,6 +341,7 @@ export interface LikeC4AstType {
     View: View;
     ViewProperty: ViewProperty;
     ViewRule: ViewRule;
+    ViewRuleAutoLayout: ViewRuleAutoLayout;
     ViewRuleExpression: ViewRuleExpression;
     ViewRuleStyle: ViewRuleStyle;
     WildcardExpression: WildcardExpression;

package/dist/generated/ast.js

@@ -148,6 +148,10 @@ export const ViewProperty = 'ViewProperty';
 export function isViewProperty(item) {
     return reflection.isInstance(item, ViewProperty);
 }
+export const ViewRuleAutoLayout = 'ViewRuleAutoLayout';
+export function isViewRuleAutoLayout(item) {
+    return reflection.isInstance(item, ViewRuleAutoLayout);
+}
 export const ViewRuleExpression = 'ViewRuleExpression';
 export function isViewRuleExpression(item) {
     return reflection.isInstance(item, ViewRuleExpression);
@@ -166,7 +170,7 @@ export function isRelationWithSource(item) {
 }
 export class LikeC4AstReflection extends AbstractAstReflection {
     getAllTypes() {
-        return ['AStyleProperty', 'ColorProperty', 'Element', 'ElementBody', 'ElementExpression', 'ElementKind', 'ElementProperty', 'ElementRef', 'ElementRefExpression', 'ElementStringProperty', 'ElementStyleProperty', 'ElementView', 'Expression', 'ExtendElement', 'ExtendElementBody', 'InOutExpression', 'IncomingExpression', 'LikeC4Document', 'Model', 'ModelViews', 'OutgoingExpression', 'Relation', 'RelationBody', 'RelationExpression', 'RelationProperty', 'RelationWithSource', 'ShapeProperty', 'SpecificationElementKind', 'SpecificationElementKindStyle', 'SpecificationRule', 'SpecificationTag', 'StrictElementRef', 'Tag', 'Tags', 'View', 'ViewProperty', 'ViewRule', 'ViewRuleExpression', 'ViewRuleStyle', 'WildcardExpression'];
+        return ['AStyleProperty', 'ColorProperty', 'Element', 'ElementBody', 'ElementExpression', 'ElementKind', 'ElementProperty', 'ElementRef', 'ElementRefExpression', 'ElementStringProperty', 'ElementStyleProperty', 'ElementView', 'Expression', 'ExtendElement', 'ExtendElementBody', 'InOutExpression', 'IncomingExpression', 'LikeC4Document', 'Model', 'ModelViews', 'OutgoingExpression', 'Relation', 'RelationBody', 'RelationExpression', 'RelationProperty', 'RelationWithSource', 'ShapeProperty', 'SpecificationElementKind', 'SpecificationElementKindStyle', 'SpecificationRule', 'SpecificationTag', 'StrictElementRef', 'Tag', 'Tags', 'View', 'ViewProperty', 'ViewRule', 'ViewRuleAutoLayout', 'ViewRuleExpression', 'ViewRuleStyle', 'WildcardExpression'];
     }
     computeIsSubtype(subtype, supertype) {
         switch (subtype) {
@@ -195,6 +199,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case RelationWithSource: {
                 return this.isSubtype(Relation, supertype);
             }
+            case ViewRuleAutoLayout:
             case ViewRuleExpression:
             case ViewRuleStyle: {
                 return this.isSubtype(ViewRule, supertype);
@@ -224,6 +229,14 @@ export class LikeC4AstReflection extends AbstractAstReflection {
     }
     getTypeMetaData(type) {
         switch (type) {
+            case 'Element': {
+                return {
+                    name: 'Element',
+                    mandatory: [
+                        { name: 'props', type: 'array' }
+                    ]
+                };
+            }
             case 'ElementBody': {
                 return {
                     name: 'ElementBody',

package/dist/generated/grammar.js

@@ -892,23 +892,77 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
                       },
                       "deprecatedSyntax": false
                     }
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "$type": "Group",
+            "elements": [
+              {
+                "$type": "Assignment",
+                "feature": "props",
+                "operator": "+=",
+                "terminal": {
+                  "$type": "RuleCall",
+                  "rule": {
+                    "$ref": "#/rules@22"
                   },
+                  "arguments": []
+                }
+              },
+              {
+                "$type": "Group",
+                "elements": [
                   {
                     "$type": "Assignment",
-                    "feature": "title",
-                    "operator": "=",
+                    "feature": "props",
+                    "operator": "+=",
                     "terminal": {
                       "$type": "RuleCall",
                       "rule": {
                         "$ref": "#/rules@22"
                       },
                       "arguments": []
-                    },
+                    }
+                  },
+                  {
+                    "$type": "Group",
+                    "elements": [
+                      {
+                        "$type": "Assignment",
+                        "feature": "props",
+                        "operator": "+=",
+                        "terminal": {
+                          "$type": "RuleCall",
+                          "rule": {
+                            "$ref": "#/rules@22"
+                          },
+                          "arguments": []
+                        }
+                      },
+                      {
+                        "$type": "Assignment",
+                        "feature": "props",
+                        "operator": "+=",
+                        "terminal": {
+                          "$type": "RuleCall",
+                          "rule": {
+                            "$ref": "#/rules@22"
+                          },
+                          "arguments": []
+                        },
+                        "cardinality": "?"
+                      }
+                    ],
                     "cardinality": "?"
                   }
-                ]
+                ],
+                "cardinality": "?"
               }
-            ]
+            ],
+            "cardinality": "?"
           },
           {
             "$type": "Assignment",
@@ -1864,7 +1918,14 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@47"
+              "$ref": "#/rules@49"
+            },
+            "arguments": []
+          },
+          {
+            "$type": "RuleCall",
+            "rule": {
+              "$ref": "#/rules@48"
             },
             "arguments": []
           }
@@ -1908,7 +1969,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@48"
+                "$ref": "#/rules@50"
               },
               "arguments": []
             }
@@ -1930,7 +1991,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@48"
+                    "$ref": "#/rules@50"
                   },
                   "arguments": []
                 }
@@ -1947,6 +2008,69 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
       "parameters": [],
       "wildcard": false
     },
+    {
+      "$type": "ParserRule",
+      "name": "ViewRuleLayoutDirection",
+      "dataType": "string",
+      "definition": {
+        "$type": "Alternatives",
+        "elements": [
+          {
+            "$type": "Keyword",
+            "value": "TB"
+          },
+          {
+            "$type": "Keyword",
+            "value": "LR"
+          },
+          {
+            "$type": "Keyword",
+            "value": "BT"
+          },
+          {
+            "$type": "Keyword",
+            "value": "RL"
+          }
+        ]
+      },
+      "definesHiddenTokens": false,
+      "entry": false,
+      "fragment": false,
+      "hiddenTokens": [],
+      "parameters": [],
+      "wildcard": false
+    },
+    {
+      "$type": "ParserRule",
+      "name": "ViewRuleAutoLayout",
+      "definition": {
+        "$type": "Group",
+        "elements": [
+          {
+            "$type": "Keyword",
+            "value": "autoLayout"
+          },
+          {
+            "$type": "Assignment",
+            "feature": "direction",
+            "operator": "=",
+            "terminal": {
+              "$type": "RuleCall",
+              "rule": {
+                "$ref": "#/rules@47"
+              },
+              "arguments": []
+            }
+          }
+        ]
+      },
+      "definesHiddenTokens": false,
+      "entry": false,
+      "fragment": false,
+      "hiddenTokens": [],
+      "parameters": [],
+      "wildcard": false
+    },
     {
       "$type": "ParserRule",
       "name": "ViewRuleStyle",
@@ -1964,7 +2088,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@49"
+                "$ref": "#/rules@51"
               },
               "arguments": []
             }
@@ -1986,7 +2110,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@49"
+                    "$ref": "#/rules@51"
                   },
                   "arguments": []
                 }
@@ -2069,7 +2193,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@49"
+                    "$ref": "#/rules@51"
                   },
                   "arguments": []
                 }
@@ -2101,7 +2225,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
               {
                 "$type": "RuleCall",
                 "rule": {
-                  "$ref": "#/rules@49"
+                  "$ref": "#/rules@51"
                 },
                 "arguments": []
               },
@@ -2131,7 +2255,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
                         "terminal": {
                           "$type": "RuleCall",
                           "rule": {
-                            "$ref": "#/rules@49"
+                            "$ref": "#/rules@51"
                           },
                           "arguments": []
                         }
@@ -2200,7 +2324,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@50"
+              "$ref": "#/rules@52"
             },
             "arguments": []
           }

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/DocumentSymbolProvider.js

@@ -110,7 +110,8 @@ export class LikeC4DocumentSymbolProvider {
             return [];
         const name = astElement.name;
         const kind = astElement.kind.$refText;
-        const detail = kind + (astElement.title ? ': ' + astElement.title : '').replaceAll('\n', ' ').trim();
+        // TODO: return the title as well
+        const detail = kind; // + (astElement.title ? ': ' + astElement.title : '').replaceAll('\n', ' ').trim()
         return [{
                 kind: SymbolKind.Constructor,
                 name: name,

package/dist/lsp/SemanticTokenProvider.js

@@ -188,6 +188,10 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         //     keyword('steps')
         //     return
         //   }
+        if (ast.isViewRuleAutoLayout(node)) {
+            keyword('autoLayout');
+            return;
+        }
         if (ast.isViewRuleStyle(node)) {
             keyword('style');
             return;

package/dist/model/model-builder.js

@@ -181,10 +181,11 @@ export class LikeC4ModelBuilder {
         const styleProps = astNode.body?.props.find(ast.isElementStyleProperty)?.props;
         const { color, shape } = toElementStyle(styleProps);
         const astPath = this.getAstNodePath(astNode);
-        const props = astNode.body?.props.filter((p) => ast.isElementStringProperty(p)) ?? [];
-        const title = astNode.title ?? props.find(p => p.key === 'title')?.value;
-        const description = props.find(p => p.key === 'description')?.value;
-        const technology = props.find(p => p.key === 'technology')?.value;
+        let [title, description, technology,] = astNode.props;
+        const bodyProps = astNode.body?.props.filter((p) => ast.isElementStringProperty(p)) ?? [];
+        title = title ?? bodyProps.find(p => p.key === 'title')?.value;
+        description = description ?? bodyProps.find(p => p.key === 'description')?.value;
+        technology = technology ?? bodyProps.find(p => p.key === 'technology')?.value;
         return {
             id,
             kind,
@@ -274,6 +275,11 @@ export class LikeC4ModelBuilder {
                 }
             };
         }
+        if (ast.isViewRuleAutoLayout(astNode)) {
+            return {
+                autoLayout: astNode.direction
+            };
+        }
         failExpectedNever(astNode);
     }
     parseElementView(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,6 @@
 {
   "name": "@likec4/language-server",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "type": "module",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://like-c4.dev",
@@ -60,7 +60,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.2.1",
+    "@likec4/core": "0.4.0",
     "@mobily/ts-belt": "^3.13.1",
     "langium": "^1.1.0",
     "nanoid": "^4.0.2",
@@ -73,12 +73,12 @@
     "vscode-uri": "3.0.7"
   },
   "devDependencies": {
-    "@types/node": "^18.15.6",
+    "@types/node": "^18.15.11",
     "@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",
-    "vitest": "^0.29.8"
+    "vitest": "^0.30.1"
   }
 }