convert Sandbox and VMSandbox to es6 class

Author: bekzod

src/sandbox.js

@@ -1,50 +1,52 @@
+'use strict';
+
 var chalk = require('chalk');
 
-function Sandbox() {
-}
+class Sandbox {
 
-Sandbox.prototype.init = function(options) {
-  this.globals = options.globals;
-  this.sandbox = this.buildSandbox();
-};
-
-Sandbox.prototype.buildSandbox = function() {
-  var console = this.buildWrappedConsole();
-  var sourceMapSupport = require('./install-source-map-support');
-  var URL = require('url');
-  var globals = this.globals;
-
-  var sandbox = {
-    sourceMapSupport: sourceMapSupport,
-    console: console,
-    setTimeout: setTimeout,
-    clearTimeout: clearTimeout,
-    URL: URL,
-
-    // Convince jQuery not to assume it's in a browser
-    module: { exports: {} }
-  };
-
-  for (var key in globals) {
-    sandbox[key] = globals[key];
+  constructor(options) {
+    this.globals = options.globals;
+    this.sandbox = this.buildSandbox();
   }
 
-  // Set the global as `window`.
-  sandbox.window = sandbox;
-  sandbox.window.self = sandbox;
+  buildSandbox() {
+    var console = this.buildWrappedConsole();
+    var sourceMapSupport = require('./install-source-map-support');
+    var URL = require('url');
+    var globals = this.globals;
+
+    var sandbox = {
+      sourceMapSupport: sourceMapSupport,
+      console: console,
+      setTimeout: setTimeout,
+      clearTimeout: clearTimeout,
+      URL: URL,
 
-  return sandbox;
-};
+      // Convince jQuery not to assume it's in a browser
+      module: { exports: {} }
+    };
 
-Sandbox.prototype.buildWrappedConsole = function() {
-  var wrappedConsole =  Object.create(console);
-  wrappedConsole.error = function() {
-    console.error.apply(console, Array.prototype.map.call(arguments, function(a) {
-      return typeof a === 'string' ? chalk.red(a) : a;
-    }));
-  };
+    for (var key in globals) {
+      sandbox[key] = globals[key];
+    }
 
-  return wrappedConsole;
-};
+    // Set the global as `window`.
+    sandbox.window = sandbox;
+    sandbox.window.self = sandbox;
+
+    return sandbox;
+  }
+
+  buildWrappedConsole() {
+    var wrappedConsole =  Object.create(console);
+    wrappedConsole.error = function() {
+      console.error.apply(console, Array.prototype.map.call(arguments, function(a) {
+        return typeof a === 'string' ? chalk.red(a) : a;
+      }));
+    };
+
+    return wrappedConsole;
+  }
+}
 
 module.exports = Sandbox;

src/vm-sandbox.js

@@ -1,21 +1,23 @@
+'use strict';
+
 var vm = require('vm');
 var Sandbox = require('./sandbox');
 
-function VMSandbox(options) {
-  this.init(options);
-  vm.createContext(this.sandbox);
-}
+class VMSandbox extends Sandbox {
+  constructor(options) {
+    super(options);
+    vm.createContext(this.sandbox);
+  }
 
-VMSandbox.prototype = Object.create(Sandbox.prototype);
-VMSandbox.prototype.constructor = Sandbox;
+  eval(source, filePath) {
+    var fileScript = new vm.Script(source, { filename: filePath });
+    fileScript.runInContext(this.sandbox);
+  }
 
-VMSandbox.prototype.eval = function(source, filePath) {
-  var fileScript = new vm.Script(source, { filename: filePath });
-  fileScript.runInContext(this.sandbox);
-};
+  run(cb) {
+    return cb.call(this.sandbox, this.sandbox);
+  }
 
-VMSandbox.prototype.run = function(cb) {
-  return cb.call(this.sandbox, this.sandbox);
-};
+}
 
 module.exports = VMSandbox;

test/fixtures/custom-sandbox/custom-sandbox.js

@@ -11,48 +11,47 @@ const Sandbox = require('./../../../src/sandbox');
  * from fastboot's Sandbox class
  *
  */
-function CustomSandbox(options) {
-  this.init(options);
-  vm.createContext(this.sandbox);
-}
-
-CustomSandbox.prototype = Object.create(Sandbox.prototype);
-CustomSandbox.prototype.constructor = Sandbox;
-
-/**
- * Evals the file in the sandbox.
- *
- */
-CustomSandbox.prototype.eval = function(source, filePath) {
-  var fileScript = new vm.Script(source, { filename: filePath });
-  fileScript.runInContext(this.sandbox);
-};
-
-/**
- * Runs a given function in the sandbox with providing the context and the sandbox object.
- * Can be used to run functions outside of the sandbox in the sandbox.
- *
- * @todo: use this when we create app factory from addon
- */
-CustomSandbox.prototype.run = function(cb) {
-  return cb.call(this.sandbox, this.sandbox);
-};
-
-/**
- * Wraps console.error with sending the error over the channel as well so that
- * it is reported by EKG.
- * // TODO: change this function to send error over the channel instead.
- *
- */
-CustomSandbox.prototype.buildWrappedConsole = function() {
-  var wrappedConsole =  Object.create(console);
-  wrappedConsole.error = function() {
-    console.error.apply(console, Array.prototype.map.call(arguments, function(a) {
-      return a;
-    }));
-  };
-
-  return wrappedConsole;
-};
+class CustomSandbox extends Sandbox {
+  constructor(options) {
+    super(options);
+    vm.createContext(this.sandbox);
+  }
+
+  /**
+   * Evals the file in the sandbox.
+   *
+   */
+  eval(source, filePath) {
+    var fileScript = new vm.Script(source, { filename: filePath });
+    fileScript.runInContext(this.sandbox);
+  }
+
+  /**
+   * Runs a given function in the sandbox with providing the context and the sandbox object.
+   * Can be used to run functions outside of the sandbox in the sandbox.
+   *
+   * @todo: use this when we create app factory from addon
+   */
+  run(cb) {
+    return cb.call(this.sandbox, this.sandbox);
+  }
+
+  /**
+   * Wraps console.error with sending the error over the channel as well so that
+   * it is reported by EKG.
+   * // TODO: change this function to send error over the channel instead.
+   *
+   */
+  buildWrappedConsole() {
+    var wrappedConsole =  Object.create(console);
+    wrappedConsole.error = function() {
+      console.error.apply(console, Array.prototype.map.call(arguments, function(a) {
+        return a;
+      }));
+    };
+
+    return wrappedConsole;
+  }
 
+}
 module.exports = CustomSandbox;