@likec4/language-server 0.35.0 → 0.37.0

package/contrib/likec4.monarch.ts

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

@@ -37,8 +37,9 @@ export interface ParsedAstRelation {
 }
 export interface ParsedAstElementView {
     id: c4.ViewID;
-    astPath: string;
     viewOf?: c4.Fqn;
+    extends?: c4.ViewID;
+    astPath: string;
     title?: string;
     description?: string;
     tags?: c4.NonEmptyArray<c4.Tag>;

package/dist/elementRef.d.ts

@@ -1,7 +1,19 @@
 import { type c4 } from '@likec4/core';
 import { ast } from './ast';
 export declare function isElementRefHead(node: ast.ElementRef | ast.StrictElementRef): boolean;
+/**
+ * Returns referenced AST Element
+ *
+ */
 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;
+/**
+ * Returns FQN of strictElementRef
+ * a.b.c.d - for c node returns a.b
+ */
+export declare function fqnElementRef(node: ast.StrictElementRef): c4.Fqn;
+/**
+ * Returns parent FQN
+ * a.b.c.d - for c node returns a.b
+ */
+export declare function parentFqnElementRef(node: ast.StrictElementRef): c4.Fqn;
 //# sourceMappingURL=elementRef.d.ts.map

package/dist/elementRef.js

@@ -9,6 +9,10 @@ export function isElementRefHead(node) {
     }
     nonexhaustive(node);
 }
