@likec4/language-server 1.4.0 → 1.6.0

package/src/like-c4.langium

@@ -4,10 +4,22 @@ entry LikeC4Grammar:
   (
     specifications+=SpecificationRule |
     models+=Model  |
-    views+=ModelViews
+    views+=ModelViews |
+    likec4lib+=LikeC4Lib
   )*
 ;
 
+// Lib -------------------------------------
+LikeC4Lib:
+  'likec4lib' '{'
+    'icons' '{'
+      (icons+=LibIcon)+
+    '}'
+  '}';
+
+LibIcon:
+  name=IconId;
+
 // Specification -------------------------------------
 
 ElementKind:
@@ -80,10 +92,10 @@ ElementBody: '{'
 ;
 
 ElementProperty:
-  ElementStringProperty | StyleProperties | LinkProperty;
+  ElementStringProperty | StyleProperties | LinkProperty | IconProperty;
 
 ElementStringProperty:
-  key=('title' | 'technology' | 'description') Colon? value=String SemiColon?;
+  key=('title' | 'technology' | 'description') ':'? value=String ';'?;
 
 ExtendElement:
   'extend' element=FqnElementRef body=ExtendElementBody
@@ -105,7 +117,7 @@ ElementRef:
   el=[Element] ({infer ElementRef.parent=current} dot=StickyDot el=[Element])*;
 
 Tags:
-  (value+=[Tag:TagId] comma+=(Comma | SemiColon)?)+
+  value+=[Tag:TagId] (','? value+=[Tag:TagId])* (';')?
 ;
 
 Relation:
@@ -135,7 +147,7 @@ RelationProperty:
   RelationStringProperty | RelationStyleProperty |  LinkProperty;
 
 RelationStringProperty:
-  key='title' Colon? value=String SemiColon?;
+  key='title' ':'? value=String ';'?;
 
 RelationStyleProperty:
   key='style' '{'
@@ -168,13 +180,6 @@ DynamicView:
   'dynamic' 'view' name=Id body=DynamicViewBody
 ;
 
-DynamicViewBody: '{'
-  tags=Tags?
-  props+=ViewProperty*
-  (steps+=DynamicViewStep | rules+=DynamicViewRule)*
-  '}'
-;
-
 ViewRef:
   view=[LikeC4View];
 
@@ -188,14 +193,22 @@ ElementViewBody: '{'
 '}'
 ;
 
-type StringProperty = ElementStringProperty| ViewStringProperty;
+DynamicViewBody: '{'
+  tags=Tags?
+  props+=ViewProperty*
+  (steps+=DynamicViewStep | rules+=DynamicViewRule)*
+  '}'
+;
+
+
+type StringProperty = ElementStringProperty| ViewStringProperty | RelationStringProperty;
 
 ViewProperty:
   ViewStringProperty | LinkProperty
 ;
 
 ViewStringProperty:
-  key=('title' | 'description') Colon? value=String SemiColon?;
+  key=('title' | 'description') ':'? value=String ';'?;
 
 ViewLayoutDirection returns string:
   'TopBottom' | 'LeftRight' | 'BottomTop' | 'RightLeft';
@@ -213,67 +226,95 @@ DynamicViewRule:
 ;
 
 DynamicViewStep:
-  source=ElementRef (isBackward?='<-' |  '->' | '-[' kind=[RelationshipKind] ']->') target=ElementRef title=String?
+  source=ElementRef (isBackward?='<-' |  '->' | '-[' kind=[RelationshipKind] ']->' | kind=[RelationshipKind:DotId] ) target=ElementRef title=String?
 ;
 
 ViewRulePredicate:
-  ({infer IncludePredicate} 'include' | {infer ExcludePredicate} 'exclude')
-  expressions+=ViewRulePredicateExpr (commas+=Comma expressions+=ViewRulePredicateExpr)* Comma?
+  {infer IncludePredicate} 'include' exprs=Expressions |
+  {infer ExcludePredicate} 'exclude' exprs=Expressions
 ;
 
-DynamicViewRulePredicate:
-  'include' expressions+=ViewRulePredicateExpr (commas+=Comma expressions+=ViewRulePredicateExpr)* Comma?
+// IncludePredicate:
+//   'include' expr=WithExpressions ({infer IncludePredicate.prev=current} ',' (expr=WithExpressions)?)*
+// ;
+// ExcludePredicate:
+//   'exclude' expr=WithExpressions ({infer ExcludePredicate.prev=current} ',' (expr=WithExpressions)?)*
+// ;
+
+Expressions:
+  value=WithExpressions ({infer Expressions.prev=current} ',' (value=WithExpressions)?)*
 ;
 
