@likec4/language-server 1.4.0 → 1.5.0

package/src/validation/view-predicates/custom-element-expr.ts

@@ -1,3 +1,4 @@
+import { nonexhaustive } from '@likec4/core'
 import type { ValidationCheck } from 'langium'
 import { ast } from '../../ast'
 import type { LikeC4Services } from '../../module'
@@ -7,15 +8,25 @@ export const customElementExprChecks = (
 ): ValidationCheck<ast.CustomElementExpr> => {
   return (el, accept) => {
     if (ast.isExcludePredicate(el.$container)) {
-      accept('error', 'Invalid inside "exclude"', {
+      accept('error', 'Invalid usage inside "exclude"', {
         node: el
       })
     }
-    if (!ast.isElementRef(el.target)) {
-      accept('error', 'Invalid target for customization', {
-        node: el,
-        property: 'target'
-      })
+    switch (true) {
+      case ast.isElementRef(el.target):
+        return
+      case ast.isExpandElementExpr(el.target):
+      case ast.isElementKindExpr(el.target):
+      case ast.isElementTagExpr(el.target):
+      case ast.isWildcardExpr(el.target):
+      case ast.isDescedantsExpr(el.target):
+        accept('error', 'Invalid target (expect reference to specific element)', {
+          node: el,
+          property: 'target'
+        })
+        return
+      default:
+        nonexhaustive(el.target)
     }
   }
 }

package/src/validation/view-predicates/custom-relation-expr.ts

@@ -0,0 +1,15 @@
+import type { ValidationCheck } from 'langium'
+import { ast } from '../../ast'
+import type { LikeC4Services } from '../../module'
+
+export const customRelationExprChecks = (
+  _services: LikeC4Services
+): ValidationCheck<ast.CustomRelationExpr> => {
+  return (el, accept) => {
+    if (ast.isExcludePredicate(el.$container)) {
+      accept('error', 'Invalid usage inside "exclude"', {
+        node: el
+      })
+    }
+  }
+}

package/src/validation/view-predicates/index.ts

@@ -1,4 +1,5 @@
 export * from './custom-element-expr'
+export * from './custom-relation-expr'
 export * from './expanded-element'
 export * from './incoming'
 export * from './outgoing'

package/src/view-utils/assignNavigateTo.ts

@@ -1,11 +1,11 @@
 import { type ComputedView, type Fqn, isComputedElementView, type ViewID } from '@likec4/core'
-import { find } from 'remeda'
+import { find, isNullish } from 'remeda'
 
 export function assignNavigateTo<R extends Iterable<ComputedView>>(views: R): R {
   const allElementViews = new Map<Fqn, ViewID[]>()
 
   for (const v of views) {
-    if (isComputedElementView(v) && v.viewOf && !v.extends) {
+    if (isComputedElementView(v) && v.viewOf && isNullish(v.extends)) {
       const viewsOf = allElementViews.get(v.viewOf) ?? []
       viewsOf.push(v.id)
       allElementViews.set(v.viewOf, viewsOf)

package/src/view-utils/manual-layout.ts

@@ -29,8 +29,10 @@ export namespace CompactViewManualLayout {
   export function pack(layout: ViewManualLayout): CompactViewManualLayout {
     return [
       1,
-      entries.strict(layout.nodes).map(([id, { x, y, width, height }]) => [id, x, y, width, height]),
-      entries.strict(layout.edges).map(([id, { controlPoints }]) => [id, controlPoints.flatMap(({ x, y }) => [x, y])])
+      entries(layout.nodes).map(([id, { x, y, width, height }]) => [id as Fqn, x, y, width, height]),
+      entries(layout.edges).map((
+        [id, { controlPoints }]
+      ) => [id as EdgeId, controlPoints.flatMap(({ x, y }) => [x, y])])
     ]
   }
 

package/src/view-utils/resolve-extended-views.ts

@@ -1,5 +1,5 @@
 import graphlib from '@dagrejs/graphlib'
-import { isExtendsElementView, type View } from '@likec4/core'
+import { isExtendsElementView, type LikeC4View } from '@likec4/core'
 
 // '@dagrejs/graphlib' is a CommonJS module
 // Here is a workaround to import it
@@ -10,7 +10,7 @@ const { Graph, alg } = graphlib
  * (Removes invalid views)
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function resolveRulesExtendedViews<V extends Record<any, View>>(
+export function resolveRulesExtendedViews<V extends Record<any, LikeC4View>>(
   unresolvedViews: V
 ): V {
   const g = new Graph({

package/src/view-utils/resolve-relative-paths.ts

@@ -1,8 +1,8 @@
-import type { View } from '@likec4/core'
+import type { LikeC4View } from '@likec4/core'
 import { invariant } from '@likec4/core'
 import { hasAtLeast, unique, zip } from 'remeda'
 
-function commonAncestorPath(views: View[], sep = '/') {
+function commonAncestorPath(views: LikeC4View[], sep = '/') {
   if (views.length <= 1) return ''
   const uniqURIs = unique(views.flatMap(({ docUri }) => (docUri ? [docUri] : [])))
   if (uniqURIs.length === 0) return ''
@@ -30,7 +30,7 @@ function commonAncestorPath(views: View[], sep = '/') {
   return prefix.endsWith(sep) ? prefix : prefix + sep
 }
 
-export function resolveRelativePaths(views: View[]): View[] {
+export function resolveRelativePaths(views: LikeC4View[]): LikeC4View[] {
   const commonPrefix = commonAncestorPath(views)
   return (
     views