@likec4/language-server 1.18.0 → 1.19.1

package/src/references/scope-computation.ts

@@ -2,27 +2,27 @@ import { nonexhaustive } from '@likec4/core'
 import {
   type AstNode,
   type AstNodeDescription,
+  type PrecomputedScopes,
   DefaultScopeComputation,
   MultiMap,
-  type PrecomputedScopes
 } from 'langium'
-import { entries, filter, flatMap, forEach, forEachObj, groupBy, isNullish, isTruthy, pipe } from 'remeda'
+import { entries, filter, flatMap, forEachObj, groupBy, isNullish, isTruthy, pipe } from 'remeda'
 import type { CancellationToken } from 'vscode-languageserver'
-import { ast, type LikeC4LangiumDocument } from '../ast'
-import { logError, logWarnError } from '../logger'
+import { type LikeC4LangiumDocument, ast } from '../ast'
+import { logWarnError } from '../logger'
 import type { LikeC4Services } from '../module'
 
 type ElementsContainer = ast.Model | ast.ElementBody | ast.ExtendElementBody
 type DeploymentsContainer = ast.ModelDeployments | ast.DeploymentNodeBody
 
 function uniqueDescriptions(
-  descs: AstNodeDescription[]
+  descs: AstNodeDescription[],
 ): AstNodeDescription[] {
   return pipe(
     descs,
     groupBy(desc => `${desc.type}.${desc.name}`),
     entries(),
-    flatMap(([_, descs]) => descs.length === 1 ? descs : [])
+    flatMap(([_, descs]) => descs.length === 1 ? descs : []),
   )
 }
 
@@ -33,7 +33,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
 
   override async computeExports(
     document: LikeC4LangiumDocument,
-    _cancelToken?: CancellationToken
+    _cancelToken?: CancellationToken,
   ): Promise<AstNodeDescription[]> {
     const docExports: AstNodeDescription[] = []
     try {
@@ -56,7 +56,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
 
       this.exportDeployments(deployments, docExports, document)
     } catch (e) {
-      logError(e)
+      logWarnError(e)
     }
     return docExports
   }
@@ -64,7 +64,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
   private exportViews(
     modelViews: ast.ModelViews[] | undefined,
     docExports: AstNodeDescription[],
-    document: LikeC4LangiumDocument
+    document: LikeC4LangiumDocument,
   ) {
     const views = modelViews?.flatMap(m => m.views)
     if (isNullish(views) || views.length === 0) {
@@ -76,7 +76,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           docExports.push(this.descriptions.createDescription(viewAst, viewAst.name, document))
         }
       } catch (e) {
-        logError(e)
+        logWarnError(e)
       }
     }
   }
@@ -84,7 +84,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
   private exportGlobals(
     globals: ast.Globals[] | undefined,
     docExports: AstNodeDescription[],
-    document: LikeC4LangiumDocument
+    document: LikeC4LangiumDocument,
   ) {
     if (isNullish(globals) || globals.length === 0) {
       return
@@ -96,7 +96,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           docExports.push(this.descriptions.createDescription(id, id.name, document))
         }
       } catch (e) {
-        logError(e)
+        logWarnError(e)
       }
     }
     for (const globalStyleAst of globals.flatMap(g => g.styles)) {
@@ -106,7 +106,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           docExports.push(this.descriptions.createDescription(id, id.name, document))
         }
       } catch (e) {
-        logError(e)
+        logWarnError(e)
       }
     }
   }
@@ -114,7 +114,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
   private exportModel(
     models: ast.Model[] | undefined,
     docExports: AstNodeDescription[],
-    document: LikeC4LangiumDocument
+    document: LikeC4LangiumDocument,
   ) {
     if (isNullish(models) || models.length === 0) {
       return
@@ -125,7 +125,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           docExports.push(this.descriptions.createDescription(elAst, elAst.name, document))
         }
       } catch (e) {
-        logError(e)
+        logWarnError(e)
       }
     }
   }
