traceur transform fix, 0.5.1

Author: guybedford

README.md

@@ -399,6 +399,7 @@ In lieu of a formal styleguide, take care to maintain the existing coding style.
 _Also, please don't edit files in the "dist" subdirectory as they are generated via grunt. You'll find source code in the "lib" subdirectory!_
 
 ## Release History
+* 0.5.1 Minor fixes and adjustment, Traceur transform bug fix, remove alias handling code
 * 0.5.0 Traceur update and separation, deferred execution pipeline, IE9 compatibility fixes, code separation
 * 0.4.3 ES6 detection fix, Traceur runtime inclusion
 * 0.4.2 promises fixes, __moduleName support, btoa language fixes, instantiation using normalized names as arguments

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "es6-module-loader",
-  "version": "0.4.3",
+  "version": "0.5.1",
   "description": "An ES6 Module Loader polyfill based on the latest spec.",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "main": "dist/es6-module-loader.js",

dist/es6-module-loader.js

@@ -56,6 +56,8 @@ function logloads(loads) {
 (function (global) {
   var Promise = global.Promise || require('./promise');
 
+  var traceur;
+
   var defineProperty;
   try {
     if (!!Object.defineProperty({}, 'a', {})) {
@@ -174,12 +176,17 @@ function logloads(loads) {
 
       var depsList;
       if (instantiateResult === undefined) {
-        if (traceur) {
+        if (global.traceur) {
+          if (!traceur) {
+            traceur = global.traceur;
+            $traceurRuntime.ModuleStore.get = $traceurRuntime.getModuleImpl = function(name) {
+              return System.get(name);
+            }
+          }
           load.address = load.address || 'anon' + ++anonCnt;
           var parser = new traceur.syntax.Parser(new traceur.syntax.SourceFile(load.address, load.source));
-          var tree = parser.parseModule();
-          depsList = getImports(tree);
-          load.body = (new traceur.codegeneration.module.AttachModuleNameTransformer(load.name)).transformAny(tree);
+          load.body = parser.parseModule();
+          depsList = getImports(load.body);
         }
         else {
           throw new TypeError('Include Traceur for module syntax support');
@@ -422,8 +429,17 @@ function logloads(loads) {
     }
 
     // transform
-    var transformer = new traceur.codegeneration.FromOptionsTransformer(reporter);
-    var tree = transformer.transform(module.body);
+
+    // traceur expects its version of System
+    var sys = global.System;
+    global.System = traceur.System;
+
+    var tree = (new traceur.codegeneration.module.AttachModuleNameTransformer(module.name)).transformAny(module.body);
+    tree = (new traceur.codegeneration.FromOptionsTransformer(reporter)).transform(tree);
+
+    // revert system
+    global.System = sys;
+
     delete module.body;
 
     // convert back to a source string
@@ -618,15 +634,6 @@ function logloads(loads) {
     }
   };
 
-  /*
-    Use Traceur?
-  */
-  var traceur = global.traceur;
-  if (traceur)
-    $traceurRuntime.ModuleStore.get = $traceurRuntime.getModuleImpl = function(name) {
-      return System.get(name);
-    }
-
   // tree traversal, NB should use visitor pattern here
   function traverse(object, iterator, parent, parentProperty) {
     var key, child;

lib/loader.js

@@ -1,7 +1,7 @@
 {
   "name": "es6-module-loader",
   "description": "An ES6 Module Loader shim",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "author": {
     "name": "Guy Bedford, Luke Hoban, Addy Osmani",