@likec4/language-server 0.2.2 → 0.5.0

package/dist/ast.js

@@ -11,7 +11,7 @@ export function c4hash({ c4Specification, c4Elements, c4Relations, c4Views }) {
         c4Relations,
         c4Views
     }, {
-        respectType: false,
+        respectType: false
     });
 }
 const idattr = Symbol.for('idattr');
@@ -39,9 +39,9 @@ export function cleanParsedModel(doc) {
     doc.c4Specification = {
         kinds: {}
     };
-    const elements = doc.c4Elements = [];
-    const relations = doc.c4Relations = [];
-    const views = doc.c4Views = [];
+    const elements = (doc.c4Elements = []);
+    const relations = (doc.c4Relations = []);
+    const views = (doc.c4Views = []);
     return {
         elements,
         relations,
@@ -53,21 +53,22 @@ export function isLikeC4LangiumDocument(doc) {
     return doc.textDocument.languageId === LikeC4LanguageMetaData.languageId;
 }
 export function isParsedLikeC4LangiumDocument(doc) {
-    return isLikeC4LangiumDocument(doc) && ['c4Specification', 'c4Elements', 'c4Relations', 'c4Views'].every(key => key in doc);
+    return (isLikeC4LangiumDocument(doc) &&
+        ['c4Specification', 'c4Elements', 'c4Relations', 'c4Views'].every(key => key in doc));
 }
 export const isValidDocument = (doc) => {
     if (!isLikeC4LangiumDocument(doc))
         return false;
     const { state, parseResult, diagnostics } = doc;
-    return (state === DocumentState.Validated
-        && parseResult.lexerErrors.length === 0
-        && (!diagnostics || diagnostics.every(d => d.severity !== 1)));
+    return (state === DocumentState.Validated &&
+        parseResult.lexerErrors.length === 0 &&
+        (!diagnostics || diagnostics.every(d => d.severity !== 1)));
 };
 export function* streamModel(doc) {
     const elements = doc.parseResult.value.model?.elements ?? [];
     const traverseStack = [...elements];
     let el;
-    while (el = traverseStack.shift()) {
+    while ((el = traverseStack.shift())) {
         if (ast.isExtendElement(el)) {
             traverseStack.push(...el.body.elements);
             continue;

package/dist/builtin.d.ts

@@ -0,0 +1,4 @@
+export declare const specification: {
+    uri: string;
+    document: string;
+};

package/dist/builtin.js

@@ -0,0 +1,8 @@
+export const specification = {
+    uri: 'builtin:///specification.likec4',
+    document: `
+specification {
+  element element
+}
+`.trimStart()
+};

package/dist/generated/ast.d.ts

@@ -16,14 +16,15 @@ export type ElementShape = 'browser' | 'cylinder' | 'person' | 'queue' | 'rectan
 export type Expression = ElementExpression | InOutExpression | IncomingExpression | OutgoingExpression | RelationExpression;
 export declare const Expression = "Expression";
 export declare function isExpression(item: unknown): item is Expression;
-export type Name = 'model' | ElementShape | ThemeColor | string;
+export type Name = 'element' | 'model' | ElementShape | ThemeColor | string;
 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

@@ -535,6 +535,10 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
             },
             "arguments": []
           },
+          {
+            "$type": "Keyword",
+            "value": "element"
+          },
           {
             "$type": "Keyword",
             "value": "model"
@@ -892,23 +896,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 +1922,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 +1973,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@48"
+                "$ref": "#/rules@50"
               },
               "arguments": []
             }
@@ -1930,7 +1995,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@48"
+                    "$ref": "#/rules@50"
                   },
                   "arguments": []
                 }
@@ -1947,6 +2012,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 +2092,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@49"
+                "$ref": "#/rules@51"
               },
               "arguments": []
             }
@@ -1986,7 +2114,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@49"
+                    "$ref": "#/rules@51"
                   },
                   "arguments": []
                 }
@@ -2069,7 +2197,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@49"
+                    "$ref": "#/rules@51"
                   },
                   "arguments": []
                 }
@@ -2101,7 +2229,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
               {
                 "$type": "RuleCall",
                 "rule": {
-                  "$ref": "#/rules@49"
+                  "$ref": "#/rules@51"
                 },
                 "arguments": []
               },
