@likec4/language-server 1.17.1 → 1.19.0

package/src/model/model-builder.ts

@@ -3,12 +3,14 @@ import {
   compareRelations,
   computeColorValues,
   type CustomColorDefinitions,
-  isElementView,
+  DeploymentElement,
   isScopedElementView,
+  LikeC4Model,
   parentFqn,
   sortByFqnHierarchically,
-  type ViewID
+  type ViewId
 } from '@likec4/core'
+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'
@@ -17,6 +19,7 @@ import {
   flatMap,
   groupBy,
   indexBy,
+  isDefined,
   isEmpty,
   isNonNullish,
   isNullish,
@@ -25,6 +28,7 @@ import {
   map,
   mapToObj,
   mapValues,
+  pick,
   pipe,
   prop,
   reduce,
@@ -33,6 +37,7 @@ import {
   values
 } from 'remeda'
 import type {
+  ParsedAstDeploymentRelation,
   ParsedAstElement,
   ParsedAstRelation,
   ParsedAstSpecification,
@@ -42,14 +47,14 @@ import type {
 } from '../ast'
 import { isParsedLikeC4LangiumDocument } from '../ast'
 import { logError, logger, logWarnError } from '../logger'
-import { computeDynamicView, computeView, LikeC4ModelGraph } from '../model-graph'
 import type { LikeC4Services } from '../module'
-import { assignNavigateTo, resolveRelativePaths, resolveRulesExtendedViews } from '../view-utils'
+import { assignNavigateTo, resolveRelativePaths } from '../view-utils'
 
 function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[]): c4.ParsedLikeC4Model {
   // Merge specifications and globals from all documents
   const c4Specification: ParsedAstSpecification = {
     tags: new Set(),
+    deployments: {},
     elements: {},
     relationships: {},
     colors: {}
@@ -69,7 +74,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     Object.assign(c4Specification.elements, spec.elements)
     Object.assign(c4Specification.relationships, spec.relationships)
     Object.assign(c4Specification.colors, spec.colors)
-
+    Object.assign(c4Specification.deployments, spec.deployments)
     Object.assign(globals.predicates, c4Globals.predicates)
     Object.assign(globals.dynamicPredicates, c4Globals.dynamicPredicates)
     Object.assign(globals.styles, c4Globals.styles)
@@ -186,10 +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}, source: ${source}(${!!elements[source]}), target: ${target}(${!!elements[target]})`
+          `Invalid relation ${id} at ${doc.uri.path} ${astPath}, source: ${source}(${!!elements[
+            source
+          ]}), target: ${target}(${!!elements[target]})`
         )
         return null
       }
@@ -204,15 +211,15 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           target,
           kind,
           id
-        } satisfies c4.Relation
+        } satisfies c4.ModelRelation
       }
       return {
-        ...(links && { links }),
+        ...links && { links },
         ...model,
         source,
         target,
         id
-      } satisfies c4.Relation
+      } satisfies c4.ModelRelation
     }
   }
 
@@ -225,6 +232,128 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     indexBy(prop('id'))
   )
 
+  function toDeploymentElement(doc: LangiumDocument) {
+    return (parsed: c4.DeploymentElement): c4.DeploymentElement | null => {
+      if (!DeploymentElement.isDeploymentNode(parsed)) {
+        if (!parsed.links || parsed.links.length === 0) {
+          return parsed
+        }
+        const links = resolveLinks(doc, parsed.links)
+        return {
+          ...parsed,
+          links
+        }
+      }
+      try {
+        const __kind = c4Specification.deployments[parsed.kind]
+        if (!__kind) {
+          logger.warn(`No kind '${parsed.kind}' found for ${parsed.id}`)
+          return null
+        }
+        let {
+          technology = __kind.technology,
+          notation = __kind.notation,
+          links,
+          style
+        } = parsed
+        return {
+          ...parsed,
+          ...notation && { notation },
+          ...technology && { technology },
+          style: {
+            border: 'dashed',
+            opacity: 10,
+            ...__kind.style,
+            ...style
+          },
+          links: links ? resolveLinks(doc, links) : null
+        }
+      } catch (e) {
+        logWarnError(e)
+      }
+      return null
+    }
+  }
+
+  const deploymentElements = pipe(
+    docs,
+    flatMap(d => map(d.c4Deployments, toDeploymentElement(d))),
+    filter(isTruthy),
+    // sort from root elements to nested, so that parent is always present
+    // Import to preserve the order from the source
+    sortByFqnHierarchically,
+    reduce(
+      (acc, el) => {
+        const parent = parentFqn(el.id)
+        if (parent && isNullish(acc[parent])) {
+          logWarnError(`No parent found for deployment element ${el.id}`)
+          return acc
+        }
+        acc[el.id] = el
+        return acc
+      },
+      {} as c4.ParsedLikeC4Model['deployments']['elements']
+    )
+  )
+
+  function toDeploymentRelation(doc: LangiumDocument) {
+    return ({
+      astPath,
+      source,
+      target,
+      kind,
+      links: unresolvedLinks,
+      id,
+      ...model
+    }: ParsedAstDeploymentRelation): c4.DeploymentRelation | null => {
+      if (isNullish(deploymentElements[source.id]) || isNullish(deploymentElements[target.id])) {
+        logger.warn(
+          `Invalid deployment relation ${id} at ${doc.uri.path} ${astPath}, source: ${source.id}(${!!deploymentElements[
+            source.id
+          ]}), target: ${target.id}(${!!deploymentElements[target.id]})`
+        )
+        return null
+      }
+      const links = unresolvedLinks ? resolveLinks(doc, unresolvedLinks) : null
+
+      if (isNonNullish(kind) && kind in c4Specification.relationships) {
+        return {
+          ...c4Specification.relationships[kind],
+          ...model,
+          ...(links && { links }),
+          source,
+          target,
+          kind,
+          id
+        } satisfies c4.DeploymentRelation
+      }
+      return {
+        ...links && { links },
+        ...model,
+        source,
+        target,
+        id
+      } satisfies c4.DeploymentRelation
+    }
+  }
+
+  const deploymentRelations = pipe(
+    docs,
+    flatMap(d => map(d.c4DeploymentRelations, toDeploymentRelation(d))),
+    filter(isTruthy),
+    reduce(
+      (acc, el) => {
+        if (isDefined(acc[el.id])) {
+          logWarnError(`Duplicate deployment relation ${el.id}`)
+          return acc
+        }
+        acc[el.id] = el
+        return acc
+      },
+      {} as c4.ParsedLikeC4Model['deployments']['relations']
+    )
+  )
+
   function toC4View(doc: LangiumDocument) {
     const docUri = doc.uri.toString()
     return (parsedAstView: ParsedAstView): c4.LikeC4View => {
@@ -273,7 +402,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
   if (!parsedViews.some(v => v.id === 'index')) {
     parsedViews.unshift({
       __: 'element',
-      id: 'index' as ViewID,
+      id: 'index' as ViewId,
       title: 'Landscape view',
       description: null,
       tags: null,
@@ -301,12 +430,17 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     specification: {
       tags: Array.from(c4Specification.tags),
       elements: c4Specification.elements,
-      relationships: c4Specification.relationships
+      relationships: c4Specification.relationships,
+      deployments: c4Specification.deployments
     },
     elements,
     relations,
     globals,
-    views
+    views,
+    deployments: {
+      elements: deploymentElements,
+      relations: deploymentRelations
+    }
   }
 }
 
@@ -335,8 +469,8 @@ export class LikeC4ModelBuilder {
         let parsed = [] as URI[]
         try {
           logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)`)
-          for (const doc of parser.parse(docs)) {
-            parsed.push(doc.uri)
+          for (const doc of docs) {
+            parsed.push(parser.parse(doc).uri)
           }
         } catch (e) {
           logWarnError(e)
@@ -356,13 +490,13 @@ export class LikeC4ModelBuilder {
    * Otherwise, the model may be incomplete.
    */
   public unsafeSyncBuildModel(): c4.ParsedLikeC4Model | null {
+    const docs = this.documents()
+    if (docs.length === 0) {
+      logger.debug('[ModelBuilder] No documents to build model from')
+      return null
+    }
     const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ParsedLikeC4Model | null>
     return cache.get(CACHE_KEY_PARSED_MODEL, () => {
-      const docs = this.documents()
-      if (docs.length === 0) {
-        logger.debug('[ModelBuilder] No documents to build model from')
-        return null
-      }
       logger.debug(`[ModelBuilder] buildModel (${docs.length} docs)`)
       return buildModel(this.services, docs)
     })
@@ -370,8 +504,9 @@ export class LikeC4ModelBuilder {
 
   public async buildModel(cancelToken?: Cancellation.CancellationToken): Promise<c4.ParsedLikeC4Model | null> {
     const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ParsedLikeC4Model | null>
-    if (cache.has(CACHE_KEY_PARSED_MODEL)) {
-      return cache.get(CACHE_KEY_PARSED_MODEL)!
+    const cached = cache.get(CACHE_KEY_PARSED_MODEL)
+    if (cached) {
+      return cached
     }
     return await this.services.shared.workspace.WorkspaceLock.read(async () => {
       if (cancelToken) {
@@ -381,7 +516,7 @@ export class LikeC4ModelBuilder {
     })
   }
 
-  private previousViews: Record<ViewID, c4.ComputedView> = {}
+  private previousViews: Record<ViewId, c4.ComputedView> = {}
 
   /**
    * WARNING:
@@ -392,13 +527,10 @@ 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 index = new LikeC4ModelGraph(model)
-
+      const computeView = LikeC4Model.makeCompute(model)
       const allViews = [] as c4.ComputedView[]
       for (const view of values(model.views)) {
-        const result = isElementView(view)
-          ? computeView(view, index)
-          : computeDynamicView(view, index)
+        const result = computeView(view)
         if (!result.isSuccess) {
           logWarnError(result.error)
           continue
@@ -414,10 +546,15 @@ export class LikeC4ModelBuilder {
       })
       this.previousViews = { ...views }
       return {
-        specification: model.specification,
-        elements: model.elements,
-        relations: model.relations,
-        globals: model.globals,
+        ...structuredClone(
+          pick(model, [
+            'specification',
+            'elements',
+            'relations',
+            'globals',
+            'deployments'
+          ])
+        ),
         views
       }
     })
@@ -443,7 +580,7 @@ export class LikeC4ModelBuilder {
   }
 
   public async computeView(
-    viewId: ViewID,
+    viewId: ViewId,
     cancelToken?: Cancellation.CancellationToken
   ): Promise<c4.ComputedView | null> {
     const cache = this.services.WorkspaceCache as WorkspaceCache<string, c4.ComputedView | null>
@@ -462,10 +599,7 @@ export class LikeC4ModelBuilder {
           logger.warn(`[ModelBuilder] Cannot find view ${viewId}`)
           return null
         }
-        const index = new LikeC4ModelGraph(model)
-        const result = isElementView(view)
-          ? computeView(view, index)
-          : computeDynamicView(view, index)
+        const result = LikeC4Model.makeCompute(model)(view)
         if (!result.isSuccess) {
           logError(result.error)
           return null
@@ -490,8 +624,11 @@ export class LikeC4ModelBuilder {
         }
 
         const previous = this.previousViews[viewId]
-        computedView = previous && eq(computedView, previous) ? previous : computedView
-        this.previousViews[viewId] = computedView
+        if (previous && eq(computedView, previous)) {
+          computedView = previous
+        } else {
+          this.previousViews[viewId] = computedView
+        }
 
         return computedView
       })

package/src/model/model-locator.ts

@@ -1,10 +1,12 @@
 import type * as c4 from '@likec4/core'
 import type { LangiumDocuments } from 'langium'
 import { AstUtils, GrammarUtils } from 'langium'
+import { isString } from 'remeda'
 import type { Location } from 'vscode-languageserver-types'
 import type { ParsedAstElement } from '../ast'
 import { ast, isParsedLikeC4LangiumDocument } from '../ast'
 import type { LikeC4Services } from '../module'
+import type { DeploymentsIndex } from './deployments-index'
 import { type FqnIndex } from './fqn-index'
 
 const { findNodeForKeyword, findNodeForProperty } = GrammarUtils
@@ -12,10 +14,12 @@ const { getDocument } = AstUtils
 
 export class LikeC4ModelLocator {
   private fqnIndex: FqnIndex
+  private deploymentsIndex: DeploymentsIndex
   private langiumDocuments: LangiumDocuments
 
   constructor(private services: LikeC4Services) {
     this.fqnIndex = services.likec4.FqnIndex
+    this.deploymentsIndex = services.likec4.DeploymentsIndex
     this.langiumDocuments = services.shared.workspace.LangiumDocuments
   }
 
@@ -23,10 +27,23 @@ export class LikeC4ModelLocator {
     return this.langiumDocuments.all.filter(isParsedLikeC4LangiumDocument)
   }
 
-  public getParsedElement(astNode: ast.Element): ParsedAstElement | null {
-    const fqn = this.fqnIndex.getFqn(astNode)
+  public getParsedElement(astNodeOrFqn: ast.Element | c4.Fqn): ParsedAstElement | null {
+    if (isString(astNodeOrFqn)) {
+      const fqn = astNodeOrFqn
+      const entry = this.fqnIndex.byFqn(astNodeOrFqn).head()
+      if (!entry) {
+        return null
+      }
+      const doc = this.langiumDocuments.getDocument(entry.documentUri)
+      if (!doc || !isParsedLikeC4LangiumDocument(doc)) {
+        return null
+      }
+      return doc.c4Elements.find(e => e.id === fqn) ?? null
+    }
+
+    const fqn = this.fqnIndex.getFqn(astNodeOrFqn)
     if (!fqn) return null
-    const doc = getDocument(astNode)
+    const doc = getDocument(astNodeOrFqn)
     if (!isParsedLikeC4LangiumDocument(doc)) {
       return null
     }
@@ -44,10 +61,22 @@ export class LikeC4ModelLocator {
       range: docsegment.range
     }
   }
+  public locateDeploymentElement(fqn: c4.Fqn, _prop?: string): Location | null {
+    const entry = this.deploymentsIndex.byFqn(fqn).head()
+    const docsegment = entry?.nameSegment ?? entry?.selectionSegment
+    if (!entry || !docsegment) {
+      return null
+    }
+    return {
+      uri: entry.documentUri.toString(),
+      range: docsegment.range
+    }
+  }
 
-  public locateRelation(relationId: c4.RelationID): Location | null {
+  public locateRelation(relationId: c4.RelationId): Location | null {
     for (const doc of this.documents()) {
       const relation = doc.c4Relations.find(r => r.id === relationId)
+        ?? doc.c4DeploymentRelations.find(r => r.id === relationId)
       if (!relation) {
         continue
       }
@@ -55,7 +84,7 @@ export class LikeC4ModelLocator {
         doc.parseResult.value,
         relation.astPath
       )
-      if (!ast.isRelation(node)) {
+      if (!ast.isRelation(node) && !ast.isDeploymentRelation(node)) {
         continue
       }
 
@@ -76,7 +105,7 @@ export class LikeC4ModelLocator {
     return null
   }
 
-  public locateViewAst(viewId: c4.ViewID) {
+  public locateViewAst(viewId: c4.ViewId) {
     for (const doc of this.documents()) {
       const view = doc.c4Views.find(r => r.id === viewId)
       if (!view) {
@@ -97,7 +126,7 @@ export class LikeC4ModelLocator {
     return null
   }
 
-  public locateView(viewId: c4.ViewID): Location | null {
+  public locateView(viewId: c4.ViewId): Location | null {
     const res = this.locateViewAst(viewId)
     if (!res) {
       return null