1 files changed, 42 insertions, 2 deletions

diff --git a/subprojects/frontend/src/xtext/XtextClient.ts b/subprojects/frontend/src/xtext/XtextClient.ts
index e8181af0..7486d737 100644
--- a/subprojects/frontend/src/xtext/XtextClient.ts
+++ b/subprojects/frontend/src/xtext/XtextClient.ts
@@ -9,6 +9,7 @@ import type {
   CompletionResult,
 } from '@codemirror/autocomplete';
 import type { Transaction } from '@codemirror/state';
+import { type IReactionDisposer, reaction } from 'mobx';
 
 import type PWAStore from '../PWAStore';
 import type EditorStore from '../editor/EditorStore';
@@ -16,7 +17,9 @@ import getLogger from '../utils/getLogger';
 
 import ContentAssistService from './ContentAssistService';
 import HighlightingService from './HighlightingService';
+import ModelGenerationService from './ModelGenerationService';
 import OccurrencesService from './OccurrencesService';
+import SemanticsService from './SemanticsService';
 import UpdateService from './UpdateService';
 import ValidationService from './ValidationService';
 import XtextWebSocketClient from './XtextWebSocketClient';
@@ -37,7 +40,16 @@ export default class XtextClient {
 
   private readonly occurrencesService: OccurrencesService;
 
-  constructor(store: EditorStore, private readonly pwaStore: PWAStore) {
+  private readonly semanticsService: SemanticsService;
+
+  private readonly modelGenerationService: ModelGenerationService;
+
+  private readonly keepAliveDisposer: IReactionDisposer;
+
+  constructor(
+    private readonly store: EditorStore,
+    private readonly pwaStore: PWAStore,
+  ) {
     this.webSocketClient = new XtextWebSocketClient(
       () => this.onReconnect(),
       () => this.onDisconnect(),
@@ -51,6 +63,16 @@ export default class XtextClient {
     );
     this.validationService = new ValidationService(store, this.updateService);
     this.occurrencesService = new OccurrencesService(store, this.updateService);
+    this.semanticsService = new SemanticsService(store, this.validationService);
+    this.modelGenerationService = new ModelGenerationService(
+      store,
+      this.updateService,
+    );
+    this.keepAliveDisposer = reaction(
+      () => store.generating,
+      (generating) => this.webSocketClient.setKeepAlive(generating),
+      { fireImmediately: true },
+    );
   }
 
   start(): void {
@@ -64,9 +86,11 @@ export default class XtextClient {
   }
 
   private onDisconnect(): void {
+    this.store.analysisCompleted(true);
     this.highlightingService.onDisconnect();
     this.validationService.onDisconnect();
     this.occurrencesService.onDisconnect();
+    this.modelGenerationService.onDisconnect();
   }
 
   onTransaction(transaction: Transaction): void {
@@ -75,6 +99,7 @@ export default class XtextClient {
     this.contentAssistService.onTransaction(transaction);
     this.updateService.onTransaction(transaction);
     this.occurrencesService.onTransaction(transaction);
+    this.modelGenerationService.onTransaction(transaction);
   }
 
   private onPush(
@@ -93,7 +118,7 @@ export default class XtextClient {
       );
       return;
     }
-    if (stateId !== xtextStateId) {
+    if (stateId !== xtextStateId && service !== 'modelGeneration') {
       log.error(
         'Unexpected xtext state id: expected:',
         xtextStateId,
@@ -111,6 +136,12 @@ export default class XtextClient {
       case 'validate':
         this.validationService.onPush(push);
         return;
+      case 'semantics':
+        this.semanticsService.onPush(push);
+        return;
+      case 'modelGeneration':
+        this.modelGenerationService.onPush(push);
+        return;
       default:
         throw new Error('Unknown service');
     }
@@ -120,6 +151,14 @@ export default class XtextClient {
     return this.contentAssistService.contentAssist(context);
   }
 
+  startModelGeneration(randomSeed?: number): Promise<void> {
+    return this.modelGenerationService.start(randomSeed);
+  }
+
+  cancelModelGeneration(): Promise<void> {
+    return this.modelGenerationService.cancel();
+  }
+
   formatText(): void {
     this.updateService.formatText().catch((e) => {
       log.error('Error while formatting text', e);
@@ -127,6 +166,7 @@ export default class XtextClient {
   }
 
   dispose(): void {
+    this.keepAliveDisposer();
     this.webSocketClient.disconnect();
   }
 }