@likec4/language-server 0.6.3 → 0.18.0

package/contrib/likec4.monarch.ts

@@ -1,7 +1,7 @@
 // Monarch syntax highlighting for the likec4 language.
 export default {
     keywords: [
-        'BottomTop','LeftRight','RightLeft','TopBottom','autoLayout','browser','color','cylinder','description','element','exclude','extend','include','it','model','muted','of','person','primary','queue','rectangle','secondary','shape','specification','storage','style','tag','technology','this','title','view','views'
+        'BottomTop','LeftRight','RightLeft','TopBottom','amber','autoLayout','blue','browser','color','cylinder','description','element','exclude','extend','gray','green','include','indigo','it','mobile','model','muted','of','person','primary','queue','rectangle','red','secondary','shape','sky','slate','specification','storage','style','tag','technology','this','title','view','views'
     ],
     operators: [
         '*','->','.*'

package/contrib/likec4.tmLanguage.json

@@ -12,7 +12,7 @@
     },
     {
       "name": "keyword.control.likec4",
-      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|autoLayout|browser|color|cylinder|description|element|exclude|extend|include|it|model|muted|of|person|primary|queue|rectangle|secondary|shape|specification|storage|style|tag|technology|this|title|view|views)\\b"
+      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|autoLayout|blue|browser|color|cylinder|description|element|exclude|extend|gray|green|include|indigo|it|mobile|model|muted|of|person|primary|queue|rectangle|red|secondary|shape|sky|slate|specification|storage|style|tag|technology|this|title|view|views)\\b"
     },
     {
       "name": "string.quoted.double.likec4",

package/dist/ast.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import * as ast from './generated/ast';
-import type { LangiumDocument } from 'langium';
+import type { LangiumDocument, MultiMap } from 'langium';
 import type { LikeC4Document } from './generated/ast';
 import type * as c4 from '@likec4/core/types';
 export { ast };
@@ -42,7 +42,7 @@ export declare const ElementViewOps: {
     readId(node: ast.ElementView): c4.ViewID | undefined;
 };
 export declare const ElementOps: {
-    writeId(node: ast.Element, id: c4.Fqn): ast.Element;
+    writeId(node: ast.Element, id: c4.Fqn | null): ast.Element;
     readId(node: ast.Element): c4.Fqn | undefined;
 };
 export interface LikeC4LangiumDocument extends LangiumDocument<LikeC4Document> {
@@ -51,6 +51,7 @@ export interface LikeC4LangiumDocument extends LangiumDocument<LikeC4Document> {
     c4Elements: ParsedAstElement[];
     c4Relations: ParsedAstRelation[];
     c4Views: ParsedAstElementView[];
+    c4fqns?: MultiMap<c4.Fqn, string> | undefined;
 }
 export declare function cleanParsedModel(doc: LikeC4LangiumDocument): {
     elements: ParsedAstElement[];
@@ -71,3 +72,4 @@ export declare function toElementStyle(props?: ast.AStyleProperty[]): {
     shape?: c4.ElementShape;
 };
 export declare function toAutoLayout(direction: ast.ViewRuleLayoutDirection): c4.ViewRuleAutoLayout['autoLayout'];
+//# sourceMappingURL=ast.d.ts.map

package/dist/ast.js

@@ -17,7 +17,8 @@ export function c4hash({ c4Specification, c4Elements, c4Relations, c4Views }) {
 const idattr = Symbol.for('idattr');
 export const ElementViewOps = {
     writeId(node, id) {
-        Object.assign(node, { [idattr]: id });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        node[idattr] = id;
         return node;
     },
     readId(node) {
@@ -27,7 +28,13 @@ export const ElementViewOps = {
 };
 export const ElementOps = {
     writeId(node, id) {
-        Object.assign(node, { [idattr]: id });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if (id === null) {
+            delete node[idattr];
+        }
+        else {
+            node[idattr] = id;
+        }
         return node;
     },
     readId(node) {
@@ -70,7 +77,9 @@ export function* streamModel(doc) {
     let el;
     while ((el = traverseStack.shift())) {
         if (ast.isExtendElement(el)) {
-            traverseStack.push(...el.body.elements);
+            if (!!el.body) {
+                traverseStack.push(...el.body.elements);
+            }
             continue;
         }
         if (ast.isElement(el) && el.body) {
@@ -131,3 +140,4 @@ export function toAutoLayout(direction) {
         }
     }
 }
+//# sourceMappingURL=ast.js.map

package/dist/builtin.d.ts

@@ -2,3 +2,4 @@ export declare const specification: {
     uri: string;
     document: string;
 };
+//# sourceMappingURL=builtin.d.ts.map

package/dist/builtin.js

@@ -6,3 +6,4 @@ specification {
 }
 `.trimStart()
 };
+//# sourceMappingURL=builtin.js.map

package/dist/elementRef.d.ts

@@ -1,6 +1,7 @@
 import type * as c4 from '@likec4/core/types';
 import { ast } from './ast';
 export declare function isElementRefHead(node: ast.ElementRef | ast.StrictElementRef): boolean;
-export declare function elementRef(node: ast.ElementRef): ast.Element | undefined;
+export declare function elementRef(node: ast.ElementRef | ast.StrictElementRef): ast.Element | undefined;
 export declare function strictElementRefFqn(node: ast.StrictElementRef): c4.Fqn;
 export declare function parentStrictElementRef(node: ast.StrictElementRef): c4.Fqn;
+//# sourceMappingURL=elementRef.d.ts.map

package/dist/elementRef.js

@@ -37,3 +37,4 @@ export function parentStrictElementRef(node) {
     }
     return path.join('.');
 }
+//# sourceMappingURL=elementRef.js.map

package/dist/generated/ast.d.ts

@@ -1,8 +1,9 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.1.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
-import { AstNode, AbstractAstReflection, Reference, ReferenceInfo, TypeMetaData } from 'langium';
+import type { AstNode, Reference, ReferenceInfo, TypeMetaData } from 'langium';
+import { AbstractAstReflection } from 'langium';
 export type AnyStringProperty = ElementStringProperty | RelationStringProperty | ViewProperty;
 export declare const AnyStringProperty = "AnyStringProperty";
 export declare function isAnyStringProperty(item: unknown): item is AnyStringProperty;
@@ -15,12 +16,15 @@ export declare function isElementExpression(item: unknown): item is ElementExpre
 export type ElementProperty = ElementStringProperty | ElementStyleProperty;
 export declare const ElementProperty = "ElementProperty";
 export declare function isElementProperty(item: unknown): item is ElementProperty;
-export type ElementShape = 'browser' | 'cylinder' | 'person' | 'queue' | 'rectangle' | 'storage';
+export type ElementShape = 'browser' | 'cylinder' | 'mobile' | 'person' | 'queue' | 'rectangle' | 'storage';
+export declare function isElementShape(item: unknown): item is ElementShape;
 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 = 'element' | 'model' | ElementShape | ThemeColor | string;
-export type ThemeColor = 'muted' | 'primary' | 'secondary';
+export declare function isName(item: unknown): item is Name;
+export type ThemeColor = 'amber' | 'blue' | 'gray' | 'green' | 'indigo' | 'muted' | 'primary' | 'red' | 'secondary' | 'sky' | 'slate';
+export declare function isThemeColor(item: unknown): item is ThemeColor;
 export type View = ElementView;
 export declare const View = "View";
 export declare function isView(item: unknown): item is View;
@@ -28,6 +32,7 @@ export type ViewRule = ViewRuleAutoLayout | ViewRuleExpression | ViewRuleStyle;
 export declare const ViewRule = "ViewRule";
 export declare function isViewRule(item: unknown): item is ViewRule;
 export type ViewRuleLayoutDirection = 'BottomTop' | 'LeftRight' | 'RightLeft' | 'TopBottom';
+export declare function isViewRuleLayoutDirection(item: unknown): item is ViewRuleLayoutDirection;
 export interface ColorProperty extends AstNode {
     readonly $container: ElementStyleProperty | SpecificationElementKindStyle | ViewRuleStyle;
     readonly $type: 'ColorProperty';
@@ -306,7 +311,7 @@ export interface RelationWithSource extends Relation {
 }
 export declare const RelationWithSource = "RelationWithSource";
 export declare function isRelationWithSource(item: unknown): item is RelationWithSource;
-export interface LikeC4AstType {
+export type LikeC4AstType = {
     AStyleProperty: AStyleProperty;
     AnyStringProperty: AnyStringProperty;
     ColorProperty: ColorProperty;
@@ -349,7 +354,7 @@ export interface LikeC4AstType {
     ViewRuleExpression: ViewRuleExpression;
     ViewRuleStyle: ViewRuleStyle;
     WildcardExpression: WildcardExpression;
-}
+};
 export declare class LikeC4AstReflection extends AbstractAstReflection {
     getAllTypes(): string[];
     protected computeIsSubtype(subtype: string, supertype: string): boolean;
@@ -357,3 +362,4 @@ export declare class LikeC4AstReflection extends AbstractAstReflection {
     getTypeMetaData(type: string): TypeMetaData;
 }
 export declare const reflection: LikeC4AstReflection;
+//# sourceMappingURL=ast.d.ts.map

package/dist/generated/ast.js

@@ -1,8 +1,7 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.1.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
-/* eslint-disable */
 import { AbstractAstReflection } from 'langium';
 export const AnyStringProperty = 'AnyStringProperty';
 export function isAnyStringProperty(item) {
@@ -20,10 +19,19 @@ export const ElementProperty = 'ElementProperty';
 export function isElementProperty(item) {
     return reflection.isInstance(item, ElementProperty);
 }
+export function isElementShape(item) {
+    return item === 'rectangle' || item === 'person' || item === 'browser' || item === 'mobile' || item === 'cylinder' || item === 'storage' || item === 'queue';
+}
 export const Expression = 'Expression';
 export function isExpression(item) {
     return reflection.isInstance(item, Expression);
 }
+export function isName(item) {
+    return isElementShape(item) || isThemeColor(item) || item === 'element' || item === 'model' || (typeof item === 'string' && (/((([^\W\d_])|(_))((([^\W\d_])|([0-9]))|(_))*)/.test(item)));
+}
+export function isThemeColor(item) {
+    return item === 'primary' || item === 'secondary' || item === 'muted' || item === 'slate' || item === 'blue' || item === 'indigo' || item === 'sky' || item === 'red' || item === 'gray' || item === 'green' || item === 'amber';
+}
 export const View = 'View';
 export function isView(item) {
     return reflection.isInstance(item, View);
@@ -32,6 +40,9 @@ export const ViewRule = 'ViewRule';
 export function isViewRule(item) {
     return reflection.isInstance(item, ViewRule);
 }
+export function isViewRuleLayoutDirection(item) {
+    return item === 'TopBottom' || item === 'LeftRight' || item === 'BottomTop' || item === 'RightLeft';
+}
 export const ColorProperty = 'ColorProperty';
 export function isColorProperty(item) {
     return reflection.isInstance(item, ColorProperty);
@@ -374,3 +385,4 @@ export class LikeC4AstReflection extends AbstractAstReflection {
     }
 }
 export const reflection = new LikeC4AstReflection();
+//# sourceMappingURL=ast.js.map

package/dist/generated/grammar.d.ts

@@ -1,6 +1,7 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.1.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
-import { Grammar } from 'langium';
+import type { Grammar } from 'langium';
 export declare const LikeC4Grammar: () => Grammar;
+//# sourceMappingURL=grammar.d.ts.map

package/dist/generated/grammar.js

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.1.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import { loadGrammarFromJson } from 'langium';
@@ -764,13 +764,6 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
               "arguments": []
             }
           },
-          {
-            "$type": "RuleCall",
-            "rule": {
-              "$ref": "#/rules@45"
-            },
-            "arguments": []
-          },
           {
             "$type": "Assignment",
             "feature": "body",
@@ -782,13 +775,6 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
               },
               "arguments": []
             }
-          },
-          {
-            "$type": "RuleCall",
-            "rule": {
-              "$ref": "#/rules@46"
-            },
-            "arguments": []
           }
         ]
       },
@@ -803,29 +789,48 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
       "$type": "ParserRule",
       "name": "ExtendElementBody",
       "definition": {
-        "$type": "Assignment",
-        "feature": "elements",
-        "operator": "+=",
-        "terminal": {
-          "$type": "Alternatives",
-          "elements": [
-            {
-              "$type": "RuleCall",
-              "rule": {
-                "$ref": "#/rules@6"
-              },
-              "arguments": []
+        "$type": "Group",
+        "elements": [
+          {
+            "$type": "RuleCall",
+            "rule": {
+              "$ref": "#/rules@45"
             },
-            {
-              "$type": "RuleCall",
-              "rule": {
-                "$ref": "#/rules@17"
-              },
-              "arguments": []
-            }
-          ]
-        },
-        "cardinality": "*"
+            "arguments": []
+          },
+          {
+            "$type": "Assignment",
+            "feature": "elements",
+            "operator": "+=",
+            "terminal": {
+              "$type": "Alternatives",
+              "elements": [
+                {
+                  "$type": "RuleCall",
+                  "rule": {
+                    "$ref": "#/rules@6"
+                  },
+                  "arguments": []
+                },
+                {
+                  "$type": "RuleCall",
+                  "rule": {
+                    "$ref": "#/rules@17"
+                  },
+                  "arguments": []
+                }
+              ]
+            },
+            "cardinality": "*"
+          },
+          {
+            "$type": "RuleCall",
+            "rule": {
+              "$ref": "#/rules@46"
+            },
+            "arguments": []
+          }
+        ]
       },
       "definesHiddenTokens": false,
       "entry": false,
@@ -2054,6 +2059,38 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
           {
             "$type": "Keyword",
             "value": "muted"
+          },
+          {
+            "$type": "Keyword",
+            "value": "slate"
+          },
+          {
+            "$type": "Keyword",
+            "value": "blue"
+          },
+          {
+            "$type": "Keyword",
+            "value": "indigo"
+          },
+          {
+            "$type": "Keyword",
+            "value": "sky"
+          },
+          {
+            "$type": "Keyword",
+            "value": "red"
+          },
+          {
+            "$type": "Keyword",
+            "value": "gray"
+          },
+          {
+            "$type": "Keyword",
+            "value": "green"
+          },
+          {
+            "$type": "Keyword",
+            "value": "amber"
           }
         ]
       },
@@ -2083,6 +2120,10 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
             "$type": "Keyword",
             "value": "browser"
           },
+          {
+            "$type": "Keyword",
+            "value": "mobile"
+          },
           {
             "$type": "Keyword",
             "value": "cylinder"
@@ -2540,3 +2581,4 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
   "interfaces": [],
   "usedGrammars": []
 }`));
+//# sourceMappingURL=grammar.js.map

package/dist/generated/module.d.ts

@@ -1,9 +1,10 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.1.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
-import { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module, IParserConfig } from 'langium';
+import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module, IParserConfig } from 'langium';
 export declare const LikeC4LanguageMetaData: LanguageMetaData;
 export declare const parserConfig: IParserConfig;
 export declare const LikeC4GeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedServices>;
 export declare const LikeC4GeneratedModule: Module<LangiumServices, LangiumGeneratedServices>;
+//# sourceMappingURL=module.d.ts.map

package/dist/generated/module.js

@@ -1,8 +1,7 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.1.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
-import 'langium';
 import { LikeC4AstReflection } from './ast';
 import { LikeC4Grammar } from './grammar';
 export const LikeC4LanguageMetaData = {
@@ -24,3 +23,4 @@ export const LikeC4GeneratedModule = {
         ParserConfig: () => parserConfig
     }
 };
+//# sourceMappingURL=module.js.map

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { createLanguageServices } from './module';
 export type { LikeC4Services } from './module';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1 +1,2 @@
 export { createLanguageServices } from './module';
+//# sourceMappingURL=index.js.map

package/dist/logger.d.ts

@@ -6,3 +6,4 @@ export declare const logger: {
     error(message: string | Error | unknown): void;
     trace(message: string): void;
 };
+//# sourceMappingURL=logger.d.ts.map

package/dist/logger.js

@@ -18,3 +18,4 @@ export const logger = {
         console.debug(message);
     }
 };
+//# sourceMappingURL=logger.js.map

package/dist/lsp/DocumentSymbolProvider.d.ts

@@ -5,7 +5,7 @@
  ******************************************************************************/
 /// <reference types="react" />
 import { type DocumentSymbolProvider, type MaybePromise } from 'langium';
-import { type DocumentSymbol } from 'vscode-languageserver-protocol';
+import { type DocumentSymbol } from 'vscode-languageserver';
 import { type LikeC4LangiumDocument, ast } from '../ast';
 import type { LikeC4Services } from '../module';
 export declare class LikeC4DocumentSymbolProvider implements DocumentSymbolProvider {
@@ -19,3 +19,4 @@ export declare class LikeC4DocumentSymbolProvider implements DocumentSymbolProvi
     protected getElementSymbol: (astElement: ast.Element) => DocumentSymbol[];
     protected getModelViewsSymbols: (astViews: ast.ModelViews | undefined) => DocumentSymbol[];
 }
+//# sourceMappingURL=DocumentSymbolProvider.d.ts.map

package/dist/lsp/DocumentSymbolProvider.js

@@ -5,8 +5,9 @@
  ******************************************************************************/
 import invariant from 'tiny-invariant';
 import { findNodeForProperty } from 'langium';
-import { SymbolKind } from 'vscode-languageserver-protocol';
+import { SymbolKind } from 'vscode-languageserver';
 import { ast } from '../ast';
+import { logger } from '../logger';
 export class LikeC4DocumentSymbolProvider {
     services;
     constructor(services) {
@@ -39,7 +40,12 @@ export class LikeC4DocumentSymbolProvider {
             };
         };
         for (const astKind of astSpec.elementKinds) {
-            specSymbols.push(getElementKindSymbol(astKind));
+            try {
+                specSymbols.push(getElementKindSymbol(astKind));
+            }
+            catch (e) {
+                logger.error(e);
+            }
         }
         const getTagSymbol = (astTag) => {
             invariant(astTag.$cstNode, 'TagSpec must have a CST node');
@@ -52,7 +58,12 @@ export class LikeC4DocumentSymbolProvider {
             };
         };
         for (const astTag of astSpec.tags) {
-            specSymbols.push(getTagSymbol(astTag));
+            try {
+                specSymbols.push(getTagSymbol(astTag));
+            }
+            catch (e) {
+                logger.error(e);
+            }
         }
         if (specSymbols.length === 0)
             return [];
@@ -79,23 +90,29 @@ export class LikeC4DocumentSymbolProvider {
                 name: astModel.name,
                 range: cstModel.range,
                 selectionRange: nameNode.range,
-                children: astModel.elements.flatMap(this.getElementsSymbol)
+                children: astModel.elements.flatMap(e => this.getElementsSymbol(e))
             }
         ];
     };
     getElementsSymbol = (el) => {
-        if (ast.isExtendElement(el)) {
-            return this.getExtendElementSymbol(el);
+        try {
+            if (ast.isExtendElement(el)) {
+                return this.getExtendElementSymbol(el);
+            }
+            if (ast.isElement(el)) {
+                return this.getElementSymbol(el);
+            }
         }
-        if (ast.isElement(el)) {
-            return this.getElementSymbol(el);
+        catch (e) {
+            logger.error(e);
         }
         return [];
     };
     getExtendElementSymbol = (astElement) => {
         const cst = astElement.$cstNode;
         const nameNode = astElement.element.$cstNode;
-        if (!cst || !nameNode)
+        const body = astElement.body;
+        if (!cst || !nameNode || !body)
             return [];
         return [
             {
@@ -103,7 +120,7 @@ export class LikeC4DocumentSymbolProvider {
                 name: nameNode.text,
                 range: cst.range,
                 selectionRange: nameNode.range,
-                children: astElement.body.elements.flatMap(this.getElementsSymbol)
+                children: body.elements.flatMap(e => this.getElementsSymbol(e))
             }
         ];
     };
@@ -125,7 +142,7 @@ export class LikeC4DocumentSymbolProvider {
                 range: cst.range,
                 selectionRange: nameNode.range,
                 detail,
-                children: astElement.body?.elements.flatMap(this.getElementsSymbol) ?? []
+                children: astElement.body?.elements.flatMap(e => this.getElementsSymbol(e)) ?? []
             }
         ];
     };
@@ -147,3 +164,4 @@ export class LikeC4DocumentSymbolProvider {
         ];
     };
 }
+//# sourceMappingURL=DocumentSymbolProvider.js.map

package/dist/lsp/HoverProvider.d.ts

@@ -1,8 +1,9 @@
 import { type AstNode, AstNodeHoverProvider, type MaybePromise } from 'langium';
-import type { Hover } from 'vscode-languageserver-protocol';
+import type { Hover } from 'vscode-languageserver';
 import type { LikeC4Services } from '../module';
 export declare class LikeC4HoverProvider extends AstNodeHoverProvider {
     private locator;
     constructor(services: LikeC4Services);
     protected getAstNodeHoverContent(node: AstNode): MaybePromise<Hover | undefined>;
 }
+//# sourceMappingURL=HoverProvider.d.ts.map

package/dist/lsp/HoverProvider.js

@@ -52,3 +52,4 @@ export class LikeC4HoverProvider extends AstNodeHoverProvider {
         return;
     }
 }
+//# sourceMappingURL=HoverProvider.js.map

package/dist/lsp/SemanticTokenProvider.d.ts

@@ -4,3 +4,4 @@ export declare class LikeC4SemanticTokenProvider extends AbstractSemanticTokenPr
     private highlightAstElement;
     private highlightView;
 }
+//# sourceMappingURL=SemanticTokenProvider.d.ts.map