@likec4/language-server 1.20.1 → 1.20.2

package/src/like-c4.langium

@@ -115,7 +115,11 @@ ElementBody: '{'
 ;
 
 ElementProperty:
-  ElementStringProperty | ElementStyleProperty | LinkProperty | IconProperty | MetadataProperty;
+  ElementStringProperty |
+  ElementStyleProperty |
+  LinkProperty |
+  IconProperty |
+  MetadataProperty;
 
 ElementStringProperty:
   key=('title' | 'technology' | 'description') ':'? value=String ';'?;
@@ -711,6 +715,9 @@ ColorProperty:
 OpacityProperty:
   key='opacity' ':'? value=Percent ';'?;
 
+MultipleProperty:
+  key='multiple' ':'? value=Boolean ';'?;
+
 // Element properties -------------------------------------
 IconProperty:
   key='icon' ':'? (libicon=[LibIcon:IconId] | value=('none'|Uri)) ';'?;
@@ -718,7 +725,6 @@ IconProperty:
 ShapeProperty:
   key='shape' ':'? value=ElementShape ';'?;
 
-
 BorderStyleValue returns string:
   LineOptions | 'none';
 
@@ -730,7 +736,8 @@ StyleProperty:
   ShapeProperty |
   BorderProperty |
   OpacityProperty |
-  IconProperty;
+  IconProperty |
+  MultipleProperty;
 
 ElementStyleProperty:
   key='style' '{'
@@ -748,6 +755,8 @@ ArrowProperty:
 RelationshipStyleProperty:
   ColorProperty | LineProperty | ArrowProperty;
 
+Boolean returns boolean: 'true' | 'false';
+
 LineOptions returns string:
   'solid' |
   'dashed' |
@@ -825,6 +834,8 @@ hidden terminal NL: /[\r\n]+/;
 // -----------------------------------
 // Terminals
 //terminal LineStartWithDash: /(?<=([\r?\n][^\S\r\n]*))-/;
+// terminal Boolean returns boolean: 'true' | 'false';
+
 
 // LibIcons
 terminal LIB_ICON: /(aws|azure|gcp|tech):[-\w]*/;

package/src/lsp/CompletionProvider.ts

@@ -1,23 +1,32 @@
-import { AstUtils, type GrammarAST, type MaybePromise } from 'langium'
+import { type GrammarAST, type MaybePromise, AstUtils } from 'langium'
 import {
   type CompletionAcceptor,
   type CompletionContext,
   type CompletionProviderOptions,
-  DefaultCompletionProvider
+  DefaultCompletionProvider,
 } from 'langium/lsp'
 import { anyPass } from 'remeda'
 import { CompletionItemKind, InsertTextFormat } from 'vscode-languageserver-types'
 import { ast } from '../ast'
 
