@likec4/language-server 1.20.2 → 1.21.0

package/src/like-c4.langium

@@ -125,10 +125,13 @@ ElementStringProperty:
   key=('title' | 'technology' | 'description') ':'? value=String ';'?;
 
 ExtendElement:
-  'extend' element=FqnElementRef body=ExtendElementBody
+  'extend' element=StrictFqnElementRef body=ExtendElementBody
 ;
 
 ExtendElementBody:  '{'
+  tags=Tags?
+  props+=ExtendElementProperty*
+
   elements+=(
     Relation<true> |
     Element
@@ -136,9 +139,13 @@ ExtendElementBody:  '{'
 '}'
 ;
 
+ExtendElementProperty:
+  LinkProperty |
+  MetadataProperty;
+
 //
-FqnElementRef:
-  el=[Element:Id] ({infer FqnElementRef.parent=current} StickyDot el=[Element:Id])*;
+StrictFqnElementRef:
+  el=[Element:Id] ({infer StrictFqnElementRef.parent=current} StickyDot el=[Element:Id])*;
 
 ElementRef:
   el=[Element:Id] ({infer ElementRef.parent=current} StickyDot el=[Element:Id])*;
@@ -362,7 +369,7 @@ WhereElementNegation:
 
 WhereElement:
   {infer WhereElementTag} 'tag' EqOperator value=[Tag:TagId]? |
-  {infer WhereElementKind} 'kind' EqOperator value=[ElementKind]?
+  {infer WhereElementKind} 'kind' EqOperator value=[DeploymentNodeOrElementKind]?
 ;
 
 ElementExpression:
@@ -627,7 +634,11 @@ DeploymentViewRulePredicateExpression:
 
 ExpressionV2:
   RelationPredicateOrWhereV2 |
-  FqnExpr
+  ElementPredicateOrWhereV2
+;
+
+ElementPredicateOrWhereV2:
+  FqnExpr ({infer ElementPredicateWhereV2.subject=current} 'where' where=WhereElementExpression?)?
 ;
 
 RelationPredicateOrWhereV2:
@@ -731,13 +742,40 @@ BorderStyleValue returns string:
 BorderProperty:
   key='border' ':'? value=BorderStyleValue ';'?;
 
+SizeValue returns string:
+  'xs' |
+  'sm' |
+  'md' |
+  'lg' |
+  'xl' |
+  'xsmall' |
+  'small' |
+  'medium' |
+  'large' |
+  'xlarge';
+
+ShapeSizeProperty:
+  key='size' ':'? value=SizeValue ';'?;
+
+PaddingSizeProperty:
+  key='padding' ':'? value=SizeValue ';'?;
+
+TextSizeProperty:
+  key='textSize' ':'? value=SizeValue ';'?;
+
+type SizeProperty = ShapeSizeProperty | PaddingSizeProperty | TextSizeProperty;
+
 StyleProperty:
   ColorProperty |
   ShapeProperty |
   BorderProperty |
   OpacityProperty |
   IconProperty |
-  MultipleProperty;
+  MultipleProperty |
+  ShapeSizeProperty |
+  PaddingSizeProperty |
+  TextSizeProperty
+;
 
 ElementStyleProperty:
   key='style' '{'
@@ -802,7 +840,7 @@ CustomColorId returns string:
   IdTerminal | ElementShape | ArrowType | LineOptions | 'element' | 'model';
 
 Id returns string:
-  IdTerminal | ElementShape | ThemeColor | ArrowType | LineOptions | Participant | 'element' | 'model' | 'group' | 'node' | 'deployment' | 'instance';
+  IdTerminal | ElementShape | ThemeColor | ArrowType | LineOptions | Participant | SizeValue | 'element' | 'model' | 'group' | 'node' | 'deployment' | 'instance';
 
 fragment EqOperator:
   (

package/src/logger.ts

@@ -10,11 +10,10 @@ export function logError(err: unknown): void {
   logger.error(err)
 }
 
+/**
+ * Logs an error as warning (not critical)
+ */
 export function logWarnError(err: unknown): void {
-  if (err instanceof Error) {
-    logger.warn(err.stack ?? err.message)
-    return
-  }
   logger.warn(err)
 }
 

package/src/lsp/CompletionProvider.ts

@@ -16,6 +16,7 @@ const STYLE_FIELDS = [
   'border',
   'opacity',
   'multiple',
+  'size',
 ].join(',')
 
 export class LikeC4CompletionProvider extends DefaultCompletionProvider {

package/src/lsp/SemanticTokenProvider.ts

@@ -140,6 +140,60 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       })
       return 'prune'
     }
