@likec4/language-server 1.20.3 → 1.21.1

package/src/ast.ts

@@ -43,6 +43,9 @@ type ParsedElementStyle = {
   border?: c4.BorderStyle
   opacity?: number
   multiple?: boolean
+  size?: c4.ShapeSize
+  padding?: c4.SpacingSize
+  textSize?: c4.TextSize
 }
 
 export interface ParsedAstSpecification {
@@ -85,6 +88,14 @@ export interface ParsedAstElement {
   metadata?: { [key: string]: string }
 }
 
+export interface ParsedAstExtendElement {
+  id: c4.Fqn
+  astPath: string
+  tags?: c4.NonEmptyArray<c4.Tag>
+  links?: c4.NonEmptyArray<ParsedLink>
+  metadata?: { [key: string]: string }
+}
+
 export interface ParsedAstRelation {
   id: c4.RelationId
   astPath: string
@@ -202,6 +213,7 @@ export interface LikeC4DocumentProps {
   diagnostics?: Array<LikeC4DocumentDiagnostic>
   c4Specification?: ParsedAstSpecification
   c4Elements?: ParsedAstElement[]
+  c4ExtendElements?: ParsedAstExtendElement[]
   c4Relations?: ParsedAstRelation[]
   c4Globals?: ParsedAstGlobals
   c4Views?: ParsedAstView[]
@@ -234,6 +246,7 @@ export function isParsedLikeC4LangiumDocument(
     && doc.state == DocumentState.Validated
     && !!doc.c4Specification
     && !!doc.c4Elements
+    && !!doc.c4ExtendElements
     && !!doc.c4Relations
     && !!doc.c4Views
     && !!doc.c4fqnIndex
@@ -251,15 +264,7 @@ export function* streamModel(doc: LikeC4LangiumDocument) {
       relations.push(el)
       continue
     }
-    if (ast.isExtendElement(el)) {
-      if (el.body && el.body.elements.length > 0) {
-        for (const child of el.body.elements) {
-          traverseStack.push(child)
-        }
-      }
-      continue
-    }
-    if (el.body && el.body.elements.length > 0) {
+    if (el.body && el.body.elements && el.body.elements.length > 0) {
       for (const child of el.body.elements) {
         traverseStack.push(child)
       }
@@ -324,6 +329,29 @@ export function parseAstOpacityProperty({ value }: ast.OpacityProperty): number
   return isNaN(opacity) ? 100 : clamp(opacity, { min: 0, max: 100 })
 }
 
+export function parseAstSizeValue({ value }: { value: ast.SizeValue }): 'xs' | 'sm' | 'md' | 'lg' | 'xl' {
+  switch (value) {
+    case 'xs':
+    case 'sm':
+    case 'md':
+    case 'lg':
+    case 'xl':
+      return value
+    case 'xsmall':
+      return 'xs'
+    case 'small':
+      return 'sm'
+    case 'medium':
+      return 'md'
+    case 'large':
+      return 'lg'
+    case 'xlarge':
+      return 'xl'
+    default:
+      nonexhaustive(value)
+  }
+}
+
 export function toElementStyle(props: Array<ast.StyleProperty> | undefined, isValid: IsValidFn) {
   const result = {} as ParsedElementStyle
   if (!props || props.length === 0) {
@@ -368,6 +396,24 @@ export function toElementStyle(props: Array<ast.StyleProperty> | undefined, isVa
         result.multiple = isBoolean(prop.value) ? prop.value : false
         break
       }
+      case ast.isShapeSizeProperty(prop): {
+        if (isTruthy(prop.value)) {
+          result.size = parseAstSizeValue(prop)
+        }
+        break
+      }
+      case ast.isPaddingSizeProperty(prop): {
+        if (isTruthy(prop.value)) {
+          result.padding = parseAstSizeValue(prop)
+        }
+        break
+      }
+      case ast.isTextSizeProperty(prop): {
+        if (isTruthy(prop.value)) {
+          result.textSize = parseAstSizeValue(prop)
+        }
+        break
+      }
       default:
         nonexhaustive(prop)
     }

package/src/formatting/LikeC4Formatter.ts

@@ -241,6 +241,9 @@ export class LikeC4Formatter extends AbstractFormatter {
       || ast.isBorderProperty(node)
       || ast.isOpacityProperty(node)
       || ast.isMultipleProperty(node)
+      || ast.isShapeSizeProperty(node)
+      || ast.isPaddingSizeProperty(node)
+      || ast.isTextSizeProperty(node)
     ) {
       const formatter = this.getNodeFormatter(node)
       const colon = formatter.keyword(':')
@@ -258,6 +261,9 @@ export class LikeC4Formatter extends AbstractFormatter {
         'border',
         'opacity',
         'multiple',
+        'size',
+        'padding',
+        'textSize',
       )
 
       if (colon.nodes.length === 0) {
@@ -471,7 +477,7 @@ export class LikeC4Formatter extends AbstractFormatter {
   protected formatWhereExpressionV2(node: AstNode) {
     if (
       ast.isRelationPredicateOrWhereV2(node)
-      // || ast.isElementPredicateOrWhere(node)
+      || ast.isElementPredicateOrWhereV2(node)
     ) {
       const formatter = this.getNodeFormatter(node)
       formatter.keyword('where').append(FormattingOptions.oneSpace)