@likec4/language-server 1.8.0 → 1.9.0

package/src/generated/ast.ts

@@ -24,6 +24,7 @@ export const LikeC4Terminals = {
     Percent: /\b\d+%/,
     String: /"[^"]*"|'[^']*'/,
     IdTerminal: /[_]*[a-zA-Z][-\w]*/,
+    Hex: /[a-zA-Z0-9]+/,
 };
 
 export type ArrowType = 'crow' | 'diamond' | 'dot' | 'none' | 'normal' | 'odiamond' | 'odot' | 'onormal' | 'open' | 'vee';
@@ -38,6 +39,18 @@ export function isBorderStyleValue(item: unknown): item is BorderStyleValue {
     return isLineOptions(item) || item === 'none';
 }
 
+export type CustomColorId = 'element' | 'model' | ArrowType | ElementShape | LineOptions | string;
+
+export function isCustomColorId(item: unknown): item is CustomColorId {
+    return isElementShape(item) || isArrowType(item) || isLineOptions(item) || item === 'element' || item === 'model' || (typeof item === 'string' && (/[_]*[a-zA-Z][-\w]*/.test(item)));
+}
+
+export type CustomColorValue = string;
+
+export function isCustomColorValue(item: unknown): item is CustomColorValue {
+    return typeof item === 'string';
+}
+
 export type DotId = string;
 
 export function isDotId(item: unknown): item is DotId {
@@ -132,14 +145,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';
@@ -329,8 +334,9 @@ export function isBorderProperty(item: unknown): item is BorderProperty {
 export interface ColorProperty extends AstNode {
     readonly $container: CustomElementProperties | CustomRelationProperties | ElementStyleProperty | RelationStyleProperty | SpecificationRelationshipKind | ViewRuleStyle;
     readonly $type: 'ColorProperty';
+    customColor?: Reference<CustomColor>;
     key: 'color';
-    value: ThemeColor;
+    themeColor?: ThemeColor;
 }
 
 export const ColorProperty = 'ColorProperty';
@@ -339,6 +345,18 @@ export function isColorProperty(item: unknown): item is ColorProperty {
     return reflection.isInstance(item, ColorProperty);
 }
 
+export interface CustomColor extends AstNode {
+    readonly $container: SpecificationColor;
+    readonly $type: 'CustomColor';
+    name: CustomColorId;
+}
+
+export const CustomColor = 'CustomColor';
+
+export function isCustomColor(item: unknown): item is CustomColor {
+    return reflection.isInstance(item, CustomColor);
+}
+
 export interface CustomElementProperties extends AstNode {
     readonly $container: ElementPredicateWith;
     readonly $type: 'CustomElementProperties';
@@ -552,7 +570,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 +686,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 +702,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 +738,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 +867,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 +956,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;
@@ -1063,6 +1064,19 @@ export function isShapeProperty(item: unknown): item is ShapeProperty {
     return reflection.isInstance(item, ShapeProperty);
 }
 
+export interface SpecificationColor extends AstNode {
+    readonly $container: SpecificationRule;
+    readonly $type: 'SpecificationColor';
+    color: CustomColorValue;
+    name: CustomColor;
+}
+
+export const SpecificationColor = 'SpecificationColor';
+
+export function isSpecificationColor(item: unknown): item is SpecificationColor {
+    return reflection.isInstance(item, SpecificationColor);
+}
+
 export interface SpecificationElementKind extends AstNode {
     readonly $container: SpecificationRule;
     readonly $type: 'SpecificationElementKind';
@@ -1118,6 +1132,7 @@ export function isSpecificationRelationshipStringProperty(item: unknown): item i
 export interface SpecificationRule extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'SpecificationRule';
+    colors: Array<SpecificationColor>;
     elements: Array<SpecificationElementKind>;
     name: 'specification';
     relationships: Array<SpecificationRelationshipKind>;
@@ -1155,7 +1170,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>>;
@@ -1327,6 +1342,7 @@ export type LikeC4AstType = {
     ArrowProperty: ArrowProperty
     BorderProperty: BorderProperty
     ColorProperty: ColorProperty
+    CustomColor: CustomColor
     CustomElementProperties: CustomElementProperties
     CustomRelationProperties: CustomRelationProperties
     DirectedRelationExpression: DirectedRelationExpression
@@ -1357,12 +1373,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
@@ -1396,6 +1410,7 @@ export type LikeC4AstType = {
     RelationshipKind: RelationshipKind
     RelationshipStyleProperty: RelationshipStyleProperty
     ShapeProperty: ShapeProperty
+    SpecificationColor: SpecificationColor
     SpecificationElementKind: SpecificationElementKind
     SpecificationElementStringProperty: SpecificationElementStringProperty
     SpecificationRelationshipKind: SpecificationRelationshipKind
@@ -1433,7 +1448,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, CustomColor, 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, SpecificationColor, 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 +1508,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);
             }
@@ -1575,10 +1586,12 @@ export class LikeC4AstReflection extends AbstractAstReflection {
     getReferenceType(refInfo: ReferenceInfo): string {
         const referenceId = `${refInfo.container.$type}:${refInfo.property}`;
         switch (referenceId) {
+            case 'ColorProperty:customColor': {
+                return CustomColor;
+            }
             case 'DynamicViewStep:kind':
-            case 'ExplicitRelation:kind':
-            case 'ImplicitRelation:kind':
             case 'OutgoingRelationExpression:kind':
+            case 'Relation:kind':
             case 'WhereRelationKind:value': {
                 return RelationshipKind;
             }
@@ -1636,8 +1649,17 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: ColorProperty,
                     properties: [
+                        { name: 'customColor' },
                         { name: 'key' },
-                        { name: 'value' }
+                        { name: 'themeColor' }
+                    ]
+                };
+            }
+            case CustomColor: {
+                return {
+                    name: CustomColor,
+                    properties: [
+                        { name: 'name' }
                     ]
                 };
             }
@@ -1870,20 +1892,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 +1928,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 +2079,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,
@@ -2146,6 +2155,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case SpecificationColor: {
+                return {
+                    name: SpecificationColor,
+                    properties: [
+                        { name: 'color' },
+                        { name: 'name' }
+                    ]
+                };
+            }
             case SpecificationElementKind: {
                 return {
                     name: SpecificationElementKind,
@@ -2186,6 +2204,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: SpecificationRule,
                     properties: [
+                        { name: 'colors', defaultValue: [] },
                         { name: 'elements', defaultValue: [] },
                         { name: 'name' },
                         { name: 'relationships', defaultValue: [] },