@likec4/language-server 1.14.0 → 1.15.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -112,8 +112,8 @@
   },
   "dependencies": {
     "@dagrejs/dagre": "^1.1.4",
-    "@likec4/core": "1.14.0",
-    "@likec4/log": "1.14.0",
+    "@likec4/core": "1.15.0",
+    "@likec4/log": "1.15.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
@@ -133,20 +133,20 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.14.0",
-    "@likec4/tsconfig": "1.14.0",
-    "@types/node": "^20.16.5",
+    "@likec4/icons": "1.15.0",
+    "@likec4/tsconfig": "1.15.0",
+    "@types/node": "^20.16.14",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
     "@vitest/coverage-v8": "^2.1.3",
     "execa": "^9.3.1",
     "langium-cli": "3.2.0",
-    "npm-run-all2": "^6.2.2",
+    "npm-run-all2": "^6.2.6",
     "tsx": "~4.9.3",
-    "turbo": "^2.1.3",
+    "turbo": "^2.2.3",
     "typescript": "^5.6.3",
     "unbuild": "^3.0.0-rc.11",
     "vitest": "^2.1.3"
   },
-  "packageManager": "yarn@4.5.0"
+  "packageManager": "yarn@4.5.1"
 }

package/src/ast.ts

@@ -236,6 +236,7 @@ function validatableAstNodeGuards<const Predicates extends Guard<AstNode>[]>(
 const isValidatableAstNode = validatableAstNodeGuards([
   ast.isGlobals,
   ast.isGlobalStyle,
+  ast.isGlobalStyleGroup,
   ast.isDynamicViewPredicateIterator,
   ast.isElementPredicateWith,
   ast.isRelationPredicateWith,

package/src/generated/ast.ts

@@ -71,6 +71,7 @@ export type LikeC4KeywordNames =
     | "global"
     | "gray"
     | "green"
+    | "group"
     | "head"
     | "icon"
     | "icons"
@@ -114,6 +115,7 @@ export type LikeC4KeywordNames =
     | "specification"
     | "storage"
     | "style"
+    | "styleGroup"
     | "tag"
     | "tail"
     | "technology"
@@ -158,7 +160,7 @@ export function isDotId(item: unknown): item is DotId {
     return typeof item === 'string';
 }
 
-export type DynamicViewRule = DynamicViewIncludePredicate | ViewRuleAutoLayout | ViewRuleGlobalStyle | ViewRuleStyle;
+export type DynamicViewRule = DynamicViewIncludePredicate | ViewRuleAutoLayout | ViewRuleStyleOrGlobalRef;
 
 export const DynamicViewRule = 'DynamicViewRule';
 
@@ -210,10 +212,10 @@ export function isIconId(item: unknown): item is IconId {
     return (typeof item === 'string' && (/(aws|azure|gcp|tech):[-\w]*/.test(item)));
 }
 
-export type Id = 'element' | 'model' | ArrowType | ElementShape | LineOptions | ThemeColor | string;
+export type Id = 'element' | 'group' | 'model' | ArrowType | ElementShape | LineOptions | ThemeColor | string;
 
 export function isId(item: unknown): item is Id {
-    return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || item === 'element' || item === 'model' || (typeof item === 'string' && (/[_]*[a-zA-Z][-\w]*/.test(item)));
+    return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || item === 'element' || item === 'model' || item === 'group' || (typeof item === 'string' && (/[_]*[a-zA-Z][-\w]*/.test(item)));
 }
 
 export type LikeC4View = DynamicView | ElementView;
@@ -334,7 +336,7 @@ export function isViewProperty(item: unknown): item is ViewProperty {
     return reflection.isInstance(item, ViewProperty);
 }
 
-export type ViewRule = ViewRuleAutoLayout | ViewRuleGlobalStyle | ViewRulePredicate | ViewRuleStyle;
+export type ViewRule = ViewRuleAutoLayout | ViewRuleGroup | ViewRulePredicate | ViewRuleStyleOrGlobalRef;
 
 export const ViewRule = 'ViewRule';
 
@@ -350,6 +352,14 @@ export function isViewRulePredicate(item: unknown): item is ViewRulePredicate {
     return reflection.isInstance(item, ViewRulePredicate);
 }
 
+export type ViewRuleStyleOrGlobalRef = ViewRuleGlobalStyle | ViewRuleStyle;
+
+export const ViewRuleStyleOrGlobalRef = 'ViewRuleStyleOrGlobalRef';
+
+export function isViewRuleStyleOrGlobalRef(item: unknown): item is ViewRuleStyleOrGlobalRef {
+    return reflection.isInstance(item, ViewRuleStyleOrGlobalRef);
+}
+
 export type WhereElement = WhereElementKind | WhereElementTag;
 
 export const WhereElement = 'WhereElement';
@@ -420,7 +430,7 @@ export function isArrowProperty(item: unknown): item is ArrowProperty {
 }
 
 export interface BorderProperty extends AstNode {
-    readonly $container: CustomElementProperties | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
+    readonly $container: CustomElementProperties | ElementStyleProperty | GlobalStyle | ViewRuleGroup | ViewRuleStyle;
     readonly $type: 'BorderProperty';
     key: 'border';
     value: BorderStyleValue;
@@ -433,7 +443,7 @@ export function isBorderProperty(item: unknown): item is BorderProperty {
 }
 
 export interface ColorProperty extends AstNode {
-    readonly $container: CustomElementProperties | CustomRelationProperties | ElementStyleProperty | GlobalStyle | RelationStyleProperty | SpecificationRelationshipKind | ViewRuleStyle;
+    readonly $container: CustomElementProperties | CustomRelationProperties | ElementStyleProperty | GlobalStyle | RelationStyleProperty | SpecificationRelationshipKind | ViewRuleGroup | ViewRuleStyle;
     readonly $type: 'ColorProperty';
     customColor?: Reference<CustomColor>;
     key: 'color';
@@ -788,7 +798,7 @@ export function isElementViewRef(item: unknown): item is ElementViewRef {
 }
 
 export interface ExcludePredicate extends AstNode {
-    readonly $container: ElementViewBody;
+    readonly $container: ElementViewBody | ViewRuleGroup;
     readonly $type: 'ExcludePredicate';
     predicates: Predicates;
 }
@@ -853,7 +863,7 @@ export interface Globals extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'Globals';
     name: 'global';
-    styles: Array<GlobalStyle>;
+    styles: Array<GlobalStyle | GlobalStyleGroup>;
 }
 
 export const Globals = 'Globals';
@@ -865,7 +875,7 @@ export function isGlobals(item: unknown): item is Globals {
 export interface GlobalStyle extends AstNode {
     readonly $container: Globals;
     readonly $type: 'GlobalStyle';
-    name: string;
+    id: GlobalStyleId;
     props: Array<NotationProperty | StyleProperty>;
     target: ElementExpressionsIterator;
 }
@@ -876,6 +886,31 @@ export function isGlobalStyle(item: unknown): item is GlobalStyle {
     return reflection.isInstance(item, GlobalStyle);
 }
 
+export interface GlobalStyleGroup extends AstNode {
+    readonly $container: Globals;
+    readonly $type: 'GlobalStyleGroup';
+    id: GlobalStyleId;
+    styles: Array<ViewRuleStyle>;
+}
+
+export const GlobalStyleGroup = 'GlobalStyleGroup';
+
+export function isGlobalStyleGroup(item: unknown): item is GlobalStyleGroup {
+    return reflection.isInstance(item, GlobalStyleGroup);
+}
+
+export interface GlobalStyleId extends AstNode {
+    readonly $container: GlobalStyle | GlobalStyleGroup;
+    readonly $type: 'GlobalStyleId';
+    name: string;
+}
+
+export const GlobalStyleId = 'GlobalStyleId';
+
+export function isGlobalStyleId(item: unknown): item is GlobalStyleId {
+    return reflection.isInstance(item, GlobalStyleId);
+}
+
 export interface IconProperty extends AstNode {
     readonly $container: CustomElementProperties | ElementBody | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
     readonly $type: 'IconProperty';
@@ -891,7 +926,7 @@ export function isIconProperty(item: unknown): item is IconProperty {
 }
 
 export interface IncludePredicate extends AstNode {
-    readonly $container: ElementViewBody;
+    readonly $container: ElementViewBody | ViewRuleGroup;
     readonly $type: 'IncludePredicate';
     predicates: Predicates;
 }
@@ -1034,7 +1069,7 @@ export interface ModelViews extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'ModelViews';
     name: 'views';
-    styles: Array<ViewRuleStyle>;
+    styles: Array<ViewRuleStyleOrGlobalRef>;
     views: Array<LikeC4View>;
 }
 
@@ -1084,7 +1119,7 @@ export function isNotesProperty(item: unknown): item is NotesProperty {
 }
 
 export interface OpacityProperty extends AstNode {
-    readonly $container: CustomElementProperties | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
+    readonly $container: CustomElementProperties | ElementStyleProperty | GlobalStyle | ViewRuleGroup | ViewRuleStyle;
     readonly $type: 'OpacityProperty';
     key: 'opacity';
     value: string;
@@ -1389,9 +1424,9 @@ export function isViewRuleAutoLayout(item: unknown): item is ViewRuleAutoLayout
 }
 
 export interface ViewRuleGlobalStyle extends AstNode {
-    readonly $container: DynamicViewBody | ElementViewBody;
+    readonly $container: DynamicViewBody | ElementViewBody | ModelViews;
     readonly $type: 'ViewRuleGlobalStyle';
-    style: Reference<GlobalStyle>;
+    style: Reference<GlobalStyleId>;
 }
 
 export const ViewRuleGlobalStyle = 'ViewRuleGlobalStyle';
@@ -1400,8 +1435,22 @@ export function isViewRuleGlobalStyle(item: unknown): item is ViewRuleGlobalStyl
     return reflection.isInstance(item, ViewRuleGlobalStyle);
 }
 
+export interface ViewRuleGroup extends AstNode {
+    readonly $container: ElementViewBody | ViewRuleGroup;
+    readonly $type: 'ViewRuleGroup';
+    groupRules: Array<ViewRuleGroup | ViewRulePredicate>;
+    props: Array<BorderProperty | ColorProperty | OpacityProperty>;
+    title?: string;
+}
+
+export const ViewRuleGroup = 'ViewRuleGroup';
+
+export function isViewRuleGroup(item: unknown): item is ViewRuleGroup {
+    return reflection.isInstance(item, ViewRuleGroup);
+}
+
 export interface ViewRuleStyle extends AstNode {
-    readonly $container: DynamicViewBody | ElementViewBody | ModelViews;
+    readonly $container: DynamicViewBody | ElementViewBody | GlobalStyleGroup | ModelViews;
     readonly $type: 'ViewRuleStyle';
     props: Array<NotationProperty | StyleProperty>;
     target: ElementExpressionsIterator;
@@ -1573,6 +1622,8 @@ export type LikeC4AstType = {
     ExtendElementBody: ExtendElementBody
     FqnElementRef: FqnElementRef
     GlobalStyle: GlobalStyle
+    GlobalStyleGroup: GlobalStyleGroup
+    GlobalStyleId: GlobalStyleId
     Globals: Globals
     IconProperty: IconProperty
     InOutRelationExpression: InOutRelationExpression
@@ -1626,8 +1677,10 @@ export type LikeC4AstType = {
     ViewRule: ViewRule
     ViewRuleAutoLayout: ViewRuleAutoLayout
     ViewRuleGlobalStyle: ViewRuleGlobalStyle
+    ViewRuleGroup: ViewRuleGroup
     ViewRulePredicate: ViewRulePredicate
     ViewRuleStyle: ViewRuleStyle
+    ViewRuleStyleOrGlobalRef: ViewRuleStyleOrGlobalRef
     ViewStringProperty: ViewStringProperty
     WhereBinaryExpression: WhereBinaryExpression
     WhereElement: WhereElement
@@ -1649,7 +1702,7 @@ export type LikeC4AstType = {
 export class LikeC4AstReflection extends AbstractAstReflection {
 
     getAllTypes(): string[] {
-        return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewPredicateIterator, DynamicViewRef, 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, GlobalStyle, Globals, IconProperty, InOutRelationExpression, IncludePredicate, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelViews, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpression, Predicate, Predicates, Relation, RelationBody, RelationExpression, RelationNavigateToProperty, 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, ViewRuleGlobalStyle, 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, DynamicViewParallelSteps, DynamicViewPredicateIterator, DynamicViewRef, 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, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, IconProperty, InOutRelationExpression, IncludePredicate, IncomingRelationExpression, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelViews, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpression, Predicate, Predicates, Relation, RelationBody, RelationExpression, RelationNavigateToProperty, 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, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationTag, WhereTagEqual, WildcardExpression];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -1744,10 +1797,14 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return this.isSubtype(RelationProperty, supertype) || this.isSubtype(StringProperty, supertype);
             }
             case ViewRuleAutoLayout:
+            case ViewRuleStyleOrGlobalRef: {
+                return this.isSubtype(DynamicViewRule, supertype) || this.isSubtype(ViewRule, supertype);
+            }
             case ViewRuleGlobalStyle:
             case ViewRuleStyle: {
-                return this.isSubtype(DynamicViewRule, supertype) || this.isSubtype(ViewRule, supertype);
+                return this.isSubtype(ViewRuleStyleOrGlobalRef, supertype);
             }
+            case ViewRuleGroup:
             case ViewRulePredicate: {
                 return this.isSubtype(ViewRule, supertype);
             }
@@ -1827,7 +1884,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return LikeC4View;
             }
             case 'ViewRuleGlobalStyle:style': {
-                return GlobalStyle;
+                return GlobalStyleId;
             }
             default: {
                 throw new Error(`${referenceId} is not a valid reference id.`);
@@ -2157,12 +2214,29 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: GlobalStyle,
                     properties: [
-                        { name: 'name' },
+                        { name: 'id' },
                         { name: 'props', defaultValue: [] },
                         { name: 'target' }
                     ]
                 };
             }
+            case GlobalStyleGroup: {
+                return {
+                    name: GlobalStyleGroup,
+                    properties: [
+                        { name: 'id' },
+                        { name: 'styles', defaultValue: [] }
+                    ]
+                };
+            }
+            case GlobalStyleId: {
+                return {
+                    name: GlobalStyleId,
+                    properties: [
+                        { name: 'name' }
+                    ]
+                };
+            }
             case IconProperty: {
                 return {
                     name: IconProperty,
@@ -2528,6 +2602,16 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case ViewRuleGroup: {
+                return {
+                    name: ViewRuleGroup,
+                    properties: [
+                        { name: 'groupRules', defaultValue: [] },
+                        { name: 'props', defaultValue: [] },
+                        { name: 'title' }
+                    ]
+                };
+            }
             case ViewRuleStyle: {
                 return {
                     name: ViewRuleStyle,