remove aliasing, add export * tests

systemjs · Oct 27, 2014 · c0ab839 · c0ab839
2 parents e6ec736 + 282dafe
commit c0ab839
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 52 deletions.
diff --git a/dist/system-csp.js b/dist/system-csp.js
diff --git a/dist/system-csp.js.map b/dist/system-csp.js.map
diff --git a/dist/system-csp.src.js b/dist/system-csp.src.js
@@ -889,9 +889,7 @@ function core(loader) {
     return Promise.resolve(loaderLocate.call(this, load));
   }
 
-
   // Traceur conveniences
-  var aliasRegEx = /^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/;
   var es6RegEx = /(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/;
 
   var loaderTranslate = loader.translate;
@@ -901,13 +899,6 @@ function core(loader) {
     if (load.name == '@traceur')
       return loaderTranslate.call(loader, load);
 
-    // support ES6 alias modules ("export * from 'module';") without needing Traceur
-    var match;
-    if ((load.metadata.format == 'es6' || !load.metadata.format) && (match = load.source.match(aliasRegEx))) {
-      load.metadata.format = 'es6';
-      load.metadata.alias = match[1] || match[2];
-    }
-
     // detect ES6
     else if (load.metadata.format == 'es6' || !load.metadata.format && load.source.match(es6RegEx)) {
       load.metadata.format = 'es6';
@@ -936,13 +927,6 @@ function core(loader) {
         }
       };
     }
-    if (load.metadata.alias) {
-      var alias = load.metadata.alias;
-      load.metadata.deps = [alias];
-      load.metadata.execute = function(require) {
-        return require(alias);
-      }
-    }
     return loaderInstantiate.call(loader, load);
   }
 }

diff --git a/dist/system.js b/dist/system.js
diff --git a/dist/system.js.map b/dist/system.js.map
diff --git a/dist/system.src.js b/dist/system.src.js
@@ -823,9 +823,7 @@ function core(loader) {
     return Promise.resolve(loaderLocate.call(this, load));
   }
 
-
   // Traceur conveniences
-  var aliasRegEx = /^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/;
   var es6RegEx = /(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/;
 
   var loaderTranslate = loader.translate;
@@ -835,13 +833,6 @@ function core(loader) {
     if (load.name == '@traceur')
       return loaderTranslate.call(loader, load);
 
-    // support ES6 alias modules ("export * from 'module';") without needing Traceur
-    var match;
-    if ((load.metadata.format == 'es6' || !load.metadata.format) && (match = load.source.match(aliasRegEx))) {
-      load.metadata.format = 'es6';
-      load.metadata.alias = match[1] || match[2];
-    }
-
     // detect ES6
     else if (load.metadata.format == 'es6' || !load.metadata.format && load.source.match(es6RegEx)) {
       load.metadata.format = 'es6';
@@ -870,13 +861,6 @@ function core(loader) {
         }
       };
     }
-    if (load.metadata.alias) {
-      var alias = load.metadata.alias;
-      load.metadata.deps = [alias];
-      load.metadata.execute = function(require) {
-        return require(alias);
-      }
-    }
     return loaderInstantiate.call(loader, load);
   }
 }

diff --git a/lib/extension-core.js b/lib/extension-core.js
@@ -93,9 +93,7 @@ function core(loader) {
     return Promise.resolve(loaderLocate.call(this, load));
   }
 
-
   // Traceur conveniences
-  var aliasRegEx = /^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/;
   var es6RegEx = /(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/;
 
   var loaderTranslate = loader.translate;
@@ -105,13 +103,6 @@ function core(loader) {
     if (load.name == '@traceur')
       return loaderTranslate.call(loader, load);
 
-    // support ES6 alias modules ("export * from 'module';") without needing Traceur
-    var match;
-    if ((load.metadata.format == 'es6' || !load.metadata.format) && (match = load.source.match(aliasRegEx))) {
-      load.metadata.format = 'es6';
-      load.metadata.alias = match[1] || match[2];
-    }
-
     // detect ES6
     else if (load.metadata.format == 'es6' || !load.metadata.format && load.source.match(es6RegEx)) {
       load.metadata.format = 'es6';
@@ -140,13 +131,6 @@ function core(loader) {
         }
       };
     }
-    if (load.metadata.alias) {
-      var alias = load.metadata.alias;
-      load.metadata.deps = [alias];
-      load.metadata.execute = function(require) {
-        return require(alias);
-      }
-    }
     return loaderInstantiate.call(loader, load);
   }
 }
diff --git a/test/test.js b/test/test.js
@@ -508,6 +508,14 @@ asyncTest('Basic exporting & importing', function() {
   })['catch'](err);
 });
 
+asyncTest('Export Star', function(assert) {
+  System['import']('tests/export-star').then(function(m) {
+    ok(m.foo == 'foo');
+    ok(m.bar == 'bar');
+    start();
+  }, err);
+});
+
 asyncTest('Importing a mapped loaded module', function() {
   System.map['default1'] = 'tests/default1';
   System['import']('default1').then(function(m) {
@@ -518,6 +526,13 @@ asyncTest('Importing a mapped loaded module', function() {
   }, err);
 });
 
+asyncTest('Loading empty ES6', function() {
+  System['import']('tests/empty-es6').then(function(m) {
+    ok(m && window.emptyES6);
+    start();
+  }, err);
+})
+
 asyncTest('Loading ES6 with format hint', function() {
   System['import']('tests/es6-format').then(function(m) {
     expect(0);

diff --git a/test/tests/empty-es6.js b/test/tests/empty-es6.js
@@ -0,0 +1 @@
+window.emptyES6 = true;
diff --git a/test/tests/export-star.js b/test/tests/export-star.js
@@ -0,0 +1,2 @@
+export * from './star-dep';
+export var bar = 'bar';
diff --git a/test/tests/star-dep.js b/test/tests/star-dep.js
@@ -0,0 +1 @@
+export var foo = 'foo';