Rewrite miri reducer with RTK

Author: shepmaster

ui/frontend/.eslintrc.js

@@ -82,6 +82,7 @@ module.exports = {
         'reducers/output/llvmIr.ts',
         'reducers/output/meta.ts',
         'reducers/output/mir.ts',
+        'reducers/output/miri.ts',
         'reducers/output/wasm.ts',
         'reducers/versions.ts',
         'reducers/websocket.ts',

ui/frontend/.prettierignore

@@ -33,6 +33,7 @@ node_modules
 !reducers/output/llvmIr.ts
 !reducers/output/meta.ts
 !reducers/output/mir.ts
+!reducers/output/miri.ts
 !reducers/output/wasm.ts
 !reducers/versions.ts
 !reducers/websocket.ts

ui/frontend/ToolsMenu.tsx

@@ -10,6 +10,7 @@ import * as actions from './actions';
 import { useAppDispatch } from './configureStore';
 import { performFormat } from './reducers/output/format';
 import { performClippy } from './reducers/output/clippy';
+import { performMiri } from './reducers/output/miri';
 
 interface ToolsMenuProps {
   close: () => void;
@@ -31,7 +32,7 @@ const ToolsMenu: React.FC<ToolsMenuProps> = props => {
     props.close();
   }, [dispatch, props]);
   const miri = useCallback(() => {
-    dispatch(actions.performMiri());
+    dispatch(performMiri());
     props.close();
   }, [dispatch, props]);
   const format = useCallback(() => {

ui/frontend/actions.ts

@@ -83,9 +83,6 @@ export enum ActionType {
   EnableFeatureGate = 'ENABLE_FEATURE_GATE',
   GotoPosition = 'GOTO_POSITION',
   SelectText = 'SELECT_TEXT',
-  RequestMiri = 'REQUEST_MIRI',
-  MiriSucceeded = 'MIRI_SUCCEEDED',
-  MiriFailed = 'MIRI_FAILED',
   RequestMacroExpansion = 'REQUEST_MACRO_EXPANSION',
   MacroExpansionSucceeded = 'MACRO_EXPANSION_SUCCEEDED',
   MacroExpansionFailed = 'MACRO_EXPANSION_FAILED',
@@ -342,46 +339,6 @@ interface GeneralSuccess {
   stderr: string;
 }
 
-const requestMiri = () =>
-  createAction(ActionType.RequestMiri);
-
-interface MiriRequestBody {
-  code: string;
-  edition: string;
-}
-
-interface MiriResponseBody {
-  success: boolean;
-  stdout: string;
-  stderr: string;
-}
-
-type MiriSuccess = GeneralSuccess;
-
-const receiveMiriSuccess = ({ stdout, stderr }: MiriSuccess) =>
-  createAction(ActionType.MiriSucceeded, { stdout, stderr });
-
-const receiveMiriFailure = ({ error }: GenericApiFailure) =>
-  createAction(ActionType.MiriFailed, { error });
-
-export function performMiri(): ThunkAction {
-  // TODO: Check a cache
-  return function(dispatch, getState) {
-    dispatch(requestMiri());
-
-    const state = getState();
-    const code = codeSelector(state);
-    const { configuration: {
-      edition,
-    } } = state;
-    const body: MiriRequestBody = { code, edition };
-
-    return jsonPost<MiriResponseBody>(routes.miri, body)
-      .then(json => dispatch(receiveMiriSuccess(json)))
-      .catch(json => dispatch(receiveMiriFailure(json)));
-  };
-}
-
 const requestMacroExpansion = () =>
   createAction(ActionType.RequestMacroExpansion);
 
@@ -557,9 +514,6 @@ export type Action =
   | ReturnType<typeof enableFeatureGate>
   | ReturnType<typeof gotoPosition>
   | ReturnType<typeof selectText>
-  | ReturnType<typeof requestMiri>
-  | ReturnType<typeof receiveMiriSuccess>
-  | ReturnType<typeof receiveMiriFailure>
   | ReturnType<typeof requestMacroExpansion>
   | ReturnType<typeof receiveMacroExpansionSuccess>
   | ReturnType<typeof receiveMacroExpansionFailure>

ui/frontend/reducers/output/meta.ts

@@ -11,6 +11,7 @@ import { performGistLoad, performGistSave } from './gist';
 import { performCompileHir } from './hir';
 import { performCompileLlvmIr } from './llvmIr';
 import { performCompileMir } from './mir';
+import { performMiri } from './miri';
 import { performCompileWasm } from './wasm';
 
 const initialState: State = {};
@@ -40,7 +41,7 @@ const slice = createSlice({
         state.focus = Focus.Clippy;
       })
 
-      .addCase(ActionType.RequestMiri, (state) => {
+      .addCase(performMiri.pending, (state) => {
         state.focus = Focus.Miri;
       })
 

ui/frontend/reducers/output/miri.ts

@@ -1,7 +1,13 @@
-import { Action, ActionType } from '../../actions';
-import { finish, start } from './sharedStateManagement';
+import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import * as z from 'zod';
 
-const DEFAULT: State = {
+import { adaptFetchError, jsonPost, routes } from '../../actions';
+import { miriRequestSelector } from '../../selectors';
+import RootState from '../../state';
+
+const sliceName = 'output/miri';
+
+const initialState: State = {
   requestsInProgress: 0,
 };
 
@@ -12,17 +18,46 @@ interface State {
   error?: string;
 }
 
-export default function miri(state = DEFAULT, action: Action) {
-  switch (action.type) {
-    case ActionType.RequestMiri:
-      return start(DEFAULT, state);
-    case ActionType.MiriSucceeded: {
-      const { stdout = '', stderr = '' } = action;
-      return finish(state, { stdout, stderr });
-    }
-    case ActionType.MiriFailed:
-      return finish(state, { error: action.error });
-    default:
-      return state;
-  }
+interface MiriRequestBody {
+  code: string;
+  edition: string;
 }
+
+const MiriResponseBody = z.object({
+  success: z.boolean(),
+  stdout: z.string(),
+  stderr: z.string(),
+});
+
+type MiriResponseBody = z.infer<typeof MiriResponseBody>;
+
+export const performMiri = createAsyncThunk<MiriResponseBody, void, { state: RootState }>(
+  sliceName,
+  async (_arg: void, { getState }) => {
+    const body: MiriRequestBody = miriRequestSelector(getState());
+
+    const d = await adaptFetchError(() => jsonPost(routes.miri, body));
+    return MiriResponseBody.parseAsync(d);
+  },
+);
+
+const slice = createSlice({
+  name: sliceName,
+  initialState,
+  reducers: {},
+  extraReducers: (builder) => {
+    builder
+      .addCase(performMiri.pending, (state) => {
+        state.requestsInProgress += 1;
+      })
+      .addCase(performMiri.fulfilled, (state, action) => {
+        state.requestsInProgress -= 1;
+        Object.assign(state, action.payload);
+      })
+      .addCase(performMiri.rejected, (state) => {
+        state.requestsInProgress -= 1;
+      });
+  },
+});
+
+export default slice.reducer;

ui/frontend/selectors/index.ts

@@ -333,6 +333,12 @@ export const formatRequestSelector = createSelector(
   (channel, edition, code) => ({ channel, edition, code }),
 );
 
+export const miriRequestSelector = createSelector(
+  editionSelector,
+  codeSelector,
+  (edition, code) => ({ edition, code }),
+);
+
 const focus = (state: State) => state.output.meta.focus;
 export const isOutputFocused = createSelector(
   focus,