use 6to5-core, parser -> transpiler

Author: guybedford

Gruntfile.js

@@ -38,7 +38,7 @@ module.exports = function (grunt) {
       dist: {
         src: [
           'src/loader.js',
-          'src/parser.js',
+          'src/transpiler.js',
           'src/system.js'
         ],
         dest: 'dist/<%= pkg.name %>.js'

karma.conf.js

@@ -37,7 +37,7 @@ module.exports = function(config) {
     'test/_helper.js',
     [options['6to5'] ? 'node_modules/regenerator/runtime.js' : ''],
 
-    [!options.ie8 ? (!options['6to5'] ? 'node_modules/traceur/bin/traceur.js' : 'node_modules/6to5/browser.js') : ''],
+    [!options.ie8 ? (!options['6to5'] ? 'node_modules/traceur/bin/traceur.js' : 'node_modules/6to5-core/browser.js') : ''],
 
     'dist/es6-module-loader' + (options.polyfill ? '' : '-sans-promises') + '.src.js',
 

lib/index-6to5.js

@@ -1,6 +1,6 @@
 var System = require('../dist/es6-module-loader.src');
 
-System.parser = '6to5';
+System.transpiler = '6to5';
 
 module.exports = {
   Loader: global.LoaderPolyfill,

package.json

@@ -63,7 +63,7 @@
     "test:browser:perf": "karma start karma-benchmark.conf.js --single-run"
   },
   "dependencies": {
-    "6to5": "^3.0.0",
+    "6to5-core": "~3.3.1",
     "grunt-contrib-uglify": "0.6.0",
     "traceur": "0.0.82",
     "when": "^3.6.4"

src/loader.js

@@ -251,8 +251,7 @@ function logloads(loads) {
 
         // instead of load.kind, use load.isDeclarative
         load.isDeclarative = true;
-        // parse sets load.declare, load.depsList
-        loader.loaderObj.parse(load);
+        __eval(loader.loaderObj.transpile(load), __global, load);
       }
       else if (typeof instantiateResult == 'object') {
         load.depsList = instantiateResult.deps || [];
@@ -1047,9 +1046,6 @@ function logloads(loads) {
     translate: function(load) {
       return load.source;
     },
-    parse: function(load) {
-      throw new TypeError('Loader.parse is not implemented');
-    },
     // 26.3.3.18.5
     instantiate: function(load) {
     }

src/parser.js renamed to src/transpiler.js

@@ -1,45 +1,40 @@
 /*
- * Traceur and 6to5 Parsing Code for Loader
+ * Traceur and 6to5 transpile hook for Loader
  */
 (function(Loader) {
-  // parse function is used to parse a load record
   // Returns an array of ModuleSpecifiers
-  var parser, parserModule, parserName, parserOptionsName;
+  var transpiler, transpilerModule;
+  var isNode = typeof window == 'undefined' && typeof WorkerGlobalScope == 'undefined';
 
   // use Traceur by default
-  Loader.prototype.parser = 'traceur';
-
-  Loader.prototype.parse = function(load) {
-    if (!parser) {
-      parserName = this.parser == '6to5' ? 'to5' : this.parser;
-
-      // try to pick up parser from global or require
-      if (typeof window == 'undefined' && typeof WorkerGlobalScope == 'undefined')
-        parserModule = require(this.parser);
-      else
-        parserModule = __global[parserName];
+  Loader.prototype.transpiler = 'traceur';
+
+  Loader.prototype.transpile = function(load) {
+    if (!transpiler) {
+      if (this.transpiler == '6to5') {
+        transpiler = to5Transpile;
+        transpilerModule = isNode ? require('6to5-core') : __global.to5;
+      }
+      else {
+        transpiler = traceurTranspile;
+        transpilerModule = isNode ? require('traceur') : __global.traceur;
+      }
 
-      if (!parserModule)
-        throw new TypeError('Include Traceur or 6to5 for module syntax support');
-
-      parser = this.parser == '6to5' ? to5Parse : traceurParse;
+      if (!transpilerModule)
+        throw new TypeError('Include Traceur or 6to5 for module syntax support.');
     }
 
-    var source = parser.call(this, load);
-
-    source = 'var __moduleAddress = "' + load.address + '";' + source;
-
-    __eval(source, __global, load);
+    return 'var __moduleAddress = "' + load.address + '";' + transpiler.call(this, load);
   }
 
-  function traceurParse(load) {
+  function traceurTranspile(load) {
     var options = this.traceurOptions || {};
     options.modules = 'instantiate';
     options.script = false;
     options.sourceMaps = 'inline';
     options.filename = load.address;
 
-    var compiler = new parserModule.Compiler(options);
+    var compiler = new transpilerModule.Compiler(options);
     var source = doTraceurCompile(load.source, compiler, options.filename);
 
     // add "!eval" to end of Traceur sourceURL
@@ -58,15 +53,15 @@
     }
   }
 
-  function to5Parse(load) {
+  function to5Transpile(load) {
     var options = this.to5Options || {};
     options.modules = 'system';
     options.sourceMap = 'inline';
     options.filename = load.address;
     options.code = true;
     options.ast = false;
 
-    var source = parserModule.transform(load.source, options).code;
+    var source = transpilerModule.transform(load.source, options).code;
 
     // add "!eval" to end of 6to5 sourceURL
     // I believe this does something?

test/system.spec.js

@@ -1,7 +1,7 @@
 //
 
 if (typeof to5 != 'undefined')
-  System.parser = '6to5';
+  System.transpiler = '6to5';
 
 var ie = typeof window != 'undefined' && window.navigator.userAgent.match(/Trident/);
 
@@ -99,7 +99,7 @@ describe('System', function () {
 
     describe('with circular dependencies', function () {
 
-      (System.parser == 'traceur' ? it : it.skip)('should resolve circular dependencies', function (done) {
+      (System.transpiler == 'traceur' ? it : it.skip)('should resolve circular dependencies', function (done) {
         System.import('test/syntax/circular1')
           .then(function (m1) {
             return System.import('test/syntax/circular2').then(function (m2) {
@@ -288,7 +288,7 @@ describe('System', function () {
           .then(done, done);
       });
 
-      (System.parser != 'traceur' ? it.skip : it)('should support re-exporting overwriting', function (done) {
+      (System.transpiler != 'traceur' ? it.skip : it)('should support re-exporting overwriting', function (done) {
         System.import('test/syntax/export-star2')
           .then(function (m) {
             expect(m.bar, 'should re-export "./export-star" bar variable')
@@ -380,7 +380,7 @@ describe('System', function () {
     typeof window != 'undefined' && window.Worker,
     'with Web Worker', function () {
       (ie ? it.skip : it)('should loading inside of a Web Worker', function (done) {
-        var worker = new Worker(System.baseURL + 'test/worker/worker-' + System.parser + '.js');
+        var worker = new Worker(System.baseURL + 'test/worker/worker-' + System.transpiler + '.js');
 
         worker.onmessage = function (e) {
           expect(e.data).to.be.equal('p');

test/test-6to5.html

@@ -6,7 +6,7 @@
   <script src="test.js"></script>
 
   <!-- set this to the path to 6to5.js -->
-  <script src="../node_modules/6to5/browser.js"></script>
+  <script src="../node_modules/6to5-core/browser.js"></script>
   <script src="../node_modules/regenerator/runtime.js"></script>
 
   <script>
@@ -18,9 +18,7 @@
 
   <script src="../dist/es6-module-loader.src.js"></script>
   <script>
-    System.parser = '6to5';
-    // test parseOptions and anonymous errors
-    // System.parseOptions = { classes: false };
+    System.transpiler = '6to5';
   </script>
 
   <script>

test/test-traceur.html

@@ -17,8 +17,7 @@
 
   <script src="../dist/es6-module-loader.src.js"></script>
   <script>
-    // test parseOptions and anonymous errors
-    // System.parseOptions = { classes: false };
+    // System.traceurOptions = { classes: false };
   </script>
 
   <script>

test/worker/worker-6to5.js

@@ -1,9 +1,9 @@
-importScripts("../../node_modules/6to5/browser.js",
+importScripts("../../node_modules/6to5-core/browser.js",
              "../../node_modules/when/es6-shim/Promise.js",
              "../../dist/es6-module-loader.src.js"
              );
 
-System.parser = '6to5';
+System.transpiler = '6to5';
 
 System['import']('es6').then(function(m) {
   postMessage(m.p);