@likec4/language-server 1.14.0 → 1.15.0

package/src/model-graph/utils/elementExpressionToPredicate.ts

@@ -4,7 +4,9 @@ import { isNullish } from 'remeda'
 
 type Predicate<T> = (x: T) => boolean
 
-export function elementExprToPredicate(target: Expr.ElementPredicateExpression): Predicate<Element> {
+export function elementExprToPredicate<T extends Pick<Element, 'id' | 'kind' | 'tags'>>(
+  target: Expr.ElementPredicateExpression
+): Predicate<T> {
   if (Expr.isElementWhere(target)) {
     const predicate = elementExprToPredicate(target.where.expr)
     const where = whereOperatorAsPredicate(target.where.condition)

package/src/model-graph/utils/sortNodes.ts

@@ -8,7 +8,7 @@ import {
   invariant,
   nonNullable
 } from '@likec4/core'
-import { difference, filter, map, pipe, sort } from 'remeda'
+import { difference, filter, map, pipe, sort, tap } from 'remeda'
 import { Graph, postorder } from '../../utils/graphlib'
 
 // side effect
@@ -27,9 +27,16 @@ export function sortNodes({
   nodes: ComputedNode[]
   edges: ComputedEdge[]
 }): ComputedNode[] {
-  if (edges.length === 0) {
+  if (nodes.length < 2) {
     return nodes
   }
+  if (edges.length === 0) {
+    return pipe(
+      nodes,
+      sort(compareByFqnHierarchically),
+      tap(sortChildren)
+    )
+  }
 
   const g = new Graph({
     compound: false,
@@ -55,9 +62,6 @@ export function sortNodes({
   for (const n of nodes) {
     g.setNode(n.id, n.id)
     if (n.children.length > 0) {
-      // n.children.forEach(c => {
-      //   g.setEdge(n.id, c, undefined, `${n.id}:${c}`)
-      // })
       n.inEdges.forEach(e => {
         const edge = getEdge(e)
         // if this edge from leaf to the child of this node
@@ -83,15 +87,15 @@ export function sortNodes({
   if (sources.length === 0) {
     sources = pipe(
       nodes,
-      sort(compareByFqnHierarchically),
       filter(n => n.inEdges.length === 0 || n.parent === null),
+      sort(compareByFqnHierarchically),
       map(n => n.id)
     )
   }
   const orderedIds = postorder(g, sources).reverse() as Fqn[]
   const sorted = orderedIds.map(getNode)
   if (sorted.length < nodes.length) {
-    const unsorted = difference(nodes, sorted)
+    const unsorted = difference(nodes, sorted).sort(compareByFqnHierarchically)
     sorted.push(...unsorted)
   }
 

package/src/references/scope-computation.ts

@@ -71,8 +71,9 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
     }
     for (const globalStyleAst of globals.flatMap(g => g.styles)) {
       try {
-        if (isTruthy(globalStyleAst.name)) {
-          docExports.push(this.descriptions.createDescription(globalStyleAst, globalStyleAst.name, document))
+        const id = globalStyleAst.id
+        if (isTruthy(id.name)) {
+          docExports.push(this.descriptions.createDescription(id, id.name, document))
         }
       } catch (e) {
         logError(e)

package/src/validation/index.ts

@@ -9,7 +9,7 @@ import { relationBodyChecks, relationChecks } from './relation'
 import {
   elementKindChecks,
   globalsChecks,
-  globalStyleChecks,
+  globalStyleIdChecks,
   modelRuleChecks,
   relationshipChecks,
   specificationRuleChecks,
@@ -34,7 +34,7 @@ export function registerValidationChecks(services: LikeC4Services) {
     SpecificationRule: specificationRuleChecks(services),
     Model: modelRuleChecks(services),
     Globals: globalsChecks(services),
-    GlobalStyle: globalStyleChecks(services),
+    GlobalStyleId: globalStyleIdChecks(services),
     DynamicViewStep: dynamicViewStep(services),
     LikeC4View: viewChecks(services),
     Element: elementChecks(services),

package/src/validation/specification.ts

@@ -130,18 +130,18 @@ export const relationshipChecks = (
   }
 }
 
-export const globalStyleChecks = (
+export const globalStyleIdChecks = (
   services: LikeC4Services
-): ValidationCheck<ast.GlobalStyle> => {
+): ValidationCheck<ast.GlobalStyleId> => {
   const index = services.shared.workspace.IndexManager
   return (node, accept) => {
     const sameName = index
-      .allElements(ast.GlobalStyle)
+      .allElements(ast.GlobalStyleId)
       .filter(s => s.name === node.name)
       .limit(2)
       .count()
     if (sameName > 1) {
-      accept('error', `Duplicate GlobalStyle name '${node.name}'`, {
+      accept('error', `Duplicate GlobalStyleId name '${node.name}'`, {
         node: node,
         property: 'name'
       })