Merge branch 'guybedford-system'

test/fixtures/transformation/es6-modules-system/exports-default/expected.js

@@ -4,10 +4,10 @@ System.register("actual", [], function (_export) {
   var __moduleName = "actual";
 
   function _anonymous() {}
-  var _anonymous2 = function _anonymous2() {};
+  var _anonymous2;
 
   function foo() {}
-  var Foo = function Foo() {};
+  var Foo;
 
   return {
     setters: [],
@@ -22,11 +22,11 @@ System.register("actual", [], function (_export) {
 
       _export("default", _anonymous);
 
-      _export("default", _anonymous2);
+      _export("default", _anonymous2 = function _anonymous2() {});
 
       _export("default", foo);
 
-      _export("default", Foo);
+      _export("default", Foo = function Foo() {});
     }
   };
 });

test/fixtures/transformation/es6-modules-system/exports-from/expected.js

@@ -1,31 +1,34 @@
-System.register("actual", [], function (_export) {
+System.register("actual", ["foo"], function (_export) {
   "use strict";
 
   var __moduleName = "actual";
 
+  var _localExports = ['foo', 'bar', 'default'];
+
   return {
-    setters: [],
+    setters: [
-    execute: function () {
+    function(m) {
-      var exports = _export;
+      _export("foo", m.foo);
-      (function (obj) {
+
-        for (var i in obj) {
+      _export("foo", m.foo);
-          exports[i] = obj[i];
+
+      _export("bar", m.bar);
+
+      _export("bar", m.foo);
+
+      _export("default", m.foo);
+
+      _export("default", m.foo);
+
+      _export("bar", m.bar);
+
+      for (var p in m) {
+        if (_localExports.indexOf(i) == -1)
+          _export(p, m[p]);
       }
-      })(foo);
+    }
-
+    ],
-      _export("foo", foo.foo);
+    execute: function () {
-
-      _export("foo", foo.foo);
-
-      _export("bar", foo.bar);
-
-      _export("bar", foo.foo);
-
-      _export("default", foo.foo);
-
-      _export("default", foo.foo);
-
-      _export("bar", foo.bar);
     }
   };
 });

test/fixtures/transformation/es6-modules-system/exports-named/expected.js

@@ -4,21 +4,23 @@ System.register("actual", [], function (_export) {
   var __moduleName = "actual";
 
   return {
-    setters: [],
+    setters: [
+    function(m) {
+      _export("foo", m.foo);
+
+      _export("foo", m.foo);
+
+      _export("bar", m.bar);
+
+      _export("bar", m.foo);
+
+      _export("default", m.foo);
+
+      _export("default", m.foo);
+
+      _export("bar", m.bar);
+    }],
     execute: function () {
-      _export("foo", foo);
-
-      _export("foo", foo);
-
-      _export("bar", bar);
-
-      _export("bar", foo);
-
-      _export("default", foo);
-
-      _export("default", foo);
-
-      _export("bar", bar);
     }
   };
 });

test/fixtures/transformation/es6-modules-system/exports-variable/expected.js

@@ -3,33 +3,35 @@ System.register("actual", [], function (_export) {
 
   var __moduleName = "actual";
 
-  var foo = 1;
+  var foo;
-  var foo2 = function () {};
+  var foo2;
   var foo3;
-  var foo4 = 2;
+  var foo4;
   var foo5;
-  var foo6 = 3;
+  var foo6;
   function foo7() {}
-  var foo8 = function foo8() {};
+  _export("foo7", foo7);
+
+  var foo8;
 
   return {
     setters: [],
     execute: function () {
-      _export("foo", foo);
+      _export("foo", foo = 1);
 
-      _export("foo2", foo2);
+      _export("foo2", foo2 = function () {});
 
       _export("foo3", foo3);
 
-      _export("foo4", foo4);
+      _export("foo4", foo4 = 2);
 
       _export("foo5", foo5);
 
-      _export("foo6", foo6);
+      _export("foo6", foo6 = 3);
 
       _export("foo7", foo7);
 
-      _export("foo8", foo8);
+      _export("foo8", foo8 = function foo8() {});
     }
   };
 });

test/fixtures/transformation/es6-modules-system/hoist-function-exports/expected.js

@@ -7,19 +7,19 @@ System.register("actual", ["./evens"], function (_export) {
   function nextOdd(n) {
     return isEven(n) ? n + 1 : n + 2;
   }
+  _export("nextOdd", nextOdd);
 
-  var isOdd = (function (isEven) {
+  var isOdd;
-    return function (n) {
+  return {
-      return !isEven(n);
-    };
-  })(isEven);return {
     setters: [function (m) {
       isEven = m.isEven;
     }],
     execute: function () {
-      _export("nextOdd", nextOdd);
+      _export("isOdd", isOdd = (function (isEven) {
-
+        return function (n) {
-      _export("isOdd", isOdd);
+          return !isEven(n);
+        };
+      })(isEven));
     }
   };
 });

test/fixtures/transformation/es6-modules-system/overview/expected.js

@@ -4,7 +4,7 @@ System.register("actual", ["foo", "foo-bar", "./directory/foo-bar"], function (_
   var __moduleName = "actual";
 
   var foo, bar;
-  var test = 5;
+  var test;
 
   return {
     setters: [function (m) {
@@ -16,7 +16,7 @@ System.register("actual", ["foo", "foo-bar", "./directory/foo-bar"], function (_
     execute: function () {
       _export("test", test);
 
-      _export("test", test);
+      _export("test", test = 5);
 
       _export("default", test);
     }