@likec4/language-server 1.0.0-next.0 → 1.0.0-next.2

package/dist/model/model-builder.js

@@ -185,7 +185,6 @@ ${printDocs(docs)}`);
   langiumDocuments;
   listeners = [];
   async buildModel(cancelToken) {
-    await this.services.shared.workspace.DocumentBuilder.waitUntil(DocumentState.Validated, cancelToken);
     return await this.services.shared.workspace.WorkspaceLock.read(async () => {
       if (cancelToken) {
         await interruptAndCheck(cancelToken);
@@ -209,35 +208,37 @@ ${printDocs(docs)}`);
     if (!model) {
       return null;
     }
-    if (cancelToken) {
-      await interruptAndCheck(cancelToken);
-    }
-    const cache = this.services.WorkspaceCache;
-    const viewsCache = this.services.WorkspaceCache;
-    return cache.get(MODEL_CACHE, () => {
-      const index = new LikeC4ModelGraph(model);
-      const allViews = [];
-      for (const view of R.values(model.views)) {
-        const result = computeView(view, index);
-        if (!result.isSuccess) {
-          logWarnError(result.error);
-          continue;
-        }
-        allViews.push(result.view);
+    return await this.services.shared.workspace.WorkspaceLock.read(async () => {
+      if (cancelToken) {
+        await interruptAndCheck(cancelToken);
       }
-      assignNavigateTo(allViews);
-      const views = R.mapToObj(allViews, (v) => {
-        const previous = this.previousViews[v.id];
-        const view = previous && eq(v, previous) ? previous : v;
-        viewsCache.set(computedViewKey(v.id), view);
-        return [v.id, view];
+      const cache = this.services.WorkspaceCache;
+      const viewsCache = this.services.WorkspaceCache;
+      return cache.get(MODEL_CACHE, () => {
+        const index = new LikeC4ModelGraph(model);
+        const allViews = [];
+        for (const view of R.values(model.views)) {
+          const result = computeView(view, index);
+          if (!result.isSuccess) {
+            logWarnError(result.error);
+            continue;
+          }
+          allViews.push(result.view);
+        }
+        assignNavigateTo(allViews);
+        const views = R.mapToObj(allViews, (v) => {
+          const previous = this.previousViews[v.id];
+          const view = previous && eq(v, previous) ? previous : v;
+          viewsCache.set(computedViewKey(v.id), view);
+          return [v.id, view];
+        });
+        this.previousViews = { ...views };
+        return {
+          elements: model.elements,
+          relations: model.relations,
+          views
+        };
       });
-      this.previousViews = { ...views };
-      return {
-        elements: model.elements,
-        relations: model.relations,
-        views
-      };
     });
   }
   async computeView(viewId, cancelToken) {
@@ -247,33 +248,35 @@ ${printDocs(docs)}`);
       logger.warn(`[ModelBuilder] Cannot find view ${viewId}`);
       return null;
     }
-    if (cancelToken) {
-      await interruptAndCheck(cancelToken);
-    }
-    const cache = this.services.WorkspaceCache;
-    return cache.get(computedViewKey(viewId), () => {
-      const index = new LikeC4ModelGraph(model);
-      const result = computeView(view, index);
-      if (!result.isSuccess) {
-        logError(result.error);
-        return null;
+    return await this.services.shared.workspace.WorkspaceLock.read(async () => {
+      if (cancelToken) {
+        await interruptAndCheck(cancelToken);
       }
-      const allElementViews = R.values(model.views).filter(
-        (v) => isStrictElementView(v) && v.id !== viewId
-      );
-      let computedView = result.view;
-      computedView.nodes.forEach((node) => {
-        if (!node.navigateTo) {
-          const navigateTo = R.find(allElementViews, (v) => v.viewOf === node.id);
-          if (navigateTo) {
-            node.navigateTo = navigateTo.id;
-          }
+      const cache = this.services.WorkspaceCache;
+      return cache.get(computedViewKey(viewId), () => {
+        const index = new LikeC4ModelGraph(model);
+        const result = computeView(view, index);
+        if (!result.isSuccess) {
+          logError(result.error);
+          return null;
         }
+        const allElementViews = R.values(model.views).filter(
+          (v) => isStrictElementView(v) && v.id !== viewId
+        );
+        let computedView = result.view;
+        computedView.nodes.forEach((node) => {
+          if (!node.navigateTo) {
+            const navigateTo = R.find(allElementViews, (v) => v.viewOf === node.id);
+            if (navigateTo) {
+              node.navigateTo = navigateTo.id;
+            }
+          }
+        });
+        const previous = this.previousViews[viewId];
+        computedView = previous && eq(computedView, previous) ? previous : computedView;
+        this.previousViews[viewId] = computedView;
+        return computedView;
       });
-      const previous = this.previousViews[viewId];
-      computedView = previous && eq(computedView, previous) ? previous : computedView;
-      this.previousViews[viewId] = computedView;
-      return computedView;
     });
   }
   onModelParsed(callback) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likec4/language-server",
   "description": "LikeC4 Language Server",
-  "version": "1.0.0-next.0",
+  "version": "1.0.0-next.2",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -74,8 +74,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@likec4/core": "1.0.0-next.0",
-    "@likec4/graph": "1.0.0-next.0",
+    "@likec4/core": "1.0.0-next.2",
+    "@likec4/graph": "1.0.0-next.2",
     "@total-typescript/ts-reset": "^0.5.1",
     "debounce-fn": "^6.0.0",
     "fast-equals": "^5.0.1",