@@ -133,7 +133,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
   private exportLibrary(
     likec4lib: ast.LikeC4Lib[] | undefined,
     docExports: AstNodeDescription[],
-    document: LikeC4LangiumDocument
+    document: LikeC4LangiumDocument,
   ) {
     if (isNullish(likec4lib)) {
       return
@@ -143,14 +143,14 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
         docExports.push(this.descriptions.createDescription(iconAst, iconAst.name, document))
       }
     } catch (e) {
-      logError(e)
+      logWarnError(e)
     }
   }
 
   private exportSpecification(
     specifications: ast.SpecificationRule[] | undefined,
     docExports: AstNodeDescription[],
-    document: LikeC4LangiumDocument
+    document: LikeC4LangiumDocument,
   ) {
     if (isNullish(specifications) || specifications.length === 0) {
       return
@@ -161,7 +161,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
         ...s.relationships,
         ...s.deploymentNodes,
         ...s.tags,
-        ...s.colors
+        ...s.colors,
       ])
     ) {
       try {
@@ -170,7 +170,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           case ast.isSpecificationElementKind(spec): {
             if (isTruthy(spec.kind.name)) {
               docExports.push(
-                this.descriptions.createDescription(spec.kind, spec.kind.name, document)
+                this.descriptions.createDescription(spec.kind, spec.kind.name, document),
               )
             }
             continue
@@ -178,7 +178,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           case ast.isSpecificationTag(spec): {
             if (isTruthy(spec.tag.name)) {
               docExports.push(
-                this.descriptions.createDescription(spec.tag, '#' + spec.tag.name, document)
+                this.descriptions.createDescription(spec.tag, '#' + spec.tag.name, document),
               )
             }
             continue
@@ -187,7 +187,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
             if (isTruthy(spec.kind.name)) {
               docExports.push(
                 this.descriptions.createDescription(spec.kind, spec.kind.name, document),
-                this.descriptions.createDescription(spec.kind, '.' + spec.kind.name, document)
+                this.descriptions.createDescription(spec.kind, '.' + spec.kind.name, document),
               )
             }
             continue
@@ -195,7 +195,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           case ast.isSpecificationColor(spec): {
             if (isTruthy(spec.name.name)) {
               docExports.push(
-                this.descriptions.createDescription(spec.name, spec.name.name, document)
+                this.descriptions.createDescription(spec.name, spec.name.name, document),
               )
             }
             continue
@@ -205,7 +205,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
             nonexhaustive(spec)
         }
       } catch (e) {
-        logError(e)
+        logWarnError(e)
       }
     }
   }
@@ -213,7 +213,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
   private exportDeployments(
     modelDeployments: ast.ModelDeployments[] | undefined,
     docExports: AstNodeDescription[],
-    document: LikeC4LangiumDocument
+    document: LikeC4LangiumDocument,
   ) {
     const nodes = modelDeployments?.flatMap(m => m.elements)
     if (isNullish(nodes) || nodes.length === 0) {
@@ -232,7 +232,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
 
   override computeLocalScopes(
     document: LikeC4LangiumDocument,
-    _cancelToken?: CancellationToken
+    _cancelToken?: CancellationToken,
   ): Promise<PrecomputedScopes> {
     return new Promise(resolve => {
       const root = document.parseResult.value
@@ -242,16 +242,16 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
       for (const model of root.models) {
         try {
           descendants.push(
-            ...this.processContainer(model, scopes, document)
+            ...this.processContainer(model, scopes, document),
           )
         } catch (e) {
-          logError(e)
+          logWarnError(e)
         }
       }
       for (const deployment of root.deployments) {
         try {
           descendants.push(
-            ...this.processDeployments(deployment, scopes, document)
+            ...this.processDeployments(deployment, scopes, document),
           )
         } catch (e) {
           logWarnError(e)
@@ -269,7 +269,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
   protected processContainer(
     container: ElementsContainer,
     scopes: PrecomputedScopes,
-    document: LikeC4LangiumDocument
+    document: LikeC4LangiumDocument,
   ): AstNodeDescription[] {
     const localScope = new MultiMap<string, AstNodeDescription>()
     const descedants = [] as AstNodeDescription[]
@@ -292,7 +292,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
       if (subcontainer && subcontainer.elements.length > 0) {
         try {
           descedants.push(
-            ...this.processContainer(subcontainer, scopes, document)
+            ...this.processContainer(subcontainer, scopes, document),
           )
         } catch (e) {
           logWarnError(e)
@@ -309,7 +309,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           if (descs.length === 1) {
             localScope.add(name, descs[0])
           }
-        })
+        }),
       )
     }
     const local = [...localScope.values()]
@@ -320,7 +320,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
   protected processDeployments(
     container: DeploymentsContainer,
     scopes: PrecomputedScopes,
-    document: LikeC4LangiumDocument
+    document: LikeC4LangiumDocument,
   ): AstNodeDescription[] {
     const localnames = new Set<string>()
     const descedants = [] as AstNodeDescription[]
@@ -340,7 +340,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
       if (ast.isDeploymentNode(el) && el.body) {
         try {
           descedants.push(
-            ...this.processDeployments(el.body, scopes, document)
+            ...this.processDeployments(el.body, scopes, document),
           )
         } catch (e) {
           logWarnError(e)
@@ -356,7 +356,7 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
           if (descs.length === 1) {
             scopes.add(container, descs[0])
           }
-        })
+        }),
       )
     }
     return [...scopes.get(container).values()]

package/src/references/scope-provider.ts

@@ -16,7 +16,7 @@ import {
   StreamImpl,
   StreamScope
 } from 'langium'
-import { ast, isLikeC4LangiumDocument } from '../ast'
+import { ast } from '../ast'
 import { logger } from '../logger'
 import type { DeploymentsIndex, FqnIndex } from '../model'
 import type { LikeC4Services } from '../module'
@@ -91,8 +91,8 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
       const referenceType = this.reflection.getReferenceType(context)
       try {
         const container = context.container
-        if (ast.isDeploymentRef(container)) {
-          return this.getScopeForDeploymentRef(container, context)
+        if (ast.isFqnRef(container)) {
+          return this.getScopeForFqnRef(container, context)
         }
 
         if (referenceType !== ast.Element) {
@@ -134,14 +134,20 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
     }
   }
 
-  protected getScopeForDeploymentRef(container: ast.DeploymentRef, context: ReferenceInfo) {
+  protected getScopeForFqnRef(container: ast.FqnRef, context: ReferenceInfo) {
     const parent = container.parent
     if (!parent) {
-      return new MapScope(
+      return this.createScope(
         // First preference for deployment nodes
         this.computeScope(context, ast.DeploymentNode).getAllElements(),
-        // Second preference for deployed instances
-        this.computeScope(context, ast.DeployedInstance)
+        this.createScope(
+          // Second preference for deployed instances
+          this.computeScope(context, ast.DeployedInstance).getAllElements(),
+          // Third preference for elements if we are in deployment view
+          AstUtils.hasContainerOfType(container, ast.isDeploymentView)
+            ? this.computeScope(context, ast.Element)
+            : EMPTY_SCOPE
+        )
       )
     }
     const parentRef = parent.value.ref

package/src/utils/{deploymentRef.ts → fqnRef.ts}

@@ -2,7 +2,7 @@ import { AstUtils } from 'langium'
 import { isNullish } from 'remeda'
 import { ast } from '../ast'
 
-export function instanceRef(deploymentRef: ast.DeploymentRef): ast.DeployedInstance | null {
+export function instanceRef(deploymentRef: ast.FqnRef): ast.DeployedInstance | null {
   let referenceable
   while ((referenceable = deploymentRef.value?.ref)) {
     if (ast.isDeploymentNode(referenceable)) {
@@ -19,7 +19,7 @@ export function instanceRef(deploymentRef: ast.DeploymentRef): ast.DeployedInsta
   return null
 }
 
-export function deploymentNodeRef(deploymentRef: ast.DeploymentRef): ast.DeploymentNode | null {
+export function deploymentNodeRef(deploymentRef: ast.FqnRef): ast.DeploymentNode | null {
   let referenceable = deploymentRef.value.ref ?? null
   if (!referenceable || ast.isDeploymentNode(referenceable)) {
     return referenceable
@@ -29,3 +29,28 @@ export function deploymentNodeRef(deploymentRef: ast.DeploymentRef): ast.Deploym
   // we find artifact first and then its container
   return artifact ? AstUtils.getContainerOfType(artifact, ast.isDeploymentNode) ?? null : null
 }
+
+export function isReferenceToLogicalModel(node: ast.FqnRef) {
+  // iterate up the root parent
+  while (node.parent) {
+    node = node.parent
+  }
+  return ast.isElement(node.value.ref)
+}
+
+/**
+ * Returns true if node references deployment model
+ */
+export function isReferenceToDeploymentModel(node: ast.FqnRef) {
+  let referenceable
+  while ((referenceable = node.value?.ref)) {
+    if (ast.isDeploymentElement(referenceable)) {
+      return true
+    }
+    if (isNullish(node.parent)) {
+      return false
+    }
+    node = node.parent
+  }
+  return false
+}

package/src/validation/_shared.ts

@@ -8,7 +8,6 @@ export const RESERVED_WORDS = [
   'it',
   'self',
   'super',
-  'instance',
   'likec4lib',
   'global'
 ]

package/src/validation/deployment-checks.ts

@@ -1,5 +1,5 @@
-import { nonNullable } from '@likec4/core'
-import { AstUtils, type ValidationCheck } from 'langium'
+import { FqnRef, isSameHierarchy, nonNullable } from '@likec4/core'
+import { type ValidationCheck, AstUtils } from 'langium'
 import { ast } from '../ast'
 import type { LikeC4Services } from '../module'
 import type { LikeC4NameProvider } from '../references'
@@ -14,7 +14,7 @@ export const deploymentNodeChecks = (services: LikeC4Services): ValidationCheck<
     const nodeName = Names.getName(el)
     if (!nodeName) {
       accept('error', 'DeploymentNode must be named', {
-        node: el
+        node: el,
       })
       return
     }
@@ -23,10 +23,10 @@ export const deploymentNodeChecks = (services: LikeC4Services): ValidationCheck<
     if (RESERVED_WORDS.includes(nodeName)) {
       accept('error', `Reserved word: ${nodeName}`, {
         node: el,
-        range
+        range,
       })
     }
-    const fqnName = DeploymentsIndex.getFqnName(el)
+    const fqnName = DeploymentsIndex.getFqn(el)
 
     const withSameName = DeploymentsIndex.byFqn(fqnName).limit(2).toArray()
     if (withSameName.length > 1) {
@@ -35,8 +35,8 @@ export const deploymentNodeChecks = (services: LikeC4Services): ValidationCheck<
         `Duplicate node name "${fqnName}"`,
         {
           node: el,
-          range
-        }
+          range,
+        },
       )
     }
   })
@@ -50,7 +50,7 @@ export const deployedInstanceChecks = (services: LikeC4Services): ValidationChec
     const artifactName = Names.getName(el)
     if (!artifactName) {
       accept('error', 'Deployed instance must be named, unique inside node', {
-        node: el
+        node: el,
       })
       return
     }
@@ -59,10 +59,11 @@ export const deployedInstanceChecks = (services: LikeC4Services): ValidationChec
     if (RESERVED_WORDS.includes(artifactName)) {
       accept('error', `Reserved word: ${artifactName}`, {
         node: el,
-        range
+        range,
       })
     }
-    const fqnName = DeploymentsIndex.getFqnName(el)
+
+    const fqnName = DeploymentsIndex.getFqn(el)
 
     const withSameName = DeploymentsIndex.byFqn(fqnName).limit(2).toArray()
     if (withSameName.length > 1) {
@@ -71,74 +72,60 @@ export const deployedInstanceChecks = (services: LikeC4Services): ValidationChec
         `Duplicate instance name "${fqnName}"`,
         {
           node: el,
-          range
-        }
+          range,
+        },
       )
     }
   })
 }
 
 export const deploymentRelationChecks = (services: LikeC4Services): ValidationCheck<ast.DeploymentRelation> => {
-  // const DeploymentsIndex = services.likec4.DeploymentsIndex
-  // const Names = services.references.NameProvider as LikeC4NameProvider
-  // const Locator = services.workspace.AstNodeLocator
-  // const fqnIndex = services.likec4.FqnIndex
+  const ModelParser = services.likec4.ModelParser
   return tryOrLog((el, accept) => {
     const source = el.source?.value?.ref
-    const target = el.target?.value?.ref
-
-    if (!source || !target) {
+    if (!source) {
+      let sourceCstText = el.source?.$cstNode?.text ?? ''
+      accept('error', `DeploymentRelation source '${sourceCstText}' not resolved`, {
+        node: el,
+        property: 'source',
+      })
       return
     }
-
-    if (
-      ast.isElement(source) && ast.isDeploymentNode(target) || ast.isElement(target) && ast.isDeploymentNode(source)
-    ) {
-      const range = el.target.$cstNode?.range ?? el.source.$cstNode?.range
-      accept('error', 'Relations between deployment nodes and instance internals are not supported', {
+    const target = el.target?.value?.ref
+    if (!target) {
+      let targetCstText = el.target?.$cstNode?.text ?? ''
+      accept('error', `DeploymentRelation target '${targetCstText}' not resolved`, {
         node: el,
-        ...range && { range }
+        property: 'target',
       })
+      return
     }
 
-    // const sourceEl = ast.isDeployedInstance(source)
-    //   ? elementRef(source.element)
-    //   : source
-    // const targetEl = ast.isDeployedInstance(target)
-    //   ? elementRef(target.element)
-    //   : target
-
-    // if (!sourceEl || !targetEl) {
-    //   return
-    // }
+    const doc = getDocument(el)
+    const parser = ModelParser.forDocument(doc)
 
-    // const sourceFqn = ast.isElement(sourceEl) ? fqnIndex.getFqn(sourceEl) : DeploymentsIndex.getFqnName(sourceEl) as Fqn
-    // if (!sourceFqn) {
-    //   accept('error', 'Source not resolved', {
-    //     node: el,
-    //     property: 'source'
-    //   })
-    // }
-
-    // const targetFqn = ast.isElement(targetEl) ? fqnIndex.getFqn(targetEl) : DeploymentsIndex.getFqnName(targetEl) as Fqn
-    // if (!targetFqn) {
-    //   accept('error', 'Target not resolved', {
-    //     node: el,
-    //     property: 'target'
-    //   })
-    // }
+    const sourceFqnRef = parser.parseFqnRef(el.source)
+    if (FqnRef.isModelRef(sourceFqnRef)) {
+      accept('error', 'DeploymentRelation must refer deployment element', {
+        node: el,
+        property: 'source',
+      })
+      return
+    }
 
-    // if (!!sourceFqn && sourceFqn === targetFqn) {
-    //   accept('error', 'Self-relation is not allowed', {
-    //     node: el
-    //   })
-    //   return
-    // }
+    const targetFqnRef = parser.parseFqnRef(el.target)
+    if (FqnRef.isModelRef(targetFqnRef)) {
+      accept('error', 'DeploymentRelation must refer deployment element', {
+        node: el,
+        property: 'target',
+      })
+      return
+    }
 
-    // if (sourceFqn && targetFqn && isSameHierarchy(sourceFqn, targetFqn)) {
-    //   accept('error', 'Invalid parent-child relationship', {
-    //     node: el
-    //   })
-    // }
+    if (isSameHierarchy(sourceFqnRef.deployment, targetFqnRef.deployment)) {
+      accept('error', 'Invalid parent-child relationship', {
+        node: el,
+      })
+    }
   })
 }

package/src/validation/dynamic-view-rule.ts

@@ -2,21 +2,22 @@ import { nonexhaustive } from '@likec4/core'
 import type { ValidationCheck } from 'langium'
 import { ast, elementExpressionFromPredicate } from '../ast'
 import type { LikeC4Services } from '../module'
+import { tryOrLog } from './_shared'
 
 export const dynamicViewRulePredicate = (
-  _services: LikeC4Services
+  _services: LikeC4Services,
 ): ValidationCheck<ast.DynamicViewPredicateIterator> => {
-  return (predicate, accept) => {
+  return tryOrLog((predicate, accept) => {
     const expr = elementExpressionFromPredicate(predicate.value)
     switch (true) {
       case ast.isElementKindExpression(expr):
       case ast.isElementTagExpression(expr):
       case ast.isWildcardExpression(expr): {
         accept('warning', `Predicate is ignored, as not supported in dynamic views`, {
-          node: predicate
+          node: predicate,
         })
         return
       }
     }
-  }
+  })
 }

package/src/validation/dynamic-view-step.ts

@@ -4,36 +4,33 @@ import { ast } from '../ast'
 import { logError } from '../logger'
 import type { LikeC4Services } from '../module'
 import { elementRef } from '../utils/elementRef'
+import { tryOrLog } from './_shared'
 
 export const dynamicViewStep = (services: LikeC4Services): ValidationCheck<ast.DynamicViewStep> => {
   const fqnIndex = services.likec4.FqnIndex
-  return (el, accept) => {
-    try {
-      const sourceEl: ast.Element | undefined = elementRef(el.source)
-      const source = sourceEl && fqnIndex.getFqn(sourceEl)
-      if (!source) {
-        accept('error', 'Source not found (not parsed/indexed yet)', {
-          node: el,
-          property: 'source'
-        })
-      }
+  return tryOrLog((el, accept) => {
+    const sourceEl: ast.Element | undefined = elementRef(el.source)
+    const source = sourceEl && fqnIndex.getFqn(sourceEl)
+    if (!source) {
+      accept('error', 'Source not found (not parsed/indexed yet)', {
+        node: el,
+        property: 'source',
+      })
+    }
 
-      const targetEl: ast.Element | undefined = elementRef(el.target)
-      const target = targetEl && fqnIndex.getFqn(targetEl)
-      if (!target) {
-        accept('error', 'Target not found (not parsed/indexed yet)', {
-          node: el,
-          property: 'target'
-        })
-      }
+    const targetEl: ast.Element | undefined = elementRef(el.target)
+    const target = targetEl && fqnIndex.getFqn(targetEl)
+    if (!target) {
+      accept('error', 'Target not found (not parsed/indexed yet)', {
+        node: el,
+        property: 'target',
+      })
+    }
 
-      if (source && target && (isAncestor(source, target) || isAncestor(target, source))) {
-        accept('error', 'Invalid parent-child relationship', {
-          node: el
-        })
-      }
-    } catch (e) {
-      logError(e)
+    if (source && target && (isAncestor(source, target) || isAncestor(target, source))) {
+      accept('error', 'Invalid parent-child relationship', {
+        node: el,
+      })
     }
-  }
+  })
 }