+    if (
+      ast.isGlobalStyleGroup(node)
+      || ast.isGlobalStyle(node)
+    ) {
+      acceptor({
+        node,
+        property: 'id',
+        type: SemanticTokenTypes.variable,
+        modifier: [
+          SemanticTokenModifiers.definition,
+          SemanticTokenModifiers.readonly,
+        ],
+      })
+      return
+    }
+    if (ast.isViewRuleGlobalStyle(node)) {
+      acceptor({
+        node,
+        property: 'style',
+        type: SemanticTokenTypes.variable,
+        modifier: [
+          SemanticTokenModifiers.definition,
+          SemanticTokenModifiers.readonly,
+        ],
+      })
+      return
+    }
+    if (
+      ast.isGlobalPredicateGroup(node)
+      || ast.isGlobalDynamicPredicateGroup(node)
+    ) {
+      acceptor({
+        node,
+        property: 'name',
+        type: SemanticTokenTypes.variable,
+        modifier: [
+          SemanticTokenModifiers.definition,
+          SemanticTokenModifiers.readonly,
+        ],
+      })
+      return
+    }
+    if (ast.isViewRuleGlobalPredicateRef(node)) {
+      acceptor({
+        node,
+        property: 'predicate',
+        type: SemanticTokenTypes.variable,
+        modifier: [
+          SemanticTokenModifiers.definition,
+          SemanticTokenModifiers.readonly,
+        ],
+      })
+      return
+    }
     if (ast.isElementTagExpression(node) && isTruthy(node.tag)) {
       acceptor({
         node,
@@ -161,7 +215,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       })
       return !node.parent ? 'prune' : undefined
     }
