@likec4/language-server 1.11.0 → 1.12.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.11.0",
+  "version": "1.12.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -112,8 +112,8 @@
   },
   "dependencies": {
     "@dagrejs/graphlib": "^2.2.4",
-    "@likec4/core": "1.11.0",
-    "@likec4/log": "1.11.0",
+    "@likec4/core": "1.12.1",
+    "@likec4/log": "1.12.1",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
@@ -133,20 +133,20 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.11.0",
-    "@likec4/tsconfig": "1.11.0",
-    "@types/node": "^20.16.1",
+    "@likec4/icons": "1.12.1",
+    "@likec4/tsconfig": "1.12.1",
+    "@types/node": "^20.16.5",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
-    "@vitest/coverage-v8": "^2.1.1",
+    "@vitest/coverage-v8": "^2.1.2",
     "execa": "^9.3.1",
     "langium-cli": "3.2.0",
     "npm-run-all2": "^6.2.2",
     "tsx": "~4.9.3",
-    "turbo": "^2.1.1",
+    "turbo": "^2.1.3",
     "typescript": "^5.6.2",
-    "unbuild": "^3.0.0-rc.7",
-    "vitest": "^2.1.1"
+    "unbuild": "^3.0.0-rc.11",
+    "vitest": "^2.1.2"
   },
-  "packageManager": "yarn@4.4.1"
+  "packageManager": "yarn@4.5.0"
 }

package/src/ast.ts