+/**
+ * Returns referenced AST Element
+ *
+ */
 export function elementRef(node) {
     invariant(isElementRefHead(node), 'Expected head ElementRef');
     while (node.next) {
@@ -16,7 +20,11 @@ export function elementRef(node) {
     }
     return node.el.ref;
 }
-export function strictElementRefFqn(node) {
+/**
+ * Returns FQN of strictElementRef
+ * a.b.c.d - for c node returns a.b
+ */
+export function fqnElementRef(node) {
     invariant(isElementRefHead(node), 'Expected head StrictElementRef');
     const name = [node.el.$refText];
     let child = node.next;
@@ -26,7 +34,11 @@ export function strictElementRefFqn(node) {
     }
     return name.join('.');
 }
-export function parentStrictElementRef(node) {
+/**
+ * Returns parent FQN
+ * a.b.c.d - for c node returns a.b
+ */
+export function parentFqnElementRef(node) {
     invariant(!isElementRefHead(node), 'Expected next StrictElementRef');
     const path = [];
     let parent = node.$container;

package/dist/generated/ast.d.ts

@@ -127,14 +127,29 @@ export declare function isElementTagExpression(item: unknown): item is ElementTa
 export interface ElementView extends AstNode {
     readonly $container: ModelViews;
     readonly $type: 'ElementView';
+    body: ElementViewBody;
+    extends?: ElementViewRef;
     name?: Name;
-    props: Array<LinkProperty | ViewProperty>;
-    rules: Array<ViewRuleAutoLayout | ViewRuleExpression | ViewRuleStyle>;
-    tags?: Tags;
     viewOf?: ElementRef;
 }
 export declare const ElementView = "ElementView";
 export declare function isElementView(item: unknown): item is ElementView;
+export interface ElementViewBody extends AstNode {
+    readonly $container: ElementView;
+    readonly $type: 'ElementViewBody';
+    props: Array<LinkProperty | ViewProperty>;
+    rules: Array<ViewRuleAutoLayout | ViewRuleExpression | ViewRuleStyle>;
+    tags?: Tags;
+}
+export declare const ElementViewBody = "ElementViewBody";
+export declare function isElementViewBody(item: unknown): item is ElementViewBody;
+export interface ElementViewRef extends AstNode {
+    readonly $container: ElementView;
+    readonly $type: 'ElementViewRef';
+    view: Reference<ElementView>;
+}
+export declare const ElementViewRef = "ElementViewRef";
+export declare function isElementViewRef(item: unknown): item is ElementViewRef;
 export interface ExtendElement extends AstNode {
     readonly $container: Model;
     readonly $type: 'ExtendElement';
@@ -183,7 +198,7 @@ export interface LikeC4Document extends AstNode {
 export declare const LikeC4Document = "LikeC4Document";
 export declare function isLikeC4Document(item: unknown): item is LikeC4Document;
 export interface LinkProperty extends AstNode {
-    readonly $container: ElementBody | ElementView;
+    readonly $container: ElementBody | ElementViewBody;
     readonly $type: 'LinkProperty';
     key: 'link';
     value: Uri;
@@ -269,8 +284,9 @@ export declare function isSpecificationElementKind(item: unknown): item is Speci
 export interface SpecificationRule extends AstNode {
     readonly $container: LikeC4Document;
     readonly $type: 'SpecificationRule';
+    elements: Array<SpecificationElementKind>;
     name: 'specification';
-    specs: Array<SpecificationElementKind | SpecificationTag>;
+    tags: Array<SpecificationTag>;
 }
 export declare const SpecificationRule = "SpecificationRule";
 export declare function isSpecificationRule(item: unknown): item is SpecificationRule;
@@ -306,14 +322,14 @@ export interface Tag extends AstNode {
 export declare const Tag = "Tag";
 export declare function isTag(item: unknown): item is Tag;
 export interface Tags extends AstNode {
-    readonly $container: ElementBody | ElementView | RelationBody;
+    readonly $container: ElementBody | ElementViewBody | RelationBody;
     readonly $type: 'Tags';
     value: Array<Reference<Tag>>;
 }
 export declare const Tags = "Tags";
 export declare function isTags(item: unknown): item is Tags;
 export interface ViewProperty extends AstNode {
-    readonly $container: ElementView;
+    readonly $container: ElementViewBody;
     readonly $type: 'ViewProperty';
     key: 'description' | 'title';
     value: string;
@@ -321,14 +337,14 @@ 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 $container: ElementViewBody;
     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 $container: ElementViewBody;
     readonly $type: 'ViewRuleExpression';
     expressions: Array<Expression>;
     isInclude: boolean;
@@ -336,7 +352,7 @@ export interface ViewRuleExpression extends AstNode {
 export declare const ViewRuleExpression = "ViewRuleExpression";
 export declare function isViewRuleExpression(item: unknown): item is ViewRuleExpression;
 export interface ViewRuleStyle extends AstNode {
-    readonly $container: ElementView;
+    readonly $container: ElementViewBody;
     readonly $type: 'ViewRuleStyle';
     props: Array<ColorProperty | IconProperty | ShapeProperty>;
     targets: Array<ElementExpression>;
@@ -363,6 +379,8 @@ export type LikeC4AstType = {
     ElementStringProperty: ElementStringProperty;
     ElementTagExpression: ElementTagExpression;
     ElementView: ElementView;
+    ElementViewBody: ElementViewBody;
+    ElementViewRef: ElementViewRef;
     Expression: Expression;
     ExtendElement: ExtendElement;
     ExtendElementBody: ExtendElementBody;

package/dist/generated/ast.js

@@ -100,6 +100,14 @@ export const ElementView = 'ElementView';
 export function isElementView(item) {
     return reflection.isInstance(item, ElementView);
 }
+export const ElementViewBody = 'ElementViewBody';
+export function isElementViewBody(item) {
+    return reflection.isInstance(item, ElementViewBody);
+}
+export const ElementViewRef = 'ElementViewRef';
+export function isElementViewRef(item) {
+    return reflection.isInstance(item, ElementViewRef);
+}
 export const ExtendElement = 'ExtendElement';
 export function isExtendElement(item) {
     return reflection.isInstance(item, ExtendElement);
@@ -210,7 +218,7 @@ export function isWildcardExpression(item) {
 }
 export class LikeC4AstReflection extends AbstractAstReflection {
     getAllTypes() {
-        return ['ColorProperty', 'Element', 'ElementBody', 'ElementExpression', 'ElementKind', 'ElementKindExpression', 'ElementProperty', 'ElementRef', 'ElementRefExpression', 'ElementStringProperty', 'ElementTagExpression', 'ElementView', 'Expression', 'ExtendElement', 'ExtendElementBody', 'IconProperty', 'InOutExpression', 'IncomingExpression', 'LikeC4Document', 'LinkProperty', 'Model', 'ModelViews', 'OutgoingExpression', 'Relation', 'RelationBody', 'RelationExpression', 'RelationStringProperty', 'ShapeProperty', 'SpecificationElementKind', 'SpecificationRule', 'SpecificationTag', 'StrictElementRef', 'StyleProperties', 'Tag', 'Tags', 'View', 'ViewProperty', 'ViewRule', 'ViewRuleAutoLayout', 'ViewRuleExpression', 'ViewRuleStyle', 'WildcardExpression'];
+        return ['ColorProperty', 'Element', 'ElementBody', 'ElementExpression', 'ElementKind', 'ElementKindExpression', 'ElementProperty', 'ElementRef', 'ElementRefExpression', 'ElementStringProperty', 'ElementTagExpression', 'ElementView', 'ElementViewBody', 'ElementViewRef', 'Expression', 'ExtendElement', 'ExtendElementBody', 'IconProperty', 'InOutExpression', 'IncomingExpression', 'LikeC4Document', 'LinkProperty', 'Model', 'ModelViews', 'OutgoingExpression', 'Relation', 'RelationBody', 'RelationExpression', 'RelationStringProperty', 'ShapeProperty', 'SpecificationElementKind', 'SpecificationRule', 'SpecificationTag', 'StrictElementRef', 'StyleProperties', 'Tag', 'Tags', 'View', 'ViewProperty', 'ViewRule', 'ViewRuleAutoLayout', 'ViewRuleExpression', 'ViewRuleStyle', 'WildcardExpression'];
     }
     computeIsSubtype(subtype, supertype) {
         switch (subtype) {
@@ -259,6 +267,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case 'Tags:value': {
                 return Tag;
             }
+            case 'ElementViewRef:view': {
+                return ElementView;
+            }
             default: {
                 throw new Error(`${referenceId} is not a valid reference id.`);
             }
@@ -307,9 +318,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
-            case 'ElementView': {
+            case 'ElementViewBody': {
                 return {
-                    name: 'ElementView',
+                    name: 'ElementViewBody',
                     mandatory: [
                         { name: 'props', type: 'array' },
                         { name: 'rules', type: 'array' }
@@ -352,7 +363,8 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: 'SpecificationRule',
                     mandatory: [
-                        { name: 'specs', type: 'array' }
+                        { name: 'elements', type: 'array' },
+                        { name: 'tags', type: 'array' }
                     ]
                 };
             }