@likec4/language-server 0.34.0 → 0.36.0

package/dist/ast.d.ts

@@ -55,7 +55,7 @@ export declare const ElementOps: {
 };
 export interface DocFqnIndexEntry {
     name: string;
-    el: ast.Element;
+    el: WeakRef<ast.Element>;
     path: string;
 }
 export interface LikeC4DocumentProps {

package/dist/ast.js

@@ -119,7 +119,7 @@ export function resolveRelationPoints(node) {
         };
     }
     if (!ast.isElementBody(node.$container)) {
-        throw new RelationRefError('Invalid relation parent');
+        throw new RelationRefError('Invalid relation parent, expected Element');
     }
     return {
         source: node.$container.$container,

package/dist/generated/ast.d.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.0.0.
+ * This file was generated by langium-cli 2.0.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import type { AstNode, Reference, ReferenceInfo, TypeMetaData } from 'langium';
@@ -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

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.0.0.
+ * This file was generated by langium-cli 2.0.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import { AbstractAstReflection } from 'langium';
@@ -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.d.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.0.0.
+ * This file was generated by langium-cli 2.0.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import type { Grammar } from 'langium';

package/dist/generated/grammar.js

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.0.0.
+ * This file was generated by langium-cli 2.0.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import { loadGrammarFromJson } from 'langium';
@@ -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/generated/module.d.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.0.0.
+ * This file was generated by langium-cli 2.0.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, Module, IParserConfig } from 'langium';

package/dist/generated/module.js

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.0.0.
+ * This file was generated by langium-cli 2.0.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import { LikeC4AstReflection } from './ast.js';

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/fqn-computation.js

