@likec4/language-server 1.18.0 → 1.19.1

package/src/model/deployments-index.ts

@@ -3,11 +3,11 @@ import type { LangiumDocument, LangiumDocuments, Stream } from 'langium'
 import { AstUtils, DocumentState, MultiMap } from 'langium'
 import { forEachObj, groupBy, isTruthy, pipe, prop } from 'remeda'
 import {
-  ast,
   type DeploymentAstNodeDescription,
+  type LikeC4LangiumDocument,
+  ast,
   ElementOps,
   isLikeC4LangiumDocument,
-  type LikeC4LangiumDocument
 } from '../ast'
 import { logWarnError } from '../logger'
 import type { LikeC4Services } from '../module'
@@ -33,7 +33,7 @@ export class DeploymentsIndex {
         for (const doc of docs) {
           delete (doc as IndexedDocument)[DeploymentsIndexKey]
         }
-      }
+      },
     )
   }
 
@@ -55,7 +55,7 @@ export class DeploymentsIndex {
    * @returns Stream of artifacts
    */
   public nested(node: ast.DeploymentNode): Stream<DeploymentAstNodeDescription> {
-    const fqnName = this.getFqnName(node)
+    const fqnName = this.getFqn(node)
     return this.documents().flatMap(doc => this.get(doc).nested(fqnName))
   }
 
@@ -63,18 +63,19 @@ export class DeploymentsIndex {
     return this.documents().flatMap(doc => this.get(doc).byFqn(fqnName))
   }
 
-  public getFqnName(node: ast.DeploymentElement): Fqn {
+  public getFqn(node: ast.DeploymentElement): Fqn {
     let id = ElementOps.readId(node)
     if (isTruthy(id)) {
       return id
     }
     const fqn = [
-      this.Names.getNameStrict(node)
+      this.Names.getNameStrict(node),
     ]
+    let _node = node
     let parentNode: ast.DeploymentNode | undefined
-    while ((parentNode = AstUtils.getContainerOfType(node.$container, ast.isDeploymentNode))) {
+    while ((parentNode = AstUtils.getContainerOfType(_node.$container, ast.isDeploymentNode))) {
       fqn.push(this.Names.getNameStrict(parentNode))
-      node = parentNode
+      _node = parentNode
     }
     id = fqn.reduceRight((acc, cur) => `${acc}.${cur}`) as Fqn
     ElementOps.writeId(node, id)
@@ -93,11 +94,11 @@ export class DeploymentsIndex {
     const Descriptions = this.services.workspace.AstNodeDescriptionProvider
 
     const createAndSaveDescription = (
-      props: { node: ast.DeploymentNode | ast.DeployedInstance; name: string; fqn: string }
+      props: { node: ast.DeploymentNode | ast.DeployedInstance; name: string; fqn: string },
     ) => {
       const desc = {
         ...Descriptions.createDescription(props.node, props.name, document),
-        fqn: props.fqn
+        fqn: props.fqn,
       }
       ElementOps.writeId(props.node, props.fqn as Fqn)
       _byfqn.add(props.fqn, desc)
@@ -106,7 +107,7 @@ export class DeploymentsIndex {
 
     const traverseNode = (
       container: ast.DeploymentNode,
-      parentFqn: string
+      parentFqn: string,
     ): readonly DeploymentAstNodeDescription[] => {
       const _descedants = [] as DeploymentAstNodeDescription[]
       const children = container.body?.elements
@@ -142,7 +143,7 @@ export class DeploymentsIndex {
               return
             }
             _nested.add(parentFqn, descs[0])
-          })
+          }),
         )
       }
       return _nested.get(parentFqn)
@@ -166,6 +167,9 @@ export class DeploymentsIndex {
   }
 }
 
+/**
+ * Index of deployment elements in the document
+ */
 export class DocumentDeploymentsIndex {
   static readonly EMPTY = new DocumentDeploymentsIndex([], new MultiMap(), new MultiMap())
 
@@ -178,7 +182,7 @@ export class DocumentDeploymentsIndex {
     /**
      * All elements by FQN
      */
-    private _byfqn: MultiMap<string, DeploymentAstNodeDescription>
+    private _byfqn: MultiMap<string, DeploymentAstNodeDescription>,
   ) {}
 
   public rootNodes(): readonly DeploymentAstNodeDescription[] {
@@ -211,7 +215,7 @@ export class DocumentDeploymentsIndex {
         if (descs.length === 1) {
           result.push(descs[0])
         }
-      })
+      }),
     )
     return result
   }

