Merge 6115584 into e07e0d8

.travis.yml

@@ -1,8 +1,7 @@
+sudo: false
 language: node_js
 node_js:
+  - '6'
   - '4'
-  - '3'
-  - '2'
-  - '1'
 script: "make test-travis"
 after_script: "npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"

index.js

@@ -72,7 +72,13 @@ proto._load = function (target, field, options) {
     }
 
     var names = properties.join('.');
-    var mod = interopRequire(item.fullpath);
+    var mod;
+    try {
+      mod = interopRequire(item.fullpath);
+    } catch (err) {
+      err.message = '[loading] load file: ' + item.fullpath + ', error: ' + err.message;
+      throw err;
+    }
     // if exist initializer function, run it;
     if (initializer) {
       mod = initializer(mod);

test/fixtures/syntax_error/error.js

@@ -0,0 +1,3 @@
+modulde.exports = function (a) {
+  yield a;
+}

test/loading.test.js

@@ -102,7 +102,7 @@ describe('loading.test.js', function () {
       .into(app, 'proxyClasses');
     (function() {
       app.proxyClasses.UserProxy();
-    }).should.throw('Class constructors cannot be invoked without \'new\'');
+    }).should.throw(/cannot be invoked without 'new'/);
     var instance = new app.proxyClasses.UserProxy();
     instance.getUser().should.eql({ name: 'xiaochen.gaoxc' });
   });
@@ -166,6 +166,14 @@ describe('loading.test.js', function () {
     app.model.mod.should.eql({ a: 1 });
   });
 
+  it('should contain syntax error filepath', function() {
+    var app = {};
+    var fixtures = path.join(__dirname, './fixtures/syntax_error');
+    (function () {
+      loading(fixtures).into(app, 'model');
+    }).should.throw(/\[loading\] load file: .*?test\/fixtures\/syntax_error\/error\.js, error:/);
+  });
+
   // feature detection
   function supportEs6Class() {
       'use strict';