better compiler errors

systemjs · Feb 15, 2016 · d72141b · d72141b
1 parent 37bcdb2
commit d72141b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/compile.js b/lib/compile.js
@@ -104,7 +104,10 @@ function compileLoad(loader, load, compileOpts, cache) {
   if (format in compilerMap) {
     if (format == 'cjs')
       mappedLoad.source = mappedLoad.source.replace(hashBangRegEx, '');
-    return Promise.resolve(require(compilerMap[format]).compile(mappedLoad, compileOpts, loader))
+    return Promise.resolve()
+    .then(function() {
+      return require(compilerMap[format]).compile(mappedLoad, compileOpts, loader);
+    })
     .then(function(output) {
       // store compiled output in cache
       cache.loads[load.name] = {
@@ -113,10 +116,13 @@ function compileLoad(loader, load, compileOpts, cache) {
       };
 
       return output;
-    }, function(err) {
+    })
+    .catch(function(err) {
       // Traceur has a habit of throwing array errors
       if (err instanceof Array)
-        throw err[0];
+        err = err[0];
+      err.message = 'Error compiling ' + format + ' module "' + load.name + '" at ' + load.path + '\n\t' + err.message;
+      throw err;
     });
   }