package/src/model/fqn-computation.ts

@@ -1,8 +1,8 @@
-import { AsFqn, nonexhaustive } from '@likec4/core'
 import type * as c4 from '@likec4/core'
+import { AsFqn, LinkedList, nonexhaustive } from '@likec4/core'
 import { type AstNodeDescription, type AstNodeLocator, AstUtils, CstUtils, GrammarUtils, MultiMap } from 'langium'
 import { isDefined, isEmpty } from 'remeda'
-import { ast, ElementOps, type LikeC4LangiumDocument } from '../ast'
+import { type LikeC4LangiumDocument, ast, ElementOps } from '../ast'
 import { logError } from '../logger'
 import type { LikeC4Services } from '../module'
 import { getFqnElementRef } from '../utils/elementRef'
@@ -16,20 +16,20 @@ type TraversePair = [el: ast.Element | ast.ExtendElement | ast.Relation, parent:
 function toAstNodeDescription(
   locator: AstNodeLocator,
   entry: ast.Element,
-  doc: LikeC4LangiumDocument
+  doc: LikeC4LangiumDocument,
 ): AstNodeDescription {
   const $cstNode = findNodeForProperty(entry.$cstNode, 'name')
   return {
     documentUri: doc.uri,
     name: entry.name,
     ...(entry.$cstNode && {
-      selectionSegment: toDocumentSegment(entry.$cstNode)
+      selectionSegment: toDocumentSegment(entry.$cstNode),
     }),
     ...($cstNode && {
-      nameSegment: toDocumentSegment($cstNode)
+      nameSegment: toDocumentSegment($cstNode),
     }),
     path: locator.getAstNodePath(entry),
-    type: ast.Element
+    type: ast.Element,
   }
 }
 
@@ -40,7 +40,7 @@ export function computeDocumentFqn(document: LikeC4LangiumDocument, services: Li
     return
   }
   const locator = services.workspace.AstNodeLocator
-  const traverseStack: TraversePair[] = elements.map(el => [el, null])
+  const traverseStack = LinkedList.from(elements.map(el => [el, null] as TraversePair))
   let pair
   while ((pair = traverseStack.shift())) {
     try {
@@ -63,7 +63,7 @@ export function computeDocumentFqn(document: LikeC4LangiumDocument, services: Li
         const fqn = AsFqn(el.name, parent)
         c4fqnIndex.add(fqn, {
           ...toAstNodeDescription(locator, el, document),
-          fqn
+          fqn,
         })
         ElementOps.writeId(el, fqn)
         if (isDefined(el.body) && !isEmpty(el.body.elements)) {

package/src/model/model-builder.ts

@@ -1,14 +1,16 @@
-import * as c4 from '@likec4/core'
+import type * as c4 from '@likec4/core'
 import {
+  type CustomColorDefinitions,
+  type ViewId,
   compareRelations,
   computeColorValues,
-  type CustomColorDefinitions,
+  DeploymentElement,
   isScopedElementView,
+  LikeC4Model,
   parentFqn,
   sortByFqnHierarchically,
-  type ViewId
 } from '@likec4/core'
-import { mkComputeView, resolveRulesExtendedViews } from '@likec4/core/compute-view'
+import { resolveRulesExtendedViews } from '@likec4/core/compute-view'
 import { deepEqual as eq } from 'fast-equals'
 import type { Cancellation, LangiumDocument, LangiumDocuments, URI, WorkspaceCache } from 'langium'
 import { Disposable, DocumentState, interruptAndCheck } from 'langium'
@@ -32,7 +34,7 @@ import {
   reduce,
   reverse,
   sort,
-  values
+  values,
 } from 'remeda'
 import type {
   ParsedAstDeploymentRelation,
@@ -41,10 +43,10 @@ import type {
   ParsedAstSpecification,
   ParsedAstView,
   ParsedLikeC4LangiumDocument,
-  ParsedLink
+  ParsedLink,
 } from '../ast'
 import { isParsedLikeC4LangiumDocument } from '../ast'
-import { logError, logger, logWarnError } from '../logger'
+import { logger, logWarnError } from '../logger'
 import type { LikeC4Services } from '../module'
 import { assignNavigateTo, resolveRelativePaths } from '../view-utils'
 
@@ -55,17 +57,17 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     deployments: {},
     elements: {},
     relationships: {},
-    colors: {}
+    colors: {},
   }
   const globals: c4.ModelGlobals = {
     predicates: {},
     dynamicPredicates: {},
-    styles: {}
+    styles: {},
   }
   for (const doc of docs) {
     const {
       c4Specification: spec,
-      c4Globals
+      c4Globals,
     } = doc
 
     spec.tags.forEach(t => c4Specification.tags.add(t))
@@ -87,20 +89,20 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           if (relative && relative !== link.url) {
             return {
               ...link,
-              relative
+              relative,
             }
           }
         } catch (e) {
           logWarnError(e)
         }
         return link
-      }
+      },
     )
   }
 
   const customColorDefinitions: CustomColorDefinitions = mapValues(
     c4Specification.colors,
-    c => computeColorValues(c.color)
+    c => computeColorValues(c.color),
   )
 
   function toModelElement(doc: LangiumDocument) {
@@ -112,14 +114,14 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         shape,
         icon,
         opacity,
-        border
+        border,
       },
       id,
       kind,
       title,
       description,
       technology,
-      metadata
+      metadata,
     }: ParsedAstElement): c4.Element | null => {
       try {
         const __kind = c4Specification.elements[kind]
@@ -142,7 +144,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           ...(__kind.notation && { notation: __kind.notation }),
           style: {
             ...(border && { border }),
-            ...(isNumber(opacity) && { opacity })
+            ...(isNumber(opacity) && { opacity }),
           },
           links,
           tags: tags ?? null,
@@ -150,7 +152,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           description: description ?? null,
           title,
           kind,
-          id
+          id,
         }
       } catch (e) {
         logWarnError(e)
@@ -176,8 +178,8 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         acc[el.id] = el
         return acc
       },
