eval consolidation

Author: guybedford

Gruntfile.js

@@ -22,23 +22,23 @@ module.exports = function (grunt) {
         files: {
           'dist/<%= pkg.name %>-prod.src.js': [
             'node_modules/when/es6-shim/Promise.js',
-            'src/polyfill-wrapper-start.js',
+            'src/wrapper-start.js',
             'src/loader.js',
             'src/dynamic-only.js',
             'src/url.js',
             'src/system.js',
-            'src/polyfill-wrapper-end.js'
+            'src/wrapper-end.js'
           ],
           'dist/<%= pkg.name %>.src.js': [
             'node_modules/when/es6-shim/Promise.js',
-            'src/polyfill-wrapper-start.js',
+            'src/wrapper-start.js',
             'src/loader.js',
             'src/declarative.js',
             'src/transpiler.js',
             'src/url.js',
             'src/system.js',
             'src/module-tag.js',
-            'src/polyfill-wrapper-end.js'
+            'src/wrapper-end.js'
           ]
         }
       }

src/loader.js

@@ -244,7 +244,8 @@ function logloads(loads) {
               load.declare = declare;
               load.depsList = deps;
             }            
-            __eval(transpiled, __global, load);
+            // empty {} context is closest to undefined 'this' we can get
+            __eval(transpiled, load.address, {});
             curSystem.register = curRegister;
           });
         }
@@ -571,14 +572,6 @@ function logloads(loads) {
       return module;
   }
 
-  function addToError(err, msg) {
-    if (err instanceof Error)
-      err.message = msg + err.message;
-    else
-      err = msg + err;
-    return err;
-  }
-
   // 26.3 Loader
 
   // 26.3.1.1

src/polyfill-wrapper-end.js

@@ -26,7 +26,16 @@
     return self['import'](self.transpiler).then(function(transpiler) {
       if (transpiler.__useDefault)
         transpiler = transpiler['default'];
-      return 'var __moduleAddress = "' + load.address + '";' + (transpiler.Compiler ? traceurTranspile : babelTranspile).call(self, load, transpiler);
+
+      return 'var __moduleName = "' + load.name + '", __moduleAddress = "' + load.address + '";'
+          + (transpiler.Compiler ? traceurTranspile : babelTranspile).call(self, load, transpiler)
+          + '\n//# sourceURL=' + load.address + '!eval';
+
+      // sourceURL and sourceMappingURL:
+      //   Ideally we wouldn't need a sourceURL and would just use the sourceMap.
+      //   But without the sourceURL as well, line-by-line debugging doesn't work.
+      //   We thus need to ensure the sourceURL is a different name to the original
+      //   source, and hence the !eval suffix.
     });
   };
 
@@ -42,7 +51,7 @@
             var curSystem = __global.System;
             var curLoader = __global.Reflect.Loader;
             // ensure not detected as CommonJS
-            __eval('(function(require,exports,module){' + load.source + '})();', __global, load);
+            __eval('(function(require,exports,module){' + load.source + '})();', load.address, __global);
             __global.System = curSystem;
             __global.Reflect.Loader = curLoader;
             return getTranspilerModule(self, load.name);
@@ -62,13 +71,8 @@
     options.moduleName = false;
 
     var compiler = new traceur.Compiler(options);
-    var source = doTraceurCompile(load.source, compiler, options.filename);
 
-    // add "!eval" to end of Traceur sourceURL
-    // I believe this does something?
-    source += '!eval';
-
-    return source;
+    return doTraceurCompile(load.source, compiler, options.filename);
   }
   function doTraceurCompile(source, compiler, filename) {
     try {
@@ -91,9 +95,5 @@
     if (!options.blacklist)
       options.blacklist = ['react'];
 
-    var source = babel.transform(load.source, options).code;
-
-    // add "!eval" to end of Babel sourceURL
-    // I believe this does something?
-    return source + '\n//# sourceURL=' + load.address + '!eval';
+    return babel.transform(load.source, options).code;
   }

src/polyfill-wrapper-start.js

@@ -0,0 +1,16 @@
+  // -- exporting --
+
+  if (typeof exports === 'object')
+    module.exports = Loader;
+
+  __global.Reflect = __global.Reflect || {};
+  __global.Reflect.Loader = __global.Reflect.Loader || Loader;
+  __global.Reflect.global = __global.Reflect.global || __global;
+  __global.LoaderPolyfill = Loader;
+
+  if (typeof exports === 'object')
+    module.exports = System;
+
+  __global.System = System;
+
+})(typeof window != 'undefined' ? window : (typeof WorkerGlobalScope != 'undefined' ? self : global));

src/transpiler.js

@@ -0,0 +1,51 @@
+(function(__global) {
+
+  var isWorker = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope;
+  var isBrowser = typeof window != 'undefined' && !isWorker;
+  var isWindows = typeof process != 'undefined' && !!process.platform.match(/^win/);
+
+  if (__global.console)
+    console.assert = console.assert || function() {};
+
+  // IE8 support
+  var indexOf = Array.prototype.indexOf || function(item) {
+    for (var i = 0, thisLen = this.length; i < thisLen; i++) {
+      if (this[i] === item) {
+        return i;
+      }
+    }
+    return -1;
+  };
+  
+  var defineProperty;
+  (function () {
+    try {
+      if (!!Object.defineProperty({}, 'a', {}))
+        defineProperty = Object.defineProperty;
+    }
+    catch (e) {
+      defineProperty = function(obj, prop, opt) {
+        try {
+          obj[prop] = opt.value || opt.get.call(obj);
+        }
+        catch(e) {}
+      }
+    }
+  })();
+
+  function addToError(err, msg) {
+    if (err instanceof Error)
+      err.message = msg + err.message;
+    else
+      err = msg + err;
+    return err;
+  }
+
+  function __eval(source, debugName, context) {
+    try {
+      new Function(source).call(context);
+    }
+    catch(e) {
+      throw addToError(e, 'Evaluating ' + debugName);
+    }
+  }