proper circular conditional error, fix #1599 again

systemjs · Apr 1, 2016 · 8bac50b · 8bac50b
1 parent b874bdf
commit 8bac50b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/trace.js b/lib/trace.js
@@ -194,7 +194,7 @@ Trace.prototype.getLoadRecord = function(canonical, excludeURLs, parentStack) {
       function toPackagePath(subPath) {
         if (isPlain(subPath)) {
           // plain name -> apply global map
-          return loader.normalize(subPath, normalizedPkgName + '/');
+          return loader.normalize(subPath);
         }
         else if (subPath == '.') {
           return Promise.resolve(normalizedPkgName);
@@ -685,11 +685,14 @@ Trace.prototype.inlineConditions = function(tree, loader, conditionalEnv) {
     Object.keys(conditionalResolutions).forEach(function(c) {
       var resolution = conditionalResolutions[c];
 
-      // yes this hangs on circular...
-      while (conditionalResolutions[resolution]) {
+      var seen = [];
+      while (conditionalResolutions[resolution] && seen.indexOf(resolution) == -1) {
+        seen.push(resolution);
         resolution = conditionalResolutions[resolution];
         conditionalResolutions[c] = resolution;
       }
+      if (seen.indexOf(resolution) != -1)
+        throw new Error('Circular conditional resolution ' + seen.join(' -> ') + ' -> ' + resolution);
     });
 
     // finally we do a deep clone of the tree, applying the conditional resolutions as we go