Various

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

@@ -406,9 +406,6 @@ function logloads(loads) {
         load.status = 'failed';
         load.exception = exc;
 
-        loader.loaderObj.failed = loader.loaderObj.failed || [];
-        loader.loaderObj.failed.push(load);
-
         var linkSets = load.linkSets.concat([]);
         for (var i = 0, l = linkSets.length; i < l; i++)
           linkSetFailed(linkSets[i], exc);
@@ -529,7 +526,8 @@ function logloads(loads) {
       var startingLoad = linkSet.loads[0];
 
       // non-executing link variation for loader tracing
-      // on the server
+      // on the server. Not in spec.
+      /***/
       if (linkSet.loader.loaderObj.execute === false) {
         var loads = [].concat(linkSet.loads);
         for (var i = 0; i < loads.length; i++) {
@@ -546,6 +544,7 @@ function logloads(loads) {
         }
         return linkSet.resolve(startingLoad);
       }
+      /***/
 
       try {
         link(linkSet);
@@ -561,9 +560,16 @@ function logloads(loads) {
 
     // 15.2.5.2.4
     function linkSetFailed(linkSet, exc) {
+      var loader = linkSet.loader;
       var loads = linkSet.loads.concat([]);
       for (var i = 0, l = loads.length; i < l; i++) {
         var load = loads[i];
+
+        // store all failed load records
+        loader.loaderObj.failed = loader.loaderObj.failed || [];
+        if (loader.loaderObj.failed.indexOf(load) == -1)
+          loader.loaderObj.failed.push(load);
+
         var linkIndex = indexOf.call(load.linkSets, linkSet);
         console.assert(linkIndex != -1, 'link not present');
         load.linkSets.splice(linkIndex, 1);

dist/es6-module-loader.js

@@ -1090,9 +1090,6 @@ function logloads(loads) {
         load.status = 'failed';
         load.exception = exc;
 
-        loader.loaderObj.failed = loader.loaderObj.failed || [];
-        loader.loaderObj.failed.push(load);
-
         var linkSets = load.linkSets.concat([]);
         for (var i = 0, l = linkSets.length; i < l; i++)
           linkSetFailed(linkSets[i], exc);
@@ -1213,7 +1210,8 @@ function logloads(loads) {
       var startingLoad = linkSet.loads[0];
 
       // non-executing link variation for loader tracing
-      // on the server
+      // on the server. Not in spec.
+      /***/
       if (linkSet.loader.loaderObj.execute === false) {
         var loads = [].concat(linkSet.loads);
         for (var i = 0; i < loads.length; i++) {
@@ -1230,6 +1228,7 @@ function logloads(loads) {
         }
         return linkSet.resolve(startingLoad);
       }
+      /***/
 
       try {
         link(linkSet);
@@ -1245,9 +1244,16 @@ function logloads(loads) {
 
     // 15.2.5.2.4
     function linkSetFailed(linkSet, exc) {
+      var loader = linkSet.loader;
       var loads = linkSet.loads.concat([]);
       for (var i = 0, l = loads.length; i < l; i++) {
         var load = loads[i];
+
+        // store all failed load records
+        loader.loaderObj.failed = loader.loaderObj.failed || [];
+        if (loader.loaderObj.failed.indexOf(load) == -1)
+          loader.loaderObj.failed.push(load);
+
         var linkIndex = indexOf.call(load.linkSets, linkSet);
         console.assert(linkIndex != -1, 'link not present');
         load.linkSets.splice(linkIndex, 1);

lib/loader.js

@@ -406,9 +406,6 @@ function logloads(loads) {
         load.status = 'failed';
         load.exception = exc;
 
-        loader.loaderObj.failed = loader.loaderObj.failed || [];
-        loader.loaderObj.failed.push(load);
-
         var linkSets = load.linkSets.concat([]);
         for (var i = 0, l = linkSets.length; i < l; i++)
           linkSetFailed(linkSets[i], exc);
@@ -529,7 +526,8 @@ function logloads(loads) {
       var startingLoad = linkSet.loads[0];
 
       // non-executing link variation for loader tracing
-      // on the server
+      // on the server. Not in spec.
+      /***/
       if (linkSet.loader.loaderObj.execute === false) {
         var loads = [].concat(linkSet.loads);
         for (var i = 0; i < loads.length; i++) {
@@ -546,6 +544,7 @@ function logloads(loads) {
         }
         return linkSet.resolve(startingLoad);
       }
+      /***/
 
       try {
         link(linkSet);
@@ -561,9 +560,16 @@ function logloads(loads) {
 
     // 15.2.5.2.4
     function linkSetFailed(linkSet, exc) {
+      var loader = linkSet.loader;
       var loads = linkSet.loads.concat([]);
       for (var i = 0, l = loads.length; i < l; i++) {
         var load = loads[i];
+
+        // store all failed load records
+        loader.loaderObj.failed = loader.loaderObj.failed || [];
+        if (loader.loaderObj.failed.indexOf(load) == -1)
+          loader.loaderObj.failed.push(load);
+
         var linkIndex = indexOf.call(load.linkSets, linkSet);
         console.assert(linkIndex != -1, 'link not present');
         load.linkSets.splice(linkIndex, 1);

test/loads/deperror.js

@@ -0,0 +1 @@
+throw 'dep error';

test/loads/main.js

@@ -0,0 +1 @@
+import "./deperror";

test/test.js

@@ -296,6 +296,21 @@ function runTests() {
     })
   });
 
+  test('Dependency race error check (fix pending)', function(assert) {
+    var systemNormalize = System.normalize;
+    System.normalize = function(name) {
+      if (name == 'loadmain')
+        return 'loads/main';
+      return systemNormalize.apply(this, arguments);
+    }
+    System['import']('loadmain').then(function(m) {
+      assert('Module returned despite error');
+    }, function(e) {
+      assert(!!e, true);
+    });
+    System['import']('loads/deperror');
+  });
+
   test('Export Syntax', function(assert) {
     System['import']('syntax/export').then(function(m) {
       assert(