Pass LongStringClient to reps/launchpad

Also, partially migrated from Object.assign to spread operator.

Author: 2007heaven

packages/devtools-launchpad/src/client/firefox-types.js

@@ -244,6 +244,7 @@ export type TabTarget = {
       func: Function,
       params?: { frameActor?: FrameId }
     ) => void,
+    longString: (Object) => Object,
   },
   form: { consoleActor: any },
   activeTab: {

packages/devtools-reps/src/launchpad/actions/expressions.js

@@ -53,6 +53,12 @@ function createObjectClient(grip) {
   };
 }
 
+function createLongStringClient(grip) {
+  return function ({dispatch, client}) {
+    return client.getLongStringClient(grip);
+  };
+}
+
 function releaseActor(actor) {
   return function ({dispatch, client}) {
     client.releaseActor(actor);
@@ -65,5 +71,6 @@ module.exports = {
   showResultPacket,
   hideResultPacket,
   createObjectClient,
+  createLongStringClient,
   releaseActor,
 };

packages/devtools-reps/src/launchpad/actions/index.js

@@ -5,7 +5,7 @@
 const expressions = require("./expressions");
 const input = require("./input");
 
-module.exports = Object.assign({},
-  expressions,
-  input,
-);
+module.exports = {
+  ...expressions,
+  ...input,
+};

packages/devtools-reps/src/launchpad/components/Console.js

@@ -31,6 +31,7 @@ class Console extends Component {
       navigateInputHistory: PropTypes.func.isRequired,
       showResultPacket: PropTypes.func.isRequired,
       createObjectClient: PropTypes.func.isRequired,
+      createLongStringClient: PropTypes.func.isRequired,
       releaseActor: PropTypes.func.isRequired,
     };
   }
@@ -55,6 +56,7 @@ class Console extends Component {
       navigateInputHistory,
       showResultPacket,
       createObjectClient,
+      createLongStringClient,
       releaseActor,
     } = this.props;
 
@@ -73,6 +75,7 @@ class Console extends Component {
         hideResultPacket,
         showResultPacket,
         createObjectClient,
+        createLongStringClient,
         releaseActor,
       })
     );

packages/devtools-reps/src/launchpad/components/Result.js

@@ -17,6 +17,7 @@ class Result extends Component {
       showResultPacket: PropTypes.func.isRequired,
       hideResultPacket: PropTypes.func.isRequired,
       createObjectClient: PropTypes.func.isRequired,
+      createLongStringClient: PropTypes.func.isRequired,
       releaseActor: PropTypes.func.isRequired,
     };
   }
@@ -59,6 +60,7 @@ class Result extends Component {
   renderRep({ object, modeKey }) {
     const {
       createObjectClient,
+      createLongStringClient,
       releaseActor,
     } = this.props;
     const path = object.actor;
@@ -78,6 +80,7 @@ class Result extends Component {
         }],
         autoExpandDepth: 0,
         createObjectClient,
+        createLongStringClient,
         releaseActor,
         mode: MODE[modeKey],
         onInspectIconClick: nodeFront => console.log("inspectIcon click", nodeFront),

packages/devtools-reps/src/launchpad/components/ResultsList.js

@@ -17,6 +17,7 @@ class ResultsList extends Component {
       showResultPacket: PropTypes.func.isRequired,
       hideResultPacket: PropTypes.func.isRequired,
       createObjectClient: PropTypes.func.isRequired,
+      createLongStringClient: PropTypes.func.isRequired,
       releaseActor: PropTypes.func.isRequired,
     };
   }
@@ -27,6 +28,7 @@ class ResultsList extends Component {
       showResultPacket,
       hideResultPacket,
       createObjectClient,
+      createLongStringClient,
       releaseActor,
     } = this.props;
 
@@ -41,6 +43,7 @@ class ResultsList extends Component {
           showResultPacket: () => showResultPacket(key),
           hideResultPacket: () => hideResultPacket(key),
           createObjectClient,
+          createLongStringClient,
           releaseActor,
         })
       )

packages/devtools-reps/src/launchpad/index.js

@@ -11,7 +11,6 @@ const ReactDOM = require("react-dom");
 
 const { bootstrap, renderRoot } = require("devtools-launchpad");
 
-const { isLongString } = require("../reps/string");
 const RepsConsole = require("./components/Console");
 const { configureStore } = require("./store");
 
@@ -33,21 +32,20 @@ function onConnect(connection) {
     },
 
     getObjectClient: function (grip) {
-      if (isLongString(grip)) {
-        // Use `WebConsoleClient.getString`.
-        return connection.tabConnection.tabTarget.activeConsole;
-      }
-
       return connection.tabConnection.threadClient.pauseGrip(grip);
     },
 
+    getLongStringClient: function (grip) {
+      return connection.tabConnection.tabTarget.activeConsole.longString(grip);
+    },
+
     releaseActor: function (actor) {
       return connection.tabConnection.debuggerClient.release(actor);
     },
   };
 
   let store = configureStore({
-    makeThunkArgs: (args, state) => Object.assign({}, args, { client }),
+    makeThunkArgs: (args, state) => ({ ...args, client }),
     client,
   });
   renderRoot(React, ReactDOM, RepsConsole, store);

packages/devtools-reps/src/launchpad/store.js

@@ -15,7 +15,7 @@ const reducers = require("./reducers");
 
 function configureStore(options, client) {
   return createStore(
-    combineReducers(Object.assign({client}, reducers)),
+    combineReducers({ client, ...reducers }),
     applyMiddleware(
       thunk(options.makeThunkArgs),
       promise,