+const STYLE_FIELDS = [
+  'color',
+  'shape',
+  'icon',
+  'border',
+  'opacity',
+  'multiple',
+].join(',')
+
 export class LikeC4CompletionProvider extends DefaultCompletionProvider {
   override readonly completionOptions = {
-    triggerCharacters: ['.']
+    triggerCharacters: ['.'],
   } satisfies CompletionProviderOptions
 
   protected override completionForKeyword(
     context: CompletionContext,
     keyword: GrammarAST.Keyword,
-    acceptor: CompletionAcceptor
+    acceptor: CompletionAcceptor,
   ): MaybePromise<void> {
     if (!this.filterKeyword(context, keyword)) {
       return
@@ -33,8 +42,8 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
           '\ttitle \'${2:Untitled}\'',
           '\t',
           '\tinclude $0',
-          '}'
-        ].join('\n')
+          '}',
+        ].join('\n'),
       })
     }
     if (['title', 'description', 'technology'].includes(keyword.value)) {
@@ -42,7 +51,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
         label: keyword.value,
         kind: CompletionItemKind.Property,
         insertTextFormat: InsertTextFormat.Snippet,
-        insertText: `${keyword.value} '\${0}'`
+        insertText: `${keyword.value} '\${0}'`,
       })
     }
     if (['views', 'specification', 'model', 'deployment', 'with'].includes(keyword.value)) {
@@ -51,7 +60,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
         detail: `Insert ${keyword.value} block`,
         kind: CompletionItemKind.Module,
         insertTextFormat: InsertTextFormat.Snippet,
-        insertText: `${keyword.value} {\n\t$0\n}`
+        insertText: `${keyword.value} {\n\t$0\n}`,
       })
     }
     if (keyword.value === 'group') {
@@ -63,8 +72,8 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
         insertText: [
           'group \'${1:Title}\' {',
           '\t$0',
-          '}'
-        ].join('\n')
+          '}',
+        ].join('\n'),
       })
     }
     if (keyword.value === 'dynamic' && AstUtils.hasContainerOfType(context.node, ast.isModelViews)) {
@@ -78,8 +87,8 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
           '\ttitle \'${2:Untitled}\'',
           '\t',
           '\t$0',
-          '}'
-        ].join('\n')
+          '}',
+        ].join('\n'),
       })
     }
     if (keyword.value === 'style' && context.node) {
@@ -89,7 +98,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
           detail: `Insert ${keyword.value} block`,
           kind: CompletionItemKind.Module,
           insertTextFormat: InsertTextFormat.Snippet,
-          insertText: `${keyword.value} \${1:name} \${2:*} {\n\t\${3|color,shape,border,opacity,icon|} $0\n}`
+          insertText: `${keyword.value} \${1:name} \${2:*} {\n\t\${3|${STYLE_FIELDS}|} $0\n}`,
         })
       }
       if (AstUtils.hasContainerOfType(context.node, anyPass([ast.isModelViews, ast.isGlobalStyleGroup]))) {
@@ -98,7 +107,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
           detail: `Insert ${keyword.value} block`,
           kind: CompletionItemKind.Module,
           insertTextFormat: InsertTextFormat.Snippet,
-          insertText: `${keyword.value} \${1:*} {\n\t\${2|color,shape,border,opacity,icon|} $0\n}`
+          insertText: `${keyword.value} \${1:*} {\n\t\${2|${STYLE_FIELDS}|} $0\n}`,
         })
       }
       return acceptor(context, {
@@ -106,7 +115,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
         detail: `Insert ${keyword.value} block`,
         kind: CompletionItemKind.Module,
         insertTextFormat: InsertTextFormat.Snippet,
-        insertText: `${keyword.value} {\n\t\${1|color,shape,border,opacity,icon|} $0\n}`
+        insertText: `${keyword.value} {\n\t\${1|${STYLE_FIELDS}|} $0\n}`,
       })
     }
     if (keyword.value === 'extend') {
@@ -115,7 +124,7 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
         detail: `Extend another view`,
         kind: CompletionItemKind.Class,
         insertTextFormat: InsertTextFormat.Snippet,
-        insertText: 'extend ${1:element} {\n\t$0\n}'
+        insertText: 'extend ${1:element} {\n\t$0\n}',
       })
     }
 
@@ -124,14 +133,14 @@ export class LikeC4CompletionProvider extends DefaultCompletionProvider {
         label: keyword.value,
         kind: CompletionItemKind.Class,
         insertTextFormat: InsertTextFormat.Snippet,
-        insertText: 'autoLayout ${1|TopBottom,BottomTop,LeftRight,RightLeft|}$0'
+        insertText: 'autoLayout ${1|TopBottom,BottomTop,LeftRight,RightLeft|}$0',
       })
     }
     acceptor(context, {
       label: keyword.value,
       kind: this.getKeywordCompletionItemKind(keyword),
       detail: 'Keyword',
-      sortText: '1'
+      sortText: '1',
     })
   }
 }

package/src/model/deployments-index.ts

@@ -1,5 +1,5 @@
 import type { Fqn } from '@likec4/core'
