@likec4/language-server 1.11.0 → 1.12.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],
@@ -85,4 +88,4 @@ export function deserializeFromComment(comment: string): ViewManualLayout {
     .join('')
   const decodedb64 = fromBase64(b64)
   return unpack(decode(decodedb64) as any) as ViewManualLayout
-}
+}