refactor: show semantics even if propagation fails

5 files changed, 32 insertions, 26 deletions

diff --git a/subprojects/frontend/src/editor/EditorStore.ts b/subprojects/frontend/src/editor/EditorStore.ts
index d0b580ed..c5dd5728 100644
--- a/subprojects/frontend/src/editor/EditorStore.ts
+++ b/subprojects/frontend/src/editor/EditorStore.ts
@@ -36,7 +36,7 @@ import {
 } from '../utils/fileIO';
 import getLogger from '../utils/getLogger';
 import type XtextClient from '../xtext/XtextClient';
-import type { SemanticsSuccessResult } from '../xtext/xtextServiceResults';
+import type { SemanticsModelResult } from '../xtext/xtextServiceResults';
 
 import EditorErrors from './EditorErrors';
 import GeneratedModelStore from './GeneratedModelStore';
@@ -365,12 +365,11 @@ export default class EditorStore {
     }
   }
 
-  setSemanticsError(semanticsError: string) {
+  setSemanticsError(semanticsError: string | undefined) {
     this.semanticsError = semanticsError;
   }
 
-  setSemantics(semantics: SemanticsSuccessResult) {
-    this.semanticsError = undefined;
+  setSemantics(semantics: SemanticsModelResult) {
     this.graph.setSemantics(semantics);
   }
 
@@ -447,7 +446,7 @@ export default class EditorStore {
 
   setGeneratedModelSemantics(
     uuid: string,
-    semantics: SemanticsSuccessResult,
+    semantics: SemanticsModelResult,
   ): void {
     this.generatedModels.get(uuid)?.setSemantics(semantics);
   }
diff --git a/subprojects/frontend/src/editor/GeneratedModelStore.ts b/subprojects/frontend/src/editor/GeneratedModelStore.ts
index 4af49e2c..fb9efbcf 100644
--- a/subprojects/frontend/src/editor/GeneratedModelStore.ts
+++ b/subprojects/frontend/src/editor/GeneratedModelStore.ts
@@ -7,7 +7,7 @@
 import { makeAutoObservable } from 'mobx';
 
 import GraphStore from '../graph/GraphStore';
-import type { SemanticsSuccessResult } from '../xtext/xtextServiceResults';
+import type { SemanticsModelResult } from '../xtext/xtextServiceResults';
 
 import type EditorStore from './EditorStore';
 
@@ -48,7 +48,7 @@ export default class GeneratedModelStore {
     }
   }
 
-  setSemantics(semantics: SemanticsSuccessResult): void {
+  setSemantics(semantics: SemanticsModelResult): void {
     if (this.running) {
       const name = `${this.editorStore.simpleNameOrFallback}_solution_${this.randomSeed}`;
       this.graph = new GraphStore(this.editorStore, name);
diff --git a/subprojects/frontend/src/graph/GraphStore.ts b/subprojects/frontend/src/graph/GraphStore.ts
index 301b4d86..86ffd802 100644
--- a/subprojects/frontend/src/graph/GraphStore.ts
+++ b/subprojects/frontend/src/graph/GraphStore.ts
@@ -9,7 +9,7 @@ import { makeAutoObservable, observable } from 'mobx';
 import type EditorStore from '../editor/EditorStore';
 import type {
   RelationMetadata,
-  SemanticsSuccessResult,
+  SemanticsModelResult,
 } from '../xtext/xtextServiceResults';
 
 export type Visibility = 'all' | 'must' | 'none';
@@ -52,7 +52,7 @@ export function isVisibilityAllowed(
 const TYPE_HASH_HEX_PREFFIX = '_';
 
 export default class GraphStore {
-  semantics: SemanticsSuccessResult = {
+  semantics: SemanticsModelResult = {
     nodes: [],
     relations: [],
     partialInterpretation: {},
@@ -175,7 +175,7 @@ export default class GraphStore {
     }
   }
 
-  setSemantics(semantics: SemanticsSuccessResult) {
+  setSemantics(semantics: SemanticsModelResult) {
     this.semantics = semantics;
     this.relationMetadata.clear();
     this.semantics.relations.forEach((metadata) => {
diff --git a/subprojects/frontend/src/xtext/SemanticsService.ts b/subprojects/frontend/src/xtext/SemanticsService.ts
index d68b87a9..b6692f2b 100644
--- a/subprojects/frontend/src/xtext/SemanticsService.ts
+++ b/subprojects/frontend/src/xtext/SemanticsService.ts
@@ -1,9 +1,11 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
 
+import { runInAction } from 'mobx';
+
 import type EditorStore from '../editor/EditorStore';
 
 import type ValidationService from './ValidationService';
@@ -17,16 +19,21 @@ export default class SemanticsService {
 
   onPush(push: unknown): void {
     const result = SemanticsResult.parse(push);
-    if ('issues' in result) {
-      this.validationService.setSemanticsIssues(result.issues);
-    } else {
-      this.validationService.setSemanticsIssues([]);
+    runInAction(() => {
+      if ('issues' in result && result.issues !== undefined) {
+        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.setSemanticsError(undefined);
+      }
+      if ('model' in result && result.model !== undefined) {
+        this.store.setSemantics(result.model);
       }
-    }
-    this.store.analysisCompleted();
+      this.store.analysisCompleted();
+    });
   }
 }
diff --git a/subprojects/frontend/src/xtext/xtextServiceResults.ts b/subprojects/frontend/src/xtext/xtextServiceResults.ts
index 792c7de3..c5bc1320 100644
--- a/subprojects/frontend/src/xtext/xtextServiceResults.ts
+++ b/subprojects/frontend/src/xtext/xtextServiceResults.ts
@@ -162,7 +162,7 @@ export const RelationMetadata = z.object({
 
 export type RelationMetadata = z.infer<typeof RelationMetadata>;
 
-export const SemanticsSuccessResult = z.object({
+export const SemanticsModelResult = z.object({
   nodes: NodeMetadata.array(),
   relations: RelationMetadata.array(),
   partialInterpretation: z.record(
@@ -171,13 +171,13 @@ export const SemanticsSuccessResult = z.object({
   ),
 });
 
-export type SemanticsSuccessResult = z.infer<typeof SemanticsSuccessResult>;
+export type SemanticsModelResult = z.infer<typeof SemanticsModelResult>;
 
-export const SemanticsResult = z.union([
-  z.object({ error: z.string() }),
-  z.object({ issues: Issue.array() }),
-  SemanticsSuccessResult,
-]);
+export const SemanticsResult = z.object({
+  model: SemanticsModelResult.optional(),
+  error: z.string().min(1).optional(),
+  issues: Issue.array().optional(),
+});
 
 export type SemanticsResult = z.infer<typeof SemanticsResult>;
 
@@ -190,7 +190,7 @@ export const ModelGenerationResult = z.union([
     uuid: z.string().min(1),
     error: z.string(),
   }),
-  SemanticsSuccessResult.extend({
+  SemanticsModelResult.extend({
     uuid: z.string().min(1),
   }),
 ]);