@likec4/language-server 0.19.0 → 0.20.1

package/dist/ast.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import * as ast from './generated/ast';
+import type * as c4 from '@likec4/core/types';
 import type { LangiumDocument, MultiMap } from 'langium';
 import type { LikeC4Document } from './generated/ast';
-import type * as c4 from '@likec4/core/types';
+import * as ast from './generated/ast';
 export { ast };
 export declare function c4hash({ c4Specification, c4Elements, c4Relations, c4Views }: LikeC4LangiumDocument): string;
 export interface ParsedAstSpecification {
@@ -62,7 +62,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 function streamModel(doc: LikeC4LangiumDocument): Generator<ast.Element | ast.Relation, void, unknown>;
+export declare function streamModel(doc: LikeC4LangiumDocument): Generator<ast.Relation | ast.Element, void, unknown>;
 export declare function resolveRelationPoints(node: ast.Relation): {
     source: ast.Element;
     target: ast.Element;

package/dist/ast.js

@@ -1,7 +1,7 @@
-import * as ast from './generated/ast';
-import { DocumentState } from 'langium';
+import { DocumentState } from 'langium/lib/workspace';
 import objectHash from 'object-hash';
 import { elementRef } from './elementRef';
+import * as ast from './generated/ast';
 import { LikeC4LanguageMetaData } from './generated/module';
 export { ast };
 export function c4hash({ c4Specification, c4Elements, c4Relations, c4Views }) {
@@ -74,19 +74,34 @@ export const isValidDocument = (doc) => {
 export function* streamModel(doc) {
     const elements = doc.parseResult.value.model?.elements ?? [];
     const traverseStack = [...elements];
+    const relations = [];
     let el;
     while ((el = traverseStack.shift())) {
+        if (ast.isRelationWithSource(el)) {
+            relations.push(el);
+            continue;
+        }
         if (ast.isExtendElement(el)) {
-            if (!!el.body) {
+            if (el.body && el.body.elements.length > 0) {
                 traverseStack.push(...el.body.elements);
             }
             continue;
         }
-        if (ast.isElement(el) && el.body) {
-            traverseStack.push(...el.body.elements);
+        if (ast.isElement(el) && el.body && el.body.elements.length > 0) {
+            for (const nested of el.body.elements) {
+                if (ast.isRelation(nested)) {
+                    relations.push(nested);
+                }
+                else {
+                    traverseStack.push(nested);
+                }
+            }
         }
         yield el;
     }
+    for (const relation of relations) {
+        yield relation;
+    }
 }
 export function resolveRelationPoints(node) {
     const target = elementRef(node.target);

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

@@ -1,10 +1,12 @@
 import type { Fqn } from '@likec4/core/types';
 import type { LangiumDocuments } from 'langium';
-import { DocumentState, MultiMap, StreamImpl } from 'langium';
-import type { SetNonNullable } from 'type-fest';
+import { StreamImpl } from 'langium';
 import type { ast } from '../ast';
 import { type LikeC4LangiumDocument } from '../ast';
 import type { LikeC4Services } from '../module';
+type FqnIndexedDocument = Omit<LikeC4LangiumDocument, 'c4fqns'> & {
+    c4fqns: NonNullable<LikeC4LangiumDocument['c4fqns']>;
+};
 export interface FqnIndexEntry {
     fqn: Fqn;
     name: string;
@@ -20,23 +22,10 @@ export declare class FqnIndex {
     get(el: ast.Element): Fqn | null;
     byFqn(fqn: Fqn): import("langium").Stream<{
         path: string;
-        doc: SetNonNullable<{
-            c4hash?: string;
-            c4Specification: import("../ast").ParsedAstSpecification;
-            c4Elements: import("../ast").ParsedAstElement[];
-            c4Relations: import("../ast").ParsedAstRelation[];
-            c4Views: import("../ast").ParsedAstElementView[];
-            readonly uri: import("vscode-uri").URI;
-            readonly textDocument: import("vscode-languageserver-textdocument").TextDocument;
-            state: DocumentState;
-            parseResult: import("langium").ParseResult<ast.LikeC4Document>;
-            precomputedScopes?: import("langium").PrecomputedScopes;
-            references: import("langium").Reference<import("langium").AstNode>[];
-            diagnostics?: import("vscode-languageserver-types").Diagnostic[];
-            c4fqns: MultiMap<Fqn, string> | undefined;
-        }, "c4fqns">;
+        doc: FqnIndexedDocument;
     }>;
     directChildrenOf(parent: Fqn): import("langium").Stream<FqnIndexEntry>;
     uniqueDescedants(parent: Fqn): StreamImpl<IterableIterator<FqnIndexEntry> | null, FqnIndexEntry>;
 }
+export {};
 //# sourceMappingURL=fqn-index.d.ts.map

package/dist/model/fqn-index.js

@@ -1,6 +1,6 @@
 import { nameFromFqn, parentFqn } from '@likec4/core/utils';
 import { DocumentState, DONE_RESULT, getDocument, MultiMap, StreamImpl } from 'langium';
-import { isNil } from 'rambdax';
+import { isNil } from 'remeda';
 import { ElementOps, isLikeC4LangiumDocument } from '../ast';
 import { logger } from '../logger';
 import { computeDocumentFqn } from './fqn-computation';

package/dist/model/model-builder.js

@@ -1,10 +1,10 @@
-import { computeViews } from '@likec4/core/compute-view';
+import { computeViews } from '@likec4/core';
 import { DefaultElementShape, DefaultThemeColor } from '@likec4/core/types';
 import { compareByFqnHierarchically, parentFqn } from '@likec4/core/utils';
-import { A, O, flow, pipe } from '@mobily/ts-belt';
 import { DocumentState, getDocument } from 'langium';
 import objectHash from 'object-hash';
-import { clone, isNil, mergeDeepRight, reduce } from 'rambdax';
+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 { elementRef, strictElementRefFqn } from '../elementRef';
@@ -31,7 +31,7 @@ export class LikeC4ModelBuilder {
                     }
                 }
                 catch (e) {
-                    logger.warn(`Error parsing document ${doc.uri.toString()}`);
+                    logger.error(`Error parsing document ${doc.uri.toString()}`);
                 }
             }
             if (countOfChangedDocs > 0 && !cancelToken.isCancellationRequested) {
@@ -53,14 +53,10 @@ export class LikeC4ModelBuilder {
         }
         // TODO:
         try {
-            const c4Specification = reduce((acc, doc) => mergeDeepRight(acc, doc.c4Specification), {
+            const c4Specification = {
                 kinds: {}
-            }, docs);
-            // const c4Specification = docs.reduce<ParsedAstSpecification>((acc, doc) => {
-            //   return mergeDeepRight(acc, doc.c4Specification)
-            // }, {
-            //   kinds: {}
-            // })
+            };
+            R.pipe(R.map(docs, R.prop('c4Specification')), R.forEach(spec => Object.assign(c4Specification.kinds, spec.kinds)));
             const toModelElement = (el) => {
                 const kind = c4Specification.kinds[el.kind];
                 if (kind) {
@@ -77,7 +73,7 @@ export class LikeC4ModelBuilder {
                 const { astPath, ...model } = rel;
                 return model;
             };
-            const elements = pipe(docs.flatMap(d => d.c4Elements), A.filterMap(flow(toModelElement, O.fromNullable)), A.sort(compareByFqnHierarchically), A.reduce({}, (acc, el) => {
+            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) {
@@ -87,15 +83,8 @@ export class LikeC4ModelBuilder {
                     acc[el.id] = el;
                 }
                 return acc;
-            }));
-            const relations = pipe(docs.flatMap(d => d.c4Relations), A.filterMap(flow(toModelRelation, O.fromPredicate(({ source, target }) => source in elements && target in elements))), A.reduce({}, (acc, el) => {
-                if (el.id in acc) {
-                    logger.warn(`Duplicate relation id: ${el.id}`);
-                    return acc;
-                }
-                acc[el.id] = el;
-                return acc;
-            }));
+            }, {}));
+            const relations = R.pipe(R.flatMap(docs, d => d.c4Relations), R.map(toModelRelation), R.filter(({ source, target }) => source in elements && target in elements), R.mapToObj(r => [r.id, r]));
             const toModelView = (view) => {
                 // eslint-disable-next-line prefer-const
                 let { astPath, rules, title, ...model } = view;
@@ -111,14 +100,7 @@ export class LikeC4ModelBuilder {
                     rules: clone(rules)
                 };
             };
-            const views = pipe(docs.flatMap(d => d.c4Views), A.filterMap(flow(toModelView, O.fromPredicate(v => isNil(v.viewOf) || v.viewOf in elements))), A.reduce({}, (acc, v) => {
-                if (v.id in acc) {
-                    logger.warn(`Duplicate view id: ${v.id}`);
-                    return acc;
-                }
-                acc[v.id] = v;
-                return acc;
-            }));
+            const views = R.pipe(docs, R.flatMap(d => d.c4Views), R.map(toModelView), R.filter(v => isNil(v.viewOf) || v.viewOf in elements), R.mapToObj(v => [v.id, v]));
             return computeViews({
                 elements,
                 relations,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.19.0",
+  "version": "0.20.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -20,15 +20,11 @@
     "directory": "packages/language-server"
   },
   "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "src/index.ts",
+  "module": "src/index.ts",
+  "types": "src/index.ts",
   "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.js"
-    }
+    ".": "./src/index.ts"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
@@ -58,15 +54,14 @@
     "test:watch": "run -T vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.19.0",
-    "@mobily/ts-belt": "^3.13.1",
+    "@likec4/core": "0.20.1",
     "langium": "^1.2.0",
     "nanoid": "^4.0.2",
     "object-hash": "^3.0.0",
     "rambdax": "^9.1.1",
+    "remeda": "^1.19.0",
     "strip-indent": "^4.0.0",
     "tiny-invariant": "^1.3.1",
-    "type-fest": "^3.11.1",
     "vscode-languageserver": "~8.1.0",
     "vscode-languageserver-protocol": "~3.17.3"
   },
@@ -77,4 +72,4 @@
     "npm-run-all": "^4.1.5",
     "typescript": "^5.1.3"
   }
-}
+}

package/src/index.ts

@@ -0,0 +1,2 @@
+export { createLanguageServices } from './module'
+export type { LikeC4Services } from './module'