0.13.0

Author: guybedford

bower.json

@@ -287,8 +287,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 || [];
@@ -1083,9 +1082,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) {
     }
@@ -1104,47 +1100,42 @@ function logloads(loads) {
 })();
 
 /*
- * 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;
+  Loader.prototype.transpiler = 'traceur';
 
-      // 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.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
@@ -1163,15 +1154,15 @@ function logloads(loads) {
     }
   }
 
-  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?

dist/es6-module-loader-sans-promises.js

@@ -1512,8 +1512,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 || [];
@@ -2308,9 +2307,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) {
     }
@@ -2329,47 +2325,42 @@ function logloads(loads) {
 })();
 
 /*
- * 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;
+  Loader.prototype.transpiler = 'traceur';
 
-      // 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.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
@@ -2388,15 +2379,15 @@ function logloads(loads) {
     }
   }
 
-  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?

dist/es6-module-loader-sans-promises.js.map

@@ -1,7 +1,7 @@
 {
   "name": "es6-module-loader",
   "description": "An ES6 Module Loader shim",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "author": {
     "name": "Guy Bedford, Luke Hoban, Addy Osmani",
@@ -63,9 +63,9 @@
     "test:browser:perf": "karma start karma-benchmark.conf.js --single-run"
   },
   "dependencies": {
-    "6to5-core": "~3.3.1",
+    "6to5-core": "~3.3.2",
     "grunt-contrib-uglify": "0.6.0",
     "traceur": "0.0.82",
-    "when": "^3.6.4"
+    "when": "^3.7.2"
   }
 }