-      {} as c4.ParsedLikeC4Model['elements']
-    )
+      {} as c4.ParsedLikeC4Model['elements'],
+    ),
   )
 
   function toModelRelation(doc: LangiumDocument) {
@@ -189,12 +191,12 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
       links: unresolvedLinks,
       id,
       ...model
-    }: ParsedAstRelation): c4.Relation | null => {
+    }: ParsedAstRelation): c4.ModelRelation | null => {
       if (isNullish(elements[source]) || isNullish(elements[target])) {
         logger.warn(
           `Invalid relation ${id} at ${doc.uri.path} ${astPath}, source: ${source}(${!!elements[
             source
-          ]}), target: ${target}(${!!elements[target]})`
+          ]}), target: ${target}(${!!elements[target]})`,
         )
         return null
       }
@@ -208,16 +210,16 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           source,
           target,
           kind,
-          id
-        } satisfies c4.Relation
+          id,
+        } satisfies c4.ModelRelation
       }
       return {
         ...links && { links },
         ...model,
         source,
         target,
-        id
-      } satisfies c4.Relation
+        id,
+      } satisfies c4.ModelRelation
     }
   }
 
@@ -227,19 +229,19 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     filter(isTruthy),
     sort(compareRelations),
     reverse(),
-    indexBy(prop('id'))
+    indexBy(prop('id')),
   )
 
   function toDeploymentElement(doc: LangiumDocument) {
     return (parsed: c4.DeploymentElement): c4.DeploymentElement | null => {
-      if (!c4.DeploymentElement.isDeploymentNode(parsed)) {
+      if (!DeploymentElement.isDeploymentNode(parsed)) {
         if (!parsed.links || parsed.links.length === 0) {
           return parsed
         }
         const links = resolveLinks(doc, parsed.links)
         return {
           ...parsed,
-          links
+          links,
         }
       }
       try {
@@ -252,7 +254,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           technology = __kind.technology,
           notation = __kind.notation,
           links,
-          style
+          style,
         } = parsed
         return {
           ...parsed,
@@ -262,9 +264,9 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
             border: 'dashed',
             opacity: 10,
             ...__kind.style,
-            ...style
+            ...style,
           },
-          links: links ? resolveLinks(doc, links) : null
+          links: links ? resolveLinks(doc, links) : null,
         }
       } catch (e) {
         logWarnError(e)
@@ -290,8 +292,8 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         acc[el.id] = el
         return acc
       },
-      {} as c4.ParsedLikeC4Model['deployments']['elements']
-    )
+      {} as c4.ParsedLikeC4Model['deployments']['elements'],
+    ),
   )
 
   function toDeploymentRelation(doc: LangiumDocument) {
@@ -308,7 +310,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         logger.warn(
           `Invalid deployment relation ${id} at ${doc.uri.path} ${astPath}, source: ${source.id}(${!!deploymentElements[
             source.id
-          ]}), target: ${target.id}(${!!deploymentElements[target.id]})`
+          ]}), target: ${target.id}(${!!deploymentElements[target.id]})`,
         )
         return null
       }
