@likec4/language-server 1.34.2 → 1.35.0

package/dist/model/builder/MergedSpecification.d.ts

@@ -1,4 +1,4 @@
-import type * as c4 from '@likec4/core';
+import * as c4 from '@likec4/core';
 import { MultiMap } from '@likec4/core';
 import type { ParsedAstDeployment, ParsedAstDeploymentRelation, ParsedAstElement, ParsedAstRelation, ParsedAstSpecification, ParsedLikeC4LangiumDocument } from '../../ast';
 /**

package/dist/model/builder/MergedSpecification.js

@@ -1,3 +1,4 @@
+import * as c4 from "@likec4/core";
 import { MultiMap } from "@likec4/core";
 import {
   FqnRef
@@ -86,6 +87,9 @@ export class MergedSpecification {
       size ??= __kind.style.size;
       padding ??= __kind.style.padding;
       textSize ??= __kind.style.textSize;
+      description ??= __kind.description;
+      links ??= __kind.links;
+      title = title === c4.nameFromFqn(id) && __kind.title ? __kind.title : title;
       return {
         ...color && { color },
         ...shape && { shape },
@@ -168,11 +172,15 @@ export class MergedSpecification {
         technology = __kind.technology,
         notation = __kind.notation,
         style,
+        title,
         description,
         ...rest
       } = parsed;
+      description ??= __kind.description;
+      title = title === c4.nameFromFqn(parsed.id) && __kind.title ? __kind.title : title;
       return {
         ...rest,
+        ...{ title },
         ...description && { description },
         ...notation && { notation },
         ...technology && { technology },

package/dist/model/parser/SpecificationParser.d.ts

@@ -1,4 +1,4 @@
-import type * as c4 from '@likec4/core';
+import * as c4 from '@likec4/core';
 import { ast } from '../../ast';
 import { type Base } from './Base';
 export declare function SpecificationParser<TBase extends Base>(B: TBase): {

package/dist/model/parser/SpecificationParser.js

@@ -1,3 +1,4 @@
+import * as c4 from "@likec4/core";
 import { nonNullable } from "@likec4/core/utils";
 import { filter, isNonNullish, isNullish, isTruthy, mapToObj, omitBy, pipe } from "remeda";
 import { ast, parseMarkdownAsString, toRelationshipStyleExcludeDefaults } from "../../ast.js";
@@ -94,15 +95,29 @@ export function SpecificationParser(B) {
       }
       const tags = this.parseTags(specAst);
       const style = this.parseElementStyle(props.find(ast.isElementStyleProperty));
+      const links = this.parseLinks(specAst);
       const bodyProps = pipe(
         props.filter(ast.isSpecificationElementStringProperty) ?? [],
-        filter((p) => this.isValid(p) && isNonNullish(p.value)),
-        mapToObj((p) => [p.key, removeIndent(p.value)])
+        filter((p) => this.isValid(p)),
+        mapToObj((p) => [p.key, p.value])
       );
+      const { title, description, technology } = this.parseTitleDescriptionTechnology(
+        {
+          title: void 0,
+          description: void 0,
+          technology: void 0
+        },
+        bodyProps
+      );
+      const notation = removeIndent(parseMarkdownAsString(bodyProps.notation));
       return {
         [kindName]: {
-          ...bodyProps,
+          ...title && { title },
+          ...description && { description },
+          ...technology && { technology },
+          ...notation && { notation },
           ...tags && { tags },
+          ...links && c4.isNonEmptyArray(links) && { links },
           style
         }
       };

package/dist/model/parser/ViewsParser.js

@@ -1,6 +1,6 @@
 import * as c4 from "@likec4/core";
 import { invariant, isNonEmptyArray, nonexhaustive } from "@likec4/core";
-import { filter, isArray, isDefined, isNonNullish, isTruthy, mapToObj, pipe } from "remeda";
+import { filter, isArray, isDefined, isEmpty, isNonNullish, isTruthy, mapToObj, pipe } from "remeda";
 import {
   ast,
   parseMarkdownAsString,
@@ -26,6 +26,7 @@ export function ViewsParser(B) {
             return [];
           }
         });
+        const folder = viewBlock.folder && !isEmpty(viewBlock.folder.trim()) ? viewBlock.folder : null;
         for (const view of viewBlock.views) {
           try {
             if (!isValid(view)) {
@@ -44,6 +45,10 @@ export function ViewsParser(B) {
               default:
                 nonexhaustive(view);
             }
+            if (folder) {
+              const view2 = this.doc.c4Views.at(-1);
+              view2.title = folder + " / " + (view2.title || view2.id);
+            }
           } catch (e) {
             logWarnError(e);
           }

package/dist/view-utils/resolve-relative-paths.js

@@ -68,7 +68,7 @@ export function resolveRelativePaths(views) {
         return compare;
       }
     }
-    return compareNatural(a.view.title ?? a.view.id, b.view.title ?? b.view.id);
+    return 0;
   }).map(({ parts, view }) => {
     return {
       ...view,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.34.2",
+  "version": "1.35.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -97,8 +97,8 @@
     "@msgpack/msgpack": "^3.1.2",
     "@smithy/util-base64": "^4.0.0",
     "@types/express": "^5.0.3",
-    "@types/node": "~20.19.1",
-    "@types/picomatch": "^4.0.0",
+    "@types/node": "~20.19.2",
+    "@types/picomatch": "^4.0.2",
     "@types/which": "^3.0.4",
     "chroma-js": "^3.1.2",
     "esm-env": "^1.2.2",
@@ -113,30 +113,30 @@
     "p-debounce": "4.0.0",
     "p-queue": "8.1.0",
     "p-timeout": "6.1.4",
-    "picomatch": "^4.0.2",
+    "picomatch": "^4.0.3",
     "pretty-ms": "^9.2.0",
     "remeda": "^2.23.1",
     "strip-indent": "^4.0.0",
-    "tsx": "4.19.4",
-    "turbo": "2.5.4",
+    "tsx": "4.20.3",
+    "turbo": "2.5.5",
     "type-fest": "^4.41.0",
     "typescript": "5.8.3",
-    "ufo": "^1.6.1",
+    "ufo": "1.6.1",
     "unbuild": "3.5.0",
     "valibot": "^1.1.0",
     "vitest": "3.2.4",
-    "vscode-jsonrpc": "8.2.0",
+    "vscode-jsonrpc": "8.2.1",
     "vscode-languageserver": "9.0.1",
     "vscode-languageserver-protocol": "3.17.5",
     "vscode-languageserver-types": "3.17.5",
     "vscode-uri": "3.1.0",
     "which": "^5.0.0",
     "zod": "3.25.67",
-    "@likec4/icons": "1.34.2",
-    "@likec4/log": "1.34.2",
-    "@likec4/tsconfig": "1.34.2",
-    "@likec4/core": "1.34.2",
-    "@likec4/layouts": "1.34.2"
+    "@likec4/core": "1.35.0",
+    "@likec4/icons": "1.35.0",
+    "@likec4/layouts": "1.35.0",
+    "@likec4/tsconfig": "1.35.0",
+    "@likec4/log": "1.35.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",