Make getMappedExpression a real action and fix double-binding action creators (#5809)

Author: loganfsmyth

src/actions/expressions.js

@@ -114,7 +114,7 @@ function evaluateExpression(expression: Expression) {
     const frame = getSelectedFrame(getState());
 
     if (frame) {
-      const { location, generatedLocation } = frame;
+      const { location } = frame;
       const source = getSource(getState(), location.sourceId);
       const sourceId = source.get("id");
 
@@ -125,11 +125,7 @@ function evaluateExpression(expression: Expression) {
         !isGeneratedId(sourceId) &&
         !isGeneratedId(selectedSource.get("id"))
       ) {
-        input = await getMappedExpression(
-          { getState, sourceMaps },
-          generatedLocation,
-          input
-        );
+        input = await dispatch(getMappedExpression(input));
       }
     }
 
@@ -147,15 +143,16 @@ function evaluateExpression(expression: Expression) {
  * Gets information about original variable names from the source map
  * and replaces all posible generated names.
  */
-export async function getMappedExpression(
-  { getState, sourceMaps }: Object,
-  generatedLocation: Location,
-  expression: string
-): Promise<string> {
-  const mappings = getSelectedScopeMappings(getState());
-  if (!mappings) {
-    return expression;
-  }
-
-  return await parser.mapOriginalExpression(expression, mappings);
+export function getMappedExpression(expression: string) {
+  return async function({ dispatch, getState, client, sourceMaps }: ThunkArgs) {
+    const mappings = getSelectedScopeMappings(getState());
+    if (!mappings) {
+      return expression;
+    }
+
+    return await dispatch({
+      type: "MAP_EXPRESSION_RESULT",
+      [PROMISE]: parser.mapOriginalExpression(expression, mappings)
+    });
+  };
 }

src/actions/preview.js

@@ -173,16 +173,7 @@ export function setPreview(
 
         const sourceId = source.get("id");
         if (location && !isGeneratedId(sourceId)) {
-          const generatedLocation = await sourceMaps.getGeneratedLocation(
-            { ...location.start, sourceId },
-            source.toJS()
-          );
-
-          expression = await getMappedExpression(
-            { sourceMaps, getState },
-            generatedLocation,
-            expression
-          );
+          expression = await dispatch(getMappedExpression(expression));
         }
 
         const selectedFrame = getSelectedFrame(getState());

src/utils/dbg.js

@@ -1,4 +1,3 @@
-import { bindActionCreators } from "redux";
 import * as timings from "./timings";
 import { prefs, features } from "./prefs";
 import { isDevelopment } from "devtools-config";
@@ -52,11 +51,9 @@ function _formatPausePoints(dbg, url) {
 
 export function setupHelper(obj) {
   const selectors = bindSelectors(obj);
-  const actions = bindActionCreators(obj.actions, obj.store.dispatch);
   const dbg = {
     ...obj,
     selectors,
-    actions,
     prefs,
     features,
     timings,