@likec4/language-server 1.8.1 → 1.9.0

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

@@ -1,9 +1,7 @@
-import graphlib from '@dagrejs/graphlib'
 import { isExtendsElementView, type LikeC4View } from '@likec4/core'
-
-// '@dagrejs/graphlib' is a CommonJS module
-// Here is a workaround to import it
-const { Graph, alg } = graphlib
+import { logger } from '@likec4/log'
+import { first, last, values } from 'remeda'
+import { findCycles, Graph, isAcyclic, postorder } from '../utils/graphlib'
 
 /**
  * Resolve rules of extended views
@@ -18,21 +16,31 @@ export function resolveRulesExtendedViews<V extends Record<any, LikeC4View>>(
     multigraph: false,
     compound: false
   })
-  for (const view of Object.values(unresolvedViews)) {
+  for (const view of values(unresolvedViews)) {
     g.setNode(view.id)
     if (isExtendsElementView(view)) {
       // view -> parent
       g.setEdge(view.id, view.extends)
     }
   }
+  if (g.edgeCount() === 0) {
+    return unresolvedViews
+  }
 
   // Remove circular dependencies
-  const cycles = alg.findCycles(g)
-  if (cycles.length > 0) {
-    cycles.flat().forEach(id => g.removeNode(id))
+  while (!isAcyclic(g)) {
+    const firstCycle = first(findCycles(g))
+    if (!firstCycle) {
+      break
+    }
+    const cycledNode = last(firstCycle)
+    if (!cycledNode) {
+      break
+    }
+    g.removeNode(cycledNode)
   }
 
-  const ordered = alg.postorder(g, g.sources())
+  const ordered = postorder(g, g.sources())
 
   return ordered.reduce((acc, id) => {
     const view = unresolvedViews[id]
@@ -42,6 +50,7 @@ export function resolveRulesExtendedViews<V extends Record<any, LikeC4View>>(
     if (isExtendsElementView(view)) {
       const extendsFrom = acc[view.extends]
       if (!extendsFrom) {
+        logger.debug(`View "${view.id}" extends from "${view.extends}" which does not exist`)
         return acc
       }
       return Object.assign(acc, {

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

@@ -1,6 +1,7 @@
 import type { LikeC4View } from '@likec4/core'
 import { invariant } from '@likec4/core'
 import { filter, hasAtLeast, isTruthy, map, pipe, unique, zip } from 'remeda'
+import { parsePath } from 'ufo'
 
 function commonAncestorPath(views: LikeC4View[], sep = '/') {
   const uniqURIs = pipe(
@@ -11,20 +12,20 @@ function commonAncestorPath(views: LikeC4View[], sep = '/') {
   )
   if (uniqURIs.length === 0) return ''
   if (hasAtLeast(uniqURIs, 1) && uniqURIs.length === 1) {
-    const parts = new URL(uniqURIs[0]).pathname.split(sep)
+    const parts = parsePath(uniqURIs[0]).pathname.split(sep)
     if (parts.length <= 1) return sep
     parts.pop() // remove filename
     return parts.join(sep) + sep
   }
   invariant(hasAtLeast(uniqURIs, 2), 'Expected at least 2 unique URIs')
   const [baseUri, ...tail] = uniqURIs
-  const parts = new URL(baseUri).pathname.split(sep)
+  const parts = parsePath(baseUri).pathname.split(sep)
   let endOfPrefix = parts.length
   for (const uri of tail) {
     if (uri === baseUri) {
       continue
     }
-    const compare = new URL(uri).pathname.split(sep)
+    const compare = parsePath(uri).pathname.split(sep)
     for (let i = 0; i < endOfPrefix; i++) {
       if (compare[i] !== parts[i]) {
         endOfPrefix = i
@@ -50,7 +51,7 @@ export function resolveRelativePaths(views: LikeC4View[]): LikeC4View[] {
             parts: []
           }
         }
-        let path = new URL(view.docUri).pathname
+        let path = parsePath(view.docUri).pathname
         if (commonPrefix.length > 0) {
           invariant(
             path.startsWith(commonPrefix),
@@ -71,9 +72,6 @@ export function resolveRelativePaths(views: LikeC4View[]): LikeC4View[] {
           if (a.parts.length === 0) {
             return 0
           }
-          if (a.parts.length === 1 && hasAtLeast(a.parts, 1) && hasAtLeast(b.parts, 1)) {
-            return a.parts[0].localeCompare(b.parts[0])
-          }
           for (const [_a, _b] of zip(a.parts, b.parts)) {
             const compare = _a.localeCompare(_b)
             if (compare !== 0) {

package/src/view-utils/view-hash.ts

@@ -1,4 +1,4 @@
-import type { ComputedView } from '@likec4/core/types'
+import type { ComputedView } from '@likec4/core'
 import objectHash from 'object-hash'
 import { isTruthy, map, mapToObj, pick, pipe } from 'remeda'
 import type { SetOptional } from 'type-fest'

package/src/reset.d.ts

@@ -1,2 +0,0 @@
-// Do not add any other lines of code to this file!
-import '@total-typescript/ts-reset'