@likec4/language-server 1.12.1 → 1.13.0

package/dist/shared/{language-server.BxxqS4Id.mjs → language-server.DFLaUdYu.mjs}

@@ -1,6 +1,6 @@
 import { Expr, whereOperatorAsPredicate, parentFqn, nonexhaustive, isViewRuleStyle, compareByFqnHierarchically, DefaultThemeColor, DefaultElementShape, compareRelations, invariant, nonNullable, compareNatural, hasAtLeast, isAncestor, isViewRulePredicate, ancestorsFqn, isViewRuleAutoLayout, isScopedElementView, commonAncestor, StepEdgeId, isDynamicViewParallelSteps, isDynamicViewIncludeRule, DefaultRelationshipColor, DefaultLineStyle, DefaultArrowType, isSameHierarchy } from '@likec4/core';
 import { pipe, map, pick, mapToObj, isTruthy, isNullish, omitBy, isEmpty, filter, anyPass, isDefined, groupBy, prop, mapValues, piped, unique, entries, flatMap, sortBy, sort, difference, allPass, omit, hasAtLeast as hasAtLeast$1, only, reduce, isNonNull, isString, isArray } from 'remeda';
-import graphlib, { Graph } from '@dagrejs/graphlib';
+import dagre from '@dagrejs/dagre';
 import objectHash from 'object-hash';
 
 function calcViewLayoutHash(view) {
@@ -298,9 +298,10 @@ function buildElementNotations(nodes) {
   );
 }
 
