@likec4/language-server 0.23.0 → 0.25.0

package/contrib/likec4.monarch.ts

@@ -4,16 +4,16 @@ export default {
         'BottomTop','LeftRight','RightLeft','TopBottom','amber','autoLayout','blue','browser','color','cylinder','description','element','exclude','extend','gray','green','include','indigo','it','kind','mobile','model','muted','of','person','primary','queue','rectangle','red','secondary','shape','sky','slate','specification','storage','style','tag','technology','this','title','view','views'
     ],
     operators: [
-        '*','->','.*'
+        '*','.*'
     ],
-    symbols:  /\*|->|\.\*/,
+    symbols:  /\*|\.\*/,
 
     tokenizer: {
         initial: [
+            { regex: /"[^"]*"|'[^']*'/, action: {"token":"string"} },
             { regex: /[^\W\d_]/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"LETTER"} }} },
             { regex: /[0-9]/, action: {"token":"DIGIT"} },
             { regex: /[\t\r\n\v\f]/, action: {"token":"NEWLINE"} },
-            { regex: /"[^"]*"|'[^']*'/, action: {"token":"string"} },
             { include: '@whitespace' },
             { regex: /@symbols/, action: { cases: { '@operators': {"token":"operator"}, '@default': {"token":""} }} },
         ],

package/dist/ast.d.ts

@@ -46,7 +46,6 @@ export declare const ElementOps: {
     readId(node: ast.Element): c4.Fqn | undefined;
 };
 export interface LikeC4LangiumDocument extends LangiumDocument<LikeC4Document> {
-    c4hash?: string;
     c4Specification: ParsedAstSpecification;
     c4Elements: ParsedAstElement[];
     c4Relations: ParsedAstRelation[];
@@ -61,7 +60,7 @@ export declare function cleanParsedModel(doc: LikeC4LangiumDocument): {
 };
 export declare function isLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument;
 export declare function isParsedLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument;
-export declare const isValidDocument: (doc: LangiumDocument) => doc is LikeC4LangiumDocument;
+export declare const isValidLikeC4LangiumDocument: (doc: LangiumDocument) => doc is LikeC4LangiumDocument;
 export declare function streamModel(doc: LikeC4LangiumDocument): Generator<ast.Relation | ast.Element, void, unknown>;
 export declare function resolveRelationPoints(node: ast.Relation): {
     source: ast.Element;

package/dist/ast.js

@@ -28,11 +28,12 @@ export const ElementViewOps = {
 };
 export const ElementOps = {
     writeId(node, id) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         if (id === null) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-dynamic-delete
             delete node[idattr];
         }
         else {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             node[idattr] = id;
         }
         return node;
@@ -63,8 +64,8 @@ export function isParsedLikeC4LangiumDocument(doc) {
     return (isLikeC4LangiumDocument(doc) &&
         ['c4Specification', 'c4Elements', 'c4Relations', 'c4Views'].every(key => key in doc));
 }
-export const isValidDocument = (doc) => {
-    if (!isLikeC4LangiumDocument(doc))
+export const isValidLikeC4LangiumDocument = (doc) => {
+    if (!isParsedLikeC4LangiumDocument(doc))
         return false;
     const { state, parseResult, diagnostics } = doc;
     return (state === DocumentState.Validated &&
@@ -87,7 +88,7 @@ export function* streamModel(doc) {
             }
             continue;
         }
-        if (ast.isElement(el) && el.body && el.body.elements.length > 0) {
+        if (el.body && el.body.elements.length > 0) {
             for (const nested of el.body.elements) {
                 if (ast.isRelation(nested)) {
                     relations.push(nested);
@@ -121,9 +122,8 @@ export function resolveRelationPoints(node) {
     if (!ast.isElementBody(node.$container)) {
         throw new Error('Skip relation due to invalid reference to source');
     }
-    const source = node.$container.$container;
     return {
-        source,
+        source: node.$container.$container,
         target
     };
 }

package/dist/elementRef.js

@@ -35,6 +35,7 @@ export function parentStrictElementRef(node) {
         path.unshift(parent.el.$refText);
         parent = parent.$container;
     }
+    invariant(path.length > 0, 'Expected non-empty parent path');
     return path.join('.');
 }
 //# sourceMappingURL=elementRef.js.map

package/dist/generated/ast.d.ts

@@ -23,6 +23,8 @@ export declare const Expression = "Expression";
 export declare function isExpression(item: unknown): item is Expression;
 export type Name = 'element' | 'model' | ElementShape | ThemeColor | string;
 export declare function isName(item: unknown): item is Name;
+export type RArrow = string;
+export declare function isRArrow(item: unknown): item is RArrow;
 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;
@@ -143,6 +145,7 @@ export declare function isExtendElementBody(item: unknown): item is ExtendElemen
 export interface IncomingExpression extends AstNode {
     readonly $container: InOutExpression | IncomingExpression | OutgoingExpression | RelationExpression | ViewRuleExpression | ViewRuleStyle;
     readonly $type: 'IncomingExpression';
+    arr: RArrow;
     target: ElementExpression;
 }
 export declare const IncomingExpression = "IncomingExpression";
@@ -150,6 +153,7 @@ export declare function isIncomingExpression(item: unknown): item is IncomingExp
 export interface InOutExpression extends AstNode {
     readonly $container: InOutExpression | IncomingExpression | OutgoingExpression | RelationExpression | ViewRuleExpression | ViewRuleStyle;
     readonly $type: 'InOutExpression';
+    arr: RArrow;
     inout: IncomingExpression;
 }
 export declare const InOutExpression = "InOutExpression";
@@ -181,6 +185,7 @@ export declare function isModelViews(item: unknown): item is ModelViews;
 export interface OutgoingExpression extends AstNode {
     readonly $container: InOutExpression | IncomingExpression | OutgoingExpression | RelationExpression | ViewRuleExpression | ViewRuleStyle;
     readonly $type: 'OutgoingExpression';
+    arr: RArrow;
     source: ElementExpression;
 }
 export declare const OutgoingExpression = "OutgoingExpression";
@@ -188,6 +193,7 @@ export declare function isOutgoingExpression(item: unknown): item is OutgoingExp
 export interface Relation extends AstNode {
     readonly $container: ElementBody | ExtendElementBody | Model;
     readonly $type: 'Relation' | 'RelationWithSource';
+    arr: RArrow;
     definition?: RelationBody;
     target: ElementRef;
     title?: string;
@@ -205,6 +211,7 @@ export declare function isRelationBody(item: unknown): item is RelationBody;
 export interface RelationExpression extends AstNode {
     readonly $container: InOutExpression | IncomingExpression | OutgoingExpression | RelationExpression | ViewRuleExpression | ViewRuleStyle;
     readonly $type: 'RelationExpression';
+    arr: RArrow;
     source: ElementExpression;
     target: ElementExpression;
 }
@@ -328,6 +335,7 @@ export declare function isWildcardExpression(item: unknown): item is WildcardExp
 export interface RelationWithSource extends Relation {
     readonly $container: ElementBody | ExtendElementBody | Model;
     readonly $type: 'RelationWithSource';
+    arr: RArrow;
     definition?: RelationBody;
     source: ElementRef;
     target: ElementRef;

package/dist/generated/ast.js

@@ -29,6 +29,9 @@ export function isExpression(item) {
 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 isRArrow(item) {
+    return (typeof item === 'string' && (/->/.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';
 }