System.register generic __moduleName arg

systemjs · Dec 14, 2015 · 7202794 · 7202794
1 parent 46cf9eb
commit 7202794
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/lib/register.js b/lib/register.js
@@ -283,7 +283,7 @@ function createEntry() {
 
       module.locked = false;
       return value;
-    });
+    }, entry.name);
 
     module.setters = declaration.setters;
     module.execute = declaration.execute;

diff --git a/test/test.js b/test/test.js
@@ -514,6 +514,13 @@ asyncTest('System.register regex test', function() {
   }, err);
 });
 
+asyncTest('System.register module name arg', function() {
+  System['import']('tests/module-name.js').then(function(m) {
+    ok(m.name == System.baseURL + 'tests/module-name.js');
+    start();
+  }, err);
+});
+
 asyncTest('System.register group linking test', function() {
   System.config({
     bundles: {

diff --git a/test/tests/module-name.js b/test/tests/module-name.js
@@ -0,0 +1,8 @@
+System.register([], function(_export, __moduleName) {
+  return {
+    setters: [],
+    execute: function() {
+      _export('name', __moduleName);
+    }
+  };
+})