@likec4/language-server 1.15.0 → 1.16.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.15.0",
+  "version": "1.16.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.15.0",
-    "@likec4/log": "1.15.0",
+    "@likec4/core": "1.16.0",
+    "@likec4/log": "1.16.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
@@ -122,7 +122,7 @@
     "langium": "3.2.0",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
-    "remeda": "^2.15.0",
+    "remeda": "^2.16.0",
     "string-hash": "^1.1.3",
     "strip-indent": "^4.0.0",
     "type-fest": "4.26.1",
@@ -133,12 +133,12 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.15.0",
-    "@likec4/tsconfig": "1.15.0",
+    "@likec4/icons": "1.16.0",
+    "@likec4/tsconfig": "1.16.0",
     "@types/node": "^20.16.14",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
-    "@vitest/coverage-v8": "^2.1.3",
+    "@vitest/coverage-v8": "^2.1.4",
     "execa": "^9.3.1",
     "langium-cli": "3.2.0",
     "npm-run-all2": "^6.2.6",
@@ -146,7 +146,7 @@
     "turbo": "^2.2.3",
     "typescript": "^5.6.3",
     "unbuild": "^3.0.0-rc.11",
-    "vitest": "^2.1.3"
+    "vitest": "^2.1.4"
   },
   "packageManager": "yarn@4.5.1"
 }

package/src/ast.ts

@@ -93,9 +93,13 @@ export interface ParsedAstRelation {
   metadata?: { [key: string]: string }
 }
 
