@likec4/language-server 0.5.0 → 0.6.1

package/dist/__test__/parser-smoke/08-Structurizr.js

@@ -0,0 +1,22 @@
+const model = `
+specification {
+  element person
+  element group
+  element softwareSystem
+  element container
+  element component
+}
+`;
+export const valid_08_Structurizr = model +
+    `
+model {
+  u = person "User"
+  s = softwareSystem "Software System" {
+      webapp = container "Web Application" "" "Spring Boot"
+      database = container "Database" "" "Relational database schema"
+  }
+
+  u -> webapp "Uses"
+  webapp -> database "Reads from and writes to"
+}
+`;

package/dist/__test__/parser-smoke/index.d.ts

@@ -0,0 +1,8 @@
+export * from './01-Specification';
+export * from './02-Model';
+export * from './03-ModelRelation';
+export * from './04-Scope';
+export * from './05-StrictElementRef';
+export * from './06-ElementRef';
+export * from './07-Views';
+export * from './08-Structurizr';

package/dist/__test__/parser-smoke/index.js

@@ -0,0 +1,8 @@
+export * from './01-Specification';
+export * from './02-Model';
+export * from './03-ModelRelation';
+export * from './04-Scope';
+export * from './05-StrictElementRef';
+export * from './06-ElementRef';
+export * from './07-Views';
+export * from './08-Structurizr';

package/dist/__test__/parser-smoke-extendsElement.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__test__/parser-smoke-extendsElement.spec.js

@@ -0,0 +1,36 @@
+import { expect, test } from 'vitest';
+import { createTestServices } from '../test';
+const document1 = `
+specification {
+  element component
+}
+model {
+  component system {
+    sub = component {
+      component sub1
+    }
+  }
+}
+`;
+const document2 = `
+model {
+  extend system.sub {
+    component sub2 {
+      -> sub1
+    }
+  }
+}
+`;
+const document3 = `
+model {
+  system.sub1 -> system.sub2
+}
+`;
+test('parser smoke: ExtendsElement Scope', async () => {
+    const { parse, validateAll } = createTestServices();
+    await parse(document1);
+    await parse(document2);
+    await parse(document3);
+    const { errors } = await validateAll();
+    expect(errors).toEqual([]);
+});

package/dist/__test__/parser-smoke.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__test__/parser-smoke.spec.js

@@ -0,0 +1,28 @@
+import { toPairs } from 'rambdax';
+import { describe, vi, it } from 'vitest';
+import { createTestServices } from '../test';
+import * as testfiles from './parser-smoke';
+vi.mock('../logger', () => ({
+    logger: {
+        log: vi.fn(),
+        error: vi.fn(),
+        warn: vi.fn(),
+        info: vi.fn(),
+        debug: vi.fn()
+    }
+}));
+describe('parser smoke', () => {
+    toPairs(testfiles).forEach(([name, document]) => {
+        it.concurrent(name, async ({ expect }) => {
+            const { validate } = createTestServices();
+            const { diagnostics } = await validate(document);
+            const errors = diagnostics.map(d => d.message);
+            if (name.startsWith('invalid_')) {
+                expect(errors).not.toEqual([]);
+            }
+            else {
+                expect(errors).toEqual([]);
+            }
+        });
+    });
+});

package/dist/ast.d.ts

@@ -70,3 +70,4 @@ export declare function toElementStyle(props?: ast.AStyleProperty[]): {
     color?: c4.ThemeColor;
     shape?: c4.ElementShape;
 };
+export declare function toAutoLayout(direction: ast.ViewRuleLayoutDirection): c4.ViewRuleAutoLayout['autoLayout'];

package/dist/ast.js

@@ -115,18 +115,19 @@ export function toElementStyle(props) {
     }
     return result;
 }
-//   const result: c4.ElementStyle = {}
-//   const shapeProperty = props.find(ast.isElementShapeStyleProperty)
-//   if (shapeProperty) {
-//     result.shape = shapeProperty.value
-//   }
-//   // const colorPropValue = props.find(isColorStyleProperty)?.value
-//   // if (isElementStyleColor(colorPropValue)) {
-//   //   result.color = colorPropValue
-//   // }
-//   // const iconProp = props.find(isIconStyleProperty)
-//   // if (iconProp) {
-//   //   result.icon = iconProp.value
-//   // }
-//   return result
-// }
+export function toAutoLayout(direction) {
+    switch (direction) {
+        case 'TopBottom': {
+            return 'TB';
+        }
+        case 'BottomTop': {
+            return 'BT';
+        }
+        case 'LeftRight': {
+            return 'LR';
+        }
+        case 'RightLeft': {
+            return 'RL';
+        }
+    }
+}