-    if (ast.isElementRef(node) || ast.isFqnElementRef(node)) {
+    if (ast.isElementRef(node) || ast.isStrictFqnElementRef(node)) {
       acceptor({
         node,
         property: 'el',
@@ -276,6 +330,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       || ast.isArrowProperty(node)
       || ast.isLineProperty(node)
       || ast.isBorderProperty(node)
+      || ast.isSizeProperty(node)
     ) {
       acceptor({
         node,

package/src/model/model-builder.ts

@@ -5,6 +5,7 @@ import {
   compareRelations,
   computeColorValues,
   DeploymentElement,
+  isNonEmptyArray,
   isScopedElementView,
   LikeC4Model,
   parentFqn,
@@ -18,6 +19,7 @@ import {
   filter,
   flatMap,
   groupBy,
+  hasAtLeast,
   indexBy,
   isBoolean,
   isDefined,
@@ -35,11 +37,13 @@ import {
   reduce,
   reverse,
   sort,
+  unique,
   values,
 } from 'remeda'
 import type {
   ParsedAstDeploymentRelation,
   ParsedAstElement,
+  ParsedAstExtendElement,
   ParsedAstRelation,
   ParsedAstSpecification,
   ParsedAstView,
@@ -117,7 +121,10 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         icon,
         opacity,
         border,
+        size,
         multiple,
+        padding,
+        textSize,
       },
       id,
       kind,
@@ -140,6 +147,9 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         border ??= __kind.style.border
         technology ??= __kind.technology
         multiple ??= __kind.style.multiple
+        size ??= __kind.style.size
+        padding ??= __kind.style.padding
+        textSize ??= __kind.style.textSize
         return {
           ...(color && { color }),
           ...(shape && { shape }),
@@ -148,6 +158,9 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           ...(__kind.notation && { notation: __kind.notation }),
           style: {
             ...(border && { border }),
+            ...(size && { size }),
+            ...(padding && { padding }),
+            ...(textSize && { textSize }),
             ...(isBoolean(multiple) && { multiple }),
             ...(isNumber(opacity) && { opacity }),
           },
@@ -166,9 +179,55 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
     }
   }
 
+  const elementsExtendData = new Map<string, Pick<c4.Element, 'links' | 'tags' | 'metadata'>>()
+  function mergeAllC4ExtendElements(doc: ParsedLikeC4LangiumDocument) {
+    for (const el of doc.c4ExtendElements) {
+      let links = el.links ? resolveLinks(doc, el.links) : null
+      const existing = elementsExtendData.get(el.id)
+      if (existing) {
+        links = existing.links ? [...existing.links, ...(links ?? [])] : links
+
+        let tags: c4.Tag[] | null = [...(existing.tags ?? []), ...(el.tags ?? [])]
+        if (!hasAtLeast(tags, 1)) {
+          tags = null
+        }
+
+        elementsExtendData.set(el.id, {
+          tags,
+          links,
+          metadata: { ...existing.metadata, ...el.metadata },
+        })
+      } else {
+        elementsExtendData.set(el.id, {
+          tags: el.tags ?? null,
+          links,
+          metadata: { ...el.metadata },
+        })
+      }
+    }
+  }
+  function withExtendElementData(el: c4.Element): c4.Element {
+    const extendData = elementsExtendData.get(el.id)
+    if (extendData) {
+      const links = [...(el.links ?? []), ...(extendData.links ?? [])]
+      const tags = unique([...(el.tags ?? []), ...(extendData.tags ?? [])])
+      const metadata = { ...el.metadata, ...extendData.metadata }
+      return {
+        ...el,
+        tags: hasAtLeast(tags, 1) ? tags : null,
+        links: hasAtLeast(links, 1) ? links : null,
+        ...(!isEmpty(metadata) && { metadata }),
+      }
+    }
+    return el
+  }
+
   const elements = pipe(
     docs,
-    flatMap(d => map(d.c4Elements, toModelElement(d))),
+    flatMap(d => {
+      mergeAllC4ExtendElements(d)
+      return map(d.c4Elements, toModelElement(d))
+    }),
     filter(isTruthy),
     // sort from root elements to nested, so that parent is always present
     // Import to preserve the order from the source
@@ -180,7 +239,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
           logWarnError(`No parent found for ${el.id}`)
           return acc
         }
-        acc[el.id] = el
+        acc[el.id] = withExtendElementData(el)
         return acc
       },
       {} as c4.ParsedLikeC4Model['elements'],
@@ -219,7 +278,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         } satisfies c4.ModelRelation
       }
       return {
-        ...links && { links },
+        ...(links && { links }),
         ...model,
         source,
         target,
@@ -263,8 +322,8 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         } = parsed
         return {
           ...parsed,
-          ...notation && { notation },
-          ...technology && { technology },
+          ...(notation && { notation }),
+          ...(technology && { technology }),
           style: {
             border: 'dashed',
             opacity: 10,
@@ -333,7 +392,7 @@ function buildModel(services: LikeC4Services, docs: ParsedLikeC4LangiumDocument[
         } satisfies c4.DeploymentRelation
       }
       return {
-        ...links && { links },
+        ...(links && { links }),
         ...model,
         source,
         target,

package/src/model/model-parser.ts

@@ -51,6 +51,7 @@ export class LikeC4ModelParser {
           deployments: {},
         },
         c4Elements: [],
+        c4ExtendElements: [],
         c4Relations: [],
         c4Deployments: [],
         c4DeploymentRelations: [],

package/src/model/parser/Base.ts

@@ -1,7 +1,7 @@
 import type * as c4 from '@likec4/core'
 import { invariant, isNonEmptyArray } from '@likec4/core'
 import type { AstNode } from 'langium'
-import { filter, flatMap, isNonNullish, isTruthy, mapToObj, pipe } from 'remeda'
+import { filter, flatMap, fromEntries, isEmpty, isNonNullish, isTruthy, map, pipe, unique } from 'remeda'
 import stripIndent from 'strip-indent'
 import { type ParsedLikeC4LangiumDocument, type ParsedLink, ast } from '../../ast'
 import type { LikeC4Services } from '../../module'
@@ -49,10 +49,16 @@ export class BaseParser {
   }
 
   getMetadata(metadataAstNode: ast.MetadataProperty | undefined): { [key: string]: string } | undefined {
-    if (!metadataAstNode || !this.isValid(metadataAstNode)) {
+    if (!metadataAstNode || !this.isValid(metadataAstNode) || isEmpty(metadataAstNode.props)) {
       return undefined
     }
-    return mapToObj(metadataAstNode.props, p => [p.key, removeIndent(p.value)] as [string, string])
+    const data = pipe(
+      metadataAstNode.props,
+      map(p => [p.key, removeIndent(p.value)] as [string, string]),
+      filter(([_, value]) => isTruthy(value)),
+      fromEntries(),
+    )
+    return isEmpty(data) ? undefined : data
   }
 
   convertTags<E extends { tags?: ast.Tags }>(withTags?: E) {
@@ -63,7 +69,7 @@ export class BaseParser {
     if (!iter) {
       return null
     }
-    const tags = [] as c4.Tag[]
+    let tags = [] as c4.Tag[]
     while (iter) {
       try {
         if (this.isValid(iter)) {
@@ -77,7 +83,7 @@ export class BaseParser {
       }
       iter = iter.prev
     }
-    tags.reverse()
+    tags = unique(tags.reverse())
     return isNonEmptyArray(tags) ? tags : null
   }
 

package/src/model/parser/DeploymentViewParser.ts

@@ -84,6 +84,9 @@ export function DeploymentViewParser<TBase extends WithExpressionV2 & WithDeploy
               case ast.isFqnExpr(expr):
                 exprs.unshift(this.parseFqnExpr(expr))
                 break
+              case ast.isElementPredicateWhereV2(expr):
+                exprs.unshift(this.parseElementWhereExpr(expr))
+                break
               case ast.isRelationExpr(expr):
                 exprs.unshift(this.parseRelationExpr(expr))
                 break

package/src/model/parser/FqnRefParser.ts

@@ -74,6 +74,17 @@ export function ExpressionV2Parser<TBase extends Base>(B: TBase) {
       }
     }
 
+    parseElementWhereExpr(astNode: ast.ElementPredicateWhereV2): c4.RelationExpr {
+      return {
+        where: {
+          expr: this.parseFqnExpr(astNode.subject as ast.FqnExpr),
+          condition: astNode.where ? parseWhereClause(astNode.where) : {
+            kind: { neq: '--always-true--' },
+          },
+        },
+      }
+    }
+
     parseFqnExpressions(astNode: ast.FqnExpressions): c4.FqnExpr[] {
       const exprs = [] as c4.FqnExpr[]
       let iter: ast.FqnExpressions['prev'] = astNode

package/src/model/parser/ModelParser.ts

@@ -1,8 +1,9 @@
 import type * as c4 from '@likec4/core'
 import { isNonEmptyArray, nonexhaustive, nonNullable } from '@likec4/core'
-import { filter, first, isNonNullish, isTruthy, map, mapToObj, pipe } from 'remeda'
+import { filter, first, isEmpty, isNonNullish, isTruthy, map, mapToObj, pipe } from 'remeda'
 import {
   type ParsedAstElement,
+  type ParsedAstExtendElement,
   type ParsedAstRelation,
   ast,
   resolveRelationPoints,
@@ -32,6 +33,13 @@ export function ModelParser<TBase extends Base>(B: TBase) {
             }
             continue
           }
+          if (ast.isExtendElement(el)) {
+            const parsed = this.parseExtendElement(el)
+            if (parsed) {
+              doc.c4ExtendElements.push(parsed)
+            }
+            continue
+          }
           nonexhaustive(el)
         } catch (e) {
           logWarnError(e)
@@ -87,6 +95,27 @@ export function ModelParser<TBase extends Base>(B: TBase) {
       }
     }
 
+    parseExtendElement(astNode: ast.ExtendElement): ParsedAstExtendElement | null {
+      const isValid = this.isValid
+      const id = this.resolveFqn(astNode)
+      const tags = this.parseTags(astNode.body)
+      const metadata = this.getMetadata(astNode.body?.props.find(ast.isMetadataProperty))
+      const astPath = this.getAstNodePath(astNode)
+      const links = this.parseLinks(astNode.body) ?? []
+
+      if (!tags && isEmpty(metadata ?? {}) && isEmpty(links)) {
+        return null
+      }
+
+      return {
+        id,
+        astPath,
+        ...(metadata && { metadata }),
+        ...(tags && { tags }),
+        ...(links && isNonEmptyArray(links) && { links }),
+      }
+    }
+
     parseRelation(astNode: ast.Relation): ParsedAstRelation {
       const isValid = this.isValid
       const coupling = resolveRelationPoints(astNode)

package/src/model/parser/PredicatesParser.ts

@@ -1,7 +1,7 @@
 import type * as c4 from '@likec4/core'
 import { invariant, nonexhaustive } from '@likec4/core'
 import { isBoolean, isDefined, isTruthy } from 'remeda'
-import { ast, parseAstOpacityProperty, toColor } from '../../ast'
+import { ast, parseAstOpacityProperty, parseAstSizeValue, toColor } from '../../ast'
 import { logWarnError } from '../../logger'
 import { elementRef } from '../../utils/elementRef'
 import { parseWhereClause } from '../model-parser-where'
@@ -180,6 +180,24 @@ export function PredicatesParser<TBase extends Base>(B: TBase) {
             }
             return acc
           }
+          if (ast.isShapeSizeProperty(prop)) {
+            if (isTruthy(prop.value)) {
+              acc.custom[prop.key] = parseAstSizeValue(prop)
+            }
+            return acc
+          }
+          if (ast.isTextSizeProperty(prop)) {
+            if (isTruthy(prop.value)) {
+              acc.custom[prop.key] = parseAstSizeValue(prop)
+            }
+            return acc
+          }
+          if (ast.isPaddingSizeProperty(prop)) {
+            if (isTruthy(prop.value)) {
+              acc.custom[prop.key] = parseAstSizeValue(prop)
+            }
+            return acc
+          }
           nonexhaustive(prop)
         },
         {

package/src/references/scope-provider.ts

@@ -3,18 +3,18 @@ import { nonexhaustive } from '@likec4/core'
 import type { AstNode } from 'langium'
 import {
   type AstNodeDescription,
+  type ReferenceInfo,
+  type Scope,
+  type Stream,
   AstUtils,
   DefaultScopeProvider,
   DONE_RESULT,
   EMPTY_SCOPE,
   EMPTY_STREAM,
   MapScope,
-  type ReferenceInfo,
-  type Scope,
-  type Stream,
   stream,
   StreamImpl,
-  StreamScope
+  StreamScope,
 } from 'langium'
 import { ast } from '../ast'
 import { logger } from '../logger'
@@ -54,7 +54,7 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
           return iterator.next()
         }
         return DONE_RESULT
-      }
+      },
     )
   }
 
@@ -99,7 +99,7 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
           return this.getGlobalScope(referenceType, context)
         }
 
-        if (ast.isFqnElementRef(container) && context.property === 'el') {
+        if (ast.isStrictFqnElementRef(container) && context.property === 'el') {
           const parent = container.parent
           if (!parent) {
             return this.getGlobalScope(referenceType, context)
@@ -116,7 +116,7 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
             const closestElement = AstUtils.getContainerOfType(container, ast.isElement)
             if (closestElement) {
               return new MapScope([
-                this.descriptions.createDescription(closestElement, context.reference.$refText)
+                this.descriptions.createDescription(closestElement, context.reference.$refText),
               ])
             } else {
               return EMPTY_SCOPE
@@ -146,8 +146,8 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
           // Third preference for elements if we are in deployment view
           AstUtils.hasContainerOfType(container, ast.isDeploymentView)
             ? this.computeScope(context, ast.Element)
-            : EMPTY_SCOPE
-        )
+            : EMPTY_SCOPE,
+        ),
       )
     }
     const parentRef = parent.value.ref

package/src/test/testServices.ts

@@ -1,3 +1,4 @@
+import { LikeC4Model } from '@likec4/core'
 import { DocumentState, EmptyFileSystem, TextDocument } from 'langium'
 import * as assert from 'node:assert'
 import stripIndent from 'strip-indent'
@@ -16,7 +17,7 @@ export function createTestServices(workspace = 'file:///test/workspace') {
   const formatter = services.lsp.Formatter
   const workspaceFolder = {
     name: 'test',
-    uri: workspaceUri.toString()
+    uri: workspaceUri.toString(),
   }
   let isInitialized = false
   let documentIndex = 1
@@ -32,7 +33,7 @@ export function createTestServices(workspace = 'file:///test/workspace') {
           capabilities: {},
           processId: null,
           rootUri: null,
-          workspaceFolders: [workspaceFolder]
+          workspaceFolders: [workspaceFolder],
         })
         await services.shared.workspace.WorkspaceManager.initializeWorkspace([workspaceFolder])
       })
@@ -40,11 +41,11 @@ export function createTestServices(workspace = 'file:///test/workspace') {
     const docUri = Utils.resolvePath(
       workspaceUri,
       './src/',
-      uri ?? `${documentIndex++}${metaData.fileExtensions[0]}`
+      uri ?? `${documentIndex++}${metaData.fileExtensions[0]}`,
     )
     const document = services.shared.workspace.LangiumDocumentFactory.fromString(
       stripIndent(input),
-      docUri
+      docUri,
     )
     langiumDocuments.addDocument(document)
     await services.shared.workspace.WorkspaceLock.write(async (_cancelToken) => {
@@ -65,7 +66,7 @@ export function createTestServices(workspace = 'file:///test/workspace') {
       document,
       diagnostics,
       warnings,
-      errors
+      errors,
     }
   }
 
@@ -79,8 +80,8 @@ export function createTestServices(workspace = 'file:///test/workspace') {
       document,
       {
         options: { tabSize: 2, insertSpaces: true },
-        textDocument: { uri: document.uri.toString() }
-      }
+        textDocument: { uri: document.uri.toString() },
+      },
     )
 
     return TextDocument.applyEdits(document.textDocument, edits ?? [])
@@ -106,7 +107,7 @@ export function createTestServices(workspace = 'file:///test/workspace') {
     return {
       diagnostics,
       errors,
-      warnings
+      warnings,
     }
   }
 
@@ -117,6 +118,13 @@ export function createTestServices(workspace = 'file:///test/workspace') {
     return model
   }
 
+  const buildLikeC4Model = async () => {
+    await validateAll()
+    const model = await modelBuilder.buildComputedModel()
+    if (!model) throw new Error('No model found')
+    return LikeC4Model.create(model)
+  }
+
   /**
    * This will clear all documents
    */
@@ -133,8 +141,9 @@ export function createTestServices(workspace = 'file:///test/workspace') {
     validate,
     validateAll,
     buildModel,
+    buildLikeC4Model,
     resetState,
-    format
+    format,
   }
 }