experimental exports form in system register

Author: guybedford

.gitignore

@@ -6,4 +6,3 @@ coverage
 npm-debug.log
 .lvimrc
 dist
-test/fixtures/register-modules

core/common.js

@@ -26,7 +26,7 @@ export function fileUrlToPath (fileUrl) {
   if (fileUrl.substr(0, 7) !== 'file://')
     throw new RangeError(fileUrl + ' is not a valid file url');
   if (isWindows)
-    return fileUrl.substr(8).replace(/\//g, '/');
+    return fileUrl.substr(8).replace(/\\/g, '/');
   else
     return fileUrl.substr(7);
 }

core/register-loader.js

@@ -339,7 +339,7 @@ function registerDeclarative (loader, load, link, declare) {
     if (locked)
       return;
 
-    if (typeof name == 'object') {
+    if (typeof name === 'object') {
       for (var p in name)
         if (p !== '__useDefault')
           moduleObj[p] = name[p];
@@ -359,6 +359,8 @@ function registerDeclarative (loader, load, link, declare) {
   if (typeof declared !== 'function') {
     link.setters = declared.setters;
     link.execute = declared.execute;
+    if (declared.exports)
+      link.moduleObj = moduleObj = declared.exports;
   }
   else {
     link.setters = [];

test/fixtures/register-modules/_a.js

@@ -0,0 +1,28 @@
+System.register(['./_b.js', './_d.js', './_g.js'], function (_export, _context) {
+  "use strict";
+
+  var a;
+  return {
+    setters: [function (_bJs) {
+      var _exportObj = {};
+      _exportObj.b = _bJs.b;
+
+      _export(_exportObj);
+    }, function (_dJs) {
+      var _exportObj2 = {};
+      _exportObj2.d = _dJs.d;
+
+      _export(_exportObj2);
+    }, function (_gJs) {
+      var _exportObj3 = {};
+      _exportObj3.g = _gJs.g;
+
+      _export(_exportObj3);
+    }],
+    execute: function () {
+      _export('a', a = 'a');
+
+      _export('a', a);
+    }
+  };
+});

test/fixtures/register-modules/_b.js

@@ -0,0 +1,18 @@
+System.register(['./_c.js'], function (_export, _context) {
+  "use strict";
+
+  var b;
+  return {
+    setters: [function (_cJs) {
+      var _exportObj = {};
+      _exportObj.c = _cJs.c;
+
+      _export(_exportObj);
+    }],
+    execute: function () {
+      _export('b', b = 'b');
+
+      _export('b', b);
+    }
+  };
+});

test/fixtures/register-modules/_c.js

@@ -0,0 +1,18 @@
+System.register(['./_d.js'], function (_export, _context) {
+  "use strict";
+
+  var c;
+  return {
+    setters: [function (_dJs) {
+      var _exportObj = {};
+      _exportObj.d = _dJs.d;
+
+      _export(_exportObj);
+    }],
+    execute: function () {
+      _export('c', c = 'c');
+
+      _export('c', c);
+    }
+  };
+});

test/fixtures/register-modules/_d.js

@@ -0,0 +1,13 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var d;
+  return {
+    setters: [],
+    execute: function () {
+      _export('d', d = 'd');
+
+      _export('d', d);
+    }
+  };
+});

test/fixtures/register-modules/_e.js

@@ -0,0 +1,18 @@
+System.register(['./_c.js'], function (_export, _context) {
+  "use strict";
+
+  var e;
+  return {
+    setters: [function (_cJs) {
+      var _exportObj = {};
+      _exportObj.c = _cJs.c;
+
+      _export(_exportObj);
+    }],
+    execute: function () {
+      _export('e', e = 'e');
+
+      _export('e', e);
+    }
+  };
+});

test/fixtures/register-modules/_f.js

@@ -0,0 +1,18 @@
+System.register(['./_g.js'], function (_export, _context) {
+  "use strict";
+
+  var f;
+  return {
+    setters: [function (_gJs) {
+      var _exportObj = {};
+      _exportObj.g = _gJs.g;
+
+      _export(_exportObj);
+    }],
+    execute: function () {
+      _export('f', f = 'f');
+
+      _export('f', f);
+    }
+  };
+});

test/fixtures/register-modules/_g.js

@@ -0,0 +1,13 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var g;
+  return {
+    setters: [],
+    execute: function () {
+      _export('g', g = 'g');
+
+      _export('g', g);
+    }
+  };
+});

test/fixtures/register-modules/_h.js

@@ -0,0 +1,23 @@
+System.register(['./_a.js', './_i.js'], function (_export, _context) {
+  "use strict";
+
+  var h;
+  return {
+    setters: [function (_aJs) {
+      var _exportObj = {};
+      _exportObj.a = _aJs.a;
+
+      _export(_exportObj);
+    }, function (_iJs) {
+      var _exportObj2 = {};
+      _exportObj2.i = _iJs.i;
+
+      _export(_exportObj2);
+    }],
+    execute: function () {
+      _export('h', h = 'h');
+
+      _export('h', h);
+    }
+  };
+});

test/fixtures/register-modules/_i.js

@@ -0,0 +1,18 @@
+System.register(['./_b.js'], function (_export, _context) {
+  "use strict";
+
+  var i;
+  return {
+    setters: [function (_bJs) {
+      var _exportObj = {};
+      _exportObj.b = _bJs.b;
+
+      _export(_exportObj);
+    }],
+    execute: function () {
+      _export('i', i = 'i');
+
+      _export('i', i);
+    }
+  };
+});

test/fixtures/register-modules/a.js

@@ -0,0 +1,18 @@
+System.register(['./b.js'], function (_export, _context) {
+  "use strict";
+
+  var a;
+  return {
+    setters: [function (_bJs) {
+      var _exportObj = {};
+      _exportObj.b = _bJs.b;
+
+      _export(_exportObj);
+    }],
+    execute: function () {
+      _export('a', a = 'a');
+
+      _export('a', a);
+    }
+  };
+});

test/fixtures/register-modules/b.js

@@ -0,0 +1,13 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var b;
+  return {
+    setters: [],
+    execute: function () {
+      _export('b', b = 'b');
+
+      _export('b', b);
+    }
+  };
+});

