Rewrite macroExpansion reducer with RTK

Author: shepmaster

ui/frontend/.eslintrc.js

@@ -81,6 +81,7 @@ module.exports = {
         'reducers/output/gist.ts',
         'reducers/output/hir.ts',
         'reducers/output/llvmIr.ts',
+        'reducers/output/macroExpansion.ts',
         'reducers/output/meta.ts',
         'reducers/output/mir.ts',
         'reducers/output/miri.ts',

ui/frontend/.prettierignore

@@ -32,6 +32,7 @@ node_modules
 !reducers/output/gist.ts
 !reducers/output/hir.ts
 !reducers/output/llvmIr.ts
+!reducers/output/macroExpansion.ts
 !reducers/output/meta.ts
 !reducers/output/mir.ts
 !reducers/output/miri.ts

ui/frontend/ToolsMenu.tsx

@@ -6,11 +6,11 @@ import MenuGroup from './MenuGroup';
 import MenuAside from './MenuAside';
 
 import * as selectors from './selectors';
-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';
+import { performMacroExpansion } from './reducers/output/macroExpansion';
 
 interface ToolsMenuProps {
   close: () => void;
@@ -40,7 +40,7 @@ const ToolsMenu: React.FC<ToolsMenuProps> = props => {
     props.close();
   }, [dispatch, props]);
   const expandMacros = useCallback(() => {
-    dispatch(actions.performMacroExpansion());
+    dispatch(performMacroExpansion());
     props.close();
   }, [dispatch, props]);
 

ui/frontend/actions.ts

@@ -2,7 +2,6 @@ import fetch from 'isomorphic-fetch';
 import { ThunkAction as ReduxThunkAction, AnyAction } from '@reduxjs/toolkit';
 
 import {
-  codeSelector,
   getCrateType,
   runAsTest,
   wasmLikelyToWork,
@@ -82,9 +81,6 @@ export enum ActionType {
   EnableFeatureGate = 'ENABLE_FEATURE_GATE',
   GotoPosition = 'GOTO_POSITION',
   SelectText = 'SELECT_TEXT',
-  RequestMacroExpansion = 'REQUEST_MACRO_EXPANSION',
-  MacroExpansionSucceeded = 'MACRO_EXPANSION_SUCCEEDED',
-  MacroExpansionFailed = 'MACRO_EXPANSION_FAILED',
   NotificationSeen = 'NOTIFICATION_SEEN',
   BrowserWidthChanged = 'BROWSER_WIDTH_CHANGED',
 }
@@ -252,10 +248,6 @@ const performTestOnly = (): ThunkAction => (dispatch, getState) => {
   return dispatch(performCommonExecute(crateType, true));
 };
 
-interface GenericApiFailure {
-  error: string;
-}
-
 const performCompileToNightlyHirOnly = (): ThunkAction => dispatch => {
   dispatch(changeChannel(Channel.Nightly));
   dispatch(performCompileToHirOnly());
@@ -331,51 +323,6 @@ export const gotoPosition = (line: string | number, column: string | number) =>
 export const selectText = (start: Position, end: Position) =>
   createAction(ActionType.SelectText, { start, end });
 
-interface GeneralSuccess {
-  stdout: string;
-  stderr: string;
-}
-
-const requestMacroExpansion = () =>
-  createAction(ActionType.RequestMacroExpansion);
-
-interface MacroExpansionRequestBody {
-  code: string;
-  edition: string;
-}
-
-interface MacroExpansionResponseBody {
-  success: boolean;
-  stdout: string;
-  stderr: string;
-}
-
-type MacroExpansionSuccess = GeneralSuccess;
-
-const receiveMacroExpansionSuccess = ({ stdout, stderr }: MacroExpansionSuccess) =>
-  createAction(ActionType.MacroExpansionSucceeded, { stdout, stderr });
-
-const receiveMacroExpansionFailure = ({ error }: GenericApiFailure) =>
-  createAction(ActionType.MacroExpansionFailed, { error });
-
-export function performMacroExpansion(): ThunkAction {
-  // TODO: Check a cache
-  return function(dispatch, getState) {
-    dispatch(requestMacroExpansion());
-
-    const state = getState();
-    const code = codeSelector(state);
-    const { configuration: {
-      edition,
-    } } = state;
-    const body: MacroExpansionRequestBody = { code, edition };
-
-    return jsonPost<MacroExpansionResponseBody>(routes.macroExpansion, body)
-      .then(json => dispatch(receiveMacroExpansionSuccess(json)))
-      .catch(json => dispatch(receiveMacroExpansionFailure(json)));
-  };
-}
-
 const notificationSeen = (notification: Notification) =>
   createAction(ActionType.NotificationSeen, { notification });
 
@@ -495,9 +442,6 @@ export type Action =
   | ReturnType<typeof enableFeatureGate>
   | ReturnType<typeof gotoPosition>
   | ReturnType<typeof selectText>
-  | ReturnType<typeof requestMacroExpansion>
-  | ReturnType<typeof receiveMacroExpansionSuccess>
-  | ReturnType<typeof receiveMacroExpansionFailure>
   | ReturnType<typeof notificationSeen>
   | ReturnType<typeof browserWidthChanged>
   | ReturnType<typeof wsExecuteRequest>

ui/frontend/reducers/output/macroExpansion.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 { macroExpansionRequestSelector } from '../../selectors';
+import RootState from '../../state';
+
+const sliceName = 'output/macroExpansion';
+
+const initialState: State = {
   requestsInProgress: 0,
 };
 
@@ -12,17 +18,47 @@ interface State {
   error?: string;
 }
 
-export default function macroExpansion(state = DEFAULT, action: Action) {
-  switch (action.type) {
-    case ActionType.RequestMacroExpansion:
-      return start(DEFAULT, state);
-    case ActionType.MacroExpansionSucceeded: {
-      const { stdout = '', stderr = '' } = action;
-      return finish(state, { stdout, stderr });
-    }
-    case ActionType.MacroExpansionFailed:
-      return finish(state, { error: action.error });
-    default:
-      return state;
-  }
+interface MacroExpansionRequestBody {
+  code: string;
+  edition: string;
 }
+
+const MacroExpansionResponseBody = z.object({
+  success: z.boolean(),
+  stdout: z.string(),
+  stderr: z.string(),
+});
+
+type MacroExpansionResponseBody = z.infer<typeof MacroExpansionResponseBody>;
+
+export const performMacroExpansion = createAsyncThunk<
+  MacroExpansionResponseBody,
+  void,
+  { state: RootState }
+>(sliceName, async (_arg: void, { getState }) => {
+  const body: MacroExpansionRequestBody = macroExpansionRequestSelector(getState());
+
+  const d = await adaptFetchError(() => jsonPost(routes.macroExpansion, body));
+  return MacroExpansionResponseBody.parseAsync(d);
+});
+
+const slice = createSlice({
+  name: sliceName,
+  initialState,
+  reducers: {},
+  extraReducers: (builder) => {
+    builder
+      .addCase(performMacroExpansion.pending, (state) => {
+        state.requestsInProgress += 1;
+      })
+      .addCase(performMacroExpansion.fulfilled, (state, action) => {
+        state.requestsInProgress -= 1;
+        Object.assign(state, action.payload);
+      })
+      .addCase(performMacroExpansion.rejected, (state) => {
+        state.requestsInProgress -= 1;
+      });
+  },
+});
+
+export default slice.reducer;

ui/frontend/reducers/output/meta.ts

@@ -1,7 +1,6 @@
 import { PayloadAction, createSlice } from '@reduxjs/toolkit';
 import { Draft } from 'immer';
 
-import { ActionType } from '../../actions';
 import { Focus } from '../../types';
 import { performCompileAssembly } from './assembly';
 import { performClippy } from './clippy';
@@ -10,6 +9,7 @@ import { performFormat } from './format';
 import { performGistLoad, performGistSave } from './gist';
 import { performCompileHir } from './hir';
 import { performCompileLlvmIr } from './llvmIr';
+import { performMacroExpansion } from './macroExpansion';
 import { performCompileMir } from './mir';
 import { performMiri } from './miri';
 import { performCompileWasm } from './wasm';
@@ -45,7 +45,7 @@ const slice = createSlice({
         state.focus = Focus.Miri;
       })
 
-      .addCase(ActionType.RequestMacroExpansion, (state) => {
+      .addCase(performMacroExpansion.pending, (state) => {
         state.focus = Focus.MacroExpansion;
       })
 

ui/frontend/selectors/index.ts

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