@likec4/language-server 0.47.0 → 0.49.0

package/dist/ast.js

@@ -47,11 +47,10 @@ export function cleanParsedModel(doc) {
     c4Relations: [],
     c4Views: []
   };
-  Object.assign(doc, props);
-  return doc;
+  return Object.assign(doc, props);
 }
 export function isFqnIndexedDocument(doc) {
-  return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !isNil(doc.c4fqns);
+  return isLikeC4LangiumDocument(doc) && doc.state >= DocumentState.IndexedContent && !!doc.c4fqns;
 }
 export function isLikeC4LangiumDocument(doc) {
   return doc.textDocument.languageId === LikeC4LanguageMetaData.languageId;

package/dist/lsp/SemanticTokenProvider.d.ts

@@ -1,6 +1,6 @@
 import { AbstractSemanticTokenProvider, type AstNode, type SemanticTokenAcceptor } from 'langium';
 export declare class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
-    protected highlightElement(node: AstNode, acceptor: SemanticTokenAcceptor): void;
+    protected highlightElement(node: AstNode, acceptor: SemanticTokenAcceptor): void | undefined | 'prune';
     private highlightAstElement;
     private highlightView;
 }

package/dist/lsp/SemanticTokenProvider.js

@@ -2,6 +2,7 @@ import { AbstractSemanticTokenProvider } from "langium";
 import { SemanticTokenModifiers, SemanticTokenTypes } from "vscode-languageserver-protocol";
 import { ast } from "../ast.js";
 export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
+  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
   highlightElement(node, acceptor) {
     if (ast.isRelation(node) && "kind" in node) {
       acceptor({
@@ -23,6 +24,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         cst: node.$cstNode,
         type: SemanticTokenTypes.variable
       });
+      return "prune";
     }
     if (ast.isWildcardExpr(node) && node.$cstNode) {
       acceptor({

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

@@ -1,6 +1,6 @@
 import { type c4 } from '@likec4/core';
 import type { LangiumDocument } from 'langium';
-import type { LikeC4LangiumDocument, ParsedLikeC4LangiumDocument } from '../ast';
+import type { FqnIndexedDocument, ParsedLikeC4LangiumDocument } from '../ast';
 import { ast } from '../ast';
 import type { LikeC4Services } from '../module';
 export type ModelParsedListener = () => void;
@@ -9,7 +9,7 @@ export declare class LikeC4ModelParser {
     private fqnIndex;
     constructor(services: LikeC4Services);
     parse(doc: LangiumDocument | LangiumDocument[]): ParsedLikeC4LangiumDocument[];
-    protected parseLikeC4Document(_doc: LikeC4LangiumDocument): ParsedLikeC4LangiumDocument;
+    protected parseLikeC4Document(_doc: FqnIndexedDocument): ParsedLikeC4LangiumDocument;
     private parseSpecification;
     private parseModel;
     private parseElement;

package/dist/model/model-parser.js

@@ -1,18 +1,13 @@
-import {
-  InvalidModelError,
-  invariant,
-  isNonEmptyArray,
-  nonexhaustive
-} from "@likec4/core";
+import { InvalidModelError, invariant, isNonEmptyArray, nonexhaustive } from "@likec4/core";
 import { getDocument } from "langium";
 import objectHash from "object-hash";
+import { isTruthy } from "remeda";
 import stripIndent from "strip-indent";
 import {
   ElementViewOps,
   ast,
   cleanParsedModel,
   isFqnIndexedDocument,
-  isLikeC4LangiumDocument,
   resolveRelationPoints,
   streamModel,
   toAutoLayout,
@@ -22,7 +17,6 @@ import {
 } from "../ast.js";
 import { elementRef, getFqnElementRef } from "../elementRef.js";
 import { logError, logWarnError, logger } from "../logger.js";
-import { isTruthy } from "remeda";
 function toSingleLine(str) {
   return str?.split("\n").join(" ").trim();
 }
@@ -40,7 +34,8 @@ export class LikeC4ModelParser {
     const docs = Array.isArray(doc) ? doc : [doc];
     const result = [];
     for (const doc2 of docs) {
-      if (!isLikeC4LangiumDocument(doc2)) {
+      if (!isFqnIndexedDocument(doc2)) {
+        logger.warn(`Not a FqnIndexedDocument: ${doc2.uri.toString(true)}`);
         continue;
       }
       try {
@@ -52,7 +47,6 @@ export class LikeC4ModelParser {
     return result;
   }
   parseLikeC4Document(_doc) {
-    invariant(isFqnIndexedDocument(_doc), "Not a FqnIndexedDocument");
     const doc = cleanParsedModel(_doc);
     this.parseSpecification(doc);
     this.parseModel(doc);

package/dist/utils.js

@@ -1,4 +1,4 @@
-export const printDocs = (docs) => docs.map((d) => "  - " + d.uri).join("\n");
+export const printDocs = (docs) => docs.map((d) => "  - " + d.uri.toString(true)).join("\n");
 export function queueMicrotask(cb) {
   return Promise.resolve().then(cb);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.47.0",
+  "version": "0.49.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -50,8 +50,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@likec4/core": "0.47.0",
-    "@likec4/graph": "0.47.0",
+    "@likec4/core": "0.49.0",
+    "@likec4/graph": "0.49.0",
     "langium": "^2.1.2",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",