-const postorder = graphlib.alg.postorder;
-const findCycles = graphlib.alg.findCycles;
-const isAcyclic = graphlib.alg.isAcyclic;
+const Graph = dagre.graphlib.Graph;
+const postorder = dagre.graphlib.alg.postorder;
+const findCycles = dagre.graphlib.alg.findCycles;
+const isAcyclic = dagre.graphlib.alg.isAcyclic;
 
 function sortChildren(nodes) {
   nodes.forEach((parent) => {
@@ -333,7 +334,7 @@ function sortNodes({
     g.setEdge(e.source, e.target);
   }
   for (const n of nodes) {
-    g.setNode(n.id);
+    g.setNode(n.id, n.id);
     if (n.children.length > 0) {
       n.inEdges.forEach((e) => {
         const edge = getEdge(e);
@@ -1675,4 +1676,4 @@ class LikeC4ModelGraph {
   }
 }
 
-export { LikeC4ModelGraph as L, computeView as a, computeDynamicView as b, computeElementView as c, findCycles as f, isAcyclic as i, postorder as p };
+export { Graph as G, LikeC4ModelGraph as L, computeView as a, computeDynamicView as b, computeElementView as c, findCycles as f, isAcyclic as i, postorder as p };

package/dist/shared/{language-server.BCDM5gt9.d.ts → language-server.eY70DuKx.d.ts}

@@ -448,6 +448,7 @@ interface ModelViews extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'ModelViews';
     name: 'views';
+    styles: Array<ViewRuleStyle>;
     views: Array<LikeC4View>;
 }
 declare const ModelViews = "ModelViews";
@@ -650,7 +651,7 @@ interface ViewRuleAutoLayout extends AstNode {
 }
 declare const ViewRuleAutoLayout = "ViewRuleAutoLayout";
 interface ViewRuleStyle extends AstNode {
-    readonly $container: DynamicViewBody | ElementViewBody;
+    readonly $container: DynamicViewBody | ElementViewBody | ModelViews;
     readonly $type: 'ViewRuleStyle';
     props: Array<NotationProperty | StyleProperty>;
     target: ElementExpressionsIterator;
@@ -1087,11 +1088,15 @@ declare class LikeC4ModelParser {
     private parseRelationPredicateWith;
     private parseRelationExpr;
     private parseViewRule;
+    private parseViewRuleStyle;
+    private parseRuleStyle;
     private parseViewManualLaout;
     private parseDynamicParallelSteps;
     private parseDynamicStep;
     private parseElementView;
     private parseDynamicElementView;
+    private parseDynamicViewRule;
+    private parseDynamicViewIncludePredicate;
     protected resolveFqn(node: Element | ExtendElement): c4.Fqn;
     private getAstNodePath;
     private getMetadata;

package/dist/shared/{language-server.B8Ce0R_D.d.ts → language-server.r5AXAWzc.d.ts}

@@ -448,6 +448,7 @@ interface ModelViews extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'ModelViews';
     name: 'views';
+    styles: Array<ViewRuleStyle>;
     views: Array<LikeC4View>;
 }
 declare const ModelViews = "ModelViews";
@@ -650,7 +651,7 @@ interface ViewRuleAutoLayout extends AstNode {
 }
 declare const ViewRuleAutoLayout = "ViewRuleAutoLayout";
 interface ViewRuleStyle extends AstNode {
-    readonly $container: DynamicViewBody | ElementViewBody;
+    readonly $container: DynamicViewBody | ElementViewBody | ModelViews;
     readonly $type: 'ViewRuleStyle';
     props: Array<NotationProperty | StyleProperty>;
     target: ElementExpressionsIterator;
@@ -955,7 +956,7 @@ interface ParsedLikeC4LangiumDocument extends Omit<LangiumDocument<LikeC4Grammar
 }
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isExtendElement | typeof isElement | typeof isLikeC4View | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
+declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isLikeC4View | typeof isExtendElement | typeof isElement | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;
@@ -1087,11 +1088,15 @@ declare class LikeC4ModelParser {
     private parseRelationPredicateWith;
     private parseRelationExpr;
     private parseViewRule;
+    private parseViewRuleStyle;
+    private parseRuleStyle;
     private parseViewManualLaout;
     private parseDynamicParallelSteps;
     private parseDynamicStep;
     private parseElementView;
     private parseDynamicElementView;
+    private parseDynamicViewRule;
+    private parseDynamicViewIncludePredicate;
     protected resolveFqn(node: Element | ExtendElement): c4.Fqn;
     private getAstNodePath;
     private getMetadata;

package/dist/shared/{language-server.BN7V1vQA.d.mts → language-server.ryB8CivX.d.mts}

@@ -448,6 +448,7 @@ interface ModelViews extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'ModelViews';
     name: 'views';
+    styles: Array<ViewRuleStyle>;
     views: Array<LikeC4View>;
 }
 declare const ModelViews = "ModelViews";
@@ -650,7 +651,7 @@ interface ViewRuleAutoLayout extends AstNode {
 }
 declare const ViewRuleAutoLayout = "ViewRuleAutoLayout";
 interface ViewRuleStyle extends AstNode {
-    readonly $container: DynamicViewBody | ElementViewBody;
+    readonly $container: DynamicViewBody | ElementViewBody | ModelViews;
     readonly $type: 'ViewRuleStyle';
     props: Array<NotationProperty | StyleProperty>;
     target: ElementExpressionsIterator;
@@ -1087,11 +1088,15 @@ declare class LikeC4ModelParser {
     private parseRelationPredicateWith;
     private parseRelationExpr;
     private parseViewRule;
+    private parseViewRuleStyle;
+    private parseRuleStyle;
     private parseViewManualLaout;
     private parseDynamicParallelSteps;
     private parseDynamicStep;
     private parseElementView;
     private parseDynamicElementView;
+    private parseDynamicViewRule;
+    private parseDynamicViewIncludePredicate;
     protected resolveFqn(node: Element | ExtendElement): c4.Fqn;
     private getAstNodePath;
     private getMetadata;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -111,9 +111,9 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@dagrejs/graphlib": "^2.2.4",
-    "@likec4/core": "1.12.1",
-    "@likec4/log": "1.12.1",
+    "@dagrejs/dagre": "^1.1.4",
+    "@likec4/core": "1.13.0",
+    "@likec4/log": "1.13.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
@@ -133,8 +133,8 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.12.1",
-    "@likec4/tsconfig": "1.12.1",
+    "@likec4/icons": "1.13.0",
+    "@likec4/tsconfig": "1.13.0",
     "@types/node": "^20.16.5",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
@@ -144,7 +144,7 @@
     "npm-run-all2": "^6.2.2",
     "tsx": "~4.9.3",
     "turbo": "^2.1.3",
-    "typescript": "^5.6.2",
+    "typescript": "^5.6.3",
     "unbuild": "^3.0.0-rc.11",
     "vitest": "^2.1.2"
   },

package/src/ast.ts

@@ -460,7 +460,7 @@ export function toAutoLayout(
   const rankSep = rule.rankSep
   const nodeSep = rule.nodeSep
 
-  let direction: c4.ViewRuleAutoLayout['direction'];
+  let direction: c4.ViewRuleAutoLayout['direction']
   switch (rule.direction) {
     case 'TopBottom': {
       direction = 'TB'

package/src/generated/ast.ts

@@ -1005,6 +1005,7 @@ export interface ModelViews extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'ModelViews';
     name: 'views';
+    styles: Array<ViewRuleStyle>;
     views: Array<LikeC4View>;
 }
 
@@ -1359,7 +1360,7 @@ export function isViewRuleAutoLayout(item: unknown): item is ViewRuleAutoLayout
 }
 
 export interface ViewRuleStyle extends AstNode {
-    readonly $container: DynamicViewBody | ElementViewBody;
+    readonly $container: DynamicViewBody | ElementViewBody | ModelViews;
     readonly $type: 'ViewRuleStyle';
     props: Array<NotationProperty | StyleProperty>;
     target: ElementExpressionsIterator;
@@ -2206,6 +2207,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                     name: ModelViews,
                     properties: [
                         { name: 'name' },
+                        { name: 'styles', defaultValue: [] },
                         { name: 'views', defaultValue: [] }
                     ]
                 };