-export interface ParsedAstGlobals {
-  styles: Record<c4.GlobalStyleID, c4.NonEmptyArray<c4.ViewRuleStyle>>
-}
+// export interface ParsedAstGlobals {
+//   predicates: Record<c4.GlobalElRelID, c4.NonEmptyArray<c4.ViewRulePredicate>>
+//   dynamicPredicates: Record<c4.GlobalElRelID, c4.NonEmptyArray<c4.DynamicViewIncludeRule>>
+//   styles: Record<c4.GlobalStyleID, c4.NonEmptyArray<c4.ViewRuleStyle>>
+// }
+// Alias for refactoring
+export type ParsedAstGlobals = c4.ModelGlobals
 
 export interface ParsedAstElementView {
   __: 'element'
@@ -196,6 +200,8 @@ export function cleanParsedModel(doc: LikeC4LangiumDocument) {
     c4Elements: [],
     c4Relations: [],
     c4Globals: {
+      predicates: {},
+      dynamicPredicates: {},
       styles: {}
     },
     c4Views: []
@@ -235,6 +241,8 @@ function validatableAstNodeGuards<const Predicates extends Guard<AstNode>[]>(
 }
 const isValidatableAstNode = validatableAstNodeGuards([
   ast.isGlobals,
+  ast.isGlobalPredicateGroup,
+  ast.isGlobalDynamicPredicateGroup,
   ast.isGlobalStyle,
   ast.isGlobalStyleGroup,
   ast.isDynamicViewPredicateIterator,

package/src/formatting/LikeC4Formatter.ts

@@ -17,17 +17,29 @@ export class LikeC4Formatter extends AbstractFormatter {
     this.removeIndentFromTopLevelStatements(node)
     this.indentContentInBraces(node)
 
+    // Specification
     this.formatSpecificationRule(node)
+    
+    // Globals
+    this.formatGlobals(node)
+
+    // Models
     this.formatElementDeclaration(node)
     this.formatRelation(node)
+    this.formatMetadataProperty(node)
+    
+    // Views
     this.formatView(node)
-    this.formatViewRuleStyle(node)
+    this.formatViewRuleGroup(node)
+    this.formatViewRuleGlobalStyle(node)
     this.formatIncludeExcludeExpressions(node)
     this.formatWhereExpression(node)
+    this.formatAutolayoutProperty(node)
     this.formatWithPredicate(node)
+    
+    // Common
+    this.formatViewRuleStyle(node)
     this.formatLeafProperty(node)
-    this.formatMetadataProperty(node)
-    this.formatAutolayoutProperty(node)
     this.formatLinkProperty(node)
     this.formatNavigateToProperty(node)
     this.formatTags(node)
@@ -92,9 +104,10 @@ export class LikeC4Formatter extends AbstractFormatter {
       || ast.isSpecificationRule(node)
       || ast.isModelViews(node)
       || ast.isLikeC4Lib(node)
+      || ast.isGlobals(node)
     ) {
       const formatter = this.getNodeFormatter(node)
-      formatter.keywords('specification', 'model', 'views', 'likec4lib')
+      formatter.keywords('specification', 'model', 'views', 'likec4lib', 'global')
         .prepend(FormattingOptions.noIndent)
     }
   }
@@ -105,6 +118,9 @@ export class LikeC4Formatter extends AbstractFormatter {
       || ast.isSpecificationRule(node)
       || ast.isSpecificationElementKind(node)
       || ast.isSpecificationRelationshipKind(node)
+      || ast.isGlobals(node)
+      || ast.isGlobalStyle(node)
+      || ast.isGlobalStyleGroup(node)
       || ast.isModel(node)
       || ast.isElementBody(node)
       || ast.isExtendElementBody(node)
@@ -115,6 +131,7 @@ export class LikeC4Formatter extends AbstractFormatter {
       || ast.isElementViewBody(node)
       || ast.isDynamicViewBody(node)
       || ast.isViewRuleStyle(node)
+      || ast.isViewRuleGroup(node)
       || ast.isCustomElementProperties(node)
       || ast.isCustomRelationProperties(node)
       || ast.isElementStyleProperty(node)
@@ -270,6 +287,17 @@ export class LikeC4Formatter extends AbstractFormatter {
     })
   }
 
+  protected formatGlobals(node: AstNode) {
+    this.on(node, ast.isGlobalStyle, (n, f) => {
+      f.keyword('style').append(FormattingOptions.oneSpace)
+      f.property('id').append(FormattingOptions.oneSpace)
+    })
+
+    this.on(node, ast.isGlobalStyleGroup, (n, f) => {
+      f.keyword('styleGroup').append(FormattingOptions.oneSpace)
+    })
+  }
+
   protected formatSpecificationRule(node: AstNode) {
     if (
       ast.isSpecificationElementKind(node)
@@ -300,6 +328,18 @@ export class LikeC4Formatter extends AbstractFormatter {
     }
   }
 
+  protected formatViewRuleGlobalStyle(node: AstNode) {
+    this.on(node, ast.isViewRuleGlobalStyle, (n, f) => {
+      f.keywords('global', 'style').append(FormattingOptions.oneSpace)
+    })
+  }
+
+  protected formatViewRuleGroup(node: AstNode) {
+    this.on(node, ast.isViewRuleGroup, (n, f) => {
+      f.keyword('group').append(FormattingOptions.oneSpace)
+    })
+  }
+
   protected formatViewRuleStyle(node: AstNode) {
     this.on(node, ast.isViewRuleStyle)
       ?.keyword('style').append(FormattingOptions.oneSpace)

package/src/generated/ast.ts

@@ -62,6 +62,7 @@ export type LikeC4KeywordNames =
     | "dot"
     | "dotted"
     | "dynamic"
+    | "dynamicPredicateGroup"
     | "element"
     | "element.kind"
     | "element.tag"
@@ -102,6 +103,8 @@ export type LikeC4KeywordNames =
     | "par"
     | "parallel"
     | "person"
+    | "predicate"
+    | "predicateGroup"
     | "primary"
     | "queue"
     | "rectangle"
@@ -160,7 +163,7 @@ export function isDotId(item: unknown): item is DotId {
     return typeof item === 'string';
 }
 
-export type DynamicViewRule = DynamicViewIncludePredicate | ViewRuleAutoLayout | ViewRuleStyleOrGlobalRef;
+export type DynamicViewRule = DynamicViewGlobalPredicateRef | DynamicViewIncludePredicate | ViewRuleAutoLayout | ViewRuleStyleOrGlobalRef;
 
 export const DynamicViewRule = 'DynamicViewRule';
 
@@ -336,7 +339,7 @@ export function isViewProperty(item: unknown): item is ViewProperty {
     return reflection.isInstance(item, ViewProperty);
 }
 
-export type ViewRule = ViewRuleAutoLayout | ViewRuleGroup | ViewRulePredicate | ViewRuleStyleOrGlobalRef;
+export type ViewRule = ViewRuleAutoLayout | ViewRuleGlobalPredicateRef | ViewRuleGroup | ViewRulePredicate | ViewRuleStyleOrGlobalRef;
 
 export const ViewRule = 'ViewRule';
 
@@ -533,8 +536,20 @@ export function isDynamicViewBody(item: unknown): item is DynamicViewBody {
     return reflection.isInstance(item, DynamicViewBody);
 }
 
-export interface DynamicViewIncludePredicate extends AstNode {
+export interface DynamicViewGlobalPredicateRef extends AstNode {
     readonly $container: DynamicViewBody;
+    readonly $type: 'DynamicViewGlobalPredicateRef';
+    predicate: Reference<GlobalDynamicPredicateGroup>;
+}
+
+export const DynamicViewGlobalPredicateRef = 'DynamicViewGlobalPredicateRef';
+
+export function isDynamicViewGlobalPredicateRef(item: unknown): item is DynamicViewGlobalPredicateRef {
+    return reflection.isInstance(item, DynamicViewGlobalPredicateRef);
+}
+
+export interface DynamicViewIncludePredicate extends AstNode {
+    readonly $container: DynamicViewBody | GlobalDynamicPredicateGroup;
     readonly $type: 'DynamicViewIncludePredicate';
     predicates: DynamicViewPredicateIterator;
 }
@@ -798,7 +813,7 @@ export function isElementViewRef(item: unknown): item is ElementViewRef {
 }
 
 export interface ExcludePredicate extends AstNode {
-    readonly $container: ElementViewBody | ViewRuleGroup;
+    readonly $container: ElementViewBody | GlobalPredicateGroup | ViewRuleGroup;
     readonly $type: 'ExcludePredicate';
     predicates: Predicates;
 }
@@ -859,10 +874,37 @@ export function isFqnElementRef(item: unknown): item is FqnElementRef {
     return reflection.isInstance(item, FqnElementRef);
 }
 
+export interface GlobalDynamicPredicateGroup extends AstNode {
+    readonly $container: Globals;
+    readonly $type: 'GlobalDynamicPredicateGroup';
+    name: string;
+    predicates: Array<DynamicViewIncludePredicate>;
+}
+
+export const GlobalDynamicPredicateGroup = 'GlobalDynamicPredicateGroup';
+
+export function isGlobalDynamicPredicateGroup(item: unknown): item is GlobalDynamicPredicateGroup {
+    return reflection.isInstance(item, GlobalDynamicPredicateGroup);
+}
+
+export interface GlobalPredicateGroup extends AstNode {
+    readonly $container: Globals;
+    readonly $type: 'GlobalPredicateGroup';
+    name: string;
+    predicates: Array<ViewRulePredicate>;
+}
+
+export const GlobalPredicateGroup = 'GlobalPredicateGroup';
+
+export function isGlobalPredicateGroup(item: unknown): item is GlobalPredicateGroup {
+    return reflection.isInstance(item, GlobalPredicateGroup);
+}
+
 export interface Globals extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'Globals';
     name: 'global';
+    predicates: Array<GlobalDynamicPredicateGroup | GlobalPredicateGroup>;
     styles: Array<GlobalStyle | GlobalStyleGroup>;
 }
 
@@ -926,7 +968,7 @@ export function isIconProperty(item: unknown): item is IconProperty {
 }
 
 export interface IncludePredicate extends AstNode {
-    readonly $container: ElementViewBody | ViewRuleGroup;
+    readonly $container: ElementViewBody | GlobalPredicateGroup | ViewRuleGroup;
     readonly $type: 'IncludePredicate';
     predicates: Predicates;
 }
@@ -1423,6 +1465,18 @@ export function isViewRuleAutoLayout(item: unknown): item is ViewRuleAutoLayout
     return reflection.isInstance(item, ViewRuleAutoLayout);
 }
 
+export interface ViewRuleGlobalPredicateRef extends AstNode {
+    readonly $container: ElementViewBody;
+    readonly $type: 'ViewRuleGlobalPredicateRef';
+    predicate: Reference<GlobalPredicateGroup>;
+}
+
+export const ViewRuleGlobalPredicateRef = 'ViewRuleGlobalPredicateRef';
+
+export function isViewRuleGlobalPredicateRef(item: unknown): item is ViewRuleGlobalPredicateRef {
+    return reflection.isInstance(item, ViewRuleGlobalPredicateRef);
+}
+
 export interface ViewRuleGlobalStyle extends AstNode {
     readonly $container: DynamicViewBody | ElementViewBody | ModelViews;
     readonly $type: 'ViewRuleGlobalStyle';
@@ -1591,6 +1645,7 @@ export type LikeC4AstType = {
     DirectedRelationExpression: DirectedRelationExpression
     DynamicView: DynamicView
     DynamicViewBody: DynamicViewBody
+    DynamicViewGlobalPredicateRef: DynamicViewGlobalPredicateRef
     DynamicViewIncludePredicate: DynamicViewIncludePredicate
     DynamicViewParallelSteps: DynamicViewParallelSteps
     DynamicViewPredicateIterator: DynamicViewPredicateIterator
@@ -1621,6 +1676,8 @@ export type LikeC4AstType = {
     ExtendElement: ExtendElement
     ExtendElementBody: ExtendElementBody
     FqnElementRef: FqnElementRef
+    GlobalDynamicPredicateGroup: GlobalDynamicPredicateGroup
+    GlobalPredicateGroup: GlobalPredicateGroup
     GlobalStyle: GlobalStyle
     GlobalStyleGroup: GlobalStyleGroup
     GlobalStyleId: GlobalStyleId
@@ -1676,6 +1733,7 @@ export type LikeC4AstType = {
     ViewRef: ViewRef
     ViewRule: ViewRule
     ViewRuleAutoLayout: ViewRuleAutoLayout
+    ViewRuleGlobalPredicateRef: ViewRuleGlobalPredicateRef
     ViewRuleGlobalStyle: ViewRuleGlobalStyle
     ViewRuleGroup: ViewRuleGroup
     ViewRulePredicate: ViewRulePredicate
@@ -1702,7 +1760,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, 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];
+        return [ArrowProperty, BorderProperty, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DirectedRelationExpression, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, 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, GlobalDynamicPredicateGroup, GlobalPredicateGroup, 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, ViewRuleGlobalPredicateRef, 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 {
@@ -1729,6 +1787,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case ElementView: {
                 return this.isSubtype(LikeC4View, supertype);
             }
+            case DynamicViewGlobalPredicateRef:
             case DynamicViewIncludePredicate: {
                 return this.isSubtype(DynamicViewRule, supertype);
             }
@@ -1800,14 +1859,15 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case ViewRuleStyleOrGlobalRef: {
                 return this.isSubtype(DynamicViewRule, supertype) || this.isSubtype(ViewRule, supertype);
             }
-            case ViewRuleGlobalStyle:
-            case ViewRuleStyle: {
-                return this.isSubtype(ViewRuleStyleOrGlobalRef, supertype);
-            }
+            case ViewRuleGlobalPredicateRef:
             case ViewRuleGroup:
             case ViewRulePredicate: {
                 return this.isSubtype(ViewRule, supertype);
             }
+            case ViewRuleGlobalStyle:
+            case ViewRuleStyle: {
+                return this.isSubtype(ViewRuleStyleOrGlobalRef, supertype);
+            }
             case ViewStringProperty: {
                 return this.isSubtype(StringProperty, supertype) || this.isSubtype(ViewProperty, supertype);
             }
@@ -1850,6 +1910,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case 'ColorProperty:customColor': {
                 return CustomColor;
             }
+            case 'DynamicViewGlobalPredicateRef:predicate': {
+                return GlobalDynamicPredicateGroup;
+            }
             case 'DynamicViewRef:view': {
                 return DynamicView;
             }
@@ -1883,6 +1946,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case 'ViewRef:view': {
                 return LikeC4View;
             }
+            case 'ViewRuleGlobalPredicateRef:predicate': {
+                return GlobalPredicateGroup;
+            }
             case 'ViewRuleGlobalStyle:style': {
                 return GlobalStyleId;
             }
@@ -1975,6 +2041,14 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case DynamicViewGlobalPredicateRef: {
+                return {
+                    name: DynamicViewGlobalPredicateRef,
+                    properties: [
+                        { name: 'predicate' }
+                    ]
+                };
+            }
             case DynamicViewIncludePredicate: {
                 return {
                     name: DynamicViewIncludePredicate,
@@ -2201,11 +2275,30 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case GlobalDynamicPredicateGroup: {
+                return {
+                    name: GlobalDynamicPredicateGroup,
+                    properties: [
+                        { name: 'name' },
+                        { name: 'predicates', defaultValue: [] }
+                    ]
+                };
+            }
+            case GlobalPredicateGroup: {
+                return {
+                    name: GlobalPredicateGroup,
+                    properties: [
+                        { name: 'name' },
+                        { name: 'predicates', defaultValue: [] }
+                    ]
+                };
+            }
             case Globals: {
                 return {
                     name: Globals,
                     properties: [
                         { name: 'name' },
+                        { name: 'predicates', defaultValue: [] },
                         { name: 'styles', defaultValue: [] }
                     ]
                 };
@@ -2594,6 +2687,14 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     ]
                 };
             }
+            case ViewRuleGlobalPredicateRef: {
+                return {
+                    name: ViewRuleGlobalPredicateRef,
+                    properties: [
+                        { name: 'predicate' }
+                    ]
+                };
+            }
             case ViewRuleGlobalStyle: {
                 return {
                     name: ViewRuleGlobalStyle,