@likec4/language-server 0.35.0 → 0.36.0

package/dist/generated/ast.d.ts

@@ -269,8 +269,9 @@ export declare function isSpecificationElementKind(item: unknown): item is Speci
 export interface SpecificationRule extends AstNode {
     readonly $container: LikeC4Document;
     readonly $type: 'SpecificationRule';
+    elements: Array<SpecificationElementKind>;
     name: 'specification';
-    specs: Array<SpecificationElementKind | SpecificationTag>;
+    tags: Array<SpecificationTag>;
 }
 export declare const SpecificationRule = "SpecificationRule";
 export declare function isSpecificationRule(item: unknown): item is SpecificationRule;

package/dist/generated/ast.js

@@ -352,7 +352,8 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: 'SpecificationRule',
                     mandatory: [
-                        { name: 'specs', type: 'array' }
+                        { name: 'elements', type: 'array' },
+                        { name: 'tags', type: 'array' }
                     ]
                 };
             }

package/dist/generated/grammar.js

@@ -130,28 +130,33 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
             "arguments": []
           },
           {
-            "$type": "Assignment",
-            "feature": "specs",
-            "operator": "+=",
-            "terminal": {
-              "$type": "Alternatives",
-              "elements": [
-                {
+            "$type": "Alternatives",
+            "elements": [
+              {
+                "$type": "Assignment",
+                "feature": "elements",
+                "operator": "+=",
+                "terminal": {
                   "$type": "RuleCall",
                   "rule": {
                     "$ref": "#/rules@4"
                   },
                   "arguments": []
-                },
-                {
+                }
+              },
+              {
+                "$type": "Assignment",
+                "feature": "tags",
+                "operator": "+=",
+                "terminal": {
                   "$type": "RuleCall",
                   "rule": {
                     "$ref": "#/rules@5"
                   },
                   "arguments": []
                 }
-              ]
-            },
+              }
+            ],
             "cardinality": "*"
           },
           {

package/dist/logger.js

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { normalizeError, serializeError } from '@likec4/core';
+import { normalizeError } from '@likec4/core';
 /* eslint-disable @typescript-eslint/no-redundant-type-constituents */
 let isSilent = false;
 export const logger = {
@@ -44,6 +44,7 @@ export function logWarnError(err) {
         logger.warn(err);
         return;
     }
-    logger.warn(serializeError(err).message);
+    const error = normalizeError(err);
+    logger.warn(`${error.name}: ${error.message}`);
 }
 //# sourceMappingURL=logger.js.map

package/dist/lsp/DocumentSymbolProvider.js

@@ -1,5 +1,5 @@
 import { findNodeForProperty } from 'langium';
-import { compact, isEmpty, map, pipe } from 'remeda';
+import { compact, concat, isEmpty, map, pipe } from 'remeda';
 import { SymbolKind } from 'vscode-languageserver-protocol';
 import { ast } from '../ast';
 import { logError } from '../logger';
@@ -68,7 +68,7 @@ export class LikeC4DocumentSymbolProvider {
         const specKeywordNode = findNodeForProperty(cstModel, 'name');
         if (!specKeywordNode)
             return [];
-        const specSymbols = pipe(astSpec.specs, map(nd => {
+        const specSymbols = pipe(concat(astSpec.elements, astSpec.tags), map(nd => {
             if (ast.isSpecificationElementKind(nd)) {
                 return getElementKindSymbol(nd);
             }

package/dist/model/model-parser.js

@@ -46,7 +46,7 @@ export class LikeC4ModelParser {
     }
     async parseDocument(doc, cancelToken) {
         const { elements, relations, views, specification } = cleanParsedModel(doc);
-        const specs = doc.parseResult.value.specification?.specs.filter(ast.isSpecificationElementKind);
+        const specs = doc.parseResult.value.specification?.elements;
         if (specs) {
             for (const { kind, style } of specs) {
                 if (kind.name in specification.kinds) {

package/dist/references/scope-computation.d.ts

@@ -1,11 +1,8 @@
 import { DefaultScopeComputation, MultiMap, type AstNodeDescription, type PrecomputedScopes } from 'langium';
 import type { CancellationToken } from 'vscode-languageserver';
 import { ast, type LikeC4LangiumDocument } from '../ast';
-import type { LikeC4Services } from '../module';
 type ElementsContainer = ast.Model | ast.ElementBody | ast.ExtendElementBody;
 export declare class LikeC4ScopeComputation extends DefaultScopeComputation {
-    private services;
-    constructor(services: LikeC4Services);
     computeExports(document: LikeC4LangiumDocument, _cancelToken: CancellationToken): Promise<AstNodeDescription[]>;
     computeLocalScopes(document: LikeC4LangiumDocument, _cancelToken: CancellationToken): Promise<PrecomputedScopes>;
     protected processContainer(container: ElementsContainer, scopes: PrecomputedScopes, document: LikeC4LangiumDocument): MultiMap<string, AstNodeDescription>;

package/dist/references/scope-computation.js

@@ -1,32 +1,21 @@
 import { DefaultScopeComputation, MultiMap } from 'langium';
-import { ast } from '../ast';
 import { isEmpty } from 'remeda';
-import { nonexhaustive } from '@likec4/core';
+import { ast } from '../ast';
 export class LikeC4ScopeComputation extends DefaultScopeComputation {
-    services;
-    constructor(services) {
-        super(services);
-        this.services = services;
-    }
     computeExports(document, _cancelToken) {
         const { specification, model, views } = document.parseResult.value;
         const docExports = [];
-        if (specification && specification.specs.length > 0) {
-            for (const spec of specification.specs) {
-                if (ast.isSpecificationElementKind(spec)) {
-                    if (spec.kind && !isEmpty(spec.kind.name)) {
-                        docExports.push(this.descriptions.createDescription(spec.kind, spec.kind.name, document));
-                    }
-                    continue;
+        if (specification) {
+            for (const spec of specification.elements) {
+                if (spec.kind && !isEmpty(spec.kind.name)) {
+                    docExports.push(this.descriptions.createDescription(spec.kind, spec.kind.name, document));
                 }
-                if (ast.isSpecificationTag(spec)) {
-                    if (spec.tag && !isEmpty(spec.tag.name)) {
-                        docExports.push(this.descriptions.createDescription(spec.tag, spec.tag.name, document));
-                        docExports.push(this.descriptions.createDescription(spec.tag, '#' + spec.tag.name, document));
-                    }
-                    continue;
+            }
+            for (const spec of specification.tags) {
+                if (spec.tag && !isEmpty(spec.tag.name)) {
+                    docExports.push(this.descriptions.createDescription(spec.tag, spec.tag.name, document));
+                    docExports.push(this.descriptions.createDescription(spec.tag, '#' + spec.tag.name, document));
                 }
-                nonexhaustive(spec);
             }
         }
         // Only root model elements are exported

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -42,7 +42,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.35.0",
+    "@likec4/core": "0.36.0",
     "langium": "^2.0.2",
     "nanoid": "^4.0.2",
     "object-hash": "^3.0.0",