@likec4/language-server 0.30.0 → 0.32.0

package/dist/logger.d.ts

@@ -6,4 +6,5 @@ export declare const logger: {
     error(message: string | Error | unknown): void;
     trace(message: string): void;
 };
+export type Logger = typeof logger;
 //# sourceMappingURL=logger.d.ts.map

package/dist/lsp/DocumentSymbolProvider.js

@@ -80,7 +80,7 @@ export class LikeC4DocumentSymbolProvider {
             return [];
         return [
             {
-                kind: SymbolKind.Class,
+                kind: SymbolKind.Namespace,
                 name: astSpec.name,
                 range: cstModel.range,
                 selectionRange: specKeywordNode.range,
@@ -97,7 +97,7 @@ export class LikeC4DocumentSymbolProvider {
             return [];
         return [
             {
-                kind: SymbolKind.Class,
+                kind: SymbolKind.Namespace,
                 name: astModel.name,
                 range: cstModel.range,
                 selectionRange: nameNode.range,
@@ -166,7 +166,7 @@ export class LikeC4DocumentSymbolProvider {
             return [];
         return [
             {
-                kind: SymbolKind.Class,
+                kind: SymbolKind.Namespace,
                 name: astViews.name,
                 range: cst.range,
                 selectionRange: nameNode.range,

package/dist/lsp/SemanticTokenProvider.js

@@ -26,11 +26,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             });
             return;
         }
-        if (ast.isRelation(node) ||
-            ast.isRelationExpression(node) ||
-            ast.isIncomingExpression(node) ||
-            ast.isInOutExpression(node) ||
-            ast.isOutgoingExpression(node)) {
+        if ('arr' in node) {
             acceptor({
                 node,
                 property: 'arr',
@@ -38,6 +34,20 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
                 modifier: [SemanticTokenModifiers.defaultLibrary]
             });
         }
+        // if (
+        //   ast.isRelation(node) ||
+        //   ast.isRelationExpression(node) ||
+        //   ast.isIncomingExpression(node) ||
+        //   ast.isInOutExpression(node) ||
+        //   ast.isOutgoingExpression(node)
+        // ) {
+        //   acceptor({
+        //     node,
+        //     property: 'arr',
+        //     type: SemanticTokenTypes.keyword,
+        //     modifier: [SemanticTokenModifiers.defaultLibrary]
+        //   })
+        // }
         if (ast.isElementKindExpression(node) || ast.isElementTagExpression(node)) {
             keyword('element');
             if (ast.isElementKindExpression(node)) {
@@ -98,16 +108,11 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             });
             return;
         }
-        if (ast.isAStyleProperty(node)) {
+        if (ast.isColorProperty(node) || ast.isShapeProperty(node)) {
             acceptor({
                 node,
                 property: 'key',
                 type: SemanticTokenTypes.keyword
-                // type: SemanticTokenTypes.property,
-                // modifier: [
-                //   SemanticTokenModifiers.readonly,
-                //   SemanticTokenModifiers.declaration
-                // ]
             });
             acceptor({
                 node,
@@ -116,20 +121,11 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             });
             return;
         }
-        // ViewProperty | ElementStringProperty | RelationStringProperty | LinkProperty
-        if (ast.isViewProperty(node) ||
-            ast.isElementStringProperty(node) ||
-            ast.isRelationStringProperty(node) ||
-            ast.isLinkProperty(node)) {
+        if (ast.isLinkProperty(node) || ast.isIconProperty(node)) {
             acceptor({
                 node,
                 property: 'key',
                 type: SemanticTokenTypes.keyword
-                // type: SemanticTokenTypes.property,
-                // modifier: [
-                //   SemanticTokenModifiers.readonly,
-                //   SemanticTokenModifiers.declaration
-                // ]
             });
             acceptor({
                 node,
@@ -138,6 +134,31 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             });
             return;
         }
+        // ViewProperty | ElementStringProperty | RelationStringProperty | LinkProperty
+        // if (
+        //   ast.isViewProperty(node) ||
+        //   ast.isElementStringProperty(node) ||
+        //   ast.isRelationStringProperty(node) ||
+        //   ast.isLinkProperty(node) ||
+        //   ast.isIconProperty(node)
+        // ) {
+        //   acceptor({
+        //     node,
+        //     property: 'key',
+        //     type: SemanticTokenTypes.keyword
+        //     // type: SemanticTokenTypes.property,
+        //     // modifier: [
+        //     //   SemanticTokenModifiers.readonly,
+        //     //   SemanticTokenModifiers.declaration
+        //     // ]
+        //   })
+        //   acceptor({
+        //     node,
+        //     property: 'value',
+        //     type: SemanticTokenTypes.string
+        //   })
+        //   return
+        // }
         // if (ast.isModel(node)) {
         //   keyword('model')
         //   return

package/dist/model/fqn-computation.js

@@ -1,4 +1,5 @@
-import { failExpectedNever, AsFqn } from '@likec4/core';
+import { nonexhaustive } from '@likec4/core/errors';
+import { AsFqn } from '@likec4/core/types';
 import { MultiMap } from 'langium';
 import { isEmpty, isNil } from 'remeda';
 import { ElementOps, ast } from '../ast';
@@ -34,7 +35,7 @@ export function computeDocumentFqn(document, services) {
             }
             continue;
         }
-        failExpectedNever(el);
+        nonexhaustive(el);
     }
 }
 //# sourceMappingURL=fqn-computation.js.map

package/dist/model/fqn-index.js

@@ -51,18 +51,18 @@ export class FqnIndex {
     }
     directChildrenOf(parent) {
         return new StreamImpl(() => {
-            const children = new MultiMap(this.entries()
+            const children = this.entries()
                 .filter(e => parentFqn(e.fqn) === parent)
                 .map((e) => {
                 const name = nameFromFqn(e.fqn);
                 const entry = { ...e, name };
                 return [name, entry];
             })
-                .toArray());
-            if (children.size === 0) {
+                .toArray();
+            if (children.length === 0) {
                 return null;
             }
-            return children
+            return new MultiMap(children)
                 .entriesGroupedByKey()
                 .flatMap(([_name, descrs]) => (descrs.length === 1 ? descrs : []))
                 .iterator();

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

@@ -1,5 +1,6 @@
 import type * as c4 from '@likec4/core/types';
-import { ast, type LikeC4LangiumDocument } from '../ast';
+import { ast } from '../ast';
+import type { LikeC4LangiumDocument } from '../ast';
 import type { LikeC4Services } from '../module';
 export declare class LikeC4ModelBuilder {
     private services;

package/dist/model/model-builder.js

@@ -1,12 +1,10 @@
-import { ModelIndex, assignNavigateTo, computeView, invariant } from '@likec4/core';
-import { DefaultElementShape, DefaultThemeColor } from '@likec4/core/types';
-import { compareByFqnHierarchically, parentFqn } from '@likec4/core/utils';
+import { ModelIndex, assignNavigateTo, compareByFqnHierarchically, computeView, invariant, isNonEmptyArray, nonexhaustive, parentFqn } from '@likec4/core';
 import { DocumentState, getDocument } from 'langium';
 import objectHash from 'object-hash';
 import { clone } from 'rambdax';
 import * as R from 'remeda';
 import stripIndent from 'strip-indent';
-import { ElementViewOps, ast, cleanParsedModel, isLikeC4LangiumDocument, isValidLikeC4LangiumDocument, resolveRelationPoints, streamModel, toAutoLayout, toElementStyle } from '../ast';
+import { ElementViewOps, ast, cleanParsedModel, isLikeC4LangiumDocument, isValidLikeC4LangiumDocument, resolveRelationPoints, streamModel, toAutoLayout, toElementStyle, toElementStyleExcludeDefaults } from '../ast';
 import { elementRef, strictElementRefFqn } from '../elementRef';
 import { logger } from '../logger';
 import { Rpc } from '../protocol';
@@ -67,15 +65,15 @@ export class LikeC4ModelBuilder {
                 kinds: {}
             };
             R.forEach(R.map(docs, R.prop('c4Specification')), spec => Object.assign(c4Specification.kinds, spec.kinds));
-            const toModelElement = ({ astPath, ...parsed }) => {
+            const toModelElement = ({ astPath, tags, links, ...parsed }) => {
                 const kind = c4Specification.kinds[parsed.kind];
                 if (kind) {
                     return {
-                        shape: kind.shape,
-                        color: kind.color,
+                        ...kind,
                         description: null,
                         technology: null,
-                        tags: [],
+                        tags: tags ?? null,
+                        links: links ?? null,
                         ...parsed
                     };
                 }
@@ -109,7 +107,7 @@ export class LikeC4ModelBuilder {
             const modelIndex = ModelIndex.from({ elements, relations });
             const toModelView = (view) => {
                 // eslint-disable-next-line prefer-const
-                let { astPath, rules, title, ...model } = view;
+                let { astPath, rules, title, description, tags, links, ...model } = view;
                 if (!title && view.viewOf) {
                     title = elements[view.viewOf]?.title;
                 }
@@ -118,7 +116,10 @@ export class LikeC4ModelBuilder {
                 }
                 return computeView({
                     ...model,
-                    ...(title && { title }),
+                    title: title ?? null,
+                    description: description ?? null,
+                    tags: tags ?? null,
+                    links: links ?? null,
                     rules: clone(rules)
                 }, modelIndex);
             };
@@ -144,11 +145,7 @@ export class LikeC4ModelBuilder {
         if (specs) {
             for (const { kind, style } of specs) {
                 try {
-                    const styleProps = toElementStyle(style?.props);
-                    specification.kinds[kind.name] = {
-                        color: styleProps.color ?? DefaultThemeColor,
-                        shape: styleProps.shape ?? DefaultElementShape
-                    };
+                    specification.kinds[kind.name] = toElementStyleExcludeDefaults(style?.props);
                 }
                 catch (e) {
                     logger.warn(e);
@@ -174,7 +171,7 @@ export class LikeC4ModelBuilder {
                 }
                 continue;
             }
-            failExpectedNever(el);
+            nonexhaustive(el);
         }
         const docviews = doc.parseResult.value.views?.views;
         if (docviews) {
@@ -197,25 +194,26 @@ export class LikeC4ModelBuilder {
         const id = this.resolveFqn(astNode);
         invariant(astNode.kind.ref, 'Element kind is not resolved: ' + astNode.name);
         const kind = astNode.kind.ref.name;
-        const tags = (astNode.body && this.convertTags(astNode.body)) ?? [];
-        const styleProps = astNode.body?.props.find(ast.isElementStyleProperties)?.props;
-        const { color, shape } = toElementStyle(styleProps);
+        const tags = this.convertTags(astNode.body);
+        const stylePropsAst = astNode.body?.props.find(ast.isStyleProperties)?.props;
+        const styleProps = toElementStyleExcludeDefaults(stylePropsAst);
         const astPath = this.getAstNodePath(astNode);
         let [title, description, technology] = astNode.props;
         const bodyProps = astNode.body?.props.filter((p) => ast.isElementStringProperty(p)) ?? [];
         title = title ?? bodyProps.find(p => p.key === 'title')?.value;
         description = description ?? bodyProps.find(p => p.key === 'description')?.value;
         technology = technology ?? bodyProps.find(p => p.key === 'technology')?.value;
+        const links = astNode.body?.props.filter(ast.isLinkProperty).map(p => p.value);
         return {
             id,
             kind,
             astPath,
-            title: title ?? astNode.name,
+            title: title ? stripIndent(title).trim() : astNode.name,
+            ...(tags && { tags }),
+            ...(links && isNonEmptyArray(links) && { links }),
             ...(technology && { technology }),
             ...(description && { description: stripIndent(description).trim() }),
-            ...(tags.length > 0 ? { tags } : {}),
-            ...(shape && shape !== DefaultElementShape ? { shape } : {}),
-            ...(color && color !== DefaultThemeColor ? { color } : {})
+            ...styleProps
         };
     }
     parseRelation(astNode) {
@@ -329,14 +327,18 @@ export class LikeC4ModelBuilder {
                 viewOf: viewOf ?? null
             });
         }
-        const title = astNode.properties.find(p => p.key === 'title')?.value;
-        const description = astNode.properties.find(p => p.key === 'description')?.value;
+        const title = astNode.props.find(p => p.key === 'title')?.value;
+        const description = astNode.props.find(p => p.key === 'description')?.value;
+        const tags = this.convertTags(astNode);
+        const links = astNode.props.filter(ast.isLinkProperty).map(p => p.value);
         return {
             id,
             astPath,
             ...(viewOf && { viewOf }),
             ...(title && { title }),
             ...(description && { description }),
+            ...(tags && { tags }),
+            ...(links && isNonEmptyArray(links) && { links }),
             rules: astNode.rules.map(n => this.parseViewRule(n))
         };
     }
@@ -351,8 +353,12 @@ export class LikeC4ModelBuilder {
     getAstNodePath(node) {
         return this.services.workspace.AstNodeLocator.getAstNodePath(node);
     }
-    convertTags(el) {
-        return el.tags?.value.map(tagRef => tagRef.ref?.name) ?? [];
+    convertTags(withTags) {
+        if (!withTags) {
+            return null;
+        }
+        const tags = withTags.tags?.value.flatMap(({ ref }) => (ref ? ref.name : []));
+        return tags && isNonEmptyArray(tags) ? tags : null;
     }
     scheduledCb = null;
     notifyClient(cancelToken) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.30.0",
+  "version": "0.32.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -55,16 +55,16 @@
     "dev": "run-p 'watch:*'",
     "lint": "run -T eslint src/ --fix",
     "clean": "run -T rimraf dist contrib",
-    "test": "run -T vitest run",
-    "test:watch": "run -T vitest"
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.30.0",
+    "@likec4/core": "0.32.0",
     "langium": "^1.2.1",
     "nanoid": "^4.0.2",
     "object-hash": "^3.0.0",
     "rambdax": "^9.1.1",
-    "remeda": "^1.23.0",
+    "remeda": "^1.24.0",
     "strip-indent": "^4.0.0",
     "vscode-languageserver": "~8.1.0",
     "vscode-languageserver-protocol": "~3.17.3"
@@ -74,6 +74,7 @@
     "@types/object-hash": "^3.0.2",
     "langium-cli": "^1.2.1",
     "npm-run-all": "^4.1.5",
-    "typescript": "^5.1.6"
+    "typescript": "^5.1.6",
+    "vitest": "^0.34.1"
   }
 }