@likec4/language-server 0.8.0 → 0.18.0

package/contrib/likec4.monarch.ts

@@ -1,7 +1,7 @@
 // Monarch syntax highlighting for the likec4 language.
 export default {
     keywords: [
-        'BottomTop','LeftRight','RightLeft','TopBottom','autoLayout','browser','color','cylinder','description','element','exclude','extend','include','it','model','muted','of','person','primary','queue','rectangle','secondary','shape','specification','storage','style','tag','technology','this','title','view','views'
+        'BottomTop','LeftRight','RightLeft','TopBottom','amber','autoLayout','blue','browser','color','cylinder','description','element','exclude','extend','gray','green','include','indigo','it','mobile','model','muted','of','person','primary','queue','rectangle','red','secondary','shape','sky','slate','specification','storage','style','tag','technology','this','title','view','views'
     ],
     operators: [
         '*','->','.*'

package/contrib/likec4.tmLanguage.json

@@ -12,7 +12,7 @@
     },
     {
       "name": "keyword.control.likec4",
-      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|autoLayout|browser|color|cylinder|description|element|exclude|extend|include|it|model|muted|of|person|primary|queue|rectangle|secondary|shape|specification|storage|style|tag|technology|this|title|view|views)\\b"
+      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|autoLayout|blue|browser|color|cylinder|description|element|exclude|extend|gray|green|include|indigo|it|mobile|model|muted|of|person|primary|queue|rectangle|red|secondary|shape|sky|slate|specification|storage|style|tag|technology|this|title|view|views)\\b"
     },
     {
       "name": "string.quoted.double.likec4",

package/dist/generated/ast.d.ts

@@ -1,8 +1,9 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.2.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
-import { AstNode, AbstractAstReflection, Reference, ReferenceInfo, TypeMetaData } from 'langium';
+import type { AstNode, Reference, ReferenceInfo, TypeMetaData } from 'langium';
+import { AbstractAstReflection } from 'langium';
 export type AnyStringProperty = ElementStringProperty | RelationStringProperty | ViewProperty;
 export declare const AnyStringProperty = "AnyStringProperty";
 export declare function isAnyStringProperty(item: unknown): item is AnyStringProperty;
@@ -15,14 +16,14 @@ export declare function isElementExpression(item: unknown): item is ElementExpre
 export type ElementProperty = ElementStringProperty | ElementStyleProperty;
 export declare const ElementProperty = "ElementProperty";
 export declare function isElementProperty(item: unknown): item is ElementProperty;
-export type ElementShape = 'browser' | 'cylinder' | 'person' | 'queue' | 'rectangle' | 'storage';
+export type ElementShape = 'browser' | 'cylinder' | 'mobile' | 'person' | 'queue' | 'rectangle' | 'storage';
 export declare function isElementShape(item: unknown): item is ElementShape;
 export type Expression = ElementExpression | InOutExpression | IncomingExpression | OutgoingExpression | RelationExpression;
 export declare const Expression = "Expression";
 export declare function isExpression(item: unknown): item is Expression;
 export type Name = 'element' | 'model' | ElementShape | ThemeColor | string;
 export declare function isName(item: unknown): item is Name;
-export type ThemeColor = 'muted' | 'primary' | 'secondary';
+export type ThemeColor = 'amber' | 'blue' | 'gray' | 'green' | 'indigo' | 'muted' | 'primary' | 'red' | 'secondary' | 'sky' | 'slate';
 export declare function isThemeColor(item: unknown): item is ThemeColor;
 export type View = ElementView;
 export declare const View = "View";

package/dist/generated/ast.js

@@ -1,8 +1,7 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.2.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
-/* eslint-disable */
 import { AbstractAstReflection } from 'langium';
 export const AnyStringProperty = 'AnyStringProperty';
 export function isAnyStringProperty(item) {
@@ -21,7 +20,7 @@ export function isElementProperty(item) {
     return reflection.isInstance(item, ElementProperty);
 }
 export function isElementShape(item) {
-    return item === 'rectangle' || item === 'person' || item === 'browser' || item === 'cylinder' || item === 'storage' || item === 'queue';
+    return item === 'rectangle' || item === 'person' || item === 'browser' || item === 'mobile' || item === 'cylinder' || item === 'storage' || item === 'queue';
 }
 export const Expression = 'Expression';
 export function isExpression(item) {
@@ -31,7 +30,7 @@ export function isName(item) {
     return isElementShape(item) || isThemeColor(item) || item === 'element' || item === 'model' || (typeof item === 'string' && (/((([^\W\d_])|(_))((([^\W\d_])|([0-9]))|(_))*)/.test(item)));
 }
 export function isThemeColor(item) {
-    return item === 'primary' || item === 'secondary' || item === 'muted';
+    return item === 'primary' || item === 'secondary' || item === 'muted' || item === 'slate' || item === 'blue' || item === 'indigo' || item === 'sky' || item === 'red' || item === 'gray' || item === 'green' || item === 'amber';
 }
 export const View = 'View';
 export function isView(item) {

package/dist/generated/grammar.d.ts

@@ -1,7 +1,7 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.2.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
-import { Grammar } from 'langium';
+import type { Grammar } from 'langium';
 export declare const LikeC4Grammar: () => Grammar;
 //# sourceMappingURL=grammar.d.ts.map

package/dist/generated/grammar.js

@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.2.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 import { loadGrammarFromJson } from 'langium';
@@ -2059,6 +2059,38 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
           {
             "$type": "Keyword",
             "value": "muted"
+          },
+          {
+            "$type": "Keyword",
+            "value": "slate"
+          },
+          {
+            "$type": "Keyword",
+            "value": "blue"
+          },
+          {
+            "$type": "Keyword",
+            "value": "indigo"
+          },
+          {
+            "$type": "Keyword",
+            "value": "sky"
+          },
+          {
+            "$type": "Keyword",
+            "value": "red"
+          },
+          {
+            "$type": "Keyword",
+            "value": "gray"
+          },
+          {
+            "$type": "Keyword",
+            "value": "green"
+          },
+          {
+            "$type": "Keyword",
+            "value": "amber"
           }
         ]
       },
@@ -2088,6 +2120,10 @@ export const LikeC4Grammar = () => loadedLikeC4Grammar ?? (loadedLikeC4Grammar =
             "$type": "Keyword",
             "value": "browser"
           },
+          {
+            "$type": "Keyword",
+            "value": "mobile"
+          },
           {
             "$type": "Keyword",
             "value": "cylinder"

package/dist/generated/module.d.ts

@@ -1,8 +1,8 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.2.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
-import { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module, IParserConfig } from 'langium';
+import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module, IParserConfig } from 'langium';
 export declare const LikeC4LanguageMetaData: LanguageMetaData;
 export declare const parserConfig: IParserConfig;
 export declare const LikeC4GeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedServices>;

package/dist/generated/module.js

@@ -1,8 +1,7 @@
 /******************************************************************************
- * This file was generated by langium-cli 1.2.0.
+ * This file was generated by langium-cli 1.2.1.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
-import 'langium';
 import { LikeC4AstReflection } from './ast';
 import { LikeC4Grammar } from './grammar';
 export const LikeC4LanguageMetaData = {

package/dist/index.d.ts

@@ -1,4 +1,3 @@
 export { createLanguageServices } from './module';
 export type { LikeC4Services } from './module';
-export * as protocol from './protocol';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,3 +1,2 @@
 export { createLanguageServices } from './module';
-export * as protocol from './protocol';
 //# sourceMappingURL=index.js.map

package/dist/lsp/SemanticTokenProvider.js

@@ -135,46 +135,9 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         if (ast.isElement(node)) {
             return this.highlightAstElement(node, acceptor);
         }
-        // if (ast.isExtendElement(node)) {
-        //   keyword('extend')
-        //   return
-        // }
-        //   if (ast.isElementProperty(node) || ast.isRelationProperty(node) || ast.isViewProperty(node)) {
-        //     acceptor({
-        //       node,
-        //       property: 'key',
-        //       type: SemanticTokenTypes.property,
-        //       modifier: [SemanticTokenModifiers.definition]
-        //     })
-        //     if ('value' in node) {
-        //       acceptor({
-        //         node,
-        //         property: 'value',
-        //         type: SemanticTokenTypes.string
-        //       })
-        //     }
-        //     return
-        //   }
         if (ast.isView(node)) {
             return this.highlightView(node, acceptor);
         }
-        //   if (ast.isDynamicViewSteps(node)) {
-        //     keyword('steps')
-        //     return
-        //   }
-        // if (ast.isViewRuleAutoLayout(node)) {
-        //   keyword('autoLayout')
-        //   return
-        // }
-        // if (ast.isViewRuleStyle(node)) {
-        //   keyword('style')
-        //   return
-        // }
-        // if (ast.isViewRuleExpression(node)) {
-        //   keyword(node.isInclude ? 'include' : 'exclude')
-        //   return
-        // }
-        // //
     }
     highlightAstElement(node, acceptor) {
         acceptor({
@@ -198,11 +161,17 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         }
     }
     highlightView(node, acceptor) {
+        acceptor({
+            node,
+            keyword: 'view',
+            type: SemanticTokenTypes.keyword
+        });
         if (node.name) {
             acceptor({
                 node,
                 property: 'name',
-                type: SemanticTokenTypes.variable
+                type: SemanticTokenTypes.variable,
+                modifier: [SemanticTokenModifiers.declaration]
             });
         }
         if (node.viewOf) {
@@ -212,11 +181,6 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
                 type: SemanticTokenTypes.keyword
             });
         }
-        acceptor({
-            node,
-            keyword: 'view',
-            type: SemanticTokenTypes.keyword
-        });
     }
 }
 //# sourceMappingURL=SemanticTokenProvider.js.map

package/dist/{references → model}/fqn-computation.js

@@ -5,11 +5,11 @@ import { isEmpty, isNil } from 'rambdax';
 import { ElementOps, ast } from '../ast';
 import { strictElementRefFqn } from '../elementRef';
 export function computeDocumentFqn(document, services) {
+    const c4fqns = document.c4fqns = new MultiMap();
     const { model } = document.parseResult.value;
     if (!model?.elements) {
         return;
     }
-    const c4fqns = document.c4fqns = new MultiMap();
     const locator = services.workspace.AstNodeLocator;
     const traverseStack = model.elements.map(el => [el, null]);
     let pair;

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

@@ -1,10 +1,10 @@
+import type { Fqn } from '@likec4/core/types';
+import type { LangiumDocuments } from 'langium';
 import { DocumentState, MultiMap, StreamImpl } from 'langium';
-import type { URI } from 'vscode-uri';
+import type { SetNonNullable } from 'type-fest';
 import type { ast } from '../ast';
 import { type LikeC4LangiumDocument } from '../ast';
 import type { LikeC4Services } from '../module';
-import type { Fqn } from '@likec4/core/types';
-import type { SetNonNullable } from 'type-fest';
 export interface FqnIndexEntry {
     fqn: Fqn;
     name: string;
@@ -13,6 +13,7 @@ export interface FqnIndexEntry {
 }
 export declare class FqnIndex {
     private services;
+    protected langiumDocuments: LangiumDocuments;
     constructor(services: LikeC4Services);
     private documents;
     private entries;
@@ -25,7 +26,7 @@ export declare class FqnIndex {
             c4Elements: import("../ast").ParsedAstElement[];
             c4Relations: import("../ast").ParsedAstRelation[];
             c4Views: import("../ast").ParsedAstElementView[];
-            readonly uri: URI;
+            readonly uri: import("vscode-uri").URI;
             readonly textDocument: import("vscode-languageserver-textdocument").TextDocument;
             state: DocumentState;
             parseResult: import("langium").ParseResult<ast.LikeC4Document>;

package/dist/model/fqn-index.js

@@ -1,59 +1,39 @@
+import { nameFromFqn, parentFqn } from '@likec4/core/utils';
 import { DocumentState, DONE_RESULT, getDocument, MultiMap, StreamImpl } from 'langium';
+import { isNil } from 'rambdax';
 import { ElementOps, isLikeC4LangiumDocument } from '../ast';
 import { logger } from '../logger';
-import { nameFromFqn, parentFqn } from '@likec4/core/utils';
-import '../elementRef';
-import { isNil } from 'rambdax';
-import '../generated/ast';
-const isFqnIndexedDocument = (doc) => isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.ComputedScopes && !isNil(doc.c4fqns);
+import { computeDocumentFqn } from './fqn-computation';
+const isFqnIndexedDocument = (doc) => isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !isNil(doc.c4fqns);
 export class FqnIndex {
     services;
-    // #fqnMap = new WeakMap<ast.Element, Fqn>()
-    // protected readonly descriptions: AstNodeDescriptionProvider
+    langiumDocuments;
     constructor(services) {
         this.services = services;
-        // this.descriptions = services.workspace.AstNodeDescriptionProvider
-        // services.shared.workspace.DocumentBuilder.onUpdate((_changed, removed) => {
-        //   for (const uri of [..._changed, ...removed]) {
-        //     this.cleanIndexedElements(uri)
-        //   }
-        // })
-        // services.shared.workspace.DocumentBuilder.onBuildPhase(
-        //   DocumentState.Parsed,
-        //   (docs, _cancelToken) => {
-        //     for (const doc of docs) {
-        //       this.cleanIndexedElements(doc.uri)
-        //       this.doIndexElements(doc as LikeC4LangiumDocument)
-        //     }
-        //   }
-        // )
+        this.langiumDocuments = services.shared.workspace.LangiumDocuments;
+        services.shared.workspace.DocumentBuilder.onBuildPhase(DocumentState.IndexedContent, (docs, _cancelToken) => {
+            for (const doc of docs) {
+                if (isLikeC4LangiumDocument(doc)) {
+                    try {
+                        computeDocumentFqn(doc, services);
+                    }
+                    catch (e) {
+                        logger.error(e);
+                    }
+                }
+            }
+        });
     }
     documents() {
-        return this.services.shared.workspace.LangiumDocuments.all.filter(isFqnIndexedDocument);
+        return this.langiumDocuments.all.filter(isFqnIndexedDocument);
     }
     entries() {
         return this.documents().flatMap(doc => doc.c4fqns.entries().map(([fqn, path]) => ({ fqn, path, doc })));
     }
-    // private index() {
-    //   const index = new MultiMap<Fqn, {
-    //     path: string,
-    //     doc: LikeC4LangiumDocument
-    //   }>()
-    //   this.entries().toMap()
-    //   this.entries().forEach(({ fqn, path, doc }) => {
-    //     index.add(fqn, { path, doc })
-    //   })
-    //   // for (const doc of this.documents()) {
-    //   //   doc.c4fqns.entries().forEach(([fqn, path]) => {
-    //   //     index.add(fqn, { path, doc })
-    //   //   })
-    //   // }
-    //   return index
-    // }
     get(el) {
         let fqn = ElementOps.readId(el) ?? null;
-        const doc = getDocument(el);
         if (fqn) {
+            const doc = getDocument(el);
             if (isFqnIndexedDocument(doc) && doc.c4fqns.has(fqn)) {
                 return fqn;
             }

package/dist/model/index.d.ts

@@ -1,3 +1,4 @@
+export * from './fqn-computation';
 export * from './fqn-index';
 export * from './model-builder';
 export * from './model-locator';

package/dist/model/index.js

@@ -1,3 +1,4 @@
+export * from './fqn-computation';
 export * from './fqn-index';
 export * from './model-builder';
 export * from './model-locator';

package/dist/model/model-builder.js

@@ -2,12 +2,11 @@ import { computeViews } from '@likec4/core/compute-view';
 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, interruptAndCheck } from 'langium';
+import { DocumentState, getDocument } from 'langium';
 import objectHash from 'object-hash';
-import { clone, isNil, mergeDeepRight, omit, reduce } from 'rambdax';
+import { clone, isNil, mergeDeepRight, reduce } from 'rambdax';
 import invariant from 'tiny-invariant';
-import { toAutoLayout } from '../ast';
-import { ElementViewOps, ast, c4hash, cleanParsedModel, isLikeC4LangiumDocument, isParsedLikeC4LangiumDocument, resolveRelationPoints, streamModel, toElementStyle } from '../ast';
+import { ElementViewOps, ast, c4hash, cleanParsedModel, isLikeC4LangiumDocument, isParsedLikeC4LangiumDocument, resolveRelationPoints, streamModel, toAutoLayout, toElementStyle } from '../ast';
 import { elementRef, strictElementRefFqn } from '../elementRef';
 import { logger } from '../logger';
 import { Rpc } from '../protocol';
@@ -20,26 +19,24 @@ export class LikeC4ModelBuilder {
         this.services = services;
         this.fqnIndex = services.likec4.FqnIndex;
         this.langiumDocuments = services.shared.workspace.LangiumDocuments;
-        services.shared.workspace.DocumentBuilder.onBuildPhase(DocumentState.Validated, async (docs, cancelToken) => {
+        services.shared.workspace.DocumentBuilder.onBuildPhase(DocumentState.Validated, (docs, cancelToken) => {
             let countOfChangedDocs = 0;
-            try {
-                for (const doc of docs) {
-                    await interruptAndCheck(cancelToken);
-                    try {
-                        if (isLikeC4LangiumDocument(doc) && this.parseDocument(doc)) {
-                            countOfChangedDocs++;
-                        }
-                    }
-                    catch (e) {
-                        logger.warn(`Error parsing document ${doc.uri.toString()}`);
+            for (const doc of docs) {
+                if (cancelToken.isCancellationRequested) {
+                    break;
+                }
+                try {
+                    if (isLikeC4LangiumDocument(doc) && this.parseDocument(doc)) {
+                        countOfChangedDocs++;
                     }
                 }
-            }
-            finally {
-                if (countOfChangedDocs > 0 && !cancelToken.isCancellationRequested) {
-                    await this.notifyClient();
+                catch (e) {
+                    logger.warn(`Error parsing document ${doc.uri.toString()}`);
                 }
             }
+            if (countOfChangedDocs > 0 && !cancelToken.isCancellationRequested) {
+                void this.notifyClient();
+            }
         });
     }
     get connection() {
@@ -51,8 +48,10 @@ export class LikeC4ModelBuilder {
     buildModel() {
         const docs = this.documents();
         if (docs.length === 0) {
+            logger.debug('No documents to build model from');
             return;
         }
+        // TODO:
         try {
             const c4Specification = reduce((acc, doc) => mergeDeepRight(acc, doc.c4Specification), {
                 kinds: {}
@@ -65,22 +64,25 @@ export class LikeC4ModelBuilder {
             const toModelElement = (el) => {
                 const kind = c4Specification.kinds[el.kind];
                 if (kind) {
+                    const { astPath, ...model } = el;
                     return {
                         ...(kind.shape !== DefaultElementShape ? { shape: kind.shape } : {}),
                         ...(kind.color !== DefaultThemeColor ? { color: kind.color } : {}),
-                        ...omit(['astPath'], el)
+                        ...model
                     };
                 }
                 return null;
             };
             const toModelRelation = (rel) => {
-                return omit(['astPath'], rel);
+                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 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;
                 }
@@ -89,24 +91,30 @@ export class LikeC4ModelBuilder {
             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 toModelView = (view) => {
-                let title = view.title;
+                // eslint-disable-next-line prefer-const
+                let { astPath, rules, title, ...model } = view;
                 if (!title && view.viewOf) {
                     title = elements[view.viewOf]?.title;
                 }
+                if (!title && view.id === 'index') {
+                    title = 'Landscape view';
+                }
                 return {
-                    ...omit(['astPath', 'rules', 'title'], view),
-                    ...(!!title ? { title } : {}),
-                    rules: clone(view.rules)
+                    ...model,
+                    ...(title && { title }),
+                    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;
@@ -332,7 +340,6 @@ export class LikeC4ModelBuilder {
         if (!connection) {
             return;
         }
-        logger.debug('Send onDidChangeModel');
         await connection.sendNotification(Rpc.onDidChangeModel);
     }
 }

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

@@ -1,5 +1,5 @@
 import type * as c4 from '@likec4/core/types';
-import type { Location } from 'vscode-languageserver';
+import type { Location } from 'vscode-languageserver-protocol';
 import type { ParsedAstElement } from '../ast';
 import { ast } from '../ast';
 import type { LikeC4Services } from '../module';

package/dist/module.js

@@ -14,10 +14,6 @@ export const LikeC4Module = {
         FqnIndex: bind(FqnIndex),
         ModelBuilder: bind(LikeC4ModelBuilder),
         ModelLocator: bind(LikeC4ModelLocator)
-        // Model: bind(LikeC4Model),
-        // Model: bind(LikeC4Model),
-        // SpecIndex: bind(LikeC4SpecIndex),
-        // Validator: bind(LikeC4Validator)
     },
     lsp: {
         DocumentSymbolProvider: bind(LikeC4DocumentSymbolProvider),

package/dist/protocol.d.ts

@@ -1,14 +1,9 @@
 import type { Fqn, LikeC4Model, RelationID, ViewID } from '@likec4/core';
 import type { DocumentUri, Location } from 'vscode-languageserver-protocol';
 import { NotificationType0, RequestType0, RequestType } from 'vscode-languageserver-protocol';
-export declare const onDidChangeModel: NotificationType0;
-export declare const fetchModel: RequestType0<{
-    model: LikeC4Model | null;
-}, void>;
-export interface BuildDocumentsParams {
+interface BuildDocumentsParams {
     docs: DocumentUri[];
 }
-export declare const buildDocuments: RequestType<BuildDocumentsParams, void, void>;
 export interface LocateElementParams {
     element: Fqn;
     property?: string;
@@ -25,6 +20,9 @@ export declare const Rpc: {
     readonly fetchModel: RequestType0<{
         model: LikeC4Model | null;
     }, void>;
+    readonly rebuild: RequestType0<{
+        docs: DocumentUri[];
+    }, void>;
     readonly buildDocuments: RequestType<BuildDocumentsParams, void, void>;
     readonly locateElement: RequestType<LocateElementParams, Location | null, void>;
     readonly locateRelation: RequestType<{
@@ -34,4 +32,5 @@ export declare const Rpc: {
         id: ViewID;
     }, Location | null, void>;
 };
+export {};
 //# sourceMappingURL=protocol.d.ts.map

package/dist/protocol.js

@@ -1,10 +1,11 @@
 import { NotificationType0, RequestType0, RequestType } from 'vscode-languageserver-protocol';
 //#region From server
-export const onDidChangeModel = new NotificationType0('likec4/onDidChangeModel');
+const onDidChangeModel = new NotificationType0('likec4/onDidChangeModel');
 //#endregion
 //#region To server
-export const fetchModel = new RequestType0('likec4/fetchModel');
-export const buildDocuments = new RequestType('likec4/buildDocuments');
+const fetchModel = new RequestType0('likec4/fetchModel');
+const rebuild = new RequestType0('likec4/rebuildModel');
+const buildDocuments = new RequestType('likec4/buildDocuments');
 export const locateElement = new RequestType('likec4/locateElement');
 export const locateRelation = new RequestType('likec4/locateRelation');
 export const locateView = new RequestType('likec4/locateView');
@@ -12,6 +13,7 @@ export const locateView = new RequestType('likec4/locateView');
 export const Rpc = {
     onDidChangeModel,
     fetchModel,
+    rebuild,
     buildDocuments,
     locateElement,
     locateRelation,

package/dist/references/scope-computation.js

@@ -1,6 +1,5 @@
 import { DefaultScopeComputation, MultiMap } from 'langium';
 import { ast } from '../ast';
-import { computeDocumentFqn } from './fqn-computation';
 export class LikeC4ScopeComputation extends DefaultScopeComputation {
     services;
     constructor(services) {
@@ -26,7 +25,6 @@ export class LikeC4ScopeComputation extends DefaultScopeComputation {
                     docExports.push(this.descriptions.createDescription(elAst, elAst.name, document));
                 }
             }
-            computeDocumentFqn(document, this.services);
         }
         // const c4fqns = document.c4fqns
         // logger.debug(`doc ${document.uri.path}:

package/dist/registerProtocolHandlers.js

@@ -1,3 +1,4 @@
+import { URI } from 'vscode-uri';
 import { logger } from './logger';
 import { Rpc } from './protocol';
 export function registerProtocolHandlers(services) {
@@ -17,24 +18,53 @@ export function registerProtocolHandlers(services) {
             model = null;
             logger.error(e);
         }
-        return Promise.resolve({
-            model: model ?? null
-        });
+        return Promise.resolve({ model });
+    });
+    connection.onRequest(Rpc.rebuild, async (cancelToken) => {
+        const changed = LangiumDocuments.all.map(d => d.uri).toArray();
+        logger.debug(`Rebuild all documents: [
+      ${changed.map(d => d.toString()).join('\n      ')}
+    ]`);
+        await services.shared.workspace.DocumentBuilder.update(changed, [], cancelToken);
+        return {
+            docs: changed.map(d => d.toString())
+        };
     });
     connection.onRequest(Rpc.buildDocuments, async ({ docs }, cancelToken) => {
+        if (docs.length === 0) {
+            logger.debug(`Received empty request to rebuild`);
+            return;
+        }
+        logger.debug(`Received request to rebuild: [
+      ${docs.join('\n      ')}
+    ]`);
         const changed = [];
         for (const d of docs) {
-            const uri = d;
-            if (LangiumDocuments.hasDocument(uri)) {
-                changed.push(uri);
+            try {
+                const uri = URI.parse(d);
+                if (LangiumDocuments.hasDocument(uri)) {
+                    changed.push(uri);
+                }
+                else {
+                    logger.warn(`LangiumDocuments does not have document: ${d}`);
+                    LangiumDocuments.getOrCreateDocument(uri);
+                }
             }
-            else {
-                logger.error(`LangiumDocuments does not have document: ${uri.toString()}`);
+            catch (e) {
+                logger.error(e);
             }
         }
-        logger.debug(`Received request to rebuild: [
-      ${changed.map(d => d.toString()).join('\n      ')}
-    ]`);
+        if (changed.length !== docs.length) {
+            const all = LangiumDocuments.all.map(d => d.uri.toString()).toArray();
+            logger.warn(`
+We have in LangiumDocuments: [
+  ${all.join('\n  ')}
+]
+We rebuild: [
+  ${changed.join('\n  ')}
+]
+`.trim());
+        }
         await services.shared.workspace.DocumentBuilder.update(changed, [], cancelToken);
     });
     connection.onRequest(Rpc.locateElement, async ({ element, property }, _cancelToken) => {

package/dist/validation/element.js

@@ -11,6 +11,12 @@ 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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.8.0",
+  "version": "0.18.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -11,8 +11,7 @@
     "contrib",
     "!**/__mocks__/",
     "!**/__test__/",
-    "!**/*.spec.js",
-    "!**/*.spec.d.ts",
+    "!**/*.spec.*",
     "!**/*.map"
   ],
   "repository": {
@@ -29,11 +28,6 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.js"
-    },
-    "./builtin": {
-      "types": "./dist/builtin.d.ts",
-      "import": "./dist/builtin.js",
-      "require": "./dist/builtin.js"
     }
   },
   "publishConfig": {
@@ -47,11 +41,6 @@
         "types": "./dist/index.d.ts",
         "import": "./dist/index.js",
         "require": "./dist/index.js"
-      },
-      "./builtin": {
-        "types": "./dist/builtin.d.ts",
-        "import": "./dist/builtin.js",
-        "require": "./dist/builtin.js"
       }
     }
   },