@@ -322,7 +324,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           source,
           target,
           kind,
-          id
+          id,
         } satisfies c4.DeploymentRelation
       }
       return {
@@ -330,7 +332,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         ...model,
         source,
         target,
-        id
+        id,
       } satisfies c4.DeploymentRelation
     }
   }
@@ -348,8 +350,8 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         acc[el.id] = el
         return acc
       },
-      {} as c4.ParsedLikeC4Model['deployments']['relations']
-    )
+      {} as c4.ParsedLikeC4Model['deployments']['relations'],
+    ),
   )
 
   function toC4View(doc: LangiumDocument) {
@@ -385,7 +387,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         docUri,
         description,
         title,
-        id
+        id,
       }
     }
   }
@@ -394,7 +396,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     docs,
     flatMap(d => map(d.c4Views, toC4View(d))),
     // Resolve relative paths and sort by
-    resolveRelativePaths
+    resolveRelativePaths,
   )
   // Add index view if not present
   if (!parsedViews.some(v => v.id === 'index')) {
@@ -410,18 +412,18 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         {
           include: [
             {
-              wildcard: true
-            }
-          ]
-        }
-      ]
+              wildcard: true,
+            },
+          ],
+        },
+      ],
     })
   }
 
   const views = pipe(
     parsedViews,
     indexBy(prop('id')),
-    resolveRulesExtendedViews
+    resolveRulesExtendedViews,
   )
 
   return {
@@ -429,7 +431,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
       tags: Array.from(c4Specification.tags),
       elements: c4Specification.elements,
       relationships: c4Specification.relationships,
-      deployments: c4Specification.deployments
+      deployments: c4Specification.deployments,
     },
     elements,
     relations,
@@ -437,8 +439,8 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     views,
     deployments: {
       elements: deploymentElements,
-      relations: deploymentRelations
-    }
+      relations: deploymentRelations,
+    },
   }
 }
 
@@ -477,7 +479,7 @@ export class LikeC4ModelBuilder {
           this.notifyListeners(parsed)
         }
         return await Promise.resolve()
-      }
+      },
     )
     logger.debug(`[ModelBuilder] Created`)
   }
@@ -525,7 +527,7 @@ export class LikeC4ModelBuilder {
     const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ComputedLikeC4Model>
     const viewsCache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ComputedView | null>
     return cache.get(CACHE_KEY_COMPUTED_MODEL, () => {
-      const computeView = mkComputeView(model)
+      const computeView = LikeC4Model.makeCompute(model)
       const allViews = [] as c4.ComputedView[]
       for (const view of values(model.views)) {
         const result = computeView(view)
@@ -550,16 +552,16 @@ export class LikeC4ModelBuilder {
             'elements',
             'relations',
             'globals',
-            'deployments'
-          ])
+            'deployments',
+          ]),
         ),
-        views
+        views,
       }
     })
   }
 
   public async buildComputedModel(
-    cancelToken?: Cancellation.CancellationToken
+    cancelToken?: Cancellation.CancellationToken,
   ): Promise<c4.ComputedLikeC4Model | null> {
     const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ComputedLikeC4Model | null>
     if (cache.has(CACHE_KEY_COMPUTED_MODEL)) {
@@ -579,7 +581,7 @@ export class LikeC4ModelBuilder {
 
   public async computeView(
     viewId: ViewId,
-    cancelToken?: Cancellation.CancellationToken
+    cancelToken?: Cancellation.CancellationToken,
   ): Promise<c4.ComputedView | null> {
     const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ComputedView | null>
     const cacheKey = computedViewKey(viewId)
@@ -597,9 +599,9 @@ export class LikeC4ModelBuilder {
           logger.warn(`[ModelBuilder] Cannot find view ${viewId}`)
           return null
         }
-        const result = mkComputeView(model)(view)
+        const result = LikeC4Model.makeCompute(model)(view)
         if (!result.isSuccess) {
-          logError(result.error)
+          logWarnError(result.error)
           return null
         }
         let computedView = result.view
@@ -609,7 +611,7 @@ export class LikeC4ModelBuilder {
           values(),
           filter(isScopedElementView),
           filter(v => v.id !== viewId),
-          groupBy(v => v.viewOf)
+          groupBy(v => v.viewOf),
         )
 
         for (const node of computedView.nodes) {
@@ -652,7 +654,7 @@ export class LikeC4ModelBuilder {
       try {
         listener(docs)
       } catch (e) {
-        logError(e)
+        logWarnError(e)
       }
     }
   }