fix data-init function

Author: guybedford

dist/es6-module-loader-sans-promises.js

@@ -652,6 +652,7 @@ function logloads(loads) {
             if (!module || !(module instanceof Module))
               throw new TypeError('Execution must define a Module instance');
             load.module = {
+              name: load.name,
               module: module
             };
             load.status = 'linked';
@@ -736,8 +737,12 @@ function logloads(loads) {
 
         // only declarative modules have dynamic bindings
         if (depModule.importers) {
-          depModule.importers.push(module);
           module.dependencies.push(depModule);
+          depModule.importers.push(module);
+        }
+        else {
+          // track dynamic records as null module records as already linked
+          module.dependencies.push(null);
         }
 
         // run the setter for this dependency
@@ -801,6 +806,10 @@ function logloads(loads) {
 
       for (var i = 0, l = deps.length; i < l; i++) {
         var dep = deps[i];
+        // dynamic dependencies are empty in module.dependencies
+        // as they are already linked
+        if (!dep)
+          continue;
         if (indexOf.call(seen, dep) == -1) {
           err = ensureEvaluated(dep, seen, loader);
           // stop on error, see https://bugs.ecmascript.org/show_bug.cgi?id=2996
@@ -1337,6 +1346,12 @@ function logloads(loads) {
   }
   System.paths = { '*': '*.js' };
 
+  // note we have to export before runing "init" below
+  if (typeof exports === 'object')
+    module.exports = System;
+
+  global.System = System;
+
   // <script type="module"> support
   // allow a data-init function callback once loaded
   if (isBrowser) {
@@ -1375,9 +1390,4 @@ function logloads(loads) {
       window[curScript.getAttribute('data-init')]();
   }
 
-  if (typeof exports === 'object')
-    module.exports = System;
-
-  global.System = System;
-
 })(typeof global !== 'undefined' ? global : this);

dist/es6-module-loader-sans-promises.min.js

@@ -1826,6 +1826,7 @@ function logloads(loads) {
             if (!module || !(module instanceof Module))
               throw new TypeError('Execution must define a Module instance');
             load.module = {
+              name: load.name,
               module: module
             };
             load.status = 'linked';
@@ -1910,8 +1911,12 @@ function logloads(loads) {
 
         // only declarative modules have dynamic bindings
         if (depModule.importers) {
-          depModule.importers.push(module);
           module.dependencies.push(depModule);
+          depModule.importers.push(module);
+        }
+        else {
+          // track dynamic records as null module records as already linked
+          module.dependencies.push(null);
         }
 
         // run the setter for this dependency
@@ -1975,6 +1980,10 @@ function logloads(loads) {
 
       for (var i = 0, l = deps.length; i < l; i++) {
         var dep = deps[i];
+        // dynamic dependencies are empty in module.dependencies
+        // as they are already linked
+        if (!dep)
+          continue;
         if (indexOf.call(seen, dep) == -1) {
           err = ensureEvaluated(dep, seen, loader);
           // stop on error, see https://bugs.ecmascript.org/show_bug.cgi?id=2996
@@ -2511,6 +2520,12 @@ function logloads(loads) {
   }
   System.paths = { '*': '*.js' };
 
+  // note we have to export before runing "init" below
+  if (typeof exports === 'object')
+    module.exports = System;
+
+  global.System = System;
+
   // <script type="module"> support
   // allow a data-init function callback once loaded
   if (isBrowser) {
@@ -2549,9 +2564,4 @@ function logloads(loads) {
       window[curScript.getAttribute('data-init')]();
   }
 
-  if (typeof exports === 'object')
-    module.exports = System;
-
-  global.System = System;
-
 })(typeof global !== 'undefined' ? global : this);

dist/es6-module-loader.js

@@ -221,6 +221,12 @@
   }
   System.paths = { '*': '*.js' };
 
+  // note we have to export before runing "init" below
+  if (typeof exports === 'object')
+    module.exports = System;
+
+  global.System = System;
+
   // <script type="module"> support
   // allow a data-init function callback once loaded
   if (isBrowser) {
@@ -259,9 +265,4 @@
       window[curScript.getAttribute('data-init')]();
   }
 
-  if (typeof exports === 'object')
-    module.exports = System;
-
-  global.System = System;
-
 })(typeof global !== 'undefined' ? global : this);