@likec4/language-server 0.22.0 → 0.24.0

package/dist/ast.d.ts

@@ -46,7 +46,6 @@ export declare const ElementOps: {
     readId(node: ast.Element): c4.Fqn | undefined;
 };
 export interface LikeC4LangiumDocument extends LangiumDocument<LikeC4Document> {
-    c4hash?: string;
     c4Specification: ParsedAstSpecification;
     c4Elements: ParsedAstElement[];
     c4Relations: ParsedAstRelation[];
@@ -61,7 +60,7 @@ export declare function cleanParsedModel(doc: LikeC4LangiumDocument): {
 };
 export declare function isLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument;
 export declare function isParsedLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument;
-export declare const isValidDocument: (doc: LangiumDocument) => doc is LikeC4LangiumDocument;
+export declare const isValidLikeC4LangiumDocument: (doc: LangiumDocument) => doc is LikeC4LangiumDocument;
 export declare function streamModel(doc: LikeC4LangiumDocument): Generator<ast.Relation | ast.Element, void, unknown>;
 export declare function resolveRelationPoints(node: ast.Relation): {
     source: ast.Element;

package/dist/ast.js

@@ -63,8 +63,8 @@ export function isParsedLikeC4LangiumDocument(doc) {
     return (isLikeC4LangiumDocument(doc) &&
         ['c4Specification', 'c4Elements', 'c4Relations', 'c4Views'].every(key => key in doc));
 }
-export const isValidDocument = (doc) => {
-    if (!isLikeC4LangiumDocument(doc))
+export const isValidLikeC4LangiumDocument = (doc) => {
+    if (!isParsedLikeC4LangiumDocument(doc))
         return false;
     const { state, parseResult, diagnostics } = doc;
     return (state === DocumentState.Validated &&
@@ -87,7 +87,7 @@ export function* streamModel(doc) {
             }
             continue;
         }
-        if (ast.isElement(el) && el.body && el.body.elements.length > 0) {
+        if (el.body && el.body.elements.length > 0) {
             for (const nested of el.body.elements) {
                 if (ast.isRelation(nested)) {
                     relations.push(nested);
@@ -121,9 +121,8 @@ export function resolveRelationPoints(node) {
     if (!ast.isElementBody(node.$container)) {
         throw new Error('Skip relation due to invalid reference to source');
     }
-    const source = node.$container.$container;
     return {
-        source,
+        source: node.$container.$container,
         target
     };
 }

package/dist/elementRef.js

@@ -35,6 +35,7 @@ export function parentStrictElementRef(node) {
         path.unshift(parent.el.$refText);
         parent = parent.$container;
     }
+    invariant(path.length > 0, 'Expected non-empty parent path');
     return path.join('.');
 }
 //# sourceMappingURL=elementRef.js.map

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

@@ -12,7 +12,7 @@ export declare class LikeC4ModelBuilder {
     /**
      * @returns if the document was changed
      */
-    protected parseDocument(doc: LikeC4LangiumDocument): boolean;
+    protected parseDocument(doc: LikeC4LangiumDocument): void;
     private parseElement;
     private parseRelation;
     private parseElementExpression;
@@ -22,6 +22,7 @@ export declare class LikeC4ModelBuilder {
     protected resolveFqn(node: ast.Element | ast.ExtendElement): c4.Fqn;
     private getAstNodePath;
     private convertTags;
+    private scheduledCb;
     private notifyClient;
 }
 //# sourceMappingURL=model-builder.d.ts.map

package/dist/model/model-builder.js

@@ -6,7 +6,7 @@ import objectHash from 'object-hash';
 import { clone, isNil } from 'rambdax';
 import * as R from 'remeda';
 import invariant from 'tiny-invariant';
-import { ElementViewOps, ast, c4hash, cleanParsedModel, isLikeC4LangiumDocument, isParsedLikeC4LangiumDocument, resolveRelationPoints, streamModel, toAutoLayout, toElementStyle } from '../ast';
+import { ElementViewOps, ast, cleanParsedModel, isLikeC4LangiumDocument, isValidLikeC4LangiumDocument, resolveRelationPoints, streamModel, toAutoLayout, toElementStyle } from '../ast';
 import { elementRef, strictElementRefFqn } from '../elementRef';
 import { logger } from '../logger';
 import { Rpc } from '../protocol';
@@ -25,17 +25,20 @@ export class LikeC4ModelBuilder {
                 if (cancelToken.isCancellationRequested) {
                     break;
                 }
+                if (!isLikeC4LangiumDocument(doc)) {
+                    continue;
+                }
+                countOfChangedDocs++;
                 try {
-                    if (isLikeC4LangiumDocument(doc) && this.parseDocument(doc)) {
-                        countOfChangedDocs++;
-                    }
+                    this.parseDocument(doc);
                 }
                 catch (e) {
                     logger.error(`Error parsing document ${doc.uri.toString()}`);
+                    logger.error(e);
                 }
             }
             if (countOfChangedDocs > 0 && !cancelToken.isCancellationRequested) {
-                void this.notifyClient();
+                this.notifyClient();
             }
         });
     }
@@ -43,7 +46,7 @@ export class LikeC4ModelBuilder {
         return this.services.shared.lsp.Connection;
     }
     documents() {
-        return this.langiumDocuments.all.toArray().filter(isParsedLikeC4LangiumDocument);
+        return this.langiumDocuments.all.toArray().filter(isValidLikeC4LangiumDocument);
     }
     buildModel() {
         const docs = this.documents();
@@ -56,7 +59,7 @@ export class LikeC4ModelBuilder {
             const c4Specification = {
                 kinds: {}
             };
-            R.pipe(R.map(docs, R.prop('c4Specification')), R.forEach(spec => Object.assign(c4Specification.kinds, spec.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];
                 if (kind) {
@@ -166,9 +169,9 @@ export class LikeC4ModelBuilder {
                 }
             }
         }
-        const prevHash = doc.c4hash ?? '';
-        doc.c4hash = c4hash(doc);
-        return prevHash !== doc.c4hash;
+        // const prevHash = doc.c4hash ?? ''
+        // doc.c4hash = c4hash(doc)
+        // return prevHash !== doc.c4hash
     }
     parseElement(astNode) {
         const id = this.resolveFqn(astNode);
@@ -331,12 +334,21 @@ export class LikeC4ModelBuilder {
     convertTags(el) {
         return el.tags?.value.map(tagRef => tagRef.ref?.name) ?? [];
     }
-    async notifyClient() {
+    scheduledCb = null;
+    notifyClient() {
         const connection = this.connection;
         if (!connection) {
             return;
         }
-        await connection.sendNotification(Rpc.onDidChangeModel);
+        if (this.scheduledCb) {
+            logger.debug('debounce scheduled onDidChangeModel');
+            clearTimeout(this.scheduledCb);
+        }
+        this.scheduledCb = setTimeout(() => {
+            this.scheduledCb = null;
+            logger.debug('send onDidChangeModel');
+            void connection.sendNotification(Rpc.onDidChangeModel);
+        }, 300);
     }
 }
 //# sourceMappingURL=model-builder.js.map

package/dist/module.js

@@ -6,6 +6,7 @@ import { LikeC4ScopeComputation, LikeC4ScopeProvider } from './references';
 import { registerProtocolHandlers } from './registerProtocolHandlers';
 import { LikeC4CodeLensProvider, LikeC4WorkspaceManager } from './shared';
 import { registerValidationChecks } from './validation';
+import { logger } from './logger';
 function bind(Type) {
     return (services) => new Type(services);
 }
@@ -39,15 +40,26 @@ const LikeC4SharedModule = {
     }
 };
 export function createLanguageServices(context) {
-    // const connection = context.connection
-    // if (connection) {
-    //   logger.log = connection.console.log.bind(connection.console)
-    //   logger.info = connection.console.info.bind(connection.console)
-    //   logger.warn = connection.console.warn.bind(connection.console)
-    //   logger.error = connection.console.error.bind(connection.console)
-    //   logger.debug = connection.tracer.log.bind(connection.tracer)
-    //   logger.trace = connection.tracer.log.bind(connection.tracer)
-    // }
+    const connection = context?.connection;
+    if (connection) {
+        const log = (method) => (message) => {
+            try {
+                console[method](message);
+                connection.console[method](String(message));
+            }
+            catch (error) {
+                console.error(error);
+            }
+        };
+        logger.log = log('log');
+        logger.info = log('info');
+        logger.warn = log('warn');
+        logger.error = log('error');
+        logger.trace = logger.debug = (message) => {
+            console.debug(message);
+            connection.tracer.log(message);
+        };
+    }
     const moduleContext = {
         ...EmptyFileSystem,
         ...context

package/dist/references/scope-computation.js

@@ -18,19 +18,17 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
                 docExports.push(this.descriptions.createDescription(tag, '#' + tag.name, document));
             }
         }
+        // Filled later by FqnIndex (on IndexedContent phase)
         document.c4fqns = undefined;
-        if (model) {
+        // Only root model elements are exported
+        if (model && model.elements.length > 0) {
             for (const elAst of model.elements) {
                 if (ast.isElement(elAst)) {
                     docExports.push(this.descriptions.createDescription(elAst, elAst.name, document));
                 }
             }
         }
-        // const c4fqns = document.c4fqns
-        // logger.debug(`doc ${document.uri.path}:
-        //  fqns: ${c4fqns ? Array.from(c4fqns.keys()).join(', ') : '--'}
-        // `)
-        if (views) {
+        if (views && views.views.length > 0) {
             for (const viewAst of views.views) {
                 if ('name' in viewAst) {
                     docExports.push(this.descriptions.createDescription(viewAst, viewAst.name, document));

package/dist/registerProtocolHandlers.js

@@ -69,23 +69,23 @@ We rebuild: [
     });
     connection.onRequest(Rpc.locateElement, async ({ element, property }, _cancelToken) => {
         try {
-            return Promise.resolve(modelLocator.locateElement(element, property ?? 'name'));
+            return modelLocator.locateElement(element, property ?? 'name');
         }
         catch (e) {
             return Promise.reject(e);
         }
     });
-    connection.onRequest(Rpc.locateRelation, ({ id }, _cancelToken) => {
+    connection.onRequest(Rpc.locateRelation, async ({ id }, _cancelToken) => {
         try {
-            return Promise.resolve(modelLocator.locateRelation(id));
+            return modelLocator.locateRelation(id);
         }
         catch (e) {
             return Promise.reject(e);
         }
     });
-    connection.onRequest(Rpc.locateView, ({ id }, _cancelToken) => {
+    connection.onRequest(Rpc.locateView, async ({ id }, _cancelToken) => {
         try {
-            return Promise.resolve(modelLocator.locateView(id));
+            return modelLocator.locateView(id);
         }
         catch (e) {
             return Promise.reject(e);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.22.0",
+  "version": "0.24.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -58,8 +58,8 @@
     "test:watch": "run -T vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.22.0",
-    "langium": "^1.2.0",
+    "@likec4/core": "0.24.0",
+    "langium": "^1.2.1",
     "nanoid": "^4.0.2",
     "object-hash": "^3.0.0",
     "rambdax": "^9.1.1",