[gh-1330] Potential fix for legacy execution flow format

Author: ashmind

source/WebApp/app/shared/resultTypes.ts

@@ -92,6 +92,8 @@ export type FlowStep = {
     readonly jump?: true;
 };
 
+export type LegacyFlowStep = number | FlowStep;
+
 export type FlowAreaType = 'method' | 'loop' | `unknown: ${string}`;
 
 export type FlowArea = {
@@ -134,7 +136,7 @@ export interface AstResult extends ResultBase {
 
 export type RunResultLegacyValue = {
     readonly output: ReadonlyArray<OutputItem>;
-    readonly flow: ReadonlyArray<FlowStep>;
+    readonly flow: ReadonlyArray<LegacyFlowStep>;
 };
 
 export interface RunResult extends ResultBase {
@@ -161,11 +163,12 @@ export interface ErrorResult extends ResultBase {
 export type NonErrorResult = CodeResult|AstResult|ExplainResult|VerifyResult|RunResult;
 export type Result = NonErrorResult|ErrorResult;
 
+export type ParsedRunResultValue = {
+    readonly output: ReadonlyArray<OutputItem>;
+    readonly flow: Flow | null;
+};
 export type ParsedRunResult = Omit<RunResult, 'value'> & {
-    readonly value: {
-        readonly output: ReadonlyArray<OutputItem>;
-        readonly flow: Flow | null;
-    } | null;
+    readonly value: ParsedRunResultValue | null;
 };
 export type ParsedNonErrorResult = Exclude<Result, RunResult|ErrorResult>|ParsedRunResult;
 export type ParsedResult = ParsedNonErrorResult|ErrorResult;

source/WebApp/app/shared/state/results/convertFromUpdateResult.ts

@@ -1,5 +1,5 @@
 import type { MaybeCached } from '../../../features/result-cache/types';
-import type { UpdateResult, DiagnosticError, DiagnosticWarning, ParsedNonErrorResult, AstItem, Explanation, RunResultLegacyValue, Flow } from '../../resultTypes';
+import type { UpdateResult, DiagnosticError, DiagnosticWarning, ParsedNonErrorResult, AstItem, Explanation, RunResultLegacyValue, ParsedRunResultValue } from '../../resultTypes';
 import { type TargetName, TARGET_AST, TARGET_EXPLAIN, TARGET_VERIFY, TARGET_RUN, TARGET_IL } from '../../targets';
 import { extractRangesFromIL } from './extractRangesFromIL';
 import { parseOutput } from './parseOutput';
@@ -19,14 +19,19 @@ const collectErrorsAndWarnings = (target: TargetName, diagnostics: UpdateResult[
     return { success, errors, warnings } as const;
 };
 
-const convertFromLegacyRunValue = (value: RunResultLegacyValue | null) => {
+const convertFromLegacyRunValue = (value: RunResultLegacyValue | null): ParsedRunResultValue | null => {
     if (!value)
         return null;
 
-    const { output, flow: steps } = value;
+    const { output, flow } = value;
+    const steps = flow.map(
+        s => typeof s === 'number'
+            ? { type: 'step', line: s }
+            : s
+    );
     return {
         output,
-        flow: { steps, areas: [] } as Flow
+        flow: { steps, areas: [] }
     };
 };
 

source/WebApp/app/shared/state/results/parseOutput.ts

@@ -1,9 +1,9 @@
 import { tryParseOutputJsonAsFlow } from '../../../features/execution-flow/tryParseOutputJsonAsFlow';
-import type { Flow, OutputItem } from '../../resultTypes';
+import type { Flow, OutputItem, ParsedRunResultValue } from '../../resultTypes';
 
 type OutputJsonLineData = Exclude<OutputItem, string> | object;
 
-export const parseOutput = (outputString: string) => {
+export const parseOutput = (outputString: string): ParsedRunResultValue => {
     const output = [] as Array<OutputItem>;
     let flow: Flow | null = null;
 
@@ -22,20 +22,16 @@ export const parseOutput = (outputString: string) => {
             const json = match[1];
             const candidate = JSON.parse(json) as OutputJsonLineData;
             if ('type' in candidate && candidate.type.startsWith('inspection:')) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                commitFragmentUpTo(match.index!);
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                lastIndex += match[0]!.length;
+                commitFragmentUpTo(match.index);
+                lastIndex += match[0].length;
                 output.push(candidate);
                 continue;
             }
 
             const flowCandidate = tryParseOutputJsonAsFlow(candidate);
             if (flowCandidate) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                commitFragmentUpTo(match.index!);
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                lastIndex += match[0]!.length;
+                commitFragmentUpTo(match.index);
+                lastIndex += match[0].length;
                 flow = flowCandidate;
                 continue;
             }