@likec4/language-server 1.8.0 → 1.8.1

package/contrib/likec4.tmLanguage.json

@@ -12,7 +12,7 @@
     },
     {
       "name": "keyword.control.likec4",
-      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|and|autoLayout|blue|border|browser|color|crow|cylinder|dashed|description|diamond|dot|dotted|dynamic|element|element\\.kind|element\\.tag|exclude|extend|extends|gray|green|head|icon|icons|include|indigo|is|it|kind|likec4lib|line|link|metadata|mobile|model|muted|navigateTo|none|normal|not|notation|odiamond|odot|of|onormal|opacity|open|or|person|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|specification|storage|style|tag|tail|technology|this|title|vee|view|views|where|with)\\b"
+      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|and|autoLayout|blue|border|browser|color|crow|cylinder|dashed|description|diamond|dot|dotted|dynamic|element|element\\.kind|element\\.tag|exclude|extend|extends|gray|green|head|icon|icons|include|indigo|is|kind|likec4lib|line|link|metadata|mobile|model|muted|navigateTo|none|normal|not|notation|odiamond|odot|of|onormal|opacity|open|or|person|primary|queue|rectangle|red|relationship|secondary|shape|sky|slate|solid|specification|storage|style|tag|tail|technology|title|vee|view|views|where|with)\\b"
     },
     {
       "name": "string.quoted.double.likec4",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -92,8 +92,8 @@
   },
   "dependencies": {
     "@dagrejs/graphlib": "^2.2.4",
-    "@likec4/core": "1.8.0",
-    "@likec4/log": "1.8.0",
+    "@likec4/core": "1.8.1",
+    "@likec4/log": "1.8.1",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "@total-typescript/ts-reset": "^0.5.1",
@@ -114,8 +114,8 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.8.0",
-    "@likec4/tsconfig": "1.8.0",
+    "@likec4/icons": "1.8.1",
+    "@likec4/tsconfig": "1.8.1",
     "@types/node": "^20.16.1",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",

package/src/ast.ts

@@ -4,12 +4,11 @@ import {
   DefaultLineStyle,
   DefaultRelationshipColor,
   nonexhaustive,
-  NullableError,
   RelationRefError
 } from '@likec4/core'
 import type { AstNode, AstNodeDescription, DiagnosticInfo, LangiumDocument, MultiMap } from 'langium'
 import { DocumentState } from 'langium'
-import { clamp, isNullish, isTruthy } from 'remeda'
+import { clamp, isDefined, isNullish, isTruthy } from 'remeda'
 import type { ConditionalPick, SetRequired, ValueOf } from 'type-fest'
 import type { Diagnostic } from 'vscode-languageserver-types'
 import { DiagnosticSeverity } from 'vscode-languageserver-types'
@@ -323,7 +322,7 @@ export function resolveRelationPoints(node: ast.Relation): {
   if (!target) {
     throw new RelationRefError('Invalid reference to target')
   }
-  if (ast.isExplicitRelation(node)) {
+  if (isDefined(node.source)) {
     const source = elementRef(node.source)
     if (!source) {
       throw new RelationRefError('Invalid reference to source')
@@ -333,6 +332,9 @@ export function resolveRelationPoints(node: ast.Relation): {
       target
     }
   }
+  if (!ast.isElementBody(node.$container)) {
+    throw new RelationRefError('Invalid container for sourceless relation')
+  }
   return {
     source: node.$container.$container,
     target

package/src/generated/ast.ts

@@ -132,14 +132,6 @@ export function isPredicate(item: unknown): item is Predicate {
     return reflection.isInstance(item, Predicate);
 }
 
-export type Relation = ExplicitRelation | ImplicitRelation;
-
-export const Relation = 'Relation';
-
-export function isRelation(item: unknown): item is Relation {
-    return reflection.isInstance(item, Relation);
-}
-
 export type RelationExpression = DirectedRelationExpression | InOutRelationExpression | IncomingRelationExpression | OutgoingRelationExpression;
 
 export const RelationExpression = 'RelationExpression';
@@ -552,7 +544,7 @@ export function isElementPredicateWith(item: unknown): item is ElementPredicateW
 }
 
 export interface ElementRef extends AstNode {
-    readonly $container: DirectedRelationExpression | DynamicViewPredicateIterator | DynamicViewStep | ElementDescedantsExpression | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | ElementRef | ElementView | ExpandElementExpression | ExplicitRelation | ImplicitRelation | IncomingRelationExpression | OutgoingRelationExpression | Predicates;
+    readonly $container: DirectedRelationExpression | DynamicViewPredicateIterator | DynamicViewStep | ElementDescedantsExpression | ElementExpressionsIterator | ElementPredicateWhere | ElementPredicateWith | ElementRef | ElementView | ExpandElementExpression | IncomingRelationExpression | OutgoingRelationExpression | Predicates | Relation;
     readonly $type: 'ElementRef';
     el: Reference<Element>;
     parent?: ElementRef;
@@ -668,24 +660,6 @@ export function isExpandElementExpression(item: unknown): item is ExpandElementE
     return reflection.isInstance(item, ExpandElementExpression);
 }
 
-export interface ExplicitRelation extends AstNode {
-    readonly $container: ElementBody | ExtendElementBody | Model;
-    readonly $type: 'ExplicitRelation';
-    body?: RelationBody;
-    kind?: Reference<RelationshipKind>;
-    source: ElementRef;
-    tags?: Tags;
-    target: ElementRef;
-    technology?: string;
-    title?: string;
-}
-
-export const ExplicitRelation = 'ExplicitRelation';
-
-export function isExplicitRelation(item: unknown): item is ExplicitRelation {
-    return reflection.isInstance(item, ExplicitRelation);
-}
-
 export interface ExtendElement extends AstNode {
     readonly $container: Model;
     readonly $type: 'ExtendElement';
@@ -702,7 +676,7 @@ export function isExtendElement(item: unknown): item is ExtendElement {
 export interface ExtendElementBody extends AstNode {
     readonly $container: ExtendElement;
     readonly $type: 'ExtendElementBody';
-    elements: Array<Element | ExplicitRelation>;
+    elements: Array<Element | Relation>;
 }
 
 export const ExtendElementBody = 'ExtendElementBody';
@@ -738,23 +712,6 @@ export function isIconProperty(item: unknown): item is IconProperty {
     return reflection.isInstance(item, IconProperty);
 }
 
-export interface ImplicitRelation extends AstNode {
-    readonly $container: ElementBody;
-    readonly $type: 'ImplicitRelation';
-    body?: RelationBody;
-    kind?: Reference<RelationshipKind>;
-    tags?: Tags;
-    target: ElementRef;
-    technology?: string;
-    title?: string;
-}
-
-export const ImplicitRelation = 'ImplicitRelation';
-
-export function isImplicitRelation(item: unknown): item is ImplicitRelation {
-    return reflection.isInstance(item, ImplicitRelation);
-}
-
 export interface IncludePredicate extends AstNode {
     readonly $container: ElementViewBody;
     readonly $type: 'IncludePredicate';
@@ -884,7 +841,7 @@ export function isMetadataBody(item: unknown): item is MetadataBody {
 export interface Model extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'Model';
-    elements: Array<Element | ExplicitRelation | ExtendElement>;
+    elements: Array<Element | ExtendElement | Relation>;
     name: 'model';
 }
 
@@ -973,8 +930,26 @@ export function isPredicates(item: unknown): item is Predicates {
     return reflection.isInstance(item, Predicates);
 }
 
+export interface Relation extends AstNode {
+    readonly $container: ElementBody | ExtendElementBody | Model;
+    readonly $type: 'Relation';
+    body?: RelationBody;
+    kind?: Reference<RelationshipKind>;
+    source?: ElementRef;
+    tags?: Tags;
+    target: ElementRef;
+    technology?: string;
+    title?: string;
+}
+
+export const Relation = 'Relation';
+
+export function isRelation(item: unknown): item is Relation {
+    return reflection.isInstance(item, Relation);
+}
+
 export interface RelationBody extends AstNode {
-    readonly $container: ExplicitRelation | ImplicitRelation;
+    readonly $container: Relation;
     readonly $type: 'RelationBody';
     props: Array<RelationProperty>;
     tags?: Tags;
@@ -1155,7 +1130,7 @@ export function isTag(item: unknown): item is Tag {
 }
 
 export interface Tags extends AstNode {
-    readonly $container: DynamicViewBody | ElementBody | ElementViewBody | ExplicitRelation | ImplicitRelation | RelationBody | Tags;
+    readonly $container: DynamicViewBody | ElementBody | ElementViewBody | Relation | RelationBody | Tags;
     readonly $type: 'Tags';
     prev?: Tags;
     values: Array<Reference<Tag>>;
@@ -1357,12 +1332,10 @@ export type LikeC4AstType = {
     ElementViewRef: ElementViewRef
     ExcludePredicate: ExcludePredicate
     ExpandElementExpression: ExpandElementExpression
-    ExplicitRelation: ExplicitRelation
     ExtendElement: ExtendElement
     ExtendElementBody: ExtendElementBody
     FqnElementRef: FqnElementRef
     IconProperty: IconProperty
-    ImplicitRelation: ImplicitRelation
     InOutRelationExpression: InOutRelationExpression
     IncludePredicate: IncludePredicate
     IncomingRelationExpression: IncomingRelationExpression
@@ -1433,7 +1406,7 @@ export type LikeC4AstType = {
 export class LikeC4AstReflection extends AbstractAstReflection {
 
     getAllTypes(): string[] {
-        return [ArrowProperty, BorderProperty, ColorProperty, CustomElementProperties, CustomRelationProperties, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewIncludePredicate, DynamicViewPredicateIterator, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementDescedantsExpression, ElementExpression, ElementExpressionsIterator, ElementKind, ElementKindExpression, ElementPredicate, ElementPredicateOrWhere, ElementPredicateWhere, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExplicitRelation, ExtendElement, ExtendElementBody, FqnElementRef, IconProperty, ImplicitRelation, InOutRelationExpression, IncludePredicate, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelViews, NavigateToProperty, NotationProperty, OpacityProperty, OutgoingRelationExpression, Predicate, Predicates, Relation, RelationBody, RelationExpression, RelationPredicate, RelationPredicateOrWhere, RelationPredicateWhere, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StringProperty, StyleProperty, Tag, Tags, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRulePredicate, ViewRuleStyle, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationTag, WhereTagEqual, WildcardExpression];
+        return [ArrowProperty, BorderProperty, ColorProperty, CustomElementProperties, CustomRelationProperties, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewIncludePredicate, DynamicViewPredicateIterator, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementDescedantsExpression, ElementExpression, ElementExpressionsIterator, ElementKind, ElementKindExpression, ElementPredicate, ElementPredicateOrWhere, ElementPredicateWhere, ElementPredicateWith, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExcludePredicate, ExpandElementExpression, ExtendElement, ExtendElementBody, FqnElementRef, IconProperty, InOutRelationExpression, IncludePredicate, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelViews, NavigateToProperty, NotationProperty, OpacityProperty, OutgoingRelationExpression, Predicate, Predicates, Relation, RelationBody, RelationExpression, RelationPredicate, RelationPredicateOrWhere, RelationPredicateWhere, RelationPredicateWith, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StringProperty, StyleProperty, Tag, Tags, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRulePredicate, ViewRuleStyle, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationTag, WhereTagEqual, WildcardExpression];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -1493,10 +1466,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case IncludePredicate: {
                 return this.isSubtype(ViewRulePredicate, supertype);
             }
-            case ExplicitRelation:
-            case ImplicitRelation: {
-                return this.isSubtype(Relation, supertype);
-            }
             case IconProperty: {
                 return this.isSubtype(ElementProperty, supertype) || this.isSubtype(StyleProperty, supertype);
             }
@@ -1576,9 +1545,8 @@ export class LikeC4AstReflection extends AbstractAstReflection {
         const referenceId = `${refInfo.container.$type}:${refInfo.property}`;
         switch (referenceId) {
             case 'DynamicViewStep:kind':
-            case 'ExplicitRelation:kind':
-            case 'ImplicitRelation:kind':
             case 'OutgoingRelationExpression:kind':
+            case 'Relation:kind':
             case 'WhereRelationKind:value': {
                 return RelationshipKind;
             }
@@ -1870,20 +1838,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
-            case ExplicitRelation: {
-                return {
-                    name: ExplicitRelation,
-                    properties: [
-                        { name: 'body' },
-                        { name: 'kind' },
-                        { name: 'source' },
-                        { name: 'tags' },
-                        { name: 'target' },
-                        { name: 'technology' },
-                        { name: 'title' }
-                    ]
-                };
-            }
             case ExtendElement: {
                 return {
                     name: ExtendElement,
@@ -1920,19 +1874,6 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
-            case ImplicitRelation: {
-                return {
-                    name: ImplicitRelation,
-                    properties: [
-                        { name: 'body' },
-                        { name: 'kind' },
-                        { name: 'tags' },
-                        { name: 'target' },
-                        { name: 'technology' },
-                        { name: 'title' }
-                    ]
-                };
-            }
             case IncludePredicate: {
                 return {
                     name: IncludePredicate,
@@ -2084,6 +2025,20 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case Relation: {
+                return {
+                    name: Relation,
+                    properties: [
+                        { name: 'body' },
+                        { name: 'kind' },
+                        { name: 'source' },
+                        { name: 'tags' },
+                        { name: 'target' },
+                        { name: 'technology' },
+                        { name: 'title' }
+                    ]
+                };
+            }
             case RelationBody: {
                 return {
                     name: RelationBody,