test/fixtures/register-modules/c.js

@@ -0,0 +1,19 @@
+System.register(['./a.js'], function (_export, _context) {
+  "use strict";
+
+  var c;
+  return {
+    setters: [function (_aJs) {
+      var _exportObj = {};
+      _exportObj.a = _aJs.a;
+      _exportObj.b = _aJs.b;
+
+      _export(_exportObj);
+    }],
+    execute: function () {
+      _export('c', c = 'c');
+
+      _export('c', c);
+    }
+  };
+});

test/fixtures/register-modules/circular1.js

@@ -0,0 +1,34 @@
+System.register(['./circular2.js'], function (_export, _context) {
+  "use strict";
+
+  var fn2, variable2, variable1, output;
+  function fn1() {
+    _export('output', output = variable2);
+  }
+
+  return {
+    exports: {
+      fn1: fn1,
+      variable1: undefined,
+      output: undefined,
+      output2: undefined
+    },
+    setters: [function (_circular2Js) {
+      fn2 = _circular2Js.fn2;
+      variable2 = _circular2Js.variable2;
+      var _exportObj = {};
+      _exportObj.output2 = _circular2Js.output;
+
+      _export(_exportObj);
+    }],
+    execute: function () {
+      _export('variable1', variable1 = 'test circular 1');
+
+      _export('variable1', variable1);
+
+      fn2();
+
+      _export('output', output);
+    }
+  };
+});

test/fixtures/register-modules/circular2.js

@@ -0,0 +1,30 @@
+System.register(['./circular1.js'], function (_export, _context) {
+  "use strict";
+
+  var fn1, variable1, variable2, output;
+  function fn2() {
+    _export('output', output = variable1);
+  }
+
+  _export('fn2', fn2);
+
+  return {
+    setters: [function (_circular1Js) {
+      fn1 = _circular1Js.fn1;
+      variable1 = _circular1Js.variable1;
+      var _exportObj = {};
+      _exportObj.output1 = _circular1Js.output;
+
+      _export(_exportObj);
+    }],
+    execute: function () {
+      _export('variable2', variable2 = 'test circular 2');
+
+      _export('variable2', variable2);
+
+      fn1();
+
+      _export('output', output);
+    }
+  };
+});

test/fixtures/register-modules/deperror.js

@@ -0,0 +1,10 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  return {
+    setters: [],
+    execute: function () {
+      throw 'dep error';
+    }
+  };
+});

test/fixtures/register-modules/direct.js

@@ -0,0 +1,11 @@
+System.register(['./es6-dep.js'], function (_export, _context) {
+  "use strict";
+
+  var p;
+  return {
+    setters: [function (_es6DepJs) {
+      p = _es6DepJs.p;
+    }],
+    execute: function () {}
+  };
+});

test/fixtures/register-modules/es6-dep.js

@@ -0,0 +1,13 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var p;
+  return {
+    setters: [],
+    execute: function () {
+      _export('p', p = 'p');
+
+      _export('p', p);
+    }
+  };
+});