9 files changed, 152 insertions, 16 deletions

diff --git a/subprojects/frontend/src/xtext/BackendConfig.ts b/subprojects/frontend/src/xtext/BackendConfig.ts
index 4c7eac5f..e7043bd5 100644
--- a/subprojects/frontend/src/xtext/BackendConfig.ts
+++ b/subprojects/frontend/src/xtext/BackendConfig.ts
@@ -11,7 +11,7 @@ import { z } from 'zod';
 export const ENDPOINT = 'config.json';
 
 const BackendConfig = z.object({
-  webSocketURL: z.string().url(),
+  webSocketURL: z.string().url().optional(),
 });
 
 type BackendConfig = z.infer<typeof BackendConfig>;
diff --git a/subprojects/frontend/src/xtext/ContentAssistService.ts b/subprojects/frontend/src/xtext/ContentAssistService.ts
index fd30c4f9..ac8ab36a 100644
--- a/subprojects/frontend/src/xtext/ContentAssistService.ts
+++ b/subprojects/frontend/src/xtext/ContentAssistService.ts
@@ -248,10 +248,20 @@ export default class ContentAssistService {
     if (lastTo === undefined) {
       return true;
     }
-    const [transformedFrom, transformedTo] = this.mapRangeInclusive(
-      lastFrom,
-      lastTo,
-    );
+    let transformedFrom: number;
+    let transformedTo: number;
+    try {
+      [transformedFrom, transformedTo] = this.mapRangeInclusive(
+        lastFrom,
+        lastTo,
+      );
+    } catch (error) {
+      if (error instanceof RangeError) {
+        log.debug('Invalidating cache due to invalid range', error);
+        return true;
+      }
+      throw error;
+    }
     let invalidate = false;
     transaction.changes.iterChangedRanges((fromA, toA) => {
       if (fromA < transformedFrom || toA > transformedTo) {
diff --git a/subprojects/frontend/src/xtext/SemanticsService.ts b/subprojects/frontend/src/xtext/SemanticsService.ts
new file mode 100644
index 00000000..d68b87a9
--- /dev/null
+++ b/subprojects/frontend/src/xtext/SemanticsService.ts
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import type EditorStore from '../editor/EditorStore';
+
+import type ValidationService from './ValidationService';
+import { SemanticsResult } from './xtextServiceResults';
+
+export default class SemanticsService {
+  constructor(
+    private readonly store: EditorStore,
+    private readonly validationService: ValidationService,
+  ) {}
+
+  onPush(push: unknown): void {
+    const result = SemanticsResult.parse(push);
+    if ('issues' in result) {
+      this.validationService.setSemanticsIssues(result.issues);
+    } else {
+      this.validationService.setSemanticsIssues([]);
+      if ('error' in result) {
+        this.store.setSemanticsError(result.error);
+      } else {
+        this.store.setSemantics(result);
+      }
+    }
+    this.store.analysisCompleted();
+  }
+}
diff --git a/subprojects/frontend/src/xtext/UpdateService.ts b/subprojects/frontend/src/xtext/UpdateService.ts
index ee5ebde2..1ac722e1 100644
--- a/subprojects/frontend/src/xtext/UpdateService.ts
+++ b/subprojects/frontend/src/xtext/UpdateService.ts
@@ -133,6 +133,7 @@ export default class UpdateService {
       return;
     }
     log.trace('Editor delta', delta);
+    this.store.analysisStarted();
     const result = await this.webSocketClient.send({
       resource: this.resourceName,
       serviceType: 'update',
@@ -157,6 +158,7 @@ export default class UpdateService {
   private async updateFullTextExclusive(): Promise<void> {
     log.debug('Performing full text update');
     this.tracker.prepareFullTextUpdateExclusive();
+    this.store.analysisStarted();
     const result = await this.webSocketClient.send({
       resource: this.resourceName,
       serviceType: 'update',
diff --git a/subprojects/frontend/src/xtext/ValidationService.ts b/subprojects/frontend/src/xtext/ValidationService.ts
index 64fb63eb..1a896db3 100644
--- a/subprojects/frontend/src/xtext/ValidationService.ts
+++ b/subprojects/frontend/src/xtext/ValidationService.ts
@@ -9,7 +9,7 @@ import type { Diagnostic } from '@codemirror/lint';
 import type EditorStore from '../editor/EditorStore';
 
 import type UpdateService from './UpdateService';
-import { ValidationResult } from './xtextServiceResults';
+import { Issue, ValidationResult } from './xtextServiceResults';
 
 export default class ValidationService {
   constructor(
@@ -17,11 +17,41 @@ export default class ValidationService {
     private readonly updateService: UpdateService,
   ) {}
 
+  private lastValidationIssues: Issue[] = [];
+
+  private lastSemanticsIssues: Issue[] = [];
+
   onPush(push: unknown): void {
-    const { issues } = ValidationResult.parse(push);
+    ({ issues: this.lastValidationIssues } = ValidationResult.parse(push));
+    this.lastSemanticsIssues = [];
+    this.updateDiagnostics();
+    if (
+      this.lastValidationIssues.some(({ severity }) => severity === 'error')
+    ) {
+      this.store.analysisCompleted(true);
+    }
+  }
+
+  onDisconnect(): void {
+    this.store.updateDiagnostics([]);
+    this.lastValidationIssues = [];
+    this.lastSemanticsIssues = [];
+  }
+
+  setSemanticsIssues(issues: Issue[]): void {
+    this.lastSemanticsIssues = issues;
+    this.updateDiagnostics();
+  }
+
+  private updateDiagnostics(): void {
     const allChanges = this.updateService.computeChangesSinceLastUpdate();
     const diagnostics: Diagnostic[] = [];
-    issues.forEach(({ offset, length, severity, description }) => {
+    function createDiagnostic({
+      offset,
+      length,
+      severity,
+      description,
+    }: Issue): void {
       if (severity === 'ignore') {
         return;
       }
@@ -31,11 +61,9 @@ export default class ValidationService {
         severity,
         message: description,
       });
-    });
+    }
+    this.lastValidationIssues.forEach(createDiagnostic);
+    this.lastSemanticsIssues.forEach(createDiagnostic);
     this.store.updateDiagnostics(diagnostics);
   }
-
-  onDisconnect(): void {
-    this.store.updateDiagnostics([]);
-  }
 }
diff --git a/subprojects/frontend/src/xtext/XtextClient.ts b/subprojects/frontend/src/xtext/XtextClient.ts
index e8181af0..87778084 100644
--- a/subprojects/frontend/src/xtext/XtextClient.ts
+++ b/subprojects/frontend/src/xtext/XtextClient.ts
@@ -17,6 +17,7 @@ import getLogger from '../utils/getLogger';
 import ContentAssistService from './ContentAssistService';
 import HighlightingService from './HighlightingService';
 import OccurrencesService from './OccurrencesService';
+import SemanticsService from './SemanticsService';
 import UpdateService from './UpdateService';
 import ValidationService from './ValidationService';
 import XtextWebSocketClient from './XtextWebSocketClient';
@@ -37,7 +38,12 @@ export default class XtextClient {
 
   private readonly occurrencesService: OccurrencesService;
 
-  constructor(store: EditorStore, private readonly pwaStore: PWAStore) {
+  private readonly semanticsService: SemanticsService;
+
+  constructor(
+    private readonly store: EditorStore,
+    private readonly pwaStore: PWAStore,
+  ) {
     this.webSocketClient = new XtextWebSocketClient(
       () => this.onReconnect(),
       () => this.onDisconnect(),
@@ -51,6 +57,7 @@ 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);
   }
 
   start(): void {
@@ -64,6 +71,7 @@ export default class XtextClient {
   }
 
   private onDisconnect(): void {
+    this.store.analysisCompleted(true);
     this.highlightingService.onDisconnect();
     this.validationService.onDisconnect();
     this.occurrencesService.onDisconnect();
@@ -111,6 +119,9 @@ export default class XtextClient {
       case 'validate':
         this.validationService.onPush(push);
         return;
+      case 'semantics':
+        this.semanticsService.onPush(push);
+        return;
       default:
         throw new Error('Unknown service');
     }
diff --git a/subprojects/frontend/src/xtext/XtextWebSocketClient.ts b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
index 6bb7eec8..963c1d4c 100644
--- a/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
+++ b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
@@ -282,7 +282,10 @@ export default class XtextWebSocketClient {
     log.debug('Creating WebSocket');
 
     (async () => {
-      const { webSocketURL } = await fetchBackendConfig();
+      let { webSocketURL } = await fetchBackendConfig();
+      if (webSocketURL === undefined) {
+        webSocketURL = `${window.origin.replace(/^http/, 'ws')}/xtext-service`;
+      }
       this.openWebSocketWithURL(webSocketURL);
     })().catch((error) => {
       log.error('Error while initializing connection', error);
diff --git a/subprojects/frontend/src/xtext/xtextMessages.ts b/subprojects/frontend/src/xtext/xtextMessages.ts
index bbbff064..971720e1 100644
--- a/subprojects/frontend/src/xtext/xtextMessages.ts
+++ b/subprojects/frontend/src/xtext/xtextMessages.ts
@@ -34,7 +34,11 @@ export const XtextWebErrorResponse = z.object({
 
 export type XtextWebErrorResponse = z.infer<typeof XtextWebErrorResponse>;
 
-export const XtextWebPushService = z.enum(['highlight', 'validate']);
+export const XtextWebPushService = z.enum([
+  'highlight',
+  'validate',
+  'semantics',
+]);
 
 export type XtextWebPushService = z.infer<typeof XtextWebPushService>;
 
diff --git a/subprojects/frontend/src/xtext/xtextServiceResults.ts b/subprojects/frontend/src/xtext/xtextServiceResults.ts
index d3b467ad..caf2cf0b 100644
--- a/subprojects/frontend/src/xtext/xtextServiceResults.ts
+++ b/subprojects/frontend/src/xtext/xtextServiceResults.ts
@@ -125,3 +125,49 @@ export const FormattingResult = DocumentStateResult.extend({
 });
 
 export type FormattingResult = z.infer<typeof FormattingResult>;
+
+export const NodeMetadata = z.object({
+  name: z.string(),
+  simpleName: z.string(),
+  kind: z.enum(['IMPLICIT', 'INDIVIDUAL', 'NEW']),
+});
+
+export type NodeMetadata = z.infer<typeof NodeMetadata>;
+
+export const RelationMetadata = z.object({
+  name: z.string(),
+  simpleName: z.string(),
+  arity: z.number().nonnegative(),
+  detail: z.union([
+    z.object({ type: z.literal('class'), abstractClass: z.boolean() }),
+    z.object({ type: z.literal('reference'), containment: z.boolean() }),
+    z.object({
+      type: z.literal('opposite'),
+      container: z.boolean(),
+      opposite: z.string(),
+    }),
+    z.object({ type: z.literal('predicate'), error: z.boolean() }),
+    z.object({ type: z.literal('builtin') }),
+  ]),
+});
+
+export type RelationMetadata = z.infer<typeof RelationMetadata>;
+
+export const SemanticsSuccessResult = z.object({
+  nodes: NodeMetadata.array(),
+  relations: RelationMetadata.array(),
+  partialInterpretation: z.record(
+    z.string(),
+    z.union([z.number(), z.string()]).array().array(),
+  ),
+});
+
+export type SemanticsSuccessResult = z.infer<typeof SemanticsSuccessResult>;
+
+export const SemanticsResult = z.union([
+  z.object({ error: z.string() }),
+  z.object({ issues: Issue.array() }),
+  SemanticsSuccessResult,
+]);
+
+export type SemanticsResult = z.infer<typeof SemanticsResult>;