@likec4/language-server 0.42.2 → 0.43.1

package/dist/Rpc.js

@@ -85,6 +85,7 @@ export class Rpc {
         `[ServerRpc] received request to buildDocuments:
 ${docs.map((d) => "   - " + d).join("\n")}`
       );
+      const deleted = LangiumDocuments.all.filter((d) => !docs.includes(d.uri.toString())).map((d) => d.uri).toArray();
       const changed = [];
       for (const d of docs) {
         try {
@@ -112,7 +113,7 @@ We rebuild: [
   `.trim()
         );
       }
-      await DocumentBuilder.update(changed, [], cancelToken);
+      await DocumentBuilder.update(changed, deleted, cancelToken);
     });
     connection.onRequest(locate, (params) => {
       if ("element" in params) {

package/dist/model/fqn-index.js

@@ -12,12 +12,20 @@ export class FqnIndex {
   langiumDocuments;
   constructor(services) {
     this.langiumDocuments = services.shared.workspace.LangiumDocuments;
-    services.shared.workspace.DocumentBuilder.onBuildPhase(
-      DocumentState.Changed,
-      (docs, _cancelToken) => {
-        logger.debug(`[FqnIndex] onChanged (${docs.length} docs):
-` + printDocs(docs));
-        for (const doc of docs) {
+    services.shared.workspace.DocumentBuilder.onUpdate((changed, deleted) => {
+      const message = [`[FqnIndex] onUpdate`];
+      if (changed.length > 0) {
+        message.push(` changed:`);
+        changed.forEach((u) => message.push(`  - ${u}`));
+      }
+      if (deleted.length > 0) {
+        message.push(` deleted:`);
+        deleted.forEach((u) => message.push(`  - ${u}`));
+      }
+      logger.debug(message.join("\n"));
+      for (const uri of changed) {
+        if (this.langiumDocuments.hasDocument(uri)) {
+          const doc = this.langiumDocuments.getOrCreateDocument(uri);
           if (isLikeC4LangiumDocument(doc)) {
             delete doc.c4fqns;
             delete doc.c4Elements;
@@ -27,7 +35,7 @@ export class FqnIndex {
           }
         }
       }
-    );
+    });
     services.shared.workspace.DocumentBuilder.onBuildPhase(
       DocumentState.IndexedContent,
       (docs, _cancelToken) => {

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

@@ -6,10 +6,8 @@ type ModelParsedListener = (docs: URI[]) => void;
 export declare class LikeC4ModelBuilder {
     private services;
     private langiumDocuments;
-    private workspaceManager;
     private listeners;
     constructor(services: LikeC4Services);
-    get workspaceUri(): string | null;
     buildRawModel(): c4.LikeC4RawModel | null;
     buildModel(): c4.LikeC4Model | null;
     computeView(viewId: ViewID): c4.ComputedView | null;

package/dist/model/model-builder.js

@@ -1,9 +1,9 @@
 import {
   compareByFqnHierarchically,
-  invariant,
   isStrictElementView,
   parentFqn
 } from "@likec4/core";
+import { LikeC4ModelGraph, computeView } from "@likec4/graph";
 import {
   DocumentState,
   interruptAndCheck
@@ -12,10 +12,8 @@ import * as R from "remeda";
 import { Disposable } from "vscode-languageserver";
 import { isValidLikeC4LangiumDocument } from "../ast.js";
 import { logError, logWarnError, logger } from "../logger.js";
-import { LikeC4WorkspaceManager } from "../shared/index.js";
-import { printDocs, queueMicrotask } from "../utils.js";
+import { printDocs } from "../utils.js";
 import { assignNavigateTo, resolveRelativePaths, resolveRulesExtendedViews } from "../view-utils/index.js";
-import { LikeC4ModelGraph, computeView } from "@likec4/graph";
 function isRelativeLink(link) {
   return link.startsWith(".") || link.startsWith("/");
 }
@@ -162,24 +160,20 @@ export class LikeC4ModelBuilder {
   constructor(services) {
     this.services = services;
     this.langiumDocuments = services.shared.workspace.LangiumDocuments;
-    invariant(services.shared.workspace.WorkspaceManager instanceof LikeC4WorkspaceManager);
-    this.workspaceManager = services.shared.workspace.WorkspaceManager;
     const parser = services.likec4.ModelParser;
     services.shared.workspace.DocumentBuilder.onBuildPhase(
       DocumentState.Validated,
       async (docs, cancelToken) => {
-        await queueMicrotask(() => parser.parse(docs));
+        const parsed = parser.parse(docs).map((d) => d.uri);
         await interruptAndCheck(cancelToken);
-        this.notifyListeners(docs.map((d) => d.uri));
+        if (parsed.length > 0) {
+          this.notifyListeners(parsed);
+        }
       }
     );
   }
   langiumDocuments;
-  workspaceManager;
   listeners = [];
-  get workspaceUri() {
-    return this.workspaceManager.workspace()?.uri ?? null;
-  }
   buildRawModel() {
     const cache = this.services.WorkspaceCache;
     return cache.get(RAW_MODEL_CACHE, () => {

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

@@ -8,7 +8,7 @@ export declare class LikeC4ModelParser {
     private services;
     private fqnIndex;
     constructor(services: LikeC4Services);
-    parse(doc: LangiumDocument | LangiumDocument[]): void;
+    parse(doc: LangiumDocument | LangiumDocument[]): LikeC4LangiumDocument[];
     protected parseLikeC4Document(doc: LikeC4LangiumDocument): void;
     private parseElement;
     private parseRelation;

package/dist/model/model-parser.js

@@ -27,16 +27,19 @@ export class LikeC4ModelParser {
     const docs = Array.isArray(doc) ? doc : [doc];
     logger.debug(`[ModelParser] onValidated (${docs.length} docs)
 ${printDocs(docs)}`);
+    const result = [];
     for (const doc2 of docs) {
       if (!isLikeC4LangiumDocument(doc2)) {
         continue;
       }
       try {
         this.parseLikeC4Document(doc2);
+        result.push(doc2);
       } catch (cause) {
         logError(new InvalidModelError(`Error parsing document ${doc2.uri.toString()}`, { cause }));
       }
     }
+    return result;
   }
   parseLikeC4Document(doc) {
     const { elements, relations, views, specification } = cleanParsedModel(doc);

package/dist/module.js

@@ -13,7 +13,6 @@ import {
 import { FqnIndex, LikeC4ModelBuilder, LikeC4ModelLocator, LikeC4ModelParser } from "./model/index.js";
 import { LikeC4ScopeComputation, LikeC4ScopeProvider } from "./references/index.js";
 import { Rpc } from "./Rpc.js";
-import { LikeC4WorkspaceManager } from "./shared/index.js";
 import { registerValidationChecks } from "./validation/index.js";
 import { logger } from "./logger.js";
 import { serializeError } from "@likec4/core";
@@ -42,9 +41,9 @@ export const LikeC4Module = {
   }
 };
 const LikeC4SharedModule = {
-  workspace: {
-    WorkspaceManager: (services) => new LikeC4WorkspaceManager(services)
-  }
+  // workspace: {
+  //   WorkspaceManager: services => new LikeC4WorkspaceManager(services)
+  // }
 };
 export function createLanguageServices(context) {
   const connection = context?.connection;

package/dist/validation/index.js

@@ -1,9 +1,9 @@
-import * as vscodeUri from "vscode-uri";
 import { logger } from "../logger.js";
 import { elementChecks } from "./element.js";
 import { relationChecks } from "./relation.js";
-import { elementKindChecks, tagChecks, relationshipChecks } from "./specification.js";
+import { elementKindChecks, relationshipChecks, tagChecks } from "./specification.js";
 import { viewChecks } from "./view.js";
+import { incomingExpressionChecks, outgoingExpressionChecks } from "./view-predicates/index.js";
 export function registerValidationChecks(services) {
   logger.info("registerValidationChecks");
   const registry = services.validation.ValidationRegistry;
@@ -13,22 +13,13 @@ export function registerValidationChecks(services) {
     ElementKind: elementKindChecks(services),
     Relation: relationChecks(services),
     Tag: tagChecks(services),
-    RelationshipKind: relationshipChecks(services)
+    RelationshipKind: relationshipChecks(services),
+    IncomingExpression: incomingExpressionChecks(services),
+    OutgoingExpression: outgoingExpressionChecks(services)
   });
   const connection = services.shared.lsp.Connection;
   if (connection) {
-    logger.info("registerValidationChecks");
     services.shared.workspace.DocumentBuilder.onUpdate((changed, deleted) => {
-      const message = [`[DocumentBuilder.onUpdate]`];
-      if (changed.length > 0) {
-        message.push(` changed:`);
-        changed.forEach((u) => message.push(`  - ${vscodeUri.Utils.basename(u)}`));
-      }
-      if (deleted.length > 0) {
-        message.push(` deleted:`);
-        deleted.forEach((u) => message.push(`  - ${vscodeUri.Utils.basename(u)}`));
-      }
-      logger.debug(message.join("\n"));
       for (const uri of deleted) {
         void connection.sendDiagnostics({
           uri: uri.toString(),

package/dist/validation/view-predicates/incoming.d.ts

@@ -0,0 +1,5 @@
+import type { ValidationCheck } from 'langium';
+import { ast } from '../../ast';
+import type { LikeC4Services } from '../../module';
+export declare const incomingExpressionChecks: (_services: LikeC4Services) => ValidationCheck<ast.IncomingExpression>;
+//# sourceMappingURL=incoming.d.ts.map

package/dist/validation/view-predicates/incoming.js

@@ -0,0 +1,14 @@
+import { ast } from "../../ast.js";
+import { isNil } from "remeda";
+export const incomingExpressionChecks = (_services) => {
+  return (el, accept) => {
+    if (ast.isWildcardExpression(el.target) && ast.isViewRuleExpression(el.$container)) {
+      const view = el.$container.$container.$container;
+      if (isNil(view.viewOf)) {
+        accept("warning", "Predicate is ignored as it concerns all relationships", {
+          node: el
+        });
+      }
+    }
+  };
+};

package/dist/validation/view-predicates/index.d.ts

@@ -0,0 +1,3 @@
+export * from './incoming';
+export * from './outgoing';
+//# sourceMappingURL=index.d.ts.map

package/dist/validation/view-predicates/index.js

@@ -0,0 +1,2 @@
+export * from "./incoming.js";
+export * from "./outgoing.js";

package/dist/validation/view-predicates/outgoing.d.ts

@@ -0,0 +1,5 @@
+import type { ValidationCheck } from 'langium';
+import { ast } from '../../ast';
+import type { LikeC4Services } from '../../module';
+export declare const outgoingExpressionChecks: (_services: LikeC4Services) => ValidationCheck<ast.OutgoingExpression>;
+//# sourceMappingURL=outgoing.d.ts.map

package/dist/validation/view-predicates/outgoing.js

@@ -0,0 +1,14 @@
+import { ast } from "../../ast.js";
+import { isNil } from "remeda";
+export const outgoingExpressionChecks = (_services) => {
+  return (el, accept) => {
+    if (ast.isWildcardExpression(el.source) && ast.isViewRuleExpression(el.$container)) {
+      const view = el.$container.$container.$container;
+      if (isNil(view.viewOf)) {
+        accept("warning", "Predicate is ignored as it concerns all relationships", {
+          node: el
+        });
+      }
+    }
+  };
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "0.42.2",
+  "version": "0.43.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -50,14 +50,14 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@likec4/core": "0.42.2",
-    "@likec4/graph": "0.42.2",
+    "@likec4/core": "0.43.1",
+    "@likec4/graph": "0.43.1",
     "langium": "^2.0.2",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
     "p-throttle": "^5.1.0",
     "rambdax": "^9.1.1",
-    "remeda": "^1.27.1",
+    "remeda": "^1.28.0",
     "strip-indent": "^4.0.0",
     "vscode-languageserver": "~8.1.0",
     "vscode-languageserver-protocol": "~3.17.3",