package/dist/generated/ast.d.ts

@@ -3,6 +3,9 @@
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import { AstNode, AbstractAstReflection, Reference, ReferenceInfo, TypeMetaData } from 'langium';
+export type AnyStringProperty = ElementStringProperty | RelationStringProperty | ViewProperty;
+export declare const AnyStringProperty = "AnyStringProperty";
+export declare function isAnyStringProperty(item: unknown): item is AnyStringProperty;
 export type AStyleProperty = ColorProperty | ShapeProperty;
 export declare const AStyleProperty = "AStyleProperty";
 export declare function isAStyleProperty(item: unknown): item is AStyleProperty;
@@ -24,7 +27,7 @@ export declare function isView(item: unknown): item is View;
 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 type ViewRuleLayoutDirection = 'BottomTop' | 'LeftRight' | 'RightLeft' | 'TopBottom';
 export interface ColorProperty extends AstNode {
     readonly $container: ElementStyleProperty | SpecificationElementKindStyle | ViewRuleStyle;
     readonly $type: 'ColorProperty';
@@ -76,7 +79,7 @@ export interface ElementRefExpression extends AstNode {
 export declare const ElementRefExpression = "ElementRefExpression";
 export declare function isElementRefExpression(item: unknown): item is ElementRefExpression;
 export interface ElementStringProperty extends AstNode {
-    readonly $container: ElementBody;
+    readonly $container: ElementBody | ElementView | RelationBody;
     readonly $type: 'ElementStringProperty';
     key: 'description' | 'technology' | 'title';
     value: string;
@@ -84,7 +87,7 @@ export interface ElementStringProperty extends AstNode {
 export declare const ElementStringProperty = "ElementStringProperty";
 export declare function isElementStringProperty(item: unknown): item is ElementStringProperty;
 export interface ElementStyleProperty extends AstNode {
-    readonly $container: ElementBody;
+    readonly $container: ElementBody | ElementView | RelationBody;
     readonly $type: 'ElementStyleProperty';
     key: 'style';
     props: Array<ColorProperty | ShapeProperty>;
@@ -96,7 +99,7 @@ export interface ElementView extends AstNode {
     readonly $type: 'ElementView';
     name?: Name;
     properties: Array<ViewProperty>;
-    rules: Array<ViewRule>;
+    rules: Array<ViewRuleAutoLayout | ViewRuleExpression | ViewRuleStyle>;
     viewOf?: ElementRef;
 }
 export declare const ElementView = "ElementView";
@@ -173,7 +176,7 @@ export declare function isRelation(item: unknown): item is Relation;
 export interface RelationBody extends AstNode {
     readonly $container: Relation | RelationWithSource;
     readonly $type: 'RelationBody';
-    props: Array<RelationProperty>;
+    props: Array<RelationStringProperty>;
     tags?: Tags;
 }
 export declare const RelationBody = "RelationBody";
@@ -186,14 +189,14 @@ export interface RelationExpression extends AstNode {
 }
 export declare const RelationExpression = "RelationExpression";
 export declare function isRelationExpression(item: unknown): item is RelationExpression;
-export interface RelationProperty extends AstNode {
-    readonly $container: RelationBody;
-    readonly $type: 'RelationProperty';
+export interface RelationStringProperty extends AstNode {
+    readonly $container: ElementBody | ElementView | RelationBody;
+    readonly $type: 'RelationStringProperty';
     key: 'title';
     value: string;
 }
-export declare const RelationProperty = "RelationProperty";
-export declare function isRelationProperty(item: unknown): item is RelationProperty;
+export declare const RelationStringProperty = "RelationStringProperty";
+export declare function isRelationStringProperty(item: unknown): item is RelationStringProperty;
 export interface ShapeProperty extends AstNode {
     readonly $container: ElementStyleProperty | SpecificationElementKindStyle | ViewRuleStyle;
     readonly $type: 'ShapeProperty';
@@ -256,7 +259,7 @@ export interface Tags extends AstNode {
 export declare const Tags = "Tags";
 export declare function isTags(item: unknown): item is Tags;
 export interface ViewProperty extends AstNode {
-    readonly $container: ElementView;
+    readonly $container: ElementBody | ElementView | RelationBody;
     readonly $type: 'ViewProperty';
     key: 'description' | 'title';
     value: string;
@@ -305,6 +308,7 @@ export declare const RelationWithSource = "RelationWithSource";
 export declare function isRelationWithSource(item: unknown): item is RelationWithSource;
 export interface LikeC4AstType {
     AStyleProperty: AStyleProperty;
+    AnyStringProperty: AnyStringProperty;
     ColorProperty: ColorProperty;
     Element: Element;
     ElementBody: ElementBody;
@@ -328,7 +332,7 @@ export interface LikeC4AstType {
     Relation: Relation;
     RelationBody: RelationBody;
     RelationExpression: RelationExpression;
-    RelationProperty: RelationProperty;
+    RelationStringProperty: RelationStringProperty;
     RelationWithSource: RelationWithSource;
     ShapeProperty: ShapeProperty;
     SpecificationElementKind: SpecificationElementKind;

package/dist/generated/ast.js

@@ -4,6 +4,10 @@
  ******************************************************************************/
 /* eslint-disable */
 import { AbstractAstReflection } from 'langium';
+export const AnyStringProperty = 'AnyStringProperty';
+export function isAnyStringProperty(item) {
+    return reflection.isInstance(item, AnyStringProperty);
+}
 export const AStyleProperty = 'AStyleProperty';
 export function isAStyleProperty(item) {
     return reflection.isInstance(item, AStyleProperty);
@@ -108,9 +112,9 @@ export const RelationExpression = 'RelationExpression';
 export function isRelationExpression(item) {
     return reflection.isInstance(item, RelationExpression);
 }
-export const RelationProperty = 'RelationProperty';
-export function isRelationProperty(item) {
-    return reflection.isInstance(item, RelationProperty);
+export const RelationStringProperty = 'RelationStringProperty';
+export function isRelationStringProperty(item) {
+    return reflection.isInstance(item, RelationStringProperty);
 }
 export const ShapeProperty = 'ShapeProperty';
 export function isShapeProperty(item) {
@@ -170,7 +174,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', 'ViewRuleAutoLayout', 'ViewRuleExpression', 'ViewRuleStyle', 'WildcardExpression'];
+        return ['AStyleProperty', 'AnyStringProperty', 'ColorProperty', 'Element', 'ElementBody', 'ElementExpression', 'ElementKind', 'ElementProperty', 'ElementRef', 'ElementRefExpression', 'ElementStringProperty', 'ElementStyleProperty', 'ElementView', 'Expression', 'ExtendElement', 'ExtendElementBody', 'InOutExpression', 'IncomingExpression', 'LikeC4Document', 'Model', 'ModelViews', 'OutgoingExpression', 'Relation', 'RelationBody', 'RelationExpression', 'RelationStringProperty', 'RelationWithSource', 'ShapeProperty', 'SpecificationElementKind', 'SpecificationElementKindStyle', 'SpecificationRule', 'SpecificationTag', 'StrictElementRef', 'Tag', 'Tags', 'View', 'ViewProperty', 'ViewRule', 'ViewRuleAutoLayout', 'ViewRuleExpression', 'ViewRuleStyle', 'WildcardExpression'];
     }
     computeIsSubtype(subtype, supertype) {
         switch (subtype) {
@@ -189,13 +193,19 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case WildcardExpression: {
                 return this.isSubtype(ElementExpression, supertype);
             }
-            case ElementStringProperty:
+            case ElementStringProperty: {
+                return this.isSubtype(AnyStringProperty, supertype) || this.isSubtype(ElementProperty, supertype);
+            }
             case ElementStyleProperty: {
                 return this.isSubtype(ElementProperty, supertype);
             }
             case ElementView: {
                 return this.isSubtype(View, supertype);
             }
+            case RelationStringProperty:
+            case ViewProperty: {
+                return this.isSubtype(AnyStringProperty, supertype);
+            }
             case RelationWithSource: {
                 return this.isSubtype(Relation, supertype);
             }