-import type { LangiumDocument, LangiumDocuments, Stream } from 'langium'
+import type { DocumentCache, LangiumDocuments, Stream } from 'langium'
 import { AstUtils, DocumentState, MultiMap } from 'langium'
 import { forEachObj, groupBy, isTruthy, pipe, prop } from 'remeda'
 import {
@@ -13,28 +13,15 @@ import { logWarnError } from '../logger'
 import type { LikeC4Services } from '../module'
 import type { LikeC4NameProvider } from '../references'
 
-const DeploymentsIndexKey = Symbol.for('DeploymentsIndex')
-
-type IndexedDocument = LangiumDocument & {
-  [DeploymentsIndexKey]?: DocumentDeploymentsIndex
-}
-
 export class DeploymentsIndex {
   protected Names: LikeC4NameProvider
   protected langiumDocuments: LangiumDocuments
+  protected documentCache: DocumentCache<string, DocumentDeploymentsIndex>
 
   constructor(private services: LikeC4Services) {
     this.Names = services.references.NameProvider
     this.langiumDocuments = services.shared.workspace.LangiumDocuments
-
-    services.shared.workspace.DocumentBuilder.onBuildPhase(
-      DocumentState.IndexedContent,
-      (docs, _cancelToken) => {
-        for (const doc of docs) {
-          delete (doc as IndexedDocument)[DeploymentsIndexKey]
-        }
-      },
-    )
+    this.documentCache = services.DocumentCache
   }
 
   private documents() {
@@ -47,7 +34,7 @@ export class DeploymentsIndex {
     if (document.state < DocumentState.IndexedContent) {
       logWarnError(`Document ${document.uri.path} is not indexed`)
     }
-    return (document as IndexedDocument)[DeploymentsIndexKey] ??= this.createDocumentIndex(document)
+    return this.documentCache.get(document.uri, 'DeploymentsIndex', () => this.createDocumentIndex(document))
   }
   /**
    * Nested elements (nodes/artifacts) of the node

package/src/model/fqn-index.ts

@@ -6,6 +6,7 @@ import type { ast, DocFqnIndexAstNodeDescription, FqnIndexedDocument } from '../
 import { ElementOps, isFqnIndexedDocument, isLikeC4LangiumDocument } from '../ast'
 import { logger, logWarnError } from '../logger'
 import type { LikeC4Services } from '../module'
+import { ADisposable } from '../utils'
 import { computeDocumentFqn } from './fqn-computation'
 
 export interface FqnIndexEntry {
@@ -16,31 +17,37 @@ export interface FqnIndexEntry {
   path: string
 }
 
-export class FqnIndex {
+export class FqnIndex extends ADisposable {
   protected langiumDocuments: LangiumDocuments
 
   constructor(private services: LikeC4Services) {
+    super()
     this.langiumDocuments = services.shared.workspace.LangiumDocuments
 
-    services.shared.workspace.DocumentBuilder.onBuildPhase(
-      DocumentState.IndexedContent,
-      async (docs, _cancelToken) => {
-        for (const doc of docs) {
-          if (isLikeC4LangiumDocument(doc)) {
-            delete doc.c4fqnIndex
-            delete doc.c4Elements
-            delete doc.c4Specification
-            delete doc.c4Relations
-            delete doc.c4Views
-            try {
-              computeDocumentFqn(doc, services)
-            } catch (e) {
-              logWarnError(e)
+    this.onDispose(
+      services.shared.workspace.DocumentBuilder.onBuildPhase(
+        DocumentState.IndexedContent,
+        async (docs, _cancelToken) => {
+          for (const doc of docs) {
+            if (isLikeC4LangiumDocument(doc)) {
+              delete doc.c4fqnIndex
+              delete doc.c4Elements
+              delete doc.c4Specification
+              delete doc.c4Relations
+              delete doc.c4Deployments
+              delete doc.c4DeploymentRelations
+              delete doc.c4Globals
+              delete doc.c4Views
+              try {
+                computeDocumentFqn(doc, services)
+              } catch (e) {
+                logWarnError(e)
+              }
             }
           }
-        }
-        return await Promise.resolve()
-      }
+          return await Promise.resolve()
+        },
+      ),
     )
     logger.debug(`[FqnIndex] Created`)
   }
@@ -125,7 +132,7 @@ export class FqnIndex {
           return iterator.next()
         }
         return DONE_RESULT as IteratorResult<AstNodeDescription>
-      }
+      },
     )
   }
 }

package/src/model/model-builder.ts

@@ -19,6 +19,7 @@ import {
   flatMap,
   groupBy,
   indexBy,
+  isBoolean,
   isDefined,
   isEmpty,
   isNonNullish,
@@ -28,7 +29,7 @@ import {
   map,
   mapToObj,
   mapValues,
-  pick,
+  omit,
   pipe,
   prop,
   reduce,
@@ -48,6 +49,7 @@ import type {
 import { isParsedLikeC4LangiumDocument } from '../ast'
 import { logger, logWarnError } from '../logger'
 import type { LikeC4Services } from '../module'
+import { ADisposable } from '../utils'
 import { assignNavigateTo, resolveRelativePaths } from '../view-utils'
 
 function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[]): c4.ParsedLikeC4Model {
@@ -115,6 +117,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         icon,
         opacity,
         border,
+        multiple,
       },
       id,
       kind,
@@ -136,6 +139,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         opacity ??= __kind.style.opacity
         border ??= __kind.style.border
         technology ??= __kind.technology
+        multiple ??= __kind.style.multiple
         return {
           ...(color && { color }),
           ...(shape && { shape }),
@@ -144,6 +148,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           ...(__kind.notation && { notation: __kind.notation }),
           style: {
             ...(border && { border }),
+            ...(isBoolean(multiple) && { multiple }),
             ...(isNumber(opacity) && { opacity }),
           },
           links,
@@ -449,37 +454,41 @@ const CACHE_KEY_COMPUTED_MODEL = 'ComputedLikeC4Model'
 
 type ModelParsedListener = (docs: URI[]) => void
 
-export class LikeC4ModelBuilder {
+export class LikeC4ModelBuilder extends ADisposable {
   private langiumDocuments: LangiumDocuments
   private listeners: ModelParsedListener[] = []
 
   constructor(private services: LikeC4Services) {
+    super()
     this.langiumDocuments = services.shared.workspace.LangiumDocuments
     const parser = services.likec4.ModelParser
 
-    services.shared.workspace.DocumentBuilder.onUpdate((_changed, deleted) => {
-      if (deleted.length > 0) {
-        this.notifyListeners(deleted)
-      }
-    })
-
-    services.shared.workspace.DocumentBuilder.onBuildPhase(
-      DocumentState.Validated,
-      async (docs, _cancelToken) => {
-        let parsed = [] as URI[]
-        try {
+    this.onDispose(
+      services.shared.workspace.DocumentBuilder.onUpdate((_changed, deleted) => {
+        if (deleted.length > 0) {
+          this.notifyListeners(deleted)
+        }
+      }),
+    )
+    this.onDispose(
+      services.shared.workspace.DocumentBuilder.onBuildPhase(
+        DocumentState.Validated,
+        async (docs, _cancelToken) => {
+          let parsed = [] as URI[]
           logger.debug(`[ModelBuilder] onValidated (${docs.length} docs)`)
           for (const doc of docs) {
-            parsed.push(parser.parse(doc).uri)
+            try {
+              parsed.push(parser.parse(doc).uri)
+            } catch (e) {
+              logWarnError(e)
+            }
           }
-        } catch (e) {
-          logWarnError(e)
-        }
-        if (parsed.length > 0) {
-          this.notifyListeners(parsed)
-        }
-        return await Promise.resolve()
-      },
+          await interruptAndCheck(_cancelToken)
+          if (parsed.length > 0) {
+            this.notifyListeners(parsed)
+          }
+        },
+      ),
     )
     logger.debug(`[ModelBuilder] Created`)
   }
@@ -546,15 +555,7 @@ export class LikeC4ModelBuilder {
       })
       this.previousViews = { ...views }
       return {
-        ...structuredClone(
-          pick(model, [
-            'specification',
-            'elements',
-            'relations',
-            'globals',
-            'deployments',
-          ]),
-        ),
+        ...omit(model, ['views']),
         views,
       }
     })

package/src/model/model-parser.ts

@@ -1,6 +1,6 @@
 import { invariant } from '@likec4/core'
-import type { LangiumDocument } from 'langium'
-import DefaultWeakMap from 'mnemonist/default-weak-map'
+import { type LangiumDocument, DocumentCache, DocumentState } from 'langium'
+import { DefaultWeakMap } from 'mnemonist'
 import { pipe } from 'remeda'
 import type { LikeC4DocumentProps, ParsedLikeC4LangiumDocument } from '../ast'
 import { isFqnIndexedDocument } from '../ast'
@@ -26,18 +26,17 @@ const DocumentParserFromMixins = pipe(
   PredicatesParser,
   SpecificationParser,
   ViewsParser,
-  GlobalsParser
+  GlobalsParser,
 )
 
 export class DocumentParser extends DocumentParserFromMixins {
 }
 
 export class LikeC4ModelParser {
-  private cachedParsers = new DefaultWeakMap<LangiumDocument, DocumentParser>((doc: LangiumDocument) =>
-    new DocumentParser(this.services, doc as ParsedLikeC4LangiumDocument)
-  )
+  private cachedParsers: DocumentCache<string, DocumentParser>
 
   constructor(private services: LikeC4Services) {
+    this.cachedParsers = new DocumentCache(services.shared, DocumentState.Validated)
   }
 
   parse(doc: LangiumDocument): ParsedLikeC4LangiumDocument {
@@ -49,7 +48,7 @@ export class LikeC4ModelParser {
           elements: {},
           relationships: {},
           colors: {},
-          deployments: {}
+          deployments: {},
         },
         c4Elements: [],
         c4Relations: [],
@@ -58,12 +57,12 @@ export class LikeC4ModelParser {
         c4Globals: {
           predicates: {},
           dynamicPredicates: {},
-          styles: {}
+          styles: {},
         },
-        c4Views: []
+        c4Views: [],
       }
       doc = Object.assign(doc, props)
-      const parser = this.cachedParsers.get(doc)
+      const parser = this.forDocument(doc)
       parser.parseSpecification()
       parser.parseModel()
       parser.parseGlobals()
@@ -77,6 +76,10 @@ export class LikeC4ModelParser {
 
   forDocument(doc: LangiumDocument): DocumentParser {
     invariant(isFqnIndexedDocument(doc), `Not a FqnIndexedDocument: ${doc.uri.toString(true)}`)
-    return this.cachedParsers.get(doc)
+    return this.cachedParsers.get(
+      doc.uri,
+      'DocumentParser',
+      () => new DocumentParser(this.services, doc as ParsedLikeC4LangiumDocument),
+    )
   }
 }

package/src/model/parser/PredicatesParser.ts

@@ -1,6 +1,6 @@
 import type * as c4 from '@likec4/core'
 import { invariant, nonexhaustive } from '@likec4/core'
-import { isDefined, isTruthy } from 'remeda'
+import { isBoolean, isDefined, isTruthy } from 'remeda'
 import { ast, parseAstOpacityProperty, toColor } from '../../ast'
 import { logWarnError } from '../../logger'
 import { elementRef } from '../../utils/elementRef'
@@ -53,14 +53,14 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
     parseElementExpression(astNode: ast.ElementExpression): c4.ElementExpression {
       if (ast.isWildcardExpression(astNode)) {
         return {
-          wildcard: true
+          wildcard: true,
         }
       }
       if (ast.isElementKindExpression(astNode)) {
         invariant(astNode.kind?.ref, 'ElementKindExpr kind is not resolved: ' + astNode.$cstNode?.text)
         return {
           elementKind: astNode.kind.ref.name as c4.ElementKind,
-          isEqual: astNode.isEqual
+          isEqual: astNode.isEqual,
         }
       }
       if (ast.isElementTagExpression(astNode)) {
@@ -71,7 +71,7 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
         }
         return {
           elementTag: elementTag as c4.Tag,
-          isEqual: astNode.isEqual
+          isEqual: astNode.isEqual,
         }
       }
       if (ast.isExpandElementExpression(astNode)) {
@@ -79,7 +79,7 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
         invariant(elementNode, 'Element not found ' + astNode.expand.$cstNode?.text)
         const expanded = this.resolveFqn(elementNode)
         return {
-          expanded
+          expanded,
         }
       }
       if (ast.isElementDescedantsExpression(astNode)) {
@@ -89,7 +89,7 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
         return {
           element,
           isChildren: astNode.suffix === '.*',
-          isDescendants: astNode.suffix === '.**'
+          isDescendants: astNode.suffix === '.**',
         }
       }
       if (ast.isElementRef(astNode)) {
@@ -97,7 +97,7 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
         invariant(elementNode, 'Element not found ' + astNode.$cstNode?.text)
         const element = this.resolveFqn(elementNode)
         return {
-          element
+          element,
         }
       }
       nonexhaustive(astNode)
@@ -109,9 +109,9 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
         where: {
           expr,
           condition: astNode.where ? parseWhereClause(astNode.where) : {
-            kind: { neq: '--always-true--' }
-          }
-        }
+            kind: { neq: '--always-true--' },
+          },
+        },
       }
     }
 
@@ -174,13 +174,19 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
             }
             return acc
           }
+          if (ast.isMultipleProperty(prop)) {
+            if (isBoolean(prop.value)) {
+              acc.custom[prop.key] = prop.value
+            }
+            return acc
+          }
           nonexhaustive(prop)
         },
         {
           custom: {
-            expr
-          }
-        } as c4.CustomElementExpr
+            expr,
+          },
+        } as c4.CustomElementExpr,
       )
     }
 
@@ -207,15 +213,15 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
         where: {
           expr,
           condition: astNode.where ? parseWhereClause(astNode.where) : {
-            kind: { neq: '--always-true--' }
-          }
-        }
+            kind: { neq: '--always-true--' },
+          },
+        },
       }
     }
 
     parseRelationPredicateWith(
       astNode: ast.RelationPredicateWith,
-      relation: c4.RelationExpression | c4.RelationWhereExpr
+      relation: c4.RelationExpression | c4.RelationWhereExpr,
     ): c4.CustomRelationExpr {
       const props = astNode.custom?.props ?? []
       return props.reduce(
@@ -256,9 +262,9 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
         },
         {
           customRelation: {
-            relation
-          }
-        } as c4.CustomRelationExpr
+            relation,
+          },
+        } as c4.CustomRelationExpr,
       )
     }
 
@@ -267,22 +273,22 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
         return {
           source: this.parseElementExpression(astNode.source.from),
           target: this.parseElementExpression(astNode.target),
-          isBidirectional: astNode.source.isBidirectional
+          isBidirectional: astNode.source.isBidirectional,
         }
       }
       if (ast.isInOutRelationExpression(astNode)) {
         return {
-          inout: this.parseElementExpression(astNode.inout.to)
+          inout: this.parseElementExpression(astNode.inout.to),
         }
       }
       if (ast.isOutgoingRelationExpression(astNode)) {
         return {
-          outgoing: this.parseElementExpression(astNode.from)
+          outgoing: this.parseElementExpression(astNode.from),
         }
       }
       if (ast.isIncomingRelationExpression(astNode)) {
         return {
-          incoming: this.parseElementExpression(astNode.to)
+          incoming: this.parseElementExpression(astNode.to),
         }
       }
       nonexhaustive(astNode)