-ViewRuleStyle:
-  'style' targets+=ElementExpr (commas+=Comma targets+=ElementExpr)* Comma? '{'
-    styleprops+=StyleProperty*
-  '}';
+WithExpressions infers Expression:
+  RelationExpression ({infer CustomRelationExpression.relation=current} 'with' custom=CustomRelationProperties)? |
+  ElementExpression ({infer CustomElementExpression.target=current} 'with' custom=CustomElementProperties)?
+;
 
-ViewRuleAutoLayout:
-  'autoLayout' direction=ViewLayoutDirection;
+ElementExpression:
+  ElementSelectorExpression |
+  ElementDescedantsExpression
+;
+
+ElementSelectorExpression infers ElementExpression:
+  {infer WildcardExpression} isWildcard?='*' |
+  {infer ElementTagExpression} 'element.tag' IsEqual tag=[Tag:TagId]? |
+  {infer ElementKindExpression} 'element.kind' IsEqual kind=[ElementKind]?
+;
 
-ViewRulePredicateExpr:
-  InOutExpr |
-  ElementExpr (
-    {infer CustomElementExpr.target=current} 'with'  body=CustomElementExprBody |
-    {infer RelationExpr.source=current} (isBidirectional?='<->' | '->') target=ElementExpr |
-    {infer OutgoingExpr.from=current} '->'
+ElementDescedantsExpression infers ElementExpression:
+  ElementRef (
+    {infer ExpandElementExpression.expand=current} DotUnderscore |
+    {infer ElementDescedantsExpression.parent=current} DotWildcard
   )?
 ;
 
-InOutExpr infers ViewRulePredicateExpr:
-  IncomingExpr ({infer InOutExpr.inout=current} '->')?;
+RelationExpression:
+  InOutRelationExpressions |
+  DirectedRelationExpressions
+;
 
-IncomingExpr:
-  '->' to=ElementExpr;
+InOutRelationExpressions infers RelationExpression:
+  IncomingRelationExpression ({infer InOutRelationExpression.inout=current} '->')?
+;
 
+IncomingRelationExpression:
+  '->' to=ElementExpression;
 
-ElementExpr:
-  WildcardExpr |
-  ElementSelectorExpr |
-  DescedantsExpr
+DirectedRelationExpressions infers RelationExpression:
+  OutgoingRelationExpression ({infer DirectedRelationExpression.source=current} target=ElementExpression)?
 ;
 
-WildcardExpr:
-  isWildcard?='*'
+OutgoingRelationExpression:
+  from=ElementExpression
+  (isBidirectional?='<->' | '->' | '-[' kind=[RelationshipKind] ']->' | kind=[RelationshipKind:DotId])
 ;
 
-ElementSelectorExpr infers ElementExpr:
-  'element' StickyDot (
-    {infer ElementTagExpr} 'tag' IsEqual tag=[Tag:TagId] |
-    {infer ElementKindExpr} 'kind' IsEqual kind=[ElementKind]
-  )
+// Comma-separated list of ElementExpressions
+ElementExpressionsIterator:
+  value=ElementExpression ({infer ElementExpressionsIterator.prev=current} ',' (value=ElementExpression)?)*
 ;
 
-DescedantsExpr infers ElementExpr:
-  ElementRef (
-    {infer ExpandElementExpr.parent=current} DotUnderscore |
-    {infer DescedantsExpr.parent=current} DotWildcard
-  )?
+DynamicViewRulePredicate:
+  'include' exprs=DynamicViewRulePredicateIterator
+;
+
+DynamicViewRulePredicateIterator:
+  value=DynamicViewElementExpressions ({infer DynamicViewRulePredicateIterator.prev=current} ',' (value=DynamicViewElementExpressions)?)*
 ;
 
-CustomElementExprBody: '{'
+DynamicViewElementExpressions infers DynamicViewElementExpression:
+  ElementExpression ({infer CustomElementExpression.target=current} 'with' custom=CustomElementProperties)?
+;
+
+ViewRuleStyle:
+  'style' target=ElementExpressionsIterator '{'
+    props+=StyleProperty*
+  '}';
+
+ViewRuleAutoLayout:
+  'autoLayout' direction=ViewLayoutDirection;
+
+CustomElementProperties: '{'
   props+=(
     NavigateToProperty |
     ElementStringProperty |
@@ -282,32 +323,40 @@ CustomElementExprBody: '{'
 '}'
 ;
 
+CustomRelationProperties: '{'
+  props+=(
+    RelationStringProperty |
+    RelationshipStyleProperty
+  )*
+'}'
+;
+
 NavigateToProperty:
   key='navigateTo' value=ViewRef;
 
 // Common properties -------------------------------------
 
 LinkProperty:
-  key='link' Colon? value=Uri SemiColon?;
+  key='link' ':'? value=Uri ';'?;
 ColorProperty:
-  key='color' Colon? value=ThemeColor SemiColon?;
+  key='color' ':'? value=ThemeColor ';'?;
 
 OpacityProperty:
-  key='opacity' Colon? value=Percent SemiColon?;
+  key='opacity' ':'? value=Percent ';'?;
 
 // Element properties -------------------------------------
 IconProperty:
-  key='icon' Colon? value=Uri SemiColon?;
+  key='icon' ':'? (libicon=[LibIcon:IconId] | value=Uri) ';'?;
 
 ShapeProperty:
-  key='shape' Colon? value=ElementShape SemiColon?;
+  key='shape' ':'? value=ElementShape ';'?;
 
 
 BorderStyleValue returns string:
   LineOptions | 'none';
 
 BorderProperty:
-  key='border' Colon? value=BorderStyleValue SemiColon?;
+  key='border' ':'? value=BorderStyleValue ';'?;
 
 StyleProperty:
   ColorProperty |
@@ -325,9 +374,9 @@ StyleProperties:
 // -------------------------
 // Relationship Style Properties
 LineProperty:
-  key='line' Colon? value=LineOptions SemiColon?;
+  key='line' ':'? value=LineOptions ';'?;
 ArrowProperty:
-  key=('head' | 'tail') Colon? value=ArrowType SemiColon?;
+  key=('head' | 'tail') ':'? value=ArrowType ';'?;
 
 RelationshipStyleProperty:
   ColorProperty | LineProperty | ArrowProperty;
@@ -342,6 +391,8 @@ ArrowType returns string:
   'none' |
   'normal' |
   'onormal' |
+  'dot' |
+  'odot' |
   'diamond' |
   'odiamond' |
   'crow' |
@@ -353,6 +404,11 @@ ThemeColor returns string:
   'primary' | 'secondary' | 'muted' | 'slate' | 'blue' | 'indigo' | 'sky' | 'red' | 'gray' | 'green' | 'amber';
 ElementShape returns string:
   'rectangle' | 'person' | 'browser' | 'mobile' | 'cylinder' | 'storage' | 'queue';
+
+IconId returns string:
+  LIB_ICON;
+  // ('aws:' | 'gcp:' | 'tech:') IdTerminal;
+
 Uri returns string:
   URI_WITH_SCHEMA | URI_RELATIVE;
 
@@ -390,6 +446,9 @@ hidden terminal WS: /\s+/;
 // Terminals
 //terminal LineStartWithDash: /(?<=([\r?\n][^\S\r\n]*))-/;
 
+// LibIcons
+terminal LIB_ICON: /\b(aws|gcp|tech):[-\w]*/;
+
 terminal URI_WITH_SCHEMA: /\w+:\/\/\S+/;
 terminal URI_RELATIVE: /\.{0,2}\/[^\/]\S+/;
 
@@ -402,13 +461,10 @@ terminal StickyDot: /\b\./;
 terminal Dot: '.';
 terminal NotEqual: /\!\={1,2}/;
 terminal Eq: /\={1,2}/;
-terminal Colon: ':';
-terminal SemiColon: ';';
-terminal Comma: ',';
 terminal Percent: /\b\d+%/;
 
 terminal String: /"[^"]*"|'[^']*'/;
 
 // terminal  TagId: HASH LETTER (LETTER | DIGIT | UNDERSCORE | DASH)*;
 // terminal IdTerminal: (LETTER | UNDERSCORE+ (LETTER | DIGIT)) (LETTER | DIGIT | UNDERSCORE | DASH)*;
-terminal IdTerminal:  /\b[_]*[a-zA-Z][_-\w]*/;
+terminal IdTerminal:  /[_]*[a-zA-Z][-\w]*/;

package/src/likec4lib.ts

@@ -0,0 +1,7 @@
+import { LibIcons } from './generated-lib/icons'
+
+export const Scheme = 'likec4-lib'
+export const Path = `/icons.c4`
+export const Uri = `${Scheme}://${Path}`
+
+export { LibIcons as Content }

package/src/lsp/DocumentSymbolProvider.ts

@@ -17,10 +17,11 @@ export class LikeC4DocumentSymbolProvider implements DocumentSymbolProvider {
 
   getSymbols({
     parseResult: {
-      value: { specifications, models, views }
+      value: { specifications, models, views, likec4lib }
     }
   }: LikeC4LangiumDocument): MaybePromise<DocumentSymbol[]> {
     return [
+      ...likec4lib.map(l => () => this.getLikec4LibSymbol(l)),
       ...specifications.map(s => () => this.getSpecSymbol(s)),
       ...models.map(s => () => this.getModelSymbol(s)),
       ...views.map(s => () => this.getModelViewsSymbol(s))
@@ -34,6 +35,22 @@ export class LikeC4DocumentSymbolProvider implements DocumentSymbolProvider {
     })
   }
 
+  protected getLikec4LibSymbol(astLib: ast.LikeC4Lib): DocumentSymbol[] {
+    const cstModel = astLib?.$cstNode
+    if (!cstModel) return []
+    const children = astLib.icons.map(i => this.getLibIconSymbol(i)).filter(isTruthy)
+    if (children.length === 0) return []
+    return [
+      {
+        kind: SymbolKind.Namespace,
+        name: 'icons',
+        range: cstModel.range,
+        selectionRange: GrammarUtils.findNodeForKeyword(cstModel, 'icons')?.range ?? cstModel.range,
+        children
+      }
+    ]
+  }
+
   protected getSpecSymbol(astSpec: ast.SpecificationRule): DocumentSymbol[] {
     const cstModel = astSpec?.$cstNode
     if (!cstModel) return []
@@ -179,6 +196,16 @@ export class LikeC4DocumentSymbolProvider implements DocumentSymbolProvider {
     }
   }
 
+  protected getLibIconSymbol(astTag: ast.LibIcon): DocumentSymbol | null {
+    if (!astTag.$cstNode || isEmpty(astTag.name)) return null
+    return {
+      kind: this.symbolKind(astTag),
+      name: astTag.name,
+      range: astTag.$cstNode.range,
+      selectionRange: astTag.$cstNode.range
+    }
+  }
+
   protected getViewSymbol(astView: ast.LikeC4View): DocumentSymbol[] {
     const cst = astView?.$cstNode
     if (!cst) return []

package/src/lsp/SemanticTokenProvider.ts

@@ -1,5 +1,6 @@
 import type { AstNode } from 'langium'
 import { AbstractSemanticTokenProvider, type SemanticTokenAcceptor } from 'langium/lsp'
+import { isTruthy } from 'remeda'
 import { SemanticTokenModifiers, SemanticTokenTypes } from 'vscode-languageserver-protocol'
 import { ast } from '../ast'
 
@@ -16,23 +17,32 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         type: SemanticTokenTypes.function
       })
     }