@@ -2131,7 +2259,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
                         "terminal": {
                           "$type": "RuleCall",
                           "rule": {
-                            "$ref": "#/rules@49"
+                            "$ref": "#/rules@51"
                           },
                           "arguments": []
                         }
@@ -2200,7 +2328,7 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@50"
+              "$ref": "#/rules@52"
             },
             "arguments": []
           }

package/dist/lsp/DocumentSymbolProvider.js

@@ -56,13 +56,15 @@ export class LikeC4DocumentSymbolProvider {
         }
         if (specSymbols.length === 0)
             return [];
-        return [{
+        return [
+            {
                 kind: SymbolKind.Class,
                 name: astSpec.name,
                 range: cstModel.range,
                 selectionRange: specKeywordNode.range,
                 children: specSymbols
-            }];
+            }
+        ];
     };
     getModelSymbols = (astModel) => {
         const cstModel = astModel?.$cstNode;
@@ -71,13 +73,15 @@ export class LikeC4DocumentSymbolProvider {
         const nameNode = findNodeForProperty(cstModel, 'name');
         if (!nameNode)
             return [];
-        return [{
+        return [
+            {
                 kind: SymbolKind.Class,
                 name: astModel.name,
                 range: cstModel.range,
                 selectionRange: nameNode.range,
                 children: astModel.elements.flatMap(this.getElementsSymbol)
-            }];
+            }
+        ];
     };
     getElementsSymbol = (el) => {
         if (ast.isExtendElement(el)) {
@@ -93,13 +97,15 @@ export class LikeC4DocumentSymbolProvider {
         const nameNode = astElement.element.$cstNode;
         if (!cst || !nameNode)
             return [];
-        return [{
+        return [
+            {
                 kind: SymbolKind.Constructor,
                 name: nameNode.text,
                 range: cst.range,
                 selectionRange: nameNode.range,
                 children: astElement.body.elements.flatMap(this.getElementsSymbol)
-            }];
+            }
+        ];
     };
     getElementSymbol = (astElement) => {
         const cst = astElement.$cstNode;
@@ -110,15 +116,18 @@ export class LikeC4DocumentSymbolProvider {
             return [];
         const name = astElement.name;
         const kind = astElement.kind.$refText;
-        const detail = kind + (astElement.title ? ': ' + astElement.title : '').replaceAll('\n', ' ').trim();
-        return [{
+        // TODO: return the title as well
+        const detail = kind; // + (astElement.title ? ': ' + astElement.title : '').replaceAll('\n', ' ').trim()
+        return [
+            {
                 kind: SymbolKind.Constructor,
                 name: name,
                 range: cst.range,
                 selectionRange: nameNode.range,
                 detail,
                 children: astElement.body?.elements.flatMap(this.getElementsSymbol) ?? []
-            }];
+            }
+        ];
     };
     getModelViewsSymbols = (astViews) => {
         const cst = astViews?.$cstNode;
@@ -127,12 +136,14 @@ export class LikeC4DocumentSymbolProvider {
         const nameNode = findNodeForProperty(cst, 'name');
         if (!nameNode)
             return [];
-        return [{
+        return [
+            {
                 kind: SymbolKind.Class,
                 name: astViews.name,
                 range: cst.range,
                 selectionRange: nameNode.range,
                 children: []
-            }];
+            }
+        ];
     };
 }

package/dist/lsp/HoverProvider.js

@@ -35,10 +35,7 @@ export class LikeC4HoverProvider extends AstNodeHoverProvider {
             if (!el) {
                 return;
             }
-            const lines = [
-                el.id,
-                `${el.kind}: **${el.title}**`
-            ];
+            const lines = [el.id, `${el.kind}: **${el.title}**`];
             if (el.tags && el.tags.length > 0) {
                 lines.push('  \n', el.tags.map(t => '#' + t).join(', '));
             }

package/dist/lsp/SemanticTokenProvider.js

@@ -7,13 +7,13 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         const keyword = (keyword, _index) => acceptor({
             node,
             keyword,
-            type: SemanticTokenTypes.keyword,
+            type: SemanticTokenTypes.keyword
         });
         if (ast.isElementRef(node) || ast.isStrictElementRef(node)) {
             acceptor({
                 node,
                 property: 'el',
-                type: isElementRefHead(node) ? SemanticTokenTypes.variable : SemanticTokenTypes.property,
+                type: isElementRefHead(node) ? SemanticTokenTypes.variable : SemanticTokenTypes.property
             });
             // acceptor({
             //   node,
@@ -34,7 +34,9 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             });
             return;
         }
-        if (ast.isRelationExpression(node) || ast.isIncomingExpression(node) || ast.isOutgoingExpression(node)) {
+        if (ast.isRelationExpression(node) ||
+            ast.isIncomingExpression(node) ||
+            ast.isOutgoingExpression(node)) {
             keyword('->');
             return;
         }
@@ -74,9 +76,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
                 node,
                 property: 'name',
                 type: SemanticTokenTypes.type,
-                modifier: [
-                    SemanticTokenModifiers.definition,
-                ]
+                modifier: [SemanticTokenModifiers.definition]
             });
             return;
         }
@@ -126,7 +126,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             acceptor({
                 node,
                 property: 'key',
-                type: SemanticTokenTypes.keyword,
+                type: SemanticTokenTypes.keyword
             });
             acceptor({
                 node,
@@ -139,7 +139,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             acceptor({
                 node,
                 property: 'key',
-                type: SemanticTokenTypes.keyword,
+                type: SemanticTokenTypes.keyword
             });
             if ('value' in node) {
                 acceptor({
@@ -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;
@@ -203,9 +207,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             node,
             property: 'name',
             type: SemanticTokenTypes.variable,
-            modifier: [
-                SemanticTokenModifiers.declaration,
-            ]
+            modifier: [SemanticTokenModifiers.declaration]
         });
         acceptor({
             node,
@@ -226,7 +228,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             acceptor({
                 node,
                 property: 'name',
-                type: SemanticTokenTypes.variable,
+                type: SemanticTokenTypes.variable
             });
         }
         if (node.viewOf) {

package/dist/lsp/index.d.ts

@@ -1,4 +1,3 @@
-export * from './CodeLensProvider';
 export * from './DocumentSymbolProvider';
 export * from './HoverProvider';
 export * from './SemanticTokenProvider';

package/dist/lsp/index.js

@@ -1,4 +1,3 @@
-export * from './CodeLensProvider';
 export * from './DocumentSymbolProvider';
 export * from './HoverProvider';
 export * from './SemanticTokenProvider';

package/dist/model/fqn-index.js

@@ -42,7 +42,7 @@ export class FqnIndex {
     directChildrenOf(parent) {
         return this.#index
             .entriesGroupedByKey()
-            .flatMap(([fqn, descrs]) => (descrs.length === 1 && parentFqn(fqn) === parent) ? descrs : []);
+            .flatMap(([fqn, descrs]) => (descrs.length === 1 && parentFqn(fqn) === parent ? descrs : []));
     }
     uniqueDescedants(parent) {
         return new StreamImpl(() => {
@@ -61,7 +61,7 @@ export class FqnIndex {
                     }
                 }
             });
-            if ((children.length + descedants.length) === 0) {
+            if (children.length + descedants.length === 0) {
                 return null;
             }
             const nested = new MultiMap(children.map(([_fqn, desc]) => [desc.name, desc]));
@@ -72,9 +72,9 @@ export class FqnIndex {
             }
             return nested
                 .entriesGroupedByKey()
-                .flatMap(([_name, descrs]) => descrs.length === 1 ? descrs : [])
+                .flatMap(([_name, descrs]) => (descrs.length === 1 ? descrs : []))
                 .iterator();
-        }, (iterator) => {
+        }, iterator => {
             if (iterator) {
                 return iterator.next();
             }
@@ -128,7 +128,9 @@ export class FqnIndex {
     }
     cleanIndexedElements(docUri) {
         const docUriAsString = docUri.toString();
-        const toDelete = this.#index.entries().filter(([, indexed]) => indexed.documentUri.toString() === docUriAsString);
+        const toDelete = this.#index
+            .entries()
+            .filter(([, indexed]) => indexed.documentUri.toString() === docUriAsString);
         for (const [fqn, indexed] of toDelete.toArray()) {
             this.#index.delete(fqn, indexed);
         }

package/dist/model/model-builder.js

@@ -67,7 +67,7 @@ export class LikeC4ModelBuilder {
                     return {
                         ...(kind.shape !== DefaultElementShape ? { shape: kind.shape } : {}),
                         ...(kind.color !== DefaultThemeColor ? { color: kind.color } : {}),
-                        ...(omit(['astPath'], el))
+                        ...omit(['astPath'], el)
                     };
                 }
                 return null;
@@ -127,7 +127,7 @@ export class LikeC4ModelBuilder {
                     const styleProps = toElementStyle(style?.props);
                     specification.kinds[kind.name] = {
                         color: styleProps.color ?? DefaultThemeColor,
-                        shape: styleProps.shape ?? DefaultElementShape,
+                        shape: styleProps.shape ?? DefaultElementShape
                     };
                 }
                 catch (e) {
@@ -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,
@@ -194,7 +195,7 @@ export class LikeC4ModelBuilder {
             ...(description && { description }),
             ...(tags.length > 0 ? { tags } : {}),
             ...(shape && shape !== DefaultElementShape ? { shape } : {}),
-            ...(color && color !== DefaultThemeColor ? { color } : {}),
+            ...(color && color !== DefaultThemeColor ? { color } : {})
         };
     }
     parseRelation(astNode) {
@@ -207,11 +208,11 @@ export class LikeC4ModelBuilder {
             target
         };
         const id = objectHash(hashdata);
-        const title = astNode.definition?.props.find(p => p.key === 'title')?.value ?? '';
+        const title = astNode.title ?? astNode.definition?.props.find(p => p.key === 'title')?.value ?? '';
         return {
             id,
             ...hashdata,
-            title: astNode.title ?? title
+            title
         };
     }
     parseElementExpression(astNode) {
@@ -252,7 +253,7 @@ export class LikeC4ModelBuilder {
         if (ast.isRelationExpression(astNode)) {
             return {
                 source: this.parseElementExpression(astNode.source),
-                target: this.parseElementExpression(astNode.target),
+                target: this.parseElementExpression(astNode.target)
             };
         }
         failExpectedNever(astNode);
@@ -274,6 +275,11 @@ export class LikeC4ModelBuilder {
                 }
             };
         }
+        if (ast.isViewRuleAutoLayout(astNode)) {
+            return {
+                autoLayout: astNode.direction
+            };
+        }
         failExpectedNever(astNode);
     }
     parseElementView(astNode) {

package/dist/module.js

@@ -1,10 +1,11 @@
-import { createDefaultModule, inject, createDefaultSharedModule } from 'langium';
+import { createDefaultModule, createDefaultSharedModule, inject } from 'langium';
 import { LikeC4GeneratedModule, LikeC4GeneratedSharedModule } from './generated/module';
-import { LikeC4ScopeComputation, LikeC4ScopeProvider } from './references';
+import { LikeC4DocumentSymbolProvider, LikeC4HoverProvider, LikeC4SemanticTokenProvider } from './lsp';
 import { FqnIndex, LikeC4ModelBuilder, LikeC4ModelLocator } from './model';
-import { registerValidationChecks } from './validation';
-import { LikeC4CodeLensProvider, LikeC4DocumentSymbolProvider, LikeC4HoverProvider, LikeC4SemanticTokenProvider } from './lsp';
+import { LikeC4ScopeComputation, LikeC4ScopeProvider } from './references';
 import { registerProtocolHandlers } from './registerProtocolHandlers';
+import { LikeC4CodeLensProvider, LikeC4WorkspaceManager } from './shared';
+import { registerValidationChecks } from './validation';
 function bind(Type) {
     return (services) => new Type(services);
 }
@@ -12,7 +13,7 @@ export const LikeC4Module = {
     likec4: {
         FqnIndex: bind(FqnIndex),
         ModelBuilder: bind(LikeC4ModelBuilder),
-        ModelLocator: bind(LikeC4ModelLocator),
+        ModelLocator: bind(LikeC4ModelLocator)
         // Model: bind(LikeC4Model),
         // Model: bind(LikeC4Model),
         // SpecIndex: bind(LikeC4SpecIndex),
@@ -21,7 +22,7 @@ export const LikeC4Module = {
     lsp: {
         DocumentSymbolProvider: bind(LikeC4DocumentSymbolProvider),
         SemanticTokenProvider: bind(LikeC4SemanticTokenProvider),
-        HoverProvider: bind(LikeC4HoverProvider),
+        HoverProvider: bind(LikeC4HoverProvider)
     },
     //
     //   // Formatter: bind(LikeC4Formatter),
@@ -34,8 +35,11 @@ export const LikeC4Module = {
 };
 const LikeC4SharedModule = {
     ...LikeC4GeneratedSharedModule,
+    workspace: {
+        WorkspaceManager: services => new LikeC4WorkspaceManager(services)
+    },
     lsp: {
-        CodeLensProvider: (services) => new LikeC4CodeLensProvider(services)
+        CodeLensProvider: services => new LikeC4CodeLensProvider(services)
     }
 };
 export function createLanguageServices(context) {

package/dist/references/scope-provider.d.ts

@@ -9,7 +9,7 @@ export declare class LikeC4ScopeProvider extends DefaultScopeProvider {
     getScope(context: ReferenceInfo): Scope;
     protected computeScope(node: AstNode, referenceType: string): Scope;
     /**
-       * Create a global scope filtered for the given reference type.
-       */
+     * Create a global scope filtered for the given reference type.
+     */
     protected getGlobalScope(referenceType: string): Scope;
 }

package/dist/references/scope-provider.js

@@ -19,7 +19,7 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
                 return this.fqnIndex.uniqueDescedants(fqn).iterator();
             }
             return null;
-        }, (iterator) => {
+        }, iterator => {
             if (iterator) {
                 return iterator.next();
             }
@@ -37,7 +37,7 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
                 return this.fqnIndex.uniqueDescedants(fqn).iterator();
             }
             return null;
-        }, (iterator) => {
+        }, iterator => {
             if (iterator) {
                 return iterator.next();
             }
@@ -102,8 +102,8 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
         }, this.getGlobalScope(referenceType));
     }
     /**
-       * Create a global scope filtered for the given reference type.
-       */
+     * Create a global scope filtered for the given reference type.
+     */
     getGlobalScope(referenceType) {
         return new StreamScope(this.indexManager.allElements(referenceType));
     }

package/dist/{lsp → shared}/CodeLensProvider.js

@@ -9,7 +9,7 @@ export class LikeC4CodeLensProvider {
         if (!isParsedLikeC4LangiumDocument(doc)) {
             return;
         }
-        return doc.parseResult.value.views?.views.flatMap((ast) => {
+        return doc.parseResult.value.views?.views.flatMap(ast => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const viewId = ElementViewOps.readId(ast);
             const range = ast.$cstNode?.range;
@@ -27,7 +27,7 @@ export class LikeC4CodeLensProvider {
                 command: {
                     command: 'likec4.open-preview',
                     arguments: [viewId],
-                    title: 'open preview',
+                    title: 'open preview'
                 }
             };
         });

package/dist/shared/WorkspaceManager.d.ts

@@ -0,0 +1,13 @@
+import type { LangiumDocument, LangiumDocumentFactory, LangiumSharedServices } from 'langium';
+import { DefaultWorkspaceManager } from 'langium';
+import type { WorkspaceFolder } from 'vscode-languageserver-protocol';
+export declare class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
+    protected readonly documentFactory: LangiumDocumentFactory;
+    constructor(services: LangiumSharedServices);
+    /**
+     * Load all additional documents that shall be visible in the context of the given workspace
+     * folders and add them to the collector. This can be used to include built-in libraries of
+     * your language, which can be either loaded from provided files or constructed in memory.
+     */
+    protected loadAdditionalDocuments(folders: WorkspaceFolder[], collector: (document: LangiumDocument) => void): Promise<void>;
+}

package/dist/shared/WorkspaceManager.js

@@ -0,0 +1,19 @@
+import { DefaultWorkspaceManager } from 'langium';
+import { URI } from 'vscode-uri';
+import * as builtin from '../builtin';
+export class LikeC4WorkspaceManager extends DefaultWorkspaceManager {
+    documentFactory;
+    constructor(services) {
+        super(services);
+        this.documentFactory = services.workspace.LangiumDocumentFactory;
+    }
+    /**
+     * Load all additional documents that shall be visible in the context of the given workspace
+     * folders and add them to the collector. This can be used to include built-in libraries of
+     * your language, which can be either loaded from provided files or constructed in memory.
+     */
+    loadAdditionalDocuments(folders, collector) {
+        collector(this.documentFactory.fromString(builtin.specification.document, URI.parse(builtin.specification.uri)));
+        return Promise.resolve();
+    }
+}

package/dist/shared/index.d.ts

@@ -0,0 +1,2 @@
+export * from './CodeLensProvider';
+export * from './WorkspaceManager';

package/dist/shared/index.js

@@ -0,0 +1,2 @@
+export * from './CodeLensProvider';
+export * from './WorkspaceManager';

package/dist/test/testServices.js

@@ -7,8 +7,10 @@ export function createTestServices() {
     const langiumDocuments = services.shared.workspace.LangiumDocuments;
     const documentBuilder = services.shared.workspace.DocumentBuilder;
     const modelBuilder = services.likec4.ModelBuilder;
+    const initPromise = services.shared.workspace.WorkspaceManager.initializeWorkspace([]);
     let documentIndex = 1;
     const parse = async (input, uri) => {
+        await initPromise;
         uri = uri ?? `${documentIndex++}${metaData.fileExtensions[0]}`;
         const document = services.shared.workspace.LangiumDocumentFactory.fromString(input, URI.file(uri));
         langiumDocuments.addDocument(document);
@@ -16,6 +18,7 @@ export function createTestServices() {
         return document;
     };
     const validate = async (input) => {
+        await initPromise;
         const document = typeof input === 'string' ? await parse(input) : input;
         await documentBuilder.build([document], { validationChecks: 'all' });
         const diagnostics = document.diagnostics ?? [];
@@ -27,6 +30,7 @@ export function createTestServices() {
         };
     };
     const validateAll = async () => {
+        await initPromise;
         const docs = langiumDocuments.all.toArray();
         await documentBuilder.build(docs, { validationChecks: 'all' });
         const diagnostics = docs.flatMap(doc => doc.diagnostics ?? []);

package/dist/validation/element.js

@@ -5,7 +5,7 @@ export const elementChecks = (services) => {
         if (!fqn) {
             accept('error', 'Not indexed', {
                 node: el,
-                property: 'name',
+                property: 'name'
             });
             return;
         }
@@ -13,7 +13,7 @@ export const elementChecks = (services) => {
         if (withSameFqn.length > 1) {
             accept('error', `Duplicate element name ${el.name !== fqn ? el.name + ' (' + fqn + ')' : el.name}`, {
                 node: el,
-                property: 'name',
+                property: 'name'
             });
         }
     };

package/dist/validation/index.js

@@ -1,4 +1,5 @@
 import { elementChecks } from './element';
+import { relationChecks } from './relation';
 import { elementKindChecks, tagChecks } from './specification';
 import { viewChecks } from './view';
 export function registerValidationChecks(services) {
@@ -15,6 +16,7 @@ export function registerValidationChecks(services) {
         ElementView: viewChecks(services),
         Element: elementChecks(services),
         ElementKind: elementKindChecks(services),
-        Tag: tagChecks(services),
+        Relation: relationChecks(services),
+        Tag: tagChecks(services)
     });
 }

package/dist/validation/relation.d.ts

@@ -0,0 +1,4 @@
+import type { ValidationCheck } from 'langium';
+import type { ast } from '../ast';
+import type { LikeC4Services } from '../module';
+export declare const relationChecks: (services: LikeC4Services) => ValidationCheck<ast.Relation>;

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,6 @@
 {
   "name": "@likec4/language-server",
-  "version": "0.2.2",
+  "version": "0.5.0",
   "type": "module",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://like-c4.dev",
@@ -24,6 +24,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 +46,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 +63,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.2.2",
+    "@likec4/core": "0.5.0",
     "@mobily/ts-belt": "^3.13.1",
     "langium": "^1.1.0",
     "nanoid": "^4.0.2",
@@ -68,17 +78,17 @@
     "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"
   },
   "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",
+    "typescript": "^5.0.4",
     "vite": "^4.2.1",
-    "vitest": "^0.29.8"
+    "vitest": "^0.30.1"
   }
 }