@likec4/language-server 1.11.0 → 1.12.1

package/src/model-change/changeViewLayout.ts

@@ -1,5 +1,6 @@
-import { type AutoLayoutDirection, invariant } from '@likec4/core'
+import { invariant, type ViewRuleAutoLayout } from '@likec4/core'
 import { GrammarUtils } from 'langium'
+import { isDefined } from 'remeda'
 import { TextEdit } from 'vscode-languageserver-types'
 import { ast, type ParsedAstView, type ParsedLikeC4LangiumDocument, toAstViewLayoutDirection } from '../ast'
 import type { LikeC4Services } from '../module'
@@ -10,7 +11,7 @@ type ChangeViewLayoutArg = {
   view: ParsedAstView
   doc: ParsedLikeC4LangiumDocument
   viewAst: ast.LikeC4View
-  layout: AutoLayoutDirection
+  layout: ViewRuleAutoLayout
 }
 
 export function changeViewLayout(_services: LikeC4Services, {
@@ -22,20 +23,25 @@ export function changeViewLayout(_services: LikeC4Services, {
   invariant(viewAst.body, `View ${view.id} has no body`)
   const viewCstNode = viewAst.$cstNode
   invariant(viewCstNode, 'viewCstNode')
-  const newlayout = toAstViewLayoutDirection(layout)
+  const newdirection = toAstViewLayoutDirection(layout.direction)
   const existingRule = viewAst.body.rules.findLast(ast.isViewRuleAutoLayout) as ast.ViewRuleAutoLayout | undefined
 
-  if (existingRule && existingRule.$cstNode) {
-    const directionCstNode = findNodeForProperty(existingRule.$cstNode, 'direction')
-    if (directionCstNode) {
-      return TextEdit.replace(directionCstNode.range, newlayout)
+  let newRule = `autoLayout ${newdirection}`
+
+  if (isDefined(layout.rankSep)) {
+    newRule += ` ${layout.rankSep}`
+    if (isDefined(layout.nodeSep)) {
+      newRule += ` ${layout.nodeSep}`
     }
-    return TextEdit.replace(existingRule.$cstNode.range, `autoLayout ${newlayout}`)
+  }
+
+  if (existingRule && existingRule.$cstNode) {
+    return TextEdit.replace(existingRule.$cstNode.range, newRule)
   }
 
   const insertPos = findNodeForKeyword(viewAst.body.$cstNode, '}')?.range.start
   invariant(insertPos, 'Closing brace not found')
-  const insert = `  autoLayout ${newlayout}\n` + ' '.repeat(insertPos.character)
+  const insert = `\t${newRule}\n\t`
 
   return TextEdit.insert(insertPos, insert)
 }

package/src/model-graph/compute-view/compute.ts

@@ -175,7 +175,11 @@ export class ComputeCtx {
 
     return calcViewLayoutHash({
       ...view,
-      autoLayout: autoLayoutRule?.autoLayout ?? 'TB',
+      autoLayout: {
+        direction: autoLayoutRule?.direction ?? 'TB',
+        ...(autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep }),
+        ...(autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }),
+      },
       nodes: map(nodes, omit(['notation'])),
       edges: applyCustomRelationProperties(rules, nodes, sortedEdges),
       ...(elementNotations.length > 0 && {

package/src/model-graph/dynamic-view/compute.ts

@@ -200,7 +200,11 @@ export class DynamicViewComputeCtx {
 
     return calcViewLayoutHash({
       ...view,
-      autoLayout: autoLayoutRule?.autoLayout ?? 'LR',
+      autoLayout: {
+        direction: autoLayoutRule?.direction ?? 'LR',
+        ...(autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep }),
+        ...(autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }),
+      },
       nodes: map(nodes, omit(['notation'])),
       edges,
       ...(elementNotations.length > 0 && {

package/src/test/testServices.ts

@@ -72,7 +72,7 @@ export function createTestServices(workspace = 'file:///test/workspace') {
   const format = async (input: string | LikeC4LangiumDocument, uri?: string) => {
     const document = typeof input === 'string' ? await parse(input, uri) : input
     await services.shared.workspace.WorkspaceLock.write(async (_cancelToken) => {
-      await documentBuilder.build([document], { validation: false })
+      await documentBuilder.build([document], { validation: true })
     })
 
     const edits = await services.lsp.Formatter?.formatDocument(

package/src/view-utils/manual-layout.ts

@@ -1,4 +1,4 @@
-import type { ViewManualLayout } from '@likec4/core'
+import { isAutoLayoutDirection, type ViewManualLayout } from '@likec4/core'
 import { decode, encode } from '@msgpack/msgpack'
 import { fromBase64, toBase64 } from '@smithy/util-base64'
 import { mapValues } from 'remeda'
@@ -28,10 +28,13 @@ function pack({
 function unpack({
   nodes,
   edges,
+  autoLayout,
   ...rest
 }: ReturnType<typeof pack>): ViewManualLayout {
   return {
     ...rest,
+    /// Try to parse the old format for backward compatibility
+    autoLayout: isAutoLayoutDirection(autoLayout) ? { direction: autoLayout } : autoLayout,
     nodes: mapValues(nodes, ({ b, c, ...n }) => ({
       x: b[0],
       y: b[1],
@@ -50,12 +53,12 @@ function unpack({
   }
 }
 
+const MAX_LINE_LENGTH = 500
 export function serializeToComment(layout: ViewManualLayout) {
   const bytes = encode(pack(layout))
   const base64 = toBase64(bytes)
   const lines = [] as string[]
   let offset = 0
-  const MAX_LINE_LENGTH = 200
   while (offset < base64.length) {
     lines.push(' * ' + base64.slice(offset, Math.min(offset + MAX_LINE_LENGTH, base64.length)))
     offset += MAX_LINE_LENGTH