@@ -65,11 +54,11 @@
     "dev": "run-p 'watch:*'",
     "lint": "run -T eslint src/ --fix",
     "clean": "run -T rimraf dist contrib",
-    "test": "vitest run",
-    "test:watch": "vitest"
+    "test": "run -T vitest run",
+    "test:watch": "run -T vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.7.0",
+    "@likec4/core": "0.18.0",
     "@mobily/ts-belt": "^3.13.1",
     "langium": "^1.2.0",
     "nanoid": "^4.0.2",
@@ -77,17 +66,15 @@
     "rambdax": "^9.1.1",
     "strip-indent": "^4.0.0",
     "tiny-invariant": "^1.3.1",
-    "type-fest": "^3.9.0",
+    "type-fest": "^3.11.1",
     "vscode-languageserver": "~8.1.0",
     "vscode-languageserver-protocol": "~3.17.3"
   },
   "devDependencies": {
     "@types/node": "^18.15.11",
     "@types/object-hash": "^3.0.2",
-    "langium-cli": "^1.2.0",
+    "langium-cli": "^1.2.1",
     "npm-run-all": "^4.1.5",
-    "typescript": "^5.0.4",
-    "vite": "^4.3.3",
-    "vitest": "^0.31.0"
+    "typescript": "^5.1.3"
   }
 }