@likec4/language-server 0.28.3 → 0.30.0

package/dist/lsp/SemanticTokenProvider.js

@@ -116,7 +116,11 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
             });
             return;
         }
-        if (ast.isAnyStringProperty(node)) {
+        // ViewProperty | ElementStringProperty | RelationStringProperty | LinkProperty
+        if (ast.isViewProperty(node) ||
+            ast.isElementStringProperty(node) ||
+            ast.isRelationStringProperty(node) ||
+            ast.isLinkProperty(node)) {
             acceptor({
                 node,
                 property: 'key',

package/dist/model/fqn-computation.js

@@ -1,11 +1,10 @@
-import { failExpectedNever } from '@likec4/core';
-import { Fqn } from '@likec4/core/types';
+import { failExpectedNever, AsFqn } from '@likec4/core';
 import { MultiMap } from 'langium';
 import { isEmpty, isNil } from 'remeda';
 import { ElementOps, ast } from '../ast';
 import { strictElementRefFqn } from '../elementRef';
 export function computeDocumentFqn(document, services) {
-    const c4fqns = document.c4fqns = new MultiMap();
+    const c4fqns = (document.c4fqns = new MultiMap());
     const { model } = document.parseResult.value;
     if (!model?.elements) {
         return;
@@ -26,7 +25,7 @@ export function computeDocumentFqn(document, services) {
             continue;
         }
         if (ast.isElement(el)) {
-            const fqn = Fqn(el.name, parent);
+            const fqn = AsFqn(el.name, parent);
             const path = locator.getAstNodePath(el);
             c4fqns.add(fqn, path);
             ElementOps.writeId(el, fqn);

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

@@ -1,6 +1,5 @@
-import type { Fqn } from '@likec4/core/types';
-import type { LangiumDocument, LangiumDocuments } from 'langium';
-import { StreamImpl } from 'langium';
+import type { Fqn } from '@likec4/core';
+import type { LangiumDocument, LangiumDocuments, Stream } from 'langium';
 import type { ast } from '../ast';
 import { type LikeC4LangiumDocument } from '../ast';
 import type { LikeC4Services } from '../module';
@@ -15,18 +14,20 @@ export interface FqnIndexEntry {
     path: string;
 }
 export declare class FqnIndex {
-    private services;
     protected langiumDocuments: LangiumDocuments;
     constructor(services: LikeC4Services);
     private documents;
     private entries;
-    get(el: ast.Element): Fqn | null;
-    byFqn(fqn: Fqn): import("langium").Stream<{
+    getFqn(el: ast.Element): Fqn | null;
+    byFqn(fqn: Fqn): Stream<{
         path: string;
-        doc: FqnIndexedDocument;
+        doc: LikeC4LangiumDocument;
     }>;
-    directChildrenOf(parent: Fqn): StreamImpl<IterableIterator<FqnIndexEntry> | null, FqnIndexEntry>;
-    uniqueDescedants(parent: Fqn): StreamImpl<IterableIterator<FqnIndexEntry> | null, FqnIndexEntry>;
+    directChildrenOf(parent: Fqn): Stream<FqnIndexEntry>;
+    /**
+     * Returns descedant elements with unique names in the scope
+     */
+    uniqueDescedants(parent: Fqn): Stream<FqnIndexEntry>;
 }
 export {};
 //# sourceMappingURL=fqn-index.d.ts.map

package/dist/model/fqn-index.js

@@ -1,17 +1,15 @@
-import { nameFromFqn, parentFqn } from '@likec4/core/utils';
+import { nameFromFqn, parentFqn } from '@likec4/core';
 import { DONE_RESULT, DocumentState, MultiMap, StreamImpl } from 'langium';
 import { isNil } from 'remeda';
 import { ElementOps, isLikeC4LangiumDocument } from '../ast';
 import { logger } from '../logger';
 import { computeDocumentFqn } from './fqn-computation';
 export function isFqnIndexedDocument(doc) {
-    return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !isNil(doc.c4fqns);
+    return (isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !isNil(doc.c4fqns));
 }
 export class FqnIndex {
-    services;
     langiumDocuments;
     constructor(services) {
-        this.services = services;
         this.langiumDocuments = services.shared.workspace.LangiumDocuments;
         services.shared.workspace.DocumentBuilder.onBuildPhase(DocumentState.IndexedContent, (docs, _cancelToken) => {
             for (const doc of docs) {
@@ -32,7 +30,7 @@ export class FqnIndex {
     entries() {
         return this.documents().flatMap(doc => doc.c4fqns.entries().map(([fqn, path]) => ({ fqn, path, doc })));
     }
-    get(el) {
+    getFqn(el) {
         return ElementOps.readId(el) ?? null;
         // if (fqn) {
         //   const doc = getDocument(el)
@@ -75,6 +73,9 @@ export class FqnIndex {
             return DONE_RESULT;
         });
     }
+    /**
+     * Returns descedant elements with unique names in the scope
+     */
     uniqueDescedants(parent) {
         return new StreamImpl(() => {
             const prefix = `${parent}.`;
@@ -86,6 +87,7 @@ export class FqnIndex {
                 .forEach(e => {
                 const name = nameFromFqn(e.fqn);
                 const entry = { ...e, name };
+                // To keep direct children always
                 if (parentFqn(e.fqn) === parent) {
                     childrenNames.add(name);
                     nested.add(name, entry);

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

@@ -5,10 +5,12 @@ export declare class LikeC4ModelBuilder {
     private services;
     private fqnIndex;
     private langiumDocuments;
+    private readonly cachedModel;
     constructor(services: LikeC4Services);
-    private get connection();
+    private cleanCache;
     private documents;
-    buildModel(): c4.LikeC4Model | undefined;
+    buildModel(): c4.LikeC4Model | null;
+    private _buildModel;
     /**
      * @returns if the document was changed
      */

package/dist/model/model-builder.js

@@ -1,4 +1,4 @@
-import { ModelIndex, assignNavigateTo, computeView } from '@likec4/core';
+import { ModelIndex, assignNavigateTo, computeView, invariant } from '@likec4/core';
 import { DefaultElementShape, DefaultThemeColor } from '@likec4/core/types';
 import { compareByFqnHierarchically, parentFqn } from '@likec4/core/utils';
 import { DocumentState, getDocument } from 'langium';
@@ -6,7 +6,6 @@ import objectHash from 'object-hash';
 import { clone } from 'rambdax';
 import * as R from 'remeda';
 import stripIndent from 'strip-indent';
-import invariant from 'tiny-invariant';
 import { ElementViewOps, ast, cleanParsedModel, isLikeC4LangiumDocument, isValidLikeC4LangiumDocument, resolveRelationPoints, streamModel, toAutoLayout, toElementStyle } from '../ast';
 import { elementRef, strictElementRefFqn } from '../elementRef';
 import { logger } from '../logger';
@@ -16,6 +15,7 @@ export class LikeC4ModelBuilder {
     services;
     fqnIndex;
     langiumDocuments;
+    cachedModel = {};
     constructor(services) {
         this.services = services;
         this.fqnIndex = services.likec4.FqnIndex;
@@ -23,9 +23,6 @@ export class LikeC4ModelBuilder {
         services.shared.workspace.DocumentBuilder.onBuildPhase(DocumentState.Validated, (docs, cancelToken) => {
             let countOfChangedDocs = 0;
             for (const doc of docs) {
-                if (cancelToken.isCancellationRequested) {
-                    break;
-                }
                 if (!isLikeC4LangiumDocument(doc)) {
                     continue;
                 }
@@ -38,22 +35,31 @@ export class LikeC4ModelBuilder {
                     logger.error(e);
                 }
             }
-            if (countOfChangedDocs > 0 && !cancelToken.isCancellationRequested) {
-                this.notifyClient();
+            if (countOfChangedDocs > 0) {
+                this.cleanCache();
+                this.notifyClient(cancelToken);
             }
         });
     }
-    get connection() {
-        return this.services.shared.lsp.Connection;
+    cleanCache() {
+        delete this.cachedModel.last;
     }
     documents() {
         return this.langiumDocuments.all.filter(isValidLikeC4LangiumDocument).toArray();
     }
     buildModel() {
+        if ('last' in this.cachedModel) {
+            logger.debug('returning cached model');
+            return this.cachedModel.last;
+        }
+        return (this.cachedModel.last = this._buildModel());
+    }
+    _buildModel() {
+        logger.debug('_buildModel');
         const docs = this.documents();
         if (docs.length === 0) {
             logger.debug('No documents to build model from');
-            return;
+            return null;
         }
         // TODO:
         try {
@@ -61,27 +67,32 @@ export class LikeC4ModelBuilder {
                 kinds: {}
             };
             R.forEach(R.map(docs, R.prop('c4Specification')), spec => Object.assign(c4Specification.kinds, spec.kinds));
-            const toModelElement = (el) => {
-                const kind = c4Specification.kinds[el.kind];
+            const toModelElement = ({ astPath, ...parsed }) => {
+                const kind = c4Specification.kinds[parsed.kind];
                 if (kind) {
-                    const { astPath, ...model } = el;
                     return {
-                        ...(kind.shape !== DefaultElementShape ? { shape: kind.shape } : {}),
-                        ...(kind.color !== DefaultThemeColor ? { color: kind.color } : {}),
-                        ...model
+                        shape: kind.shape,
+                        color: kind.color,
+                        description: null,
+                        technology: null,
+                        tags: [],
+                        ...parsed
                     };
                 }
                 return null;
             };
             const elements = R.pipe(R.flatMap(docs, d => d.c4Elements), R.map(toModelElement), R.compact, R.sort(compareByFqnHierarchically), R.reduce((acc, el) => {
                 const parent = parentFqn(el.id);
-                if (!parent || parent in acc) {
-                    if (el.id in acc) {
-                        logger.warn(`Duplicate element id: ${el.id}`);
-                        return acc;
-                    }
-                    acc[el.id] = el;
+                if (parent && R.isNil(acc[parent])) {
+                    logger.warn(`No parent found for ${el.id}`);
+                    return acc;
+                }
+                if (el.id in acc) {
+                    // should not happen, as validated
+                    logger.warn(`Duplicate element id: ${el.id}`);
+                    return acc;
                 }
+                acc[el.id] = el;
                 return acc;
             }, {}));
             const toModelRelation = ({ astPath, source, target, ...model }) => {
@@ -121,7 +132,7 @@ export class LikeC4ModelBuilder {
         }
         catch (e) {
             logger.error(e);
-            return;
+            return null;
         }
     }
     /**
@@ -187,7 +198,7 @@ export class LikeC4ModelBuilder {
         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.isElementStyleProperty)?.props;
+        const styleProps = astNode.body?.props.find(ast.isElementStyleProperties)?.props;
         const { color, shape } = toElementStyle(styleProps);
         const astPath = this.getAstNodePath(astNode);
         let [title, description, technology] = astNode.props;
@@ -217,7 +228,7 @@ export class LikeC4ModelBuilder {
             target
         };
         const id = objectHash(hashdata);
-        const title = astNode.title ?? astNode.definition?.props.find(p => p.key === 'title')?.value ?? '';
+        const title = astNode.title ?? astNode.body?.props.find(p => p.key === 'title')?.value ?? '';
         return {
             id,
             ...hashdata,
@@ -333,7 +344,7 @@ export class LikeC4ModelBuilder {
         if (ast.isExtendElement(node)) {
             return strictElementRefFqn(node.element);
         }
-        const fqn = this.fqnIndex.get(node);
+        const fqn = this.fqnIndex.getFqn(node);
         invariant(fqn, `Not indexed element: ${this.getAstNodePath(node)}`);
         return fqn;
     }
@@ -344,8 +355,8 @@ export class LikeC4ModelBuilder {
         return el.tags?.value.map(tagRef => tagRef.ref?.name) ?? [];
     }
     scheduledCb = null;
-    notifyClient() {
-        const connection = this.connection;
+    notifyClient(cancelToken) {
+        const connection = this.services.shared.lsp.Connection;
         if (!connection) {
             return;
         }
@@ -356,8 +367,10 @@ export class LikeC4ModelBuilder {
         this.scheduledCb = setTimeout(() => {
             logger.debug('send onDidChangeModel');
             this.scheduledCb = null;
-            void connection.sendNotification(Rpc.onDidChangeModel, '');
-        }, 350);
+            if (!cancelToken.isCancellationRequested) {
+                void connection.sendNotification(Rpc.onDidChangeModel, '');
+            }
+        }, 300);
     }
 }
 //# sourceMappingURL=model-builder.js.map

package/dist/references/scope-provider.js

@@ -17,18 +17,15 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
         this.fqnIndex = services.likec4.FqnIndex;
     }
     directChildrenOf(parent) {
-        return this.fqnIndex
-            .directChildrenOf(parent)
-            .map(toAstNodeDescription);
+        return this.fqnIndex.directChildrenOf(parent).map(toAstNodeDescription);
     }
+    // we need lazy resolving here
     uniqueDescedants(of) {
         return new StreamImpl(() => {
             const element = of();
-            const fqn = element && this.fqnIndex.get(element);
+            const fqn = element && this.fqnIndex.getFqn(element);
             if (fqn) {
-                return this.fqnIndex.uniqueDescedants(fqn)
-                    .map(toAstNodeDescription)
-                    .iterator();
+                return this.fqnIndex.uniqueDescedants(fqn).map(toAstNodeDescription).iterator();
             }
             return null;
         }, iterator => {
@@ -57,21 +54,21 @@ export class LikeC4ScopeProvider extends DefaultScopeProvider {
     getScope(context) {
         const referenceType = this.reflection.getReferenceType(context);
         try {
-            const node = context.container;
+            const container = context.container;
             // const path = this.services.workspace.AstNodeLocator.getAstNodePath(node)
             if (referenceType === ast.Element) {
-                if (ast.isStrictElementRef(node)) {
-                    if (isElementRefHead(node)) {
+                if (ast.isStrictElementRef(container)) {
+                    if (isElementRefHead(container)) {
                         return this.getGlobalScope(referenceType);
                     }
-                    const parent = parentStrictElementRef(node);
+                    const parent = parentStrictElementRef(container);
                     return new StreamScope(this.directChildrenOf(parent));
                 }
-                if (ast.isElementRef(node) && !isElementRefHead(node)) {
-                    return new StreamScope(this.scopeElementRef(node));
+                if (ast.isElementRef(container) && !isElementRefHead(container)) {
+                    return new StreamScope(this.scopeElementRef(container));
                 }
             }
-            return this.computeScope(node, referenceType);
+            return this.computeScope(container, referenceType);
         }
         catch (e) {
             // console.error(e)

package/dist/validation/element.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { ValidationCheck } from 'langium';
 import type { ast } from '../ast';
 import type { LikeC4Services } from '../module';

package/dist/validation/element.js

@@ -1,9 +1,9 @@
 export const elementChecks = (services) => {
     const fqnIndex = services.likec4.FqnIndex;
     return (el, accept) => {
-        const fqn = fqnIndex.get(el);
+        const fqn = fqnIndex.getFqn(el);
         if (!fqn) {
-            accept('error', 'Not indexed', {
+            accept('error', 'Not indexed element', {
                 node: el,
                 property: 'name'
             });
@@ -11,12 +11,6 @@ export const elementChecks = (services) => {
         }
         const withSameFqn = fqnIndex.byFqn(fqn).limit(2).count();
         if (withSameFqn > 1) {
-            // console.error(withSameFqn.map(e => ({
-            //   fqn,
-            //   name: el.name,
-            //   path: e.path,
-            //   doc: e.doc.uri.toString()
-            // })))
             accept('error', `Duplicate element name ${el.name !== fqn ? el.name + ' (' + fqn + ')' : el.name}`, {
                 node: el,
                 property: 'name'

package/dist/validation/relation.js

@@ -1,31 +1,36 @@
-import { resolveRelationPoints } from '../ast';
+import { BaseError } from '@likec4/core';
 import { isSameHierarchy } from '@likec4/core/utils';
+import { resolveRelationPoints } from '../ast';
 export const relationChecks = (services) => {
     const fqnIndex = services.likec4.FqnIndex;
     return (el, accept) => {
         try {
             const coupling = resolveRelationPoints(el);
-            const target = fqnIndex.get(coupling.target);
-            if (!target) {
-                return accept('error', 'Invalid target', {
-                    node: el,
-                    property: 'target'
-                });
-            }
-            const source = fqnIndex.get(coupling.source);
-            if (!source) {
-                return accept('error', 'Invalid source', {
-                    node: el
-                });
+            const target = fqnIndex.getFqn(coupling.target);
+            const source = fqnIndex.getFqn(coupling.source);
+            if (!target || !source) {
+                if (!target) {
+                    accept('error', 'Target not found', {
+                        node: el,
+                        property: 'target'
+                    });
+                }
+                if (!source) {
+                    accept('error', 'Source not found', {
+                        node: el,
+                        property: 'source'
+                    });
+                }
+                return;
             }
             if (isSameHierarchy(source, target)) {
-                return accept('error', 'Invalid relation (same hierarchy)', {
+                return accept('error', 'Invalid parent-child relation', {
                     node: el
                 });
             }
         }
         catch (e) {
-            if (e instanceof Error) {
+            if (e instanceof BaseError) {
                 return accept('error', e.message, {
                     node: el
                 });
@@ -34,21 +39,6 @@ export const relationChecks = (services) => {
                 node: el
             });
         }
-        // const fqn = fqnIndex.get(el)
-        // if (!fqn) {
-        //   accept('error', 'Not indexed', {
-        //     node: el,
-        //     property: 'name',
-        //   })
-        //   return
-        // }
-        // const withSameFqn = fqnIndex.byFqn(fqn)
-        // if (withSameFqn.length > 1) {
-        //   accept('error', `Duplicate element name ${el.name !== fqn ? el.name +' (' + fqn + ')' : el.name}`, {
-        //     node: el,
-        //     property: 'name',
-        //   })
-        // }
     };
 };
 //# sourceMappingURL=relation.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.28.3",
+  "version": "0.30.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -46,6 +46,7 @@
   },
   "scripts": {
     "turbo-build": "run -T turbo run build --filter='language-server'",
+    "turbo-compile": "run -T turbo run compile --filter='language-server'",
     "compile": "tsc --noEmit",
     "watch:langium": "langium generate --watch",
     "watch:ts": "tsc --watch",
@@ -58,14 +59,13 @@
     "test:watch": "run -T vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.28.3",
+    "@likec4/core": "0.30.0",
     "langium": "^1.2.1",
     "nanoid": "^4.0.2",
     "object-hash": "^3.0.0",
     "rambdax": "^9.1.1",
     "remeda": "^1.23.0",
     "strip-indent": "^4.0.0",
-    "tiny-invariant": "^1.3.1",
     "vscode-languageserver": "~8.1.0",
     "vscode-languageserver-protocol": "~3.17.3"
   },