+    if (ast.isLibIcon(node)) {
+      acceptor({
+        node,
+        property: 'name',
+        type: SemanticTokenTypes.type,
+        modifier: [SemanticTokenModifiers.definition]
+      })
+      return 'prune'
+    }
+
     if (ast.isRelation(node) && 'kind' in node) {
-      return acceptor({
+      acceptor({
         node,
         property: 'kind',
         type: SemanticTokenTypes.function
       })
     }
-    if (ast.isElementViewRef(node)) {
-      return acceptor({
+    if (ast.isNavigateToProperty(node)) {
+      acceptor({
         node,
-        property: 'view',
-        type: SemanticTokenTypes.variable
+        property: 'key',
+        type: SemanticTokenTypes.property
       })
-    }
-    if (ast.isDescedantsExpr(node) && node.$cstNode) {
       acceptor({
-        cst: node.$cstNode,
+        node,
+        property: 'value',
         type: SemanticTokenTypes.variable,
         modifier: [
           SemanticTokenModifiers.definition,
@@ -41,7 +51,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       })
       return 'prune'
     }
-    if (ast.isWildcardExpr(node) && node.$cstNode) {
+    if ((ast.isElementDescedantsExpression(node) || ast.isWildcardExpression(node)) && node.$cstNode) {
       acceptor({
         cst: node.$cstNode,
         type: SemanticTokenTypes.variable,
@@ -52,8 +62,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       })
       return 'prune'
     }
-
-    if (ast.isElementKindExpr(node)) {
+    if (ast.isElementKindExpression(node) && isTruthy(node.kind)) {
       acceptor({
         node,
         property: 'kind',
@@ -61,7 +70,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         modifier: [SemanticTokenModifiers.definition]
       })
     }
-    if (ast.isElementTagExpr(node)) {
+    if (ast.isElementTagExpression(node) && isTruthy(node.tag)) {
       acceptor({
         node,
         property: 'tag',
@@ -98,6 +107,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         property: 'value',
         type: SemanticTokenTypes.interface
       })
+      return
     }
     if (ast.isTag(node)) {
       return acceptor({
@@ -134,6 +144,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         property: 'value',
         type: SemanticTokenTypes.enum
       })
+      return 'prune'
     }
     if (ast.isOpacityProperty(node)) {
       acceptor({
@@ -146,26 +157,34 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         property: 'value',
         type: SemanticTokenTypes.number
       })
-      return
+      return 'prune'
     }
     if (
       ast.isLinkProperty(node)
       || ast.isIconProperty(node)
-      || ast.isElementStringProperty(node)
-      || ast.isRelationStringProperty(node)
-      || ast.isViewStringProperty(node)
+      || ast.isStringProperty(node)
     ) {
       acceptor({
         node,
         property: 'key',
         type: SemanticTokenTypes.property
       })
-      acceptor({
-        node,
-        property: 'value',
-        type: SemanticTokenTypes.string
-      })
-      return
+      if (ast.isIconProperty(node) && node.libicon) {
+        acceptor({
+          node,
+          property: 'libicon',
+          type: SemanticTokenTypes.enum
+        })
+      }
+      if ('value' in node) {
+        acceptor({
+          node,
+          property: 'value',
+          type: SemanticTokenTypes.string
+        })
+      }
+
+      return 'prune'
     }
     if (ast.isElement(node)) {
       return this.highlightAstElement(node, acceptor)

package/src/model/fqn-computation.ts

@@ -1,14 +1,38 @@
 import { AsFqn, type c4, nonexhaustive } from '@likec4/core'
-import { MultiMap } from 'langium'
+import { type AstNodeDescription, type AstNodeLocator, AstUtils, CstUtils, GrammarUtils, MultiMap } from 'langium'
 import { isEmpty, isNullish as isNil } from 'remeda'
 import { ast, ElementOps, type LikeC4LangiumDocument } from '../ast'
 import { getFqnElementRef } from '../elementRef'
 import type { LikeC4Services } from '../module'
 
+const { findNodeForProperty } = GrammarUtils
+const { toDocumentSegment } = CstUtils
+const { getDocument } = AstUtils
+
 type TraversePair = [el: ast.Element | ast.ExtendElement | ast.Relation, parent: c4.Fqn | null]
 
+function toAstNodeDescription(
+  locator: AstNodeLocator,
+  entry: ast.Element,
+  doc: LikeC4LangiumDocument
+): AstNodeDescription {
+  const $cstNode = findNodeForProperty(entry.$cstNode, 'name')
+  return {
+    documentUri: doc.uri,
+    name: entry.name,
+    ...(entry.$cstNode && {
+      selectionSegment: toDocumentSegment(entry.$cstNode)
+    }),
+    ...($cstNode && {
+      nameSegment: toDocumentSegment($cstNode)
+    }),
+    path: locator.getAstNodePath(entry),
+    type: ast.Element
+  }
+}
+
 export function computeDocumentFqn(document: LikeC4LangiumDocument, services: LikeC4Services) {
-  const c4fqns = (document.c4fqns = new MultiMap())
+  const c4fqnIndex = (document.c4fqnIndex = new MultiMap())
   const elements = document.parseResult.value.models.flatMap(m => m.elements)
   if (elements.length === 0) {
     return
@@ -30,11 +54,9 @@ export function computeDocumentFqn(document: LikeC4LangiumDocument, services: Li
     }
     if (ast.isElement(el)) {
       const fqn = AsFqn(el.name, parent)
-      const path = locator.getAstNodePath(el)
-      c4fqns.add(fqn, {
-        el: new WeakRef(el),
-        path,
-        name: el.name
+      c4fqnIndex.add(fqn, {
+        ...toAstNodeDescription(locator, el, document),
+        fqn
       })
       ElementOps.writeId(el, fqn)
       if (!isNil(el.body) && !isEmpty(el.body.elements)) {

package/src/model/fqn-index.ts

@@ -1,8 +1,8 @@
 import type { Fqn } from '@likec4/core'
 import { nameFromFqn, parentFqn } from '@likec4/core'
-import type { LangiumDocuments, Stream } from 'langium'
+import type { AstNodeDescription, LangiumDocuments, Stream } from 'langium'
 import { DocumentState, DONE_RESULT, MultiMap, stream, StreamImpl } from 'langium'
-import type { ast, FqnIndexedDocument } from '../ast'
+import type { ast, DocFqnIndexAstNodeDescription, FqnIndexedDocument } from '../ast'
 import { ElementOps, isFqnIndexedDocument, isLikeC4LangiumDocument } from '../ast'
 import { logError, logger } from '../logger'
 import type { LikeC4Services } from '../module'
@@ -17,8 +17,6 @@ export interface FqnIndexEntry {
   path: string
 }
 
-const True = () => true
-
 export class FqnIndex {
   protected langiumDocuments: LangiumDocuments
 
@@ -31,7 +29,7 @@ export class FqnIndex {
         logger.debug(`[FqnIndex] onIndexedContent ${docs.length}:\n` + printDocs(docs))
         for (const doc of docs) {
           if (isLikeC4LangiumDocument(doc)) {
-            delete doc.c4fqns
+            delete doc.c4fqnIndex
             delete doc.c4Elements
             delete doc.c4Specification
             delete doc.c4Relations
@@ -53,18 +51,13 @@ export class FqnIndex {
     return this.langiumDocuments.all.filter(isFqnIndexedDocument)
   }
 
-  private entries(filterByFqn: (fqn: Fqn) => boolean = True): Stream<FqnIndexEntry> {
-    return this.documents.flatMap(doc =>
-      doc.c4fqns.entries().flatMap(([fqn, entry]): FqnIndexEntry | FqnIndexEntry[] => {
-        if (filterByFqn(fqn)) {
-          const el = entry.el.deref()
-          if (el) {
-            return { ...entry, fqn, el, doc }
-          }
-        }
-        return []
-      })
-    )
+  private entries(filterByFqn?: (fqn: Fqn) => boolean): Stream<DocFqnIndexAstNodeDescription> {
+    return this.documents.flatMap(doc => {
+      if (filterByFqn) {
+        return doc.c4fqnIndex.keys().filter(filterByFqn).flatMap(fqn => doc.c4fqnIndex.get(fqn))
+      }
+      return doc.c4fqnIndex.values()
+    })
   }
 
   public getFqn(el: ast.Element): Fqn | null {
@@ -83,22 +76,16 @@ export class FqnIndex {
     // return fqn
   }
 
-  public byFqn(fqn: Fqn): Stream<FqnIndexEntry> {
+  public byFqn(fqn: Fqn): Stream<AstNodeDescription> {
     return this.documents.flatMap(doc => {
-      return doc.c4fqns.get(fqn).flatMap(entry => {
-        const el = entry.el.deref()
-        if (el) {
-          return { fqn, el, doc, path: entry.path, name: entry.name }
-        }
-        return []
-      })
+      return doc.c4fqnIndex.get(fqn)
     })
   }
 
-  public directChildrenOf(parent: Fqn): Stream<FqnIndexEntry> {
+  public directChildrenOf(parent: Fqn): Stream<AstNodeDescription> {
     return stream([parent]).flatMap(_parent => {
       const children = this.entries(fqn => parentFqn(fqn) === _parent)
-        .map((entry): [string, FqnIndexEntry] => [entry.name, entry])
+        .map((entry) => [entry.name, entry] as [string, AstNodeDescription])
         .toArray()
       if (children.length === 0) {
         return []
@@ -113,15 +100,15 @@ export class FqnIndex {
   /**
    * Returns descedant elements with unique names in the scope
    */
-  public uniqueDescedants(parent: Fqn): Stream<FqnIndexEntry> {
+  public uniqueDescedants(parent: Fqn): Stream<AstNodeDescription> {
     return new StreamImpl(
       () => {
         const prefix = `${parent}.`
 
         const childrenNames = new Set<string>()
-        const descedants = [] as FqnIndexEntry[]
+        const descedants = [] as AstNodeDescription[]
 
-        const nested = new MultiMap<string, FqnIndexEntry>()
+        const nested = new MultiMap<string, AstNodeDescription>()
 
         this.entries(f => f.startsWith(prefix)).forEach(e => {
           const name = nameFromFqn(e.fqn)
@@ -154,7 +141,7 @@ export class FqnIndex {
         if (iterator) {
           return iterator.next()
         }
-        return DONE_RESULT as IteratorResult<FqnIndexEntry>
+        return DONE_RESULT as IteratorResult<AstNodeDescription>
       }
     )
   }