Correct call site for wrapped functions and properties

Author: dougwilson

History.md

@@ -1,3 +1,8 @@
+unreleased
+==========
+
+  * Correct call site for wrapped functions and properties
+
 0.4.1 / 2014-07-19
 ==================
 

index.js

@@ -183,6 +183,7 @@ function log(message, site) {
   }
 
   var caller
+  var callFile
   var callSite
   var i = 0
   var seen = false
@@ -204,9 +205,12 @@ function log(message, site) {
   // get caller of deprecated thing in relation to file
   for (; i < stack.length; i++) {
     caller = callSiteLocation(stack[i])
+    callFile = caller[0]
 
-    if (caller[0] === file) {
+    if (callFile === file) {
       seen = true
+    } else if (callFile === this._file) {
+      file = this._file
     } else if (seen) {
       break
     }

test/fixtures/my-lib.js

@@ -66,6 +66,14 @@ exports.fnprop.propautomsg = 'thingie'
 deprecate.property(exports.fnprop, 'propa', 'fn propa gone')
 deprecate.property(exports.fnprop, 'propautomsg')
 
+exports.layerfn = function () {
+  exports.oldfn()
+}
+
+exports.layerprop = function () {
+  exports.propa
+}
+
 function fn(a1, a2) {
   return a2
 }

test/test.js

@@ -222,6 +222,13 @@ describe('deprecate.function(fn, message)', function () {
     ret.should.equal(2)
   })
 
+  it('should show call site outside scope', function () {
+    function callold() { mylib.layerfn() }
+    var stderr = captureStderr(callold)
+    stderr.should.containEql(' oldfn ')
+    stderr.should.match(/test.js:[0-9]+:[0-9]+/)
+  })
+
   it('should only warn once per call site', function () {
     function callold() {
       for (var i = 0; i < 5; i++) {
@@ -330,6 +337,13 @@ describe('deprecate.property(obj, prop, message)', function () {
     stderr.split(fileline[0]).should.have.length(3)
   })
 
+  it('should show call site outside scope', function () {
+    function callold() { mylib.layerprop() }
+    var stderr = captureStderr(callold)
+    stderr.should.containEql(' propa ')
+    stderr.should.match(/test.js:[0-9]+:[0-9]+/)
+  })
+
   describe('when obj is a function', function () {
     it('should log on access to property on function', function () {
       function callprop() { mylib.fnprop.propa }