Reimplement System.parse() using traceur.Compiler

Author: johnjbarton

bower.json

@@ -5,7 +5,7 @@
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "main": "dist/es6-module-loader-sans-promises.js",
   "dependencies": {
-    "traceur": "0.0.45"
+    "traceur": "0.0.49"
   },
   "keywords": [
     "es6",

lib/loader.js

@@ -107,8 +107,6 @@ function logloads(loads) {
   (function() {
     var Promise = __global.Promise || require('when/es6-shim/Promise');
 
-    var traceur;
-
     var defineProperty;
     (function () {
       try {

lib/system.js

@@ -264,8 +264,10 @@
     });
       // --- <Specific Traceur Parsing Code> ---
 
-      // parse function is used to parse a load record
-      // Returns an array of ModuleSpecifiers
+    System.traceurOptions = {modules: 'instantiate'};
+
+    // parse function is used to parse a load record
+    // Returns an array of ModuleSpecifiers
     System.parse = function(load) {
       if (!traceur) {
         if (typeof window == 'undefined')
@@ -278,60 +280,45 @@
 
       console.assert(load.source, 'Non-empty source');
 
-      var depsList, curSystem, oldSourceMaps, oldModules;
+      function checkForErrors(output) {
+        if (output.errors.length) {
+          output.errors.map(function(error) {
+            console.error(error);
+          });
+          throw new Error('Parse failed, ' + output.errors.length);
+        }
+      }
+
+      var depsList;
       (function () {
         try {
-
-          var parser = new traceur.syntax.Parser(new traceur.syntax.SourceFile(load.address, load.source));
-          var body = parser.parseModule();
-
           load.kind = 'declarative';
-          depsList = getImports(body);
-
-          oldSourceMaps = traceur.options.sourceMaps;
-          oldModules = traceur.options.modules;
-
-          traceur.options.sourceMaps = true;
-          traceur.options.modules = 'instantiate';
-
-          var reporter = new traceur.util.ErrorReporter();
-
-          reporter.reportMessageInternal = function(location, kind, format, args) {
-            throw new SyntaxError(kind, location.start && location.start.line_, location.start && location.start.column_);
-          }
-
-          // traceur expects its version of System
-          curSystem = global.System;
-          global.System = global.traceurSystem;
 
-          var tree = (new traceur.codegeneration.module.AttachModuleNameTransformer(load.name)).transformAny(body);
-          tree = (new traceur.codegeneration.FromOptionsTransformer(reporter)).transform(tree);
+          var compiler = new traceur.Compiler();
+          var options = System.traceurOptions || {};
+          var output = compiler.stringToTree({content: load.source, options: options});
+          checkForErrors(output);
 
-          var sourceMapGenerator = new traceur.outputgeneration.SourceMapGenerator({ file: load.address });
-          var options = { sourceMapGenerator: sourceMapGenerator };
+          depsList = getImports(output.tree);
+          output = compiler.treeToTree(output);
+          checkForErrors(output);
 
-          var source = traceur.outputgeneration.TreeWriter.write(tree, options);
+          output = compiler.treeToString(output);
+          checkForErrors(output);
+          var source = output.js;
+          var sourceMap = output.generatedSourceMap;
 
-          if (global.btoa)
-            source += '\n//# sourceMappingURL=data:application/json;base64,' + btoa(unescape(encodeURIComponent(options.sourceMap))) + '\n';
+          if (global.btoa && sourceMap)
+            source += '\n//# sourceMappingURL=data:application/json;base64,' + btoa(unescape(encodeURIComponent(sourceMap))) + '\n';
 
           __eval(source, global, load);
         }
         catch(e) {
           if (e.name == 'SyntaxError' || e.name == 'TypeError')
             e.message = 'Evaluating ' + (load.name || load.address) + '\n\t' + e.message;
-          if (curSystem)
-            global.System = curSystem;
-          if (oldSourceMaps)
-            traceur.options.sourceMaps = oldSourceMaps;
-          if (oldModules)
-            traceur.options.modules = oldModules;
           throw e;
         }
       }());
-      global.System = curSystem;
-      traceur.options.sourceMaps = oldSourceMaps;
-      traceur.options.modules = oldModules;
       return depsList;
     }
 
@@ -385,8 +372,6 @@
     if (typeof exports === 'object')
       module.exports = System;
 
-    if (global.System && global.traceur)
-      global.traceurSystem = global.System;
     global.System = System;
   })();