@likec4/language-server 1.12.0 → 1.12.2

package/dist/browser.cjs

@@ -2,7 +2,7 @@
 
 const lsp = require('langium/lsp');
 const browser = require('vscode-languageserver/browser');
-const module$1 = require('./shared/language-server.BzrAcTYK.cjs');
+const module$1 = require('./shared/language-server.BH0brgLf.cjs');
 
 function startLanguageServer() {
   const messageReader = new browser.BrowserMessageReader(self);

package/dist/browser.mjs

@@ -1,7 +1,7 @@
 import { startLanguageServer as startLanguageServer$1 } from 'langium/lsp';
 import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser';
-import { c as createLanguageServices } from './shared/language-server.BbMFBkE-.mjs';
-export { L as LikeC4Module, a as createCustomLanguageServices, s as setLogLevel } from './shared/language-server.BbMFBkE-.mjs';
+import { c as createLanguageServices } from './shared/language-server.BYjS7OIz.mjs';
+export { L as LikeC4Module, a as createCustomLanguageServices, s as setLogLevel } from './shared/language-server.BYjS7OIz.mjs';
 
 function startLanguageServer() {
   const messageReader = new BrowserMessageReader(self);

package/dist/index.cjs

@@ -3,7 +3,7 @@
 const lsp = require('langium/lsp');
 const node$1 = require('langium/node');
 const node = require('vscode-languageserver/node');
-const module$1 = require('./shared/language-server.BzrAcTYK.cjs');
+const module$1 = require('./shared/language-server.BH0brgLf.cjs');
 
 function startLanguageServer() {
   const connection = node.createConnection(node.ProposedFeatures.all);

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { startLanguageServer as startLanguageServer$1 } from 'langium/lsp';
 import { NodeFileSystem } from 'langium/node';
 import { createConnection, ProposedFeatures } from 'vscode-languageserver/node';
-import { c as createLanguageServices } from './shared/language-server.BbMFBkE-.mjs';
-export { L as LikeC4Module, a as createCustomLanguageServices, l as lspLogger, s as setLogLevel } from './shared/language-server.BbMFBkE-.mjs';
+import { c as createLanguageServices } from './shared/language-server.BYjS7OIz.mjs';
+export { L as LikeC4Module, a as createCustomLanguageServices, l as lspLogger, s as setLogLevel } from './shared/language-server.BYjS7OIz.mjs';
 
 function startLanguageServer() {
   const connection = createConnection(ProposedFeatures.all);

package/dist/shared/{language-server.BzrAcTYK.cjs → language-server.BH0brgLf.cjs}

@@ -3313,12 +3313,12 @@ function unpack({
     }))
   };
 }
+const MAX_LINE_LENGTH = 500;
 function serializeToComment(layout) {
   const bytes = msgpack.encode(pack(layout));
   const base64 = utilBase64.toBase64(bytes);
   const lines = [];
   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;
@@ -4364,19 +4364,22 @@ function changeViewLayout(_services, {
   core.invariant(viewAst.body, `View ${view.id} has no body`);
   const viewCstNode = viewAst.$cstNode;
   core.invariant(viewCstNode, "viewCstNode");
-  const newlayout = toAstViewLayoutDirection(layout);
+  const newdirection = toAstViewLayoutDirection(layout.direction);
   const existingRule = viewAst.body.rules.findLast(isViewRuleAutoLayout);
-  if (existingRule && existingRule.$cstNode) {
-    const directionCstNode = findNodeForProperty(existingRule.$cstNode, "direction");
-    if (directionCstNode) {
-      return vscodeLanguageserverTypes.TextEdit.replace(directionCstNode.range, newlayout);
+  let newRule = `autoLayout ${newdirection}`;
+  if (remeda.isDefined(layout.rankSep)) {
+    newRule += ` ${layout.rankSep}`;
+    if (remeda.isDefined(layout.nodeSep)) {
+      newRule += ` ${layout.nodeSep}`;
     }
-    return vscodeLanguageserverTypes.TextEdit.replace(existingRule.$cstNode.range, `autoLayout ${newlayout}`);
+  }
+  if (existingRule && existingRule.$cstNode) {
+    return vscodeLanguageserverTypes.TextEdit.replace(existingRule.$cstNode.range, newRule);
   }
   const insertPos = findNodeForKeyword(viewAst.body.$cstNode, "}")?.range.start;
   core.invariant(insertPos, "Closing brace not found");
-  const insert = `  autoLayout ${newlayout}
-` + " ".repeat(insertPos.character);
+  const insert = `	${newRule}
+	`;
   return vscodeLanguageserverTypes.TextEdit.insert(insertPos, insert);
 }
 
@@ -5569,7 +5572,8 @@ class LikeC4Formatter extends lsp.AbstractFormatter {
   formatLeafProperty(node) {
     if (isElementStringProperty(node) || isRelationStringProperty(node) || isViewStringProperty(node) || isNotationProperty(node) || isSpecificationElementStringProperty(node) || isSpecificationRelationshipStringProperty(node) || isColorProperty(node) || isLineProperty(node) || isArrowProperty(node) || isIconProperty(node) || isShapeProperty(node) || isBorderProperty(node) || isOpacityProperty(node)) {
       const formatter = this.getNodeFormatter(node);
-      formatter.keywords(
+      const colon = formatter.keyword(":");
+      const propertyName = formatter.keywords(
         "title",
         "description",
         "technology",
@@ -5582,8 +5586,12 @@ class LikeC4Formatter extends lsp.AbstractFormatter {
         "shape",
         "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).append(FormattingOptions.newLine);
     }
   }

package/dist/shared/{language-server.BbMFBkE-.mjs → language-server.BYjS7OIz.mjs}

@@ -3305,12 +3305,12 @@ function unpack({
     }))
   };
 }
+const MAX_LINE_LENGTH = 500;
 function serializeToComment(layout) {
   const bytes = encode(pack(layout));
   const base64 = toBase64(bytes);
   const lines = [];
   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;
@@ -4356,19 +4356,22 @@ function changeViewLayout(_services, {
   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(isViewRuleAutoLayout);
-  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}
-` + " ".repeat(insertPos.character);
+  const insert = `	${newRule}
+	`;
   return TextEdit.insert(insertPos, insert);
 }
 
@@ -5561,7 +5564,8 @@ class LikeC4Formatter extends AbstractFormatter {
   formatLeafProperty(node) {
     if (isElementStringProperty(node) || isRelationStringProperty(node) || isViewStringProperty(node) || isNotationProperty(node) || isSpecificationElementStringProperty(node) || isSpecificationRelationshipStringProperty(node) || isColorProperty(node) || isLineProperty(node) || isArrowProperty(node) || isIconProperty(node) || isShapeProperty(node) || isBorderProperty(node) || isOpacityProperty(node)) {
       const formatter = this.getNodeFormatter(node);
-      formatter.keywords(
+      const colon = formatter.keyword(":");
+      const propertyName = formatter.keywords(
         "title",
         "description",
         "technology",
@@ -5574,8 +5578,12 @@ class LikeC4Formatter extends AbstractFormatter {
         "shape",
         "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).append(FormattingOptions.newLine);
     }
   }

package/dist/shared/{language-server.ljop0PBQ.d.ts → language-server.CfQfeZck.d.ts}

@@ -955,7 +955,7 @@ interface ParsedLikeC4LangiumDocument extends Omit<LangiumDocument<LikeC4Grammar
 }
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isExtendElement | typeof isElement | typeof isLikeC4View | typeof isExtendElementBody | typeof isElementViewBody | typeof isSpecificationElementKind | typeof isSpecificationTag | typeof isSpecificationRelationshipKind | typeof isSpecificationColor | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
+declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isLikeC4View | typeof isExtendElement | typeof isElement | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/dist/shared/{language-server.BX2gtzo8.d.cts → language-server.CtaXfyB2.d.cts}

@@ -955,7 +955,7 @@ interface ParsedLikeC4LangiumDocument extends Omit<LangiumDocument<LikeC4Grammar
 }
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isExtendElement | typeof isElement | typeof isLikeC4View | typeof isExtendElementBody | typeof isElementViewBody | typeof isSpecificationElementKind | typeof isSpecificationTag | typeof isSpecificationRelationshipKind | typeof isSpecificationColor | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
+declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isLikeC4View | typeof isExtendElement | typeof isElement | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/dist/shared/{language-server.BiN_phWO.d.mts → language-server.DdS5JzQT.d.mts}

@@ -955,7 +955,7 @@ interface ParsedLikeC4LangiumDocument extends Omit<LangiumDocument<LikeC4Grammar
 }
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isExtendElement | typeof isElement | typeof isLikeC4View | typeof isExtendElementBody | typeof isElementViewBody | typeof isSpecificationElementKind | typeof isSpecificationTag | typeof isSpecificationRelationshipKind | typeof isSpecificationColor | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
+declare const isValidatableAstNode: (n: AstNode) => n is Guarded<typeof isRelation | typeof isLikeC4View | typeof isExtendElement | typeof isElement | typeof isDynamicViewPredicateIterator | typeof isElementPredicateWith | typeof isRelationPredicateWith | typeof isElementExpression | typeof isRelationExpression | typeof isDynamicViewParallelSteps | typeof isDynamicViewStep | typeof isViewProperty | typeof isStyleProperty | typeof isTags | typeof isViewRule | typeof isDynamicViewRule | typeof isElementViewBody | typeof isDynamicViewBody | typeof isRelationProperty | typeof isRelationBody | typeof isElementProperty | typeof isElementBody | typeof isExtendElementBody | typeof isSpecificationElementKind | typeof isSpecificationRelationshipKind | typeof isSpecificationTag | typeof isSpecificationColor | typeof isSpecificationRule | typeof isModelViews | typeof isModel>;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.12.0",
+  "version": "1.12.2",
   "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.12.0",
-    "@likec4/log": "1.12.0",
+    "@likec4/core": "1.12.2",
+    "@likec4/log": "1.12.2",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@smithy/util-base64": "^3.0.0",
     "fast-equals": "^5.0.1",
@@ -133,8 +133,8 @@
     "vscode-uri": "3.0.8"
   },
   "devDependencies": {
-    "@likec4/icons": "1.12.0",
-    "@likec4/tsconfig": "1.12.0",
+    "@likec4/icons": "1.12.2",
+    "@likec4/tsconfig": "1.12.2",
     "@types/node": "^20.16.5",
     "@types/object-hash": "^3.0.6",
     "@types/string-hash": "^1.1.3",
@@ -143,9 +143,9 @@
     "langium-cli": "3.2.0",
     "npm-run-all2": "^6.2.2",
     "tsx": "~4.9.3",
-    "turbo": "^2.1.2",
+    "turbo": "^2.1.3",
     "typescript": "^5.6.2",
-    "unbuild": "^3.0.0-rc.8",
+    "unbuild": "^3.0.0-rc.11",
     "vitest": "^2.1.2"
   },
   "packageManager": "yarn@4.5.0"

package/src/formatting/LikeC4Formatter.ts

@@ -179,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',
@@ -193,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)

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/view-utils/manual-layout.ts

@@ -53,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
@@ -88,4 +88,4 @@ export function deserializeFromComment(comment: string): ViewManualLayout {
     .join('')
   const decodedb64 = fromBase64(b64)
   return unpack(decode(decodedb64) as any) as ViewManualLayout
-}
+}