@@ -28,7 +28,7 @@ export function computeDocumentFqn(document, services) {
             const fqn = AsFqn(el.name, parent);
             const path = locator.getAstNodePath(el);
             c4fqns.add(fqn, {
-                el,
+                el: new WeakRef(el),
                 path,
                 name: el.name
             });

package/dist/model/fqn-index.d.ts

@@ -20,7 +20,7 @@ export declare class FqnIndex {
     private documents;
     private entries;
     getFqn(el: ast.Element): Fqn | null;
-    byFqn(fqn: Fqn): Stream<import("../ast").DocFqnIndexEntry>;
+    byFqn(fqn: Fqn): Stream<FqnIndexEntry>;
     directChildrenOf(parent: Fqn): Stream<FqnIndexEntry>;
     /**
      * Returns descedant elements with unique names in the scope

package/dist/model/fqn-index.js

@@ -52,7 +52,16 @@ export class FqnIndex {
         return this.langiumDocuments.all.filter(isFqnIndexedDocument);
     }
     entries() {
-        return this.documents().flatMap(doc => doc.c4fqns.entries().map(([fqn, el]) => ({ fqn, doc, ...el })));
+        return this.documents().flatMap(doc => doc.c4fqns
+            .entries()
+            .map(([fqn, entry]) => {
+            const el = entry.el.deref();
+            if (el) {
+                return { ...entry, fqn, el, doc };
+            }
+            return null;
+        })
+            .nonNullable());
     }
     getFqn(el) {
         return el.fqn ?? ElementOps.readId(el) ?? null;
@@ -70,7 +79,13 @@ export class FqnIndex {
     }
     byFqn(fqn) {
         return this.documents().flatMap(doc => {
-            return doc.c4fqns.get(fqn);
+            return doc.c4fqns.get(fqn).flatMap(entry => {
+                const el = entry.el.deref();
+                if (el) {
+                    return [{ fqn, el, doc, path: entry.path, name: entry.name }];
+                }
+                return [];
+            });
         });
     }
     directChildrenOf(parent) {

package/dist/model/model-locator.js

@@ -1,7 +1,7 @@
+import { InvalidModelError } from '@likec4/core';
 import { findNodeForProperty, getDocument } from 'langium';
-import { ElementOps, ast, isParsedLikeC4LangiumDocument } from '../ast';
-import { isFqnIndexedDocument } from './fqn-index';
-import { nonNullable } from '@likec4/core';
+import { ast, isParsedLikeC4LangiumDocument } from '../ast';
+import {} from './fqn-index';
 export class LikeC4ModelLocator {
     services;
     fqnIndex;
@@ -15,7 +15,7 @@ export class LikeC4ModelLocator {
         return this.langiumDocuments.all.filter(isParsedLikeC4LangiumDocument);
     }
     getParsedElement(astNode) {
-        const fqn = ElementOps.readId(astNode) ?? null;
+        const fqn = this.fqnIndex.getFqn(astNode);
         if (!fqn)
             return null;
         const doc = getDocument(astNode);
@@ -25,22 +25,18 @@ export class LikeC4ModelLocator {
         return doc.c4Elements.find(e => e.id === fqn) ?? null;
     }
     locateElement(fqn, property = 'name') {
-        for (const doc of this.documents()) {
-            const entries = doc.c4fqns.get(fqn);
-            if (entries.length === 0) {
-                continue;
-            }
-            const { el: node } = nonNullable(entries[0]);
-            const propertyNode = findNodeForProperty(node.$cstNode, property) ?? node.$cstNode;
-            if (!propertyNode) {
-                return null;
-            }
-            return {
-                uri: doc.uri.toString(),
-                range: propertyNode.range
-            };
+        const entry = this.fqnIndex.byFqn(fqn).head();
+        if (!entry) {
+            return null;
         }
-        return null;
+        const propertyNode = findNodeForProperty(entry.el.$cstNode, property) ?? entry.el.$cstNode;
+        if (!propertyNode) {
+            return null;
+        }
+        return {
+            uri: entry.doc.uri.toString(),
+            range: propertyNode.range
+        };
     }
     locateRelation(relationId) {
         for (const doc of this.documents()) {
@@ -64,6 +60,9 @@ export class LikeC4ModelLocator {
                     };
                 }
             }
+            if (node.arr == null) {
+                throw new InvalidModelError('Relation.arr is not defined, but should be');
+            }
             const targetNode = findNodeForProperty(node.$cstNode, 'arr');
             if (!targetNode) {
                 return null;
@@ -71,7 +70,7 @@ export class LikeC4ModelLocator {
             return {
                 uri: doc.uri.toString(),
                 range: {
-                    start: targetNode.range.end,
+                    start: targetNode.range.start,
                     end: targetNode.range.end
                 }
             };

package/dist/model/model-parser.js

@@ -46,9 +46,13 @@ 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) {
+                    logger.warn(`Duplicate specification for kind ${kind.name}`);
+                    continue;
+                }
                 try {
                     specification.kinds[kind.name] = toElementStyleExcludeDefaults(style?.props);
                 }
@@ -246,7 +250,15 @@ export class LikeC4ModelParser {
             ...(description && { description }),
             ...(tags && { tags }),
             ...(links && isNonEmptyArray(links) && { links }),
-            rules: astNode.rules.map(n => this.parseViewRule(n))
+            rules: astNode.rules.flatMap(n => {
+                try {
+                    return this.parseViewRule(n);
+                }
+                catch (e) {
+                    logWarnError(e);
+                    return [];
+                }
+            })
         };
     }
     resolveFqn(node) {

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,25 +1,20 @@
 import { DefaultScopeComputation, MultiMap } from 'langium';
-import { ast } from '../ast';
 import { isEmpty } from 'remeda';
+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) && spec.kind && !isEmpty(spec.kind.name)) {
+        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));
-                    continue;
                 }
-                if (ast.isSpecificationTag(spec) && spec.tag && !isEmpty(spec.tag.name)) {
+            }
+            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));
-                    continue;
                 }
             }
         }

package/dist/references/scope-provider.js

@@ -1,11 +1,18 @@
-import { DONE_RESULT, DefaultScopeProvider, EMPTY_STREAM, StreamImpl, StreamScope, getDocument, stream } from 'langium';
+import { DONE_RESULT, DefaultScopeProvider, EMPTY_STREAM, StreamImpl, StreamScope, getDocument, stream, findNodeForProperty, toDocumentSegment } from 'langium';
 import { ast } from '../ast';
 import { elementRef, isElementRefHead, parentStrictElementRef } from '../elementRef';
 import { logError } from '../logger';
 function toAstNodeDescription(entry) {
+    const $cstNode = findNodeForProperty(entry.el.$cstNode, 'name');
     return {
         documentUri: entry.doc.uri,
         name: entry.name,
+        ...(entry.el.$cstNode && {
+            selectionSegment: toDocumentSegment(entry.el.$cstNode)
+        }),
+        ...($cstNode && {
+            nameSegment: toDocumentSegment($cstNode)
+        }),
         path: entry.path,
         type: ast.Element
     };

package/dist/registerProtocolHandlers.js

@@ -2,6 +2,7 @@ import { URI } from 'vscode-uri';
 import { logger, logError } from './logger';
 import { Rpc } from './protocol';
 import { nonexhaustive } from '@likec4/core';
+import { isLikeC4LangiumDocument } from './ast';
 export function registerProtocolHandlers(services) {
     const connection = services.shared.lsp.Connection;
     if (!connection) {
@@ -22,7 +23,19 @@ export function registerProtocolHandlers(services) {
         return Promise.resolve({ model });
     });
     connection.onRequest(Rpc.rebuild, async (cancelToken) => {
-        const changed = LangiumDocuments.all.map(d => d.uri).toArray();
+        const changed = LangiumDocuments.all
+            .map(d => {
+            // clean up any computed properties
+            if (isLikeC4LangiumDocument(d)) {
+                delete d.c4Specification;
+                delete d.c4Elements;
+                delete d.c4Relations;
+                delete d.c4Views;
+                delete d.c4fqns;
+            }
+            return d.uri;
+        })
+            .toArray();
         logger.debug(`[ProtocolHandlers] rebuild all documents: [
       ${changed.map(d => d.toString()).join('\n      ')}
     ]`);

package/dist/validation/element.js

@@ -29,6 +29,13 @@ export const elementChecks = (services) => {
                 ]
             });
         }
+        // for (let i = 3; i < el.props.length; i++) {
+        //   accept('error', `Too many properties, max 3 allowed`, {
+        //     node: el,
+        //     property: 'props',
+        //     index: i
+        //   })
+        // }
     };
 };
 //# sourceMappingURL=element.js.map

package/dist/validation/relation.d.ts

@@ -1,5 +1,5 @@
 import type { ValidationCheck } from 'langium';
-import type { ast } from '../ast';
+import { ast } from '../ast';
 import type { LikeC4Services } from '../module';
 export declare const relationChecks: (services: LikeC4Services) => ValidationCheck<ast.Relation>;
 //# sourceMappingURL=relation.d.ts.map

package/dist/validation/relation.js

@@ -1,30 +1,43 @@
 import { isSameHierarchy } from '@likec4/core';
-import { resolveRelationPoints } from '../ast';
+import { ast } from '../ast';
+import { elementRef } from '../elementRef';
 import { logError } from '../logger';
 export const relationChecks = (services) => {
     const fqnIndex = services.likec4.FqnIndex;
     return (el, accept) => {
         try {
-            const coupling = resolveRelationPoints(el);
-            const target = fqnIndex.getFqn(coupling.target);
-            const source = fqnIndex.getFqn(coupling.source);
-            if (!target || !source) {
-                if (!target) {
-                    accept('error', 'Target not found', {
+            const targetEl = elementRef(el.target);
+            const target = targetEl && fqnIndex.getFqn(targetEl);
+            if (!target) {
+                accept('error', 'Target not found (not parsed/indexed yet)', {
+                    node: el,
+                    property: 'target'
+                });
+            }
+            let sourceEl;
+            if ('source' in el) {
+                sourceEl = elementRef(el.source);
+            }
+            else {
+                if (!ast.isElementBody(el.$container)) {
+                    accept('error', 'Invalid relation, expected to have source defined or be inside the element', {
                         node: el,
-                        property: 'target'
+                        keyword: '->'
                     });
                 }
-                if (!source) {
-                    accept('error', 'Source not found', {
-                        node: el,
-                        property: 'source'
-                    });
+                else {
+                    sourceEl = el.$container.$container;
                 }
-                return;
             }
-            if (isSameHierarchy(source, target)) {
-                return accept('error', 'Invalid parent-child relation', {
+            const source = sourceEl && fqnIndex.getFqn(sourceEl);
+            if (sourceEl && !source) {
+                accept('error', 'Source not found (not parsed/indexed yet)', {
+                    node: el,
+                    property: 'source'
+                });
+            }
+            if (source && target && isSameHierarchy(source, target)) {
+                return accept('error', 'Invalid parent-child relationship', {
                     node: el
                 });
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.34.0",
+  "version": "0.36.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -42,8 +42,8 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.34.0",
-    "langium": "^2.0.0",
+    "@likec4/core": "0.36.0",
+    "langium": "^2.0.2",
     "nanoid": "^4.0.2",
     "object-hash": "^3.0.0",
     "rambdax": "^9.1.1",
@@ -56,9 +56,10 @@
   "devDependencies": {
     "@types/node": "^18.15.11",
     "@types/object-hash": "^3.0.2",
-    "langium-cli": "^2.0.0",
+    "langium-cli": "^2.0.1",
     "npm-run-all": "^4.1.5",
-    "typescript": "^5.1.6",
-    "vitest": "^0.34.1"
-  }
+    "typescript": "^5.2.2",
+    "vitest": "^0.34.3"
+  },
+  "packageManager": "yarn@3.6.3"
 }