@@ -455,27 +455,41 @@ export function toColor(astNode: ast.ColorProperty): c4.Color | undefined {
 }
 
 export function toAutoLayout(
-  direction: ast.ViewLayoutDirection
-): c4.ViewRuleAutoLayout['autoLayout'] {
-  switch (direction) {
+  rule: ast.ViewRuleAutoLayout
+): c4.ViewRuleAutoLayout {
+  const rankSep = rule.rankSep
+  const nodeSep = rule.nodeSep
+
+  let direction: c4.ViewRuleAutoLayout['direction'];
+  switch (rule.direction) {
     case 'TopBottom': {
-      return 'TB'
+      direction = 'TB'
+      break
     }
     case 'BottomTop': {
-      return 'BT'
+      direction = 'BT'
+      break
     }
     case 'LeftRight': {
-      return 'LR'
+      direction = 'LR'
+      break
     }
     case 'RightLeft': {
-      return 'RL'
+      direction = 'RL'
+      break
     }
     default:
-      nonexhaustive(direction)
+      nonexhaustive(rule.direction)
+  }
+
+  return {
+    direction,
+    ...(nodeSep && { nodeSep }),
+    ...(rankSep && { rankSep })
   }
 }
 
-export function toAstViewLayoutDirection(c4: c4.ViewRuleAutoLayout['autoLayout']): ast.ViewLayoutDirection {
+export function toAstViewLayoutDirection(c4: c4.ViewRuleAutoLayout['direction']): ast.ViewLayoutDirection {
   switch (c4) {
     case 'TB': {
       return 'TopBottom'

package/src/formatting/LikeC4Formatter.ts

@@ -56,10 +56,18 @@ export class LikeC4Formatter extends AbstractFormatter {
     })
 
     this.on(node, ast.isDynamicViewStep, (n, f) => {
-      f.properties('source').append(FormattingOptions.oneSpace)
-      f.keywords(']->').prepend(FormattingOptions.noSpace)
-      f.keywords('-[').append(FormattingOptions.noSpace)
-      f.properties('target', 'title').prepend(FormattingOptions.oneSpace)
+      f.keywords('->', '<-').surround(FormattingOptions.oneSpace)
+
+      const kind = f.property('kind')
+      kind.nodes[0]?.text.startsWith('.') && kind.surround(FormattingOptions.oneSpace)
+      f.keywords(']->')
+        .prepend(FormattingOptions.noSpace)
+        .append(FormattingOptions.oneSpace)
+      f.keywords('-[')
+        .prepend(FormattingOptions.oneSpace)
+        .append(FormattingOptions.noSpace)
+
+      f.properties('title').prepend(FormattingOptions.oneSpace)
     })
 
     this.on(node, ast.isDirectedRelationExpression)
@@ -110,6 +118,7 @@ export class LikeC4Formatter extends AbstractFormatter {
       || ast.isCustomElementProperties(node)
       || ast.isCustomRelationProperties(node)
       || ast.isElementStyleProperty(node)
+      || ast.isDynamicViewParallelSteps(node)
     ) {
       const formatter = this.getNodeFormatter(node)
       const openBrace = formatter.keywords('{')
@@ -170,7 +179,8 @@ export class LikeC4Formatter extends AbstractFormatter {
       || ast.isOpacityProperty(node)
     ) {
       const formatter = this.getNodeFormatter(node)
-      formatter.keywords(
+      const colon = formatter.keyword(':')
+      const propertyName = formatter.keywords(
         'title',
         'description',
         'technology',
@@ -184,11 +194,15 @@ export class LikeC4Formatter extends AbstractFormatter {
         'border',
         'opacity'
       )
-        .append(FormattingOptions.oneSpace)
 
-      formatter.keyword(':')
-        .prepend(FormattingOptions.noSpace)
-        .append(FormattingOptions.oneSpace)
+      if (colon.nodes.length === 0) {
+        propertyName
+          .append(FormattingOptions.oneSpace)
+      } else {
+        colon
+          .prepend(FormattingOptions.noSpace)
+          .append(FormattingOptions.oneSpace)
+      }
 
       formatter.keyword(';')
         .prepend(FormattingOptions.noSpace)
@@ -216,8 +230,11 @@ export class LikeC4Formatter extends AbstractFormatter {
   }
 
   protected formatAutolayoutProperty(node: AstNode) {
-    this.on(node, ast.isViewRuleAutoLayout)
-      ?.keyword('autoLayout').append(FormattingOptions.oneSpace)
+    this.on(node, ast.isViewRuleAutoLayout, (n, f) => {
+      f.keyword('autoLayout').append(FormattingOptions.oneSpace)
+      f.property('rankSep').prepend(FormattingOptions.oneSpace)
+      f.property('nodeSep').prepend(FormattingOptions.oneSpace)
+    })
   }
 
   protected formatMetadataProperty(node: AstNode) {
@@ -287,7 +304,7 @@ export class LikeC4Formatter extends AbstractFormatter {
     this.on(node, ast.isViewRuleStyle)
       ?.keyword('style').append(FormattingOptions.oneSpace)
 
-      this.on(node, ast.isElementExpressionsIterator)
+    this.on(node, ast.isElementExpressionsIterator)
       ?.keyword(',')
       .prepend(FormattingOptions.noSpace)
       .append(FormattingOptions.oneSpace)

package/src/generated/ast.ts

@@ -12,7 +12,7 @@ export const LikeC4Terminals = {
     LINE_COMMENT: /\/\/[^\n\r]*/,
     WS: /[\t ]+/,
     NL: /[\r\n]+/,
-    LIB_ICON: /(aws|gcp|tech):[-\w]*/,
+    LIB_ICON: /(aws|azure|gcp|tech):[-\w]*/,
     URI_WITH_SCHEMA: /\w+:\/\/\S+/,
     URI_RELATIVE: /\.{0,2}\/[^\/]\S+/,
     DotUnderscore: /\b\._/,
@@ -25,7 +25,8 @@ export const LikeC4Terminals = {
     Percent: /\b\d+%/,
     String: /"[^"]*"|'[^']*'/,
     IdTerminal: /[_]*[a-zA-Z][-\w]*/,
-    Hex: /[a-zA-Z0-9]+/,
+    Number: /\b\d+\b/,
+    Hex: /\b[a-zA-Z0-9]+\b/,
 };
 
 export type LikeC4TerminalNames = keyof typeof LikeC4Terminals;
@@ -205,7 +206,7 @@ export function isElementShape(item: unknown): item is ElementShape {
 export type IconId = string;
 
 export function isIconId(item: unknown): item is IconId {
-    return (typeof item === 'string' && (/(aws|gcp|tech):[-\w]*/.test(item)));
+    return (typeof item === 'string' && (/(aws|azure|gcp|tech):[-\w]*/.test(item)));
 }
 
 export type Id = 'element' | 'model' | ArrowType | ElementShape | LineOptions | ThemeColor | string;
@@ -1347,6 +1348,8 @@ export interface ViewRuleAutoLayout extends AstNode {
     readonly $container: DynamicViewBody | ElementViewBody;
     readonly $type: 'ViewRuleAutoLayout';
     direction: ViewLayoutDirection;
+    nodeSep?: number;
+    rankSep?: number;
 }
 
 export const ViewRuleAutoLayout = 'ViewRuleAutoLayout';
@@ -2441,7 +2444,9 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: ViewRuleAutoLayout,
                     properties: [
-                        { name: 'direction' }
+                        { name: 'direction' },
+                        { name: 'nodeSep' },
+                        { name: 'rankSep' }
                     ]
                 };
             }