New approach of building substitute CallSite objects that pass all the tests

Author: Lucas-C

index.js

@@ -265,23 +265,19 @@ function log (message, site) {
  */
 
 function callSiteLocation (callSite) {
-  var site
-  if (callSite) {
-    var file = callSite.getFileName() || '<anonymous>'
-    var line = callSite.getLineNumber()
-    var colm = callSite.getColumnNumber()
-    if (callSite.isEval()) {
-      file = callSite.getEvalOrigin() + ', ' + file
-    }
-    site = [file, line, colm]
-    site.callSite = callSite
-    site.name = callSite.getFunctionName()
-  } else {
-    site = ['<unknown file>', '<unknown line>', '<unknown column>']
-    site.callSite = {}
-    site.callSite.getThis = function () { return null }
-    site.name = '<unknown function>'
+  var file = callSite.getFileName() || '<anonymous>'
+  var line = callSite.getLineNumber()
+  var colm = callSite.getColumnNumber()
+
+  if (callSite.isEval()) {
+    file = callSite.getEvalOrigin() + ', ' + file
   }
+
+  var site = [file, line, colm]
+
+  site.callSite = callSite
+  site.name = callSite.getFunctionName()
+
   return site
 }
 
@@ -393,21 +389,68 @@ function getStack () {
   // capture the stack
   Error.captureStackTrace(obj)
 
-  if (typeof obj.stack === 'string' || obj.stack instanceof String) {
+  var stack = obj.stack
+  if (typeof stack === 'string' || stack instanceof String) {
     // Means that prepareObjectStackTrace failed, obj.stack is not a CallSite array.
-    // We fallback to returning an empty array.
-    return []
+    // We fallback to returning an array of custom-made CallSite objects:
+    stack = stack.split('\n').slice(1).map(makeCallSite)
   }
 
   // slice this function off the top
-  var stack = obj.stack.slice(1)
+  stack = stack.slice(1)
 
   Error.prepareStackTrace = prep
   Error.stackTraceLimit = limit
 
   return stack
 }
 
+/**
+ * Build a substitute CallSite object out of a stack trace line.
+ */
+
+function makeCallSite (line) {
+  var at = line.split(' at ').slice(1).join(' at ')
+  var filePath = at
+  var functionName = '<anonymous>'
+  var lineNumber = 1
+  var columnNumber = ''
+  if (filePath.indexOf('(') !== -1) {
+    var parts = filePath.split(' (')
+    if (parts[0] !== 'eval') {
+      functionName = parts[0]
+    }
+    filePath = parts.slice(1).join(' (').slice(0, -1)
+  }
+  if (functionName !== '<anonymous>') {
+    var parts2 = rsplit(filePath, ':', 2)
+    filePath = parts2[0]
+    lineNumber = Number(parts2[1])
+    columnNumber = Number(parts2[2])
+    if (functionName.indexOf('Object.') === 0) {
+      functionName = functionName.slice(7)
+    }
+  }
+  return {
+    getFileName: function () { return filePath },
+    getLineNumber: function () { return lineNumber },
+    getColumnNumber: function () { return columnNumber },
+    isEval: function () { return false },
+    getFunctionName: function () { return functionName },
+    getThis: function () { return null },
+    toString: function () { return at }
+  }
+}
+
+/**
+ * Function to split a string from the right, based on a separator pattern.
+ */
+
+function rsplit (str, sep, maxsplit) {
+  var split = str.split(sep)
+  return [split.slice(0, -maxsplit).join(sep)].concat(split.slice(-maxsplit))
+}
+
 /**
  * Capture call site stack from v8.
  */

test/test.js

@@ -165,7 +165,7 @@ describe('deprecate(message)', function () {
       var stderr = captureStderr(callold)
       assert.notStrictEqual(stderr.indexOf(basename(__filename)), -1)
       assert.notStrictEqual(stderr.indexOf('deprecated'), -1)
-      assert.ok(/ exports\.automsganon | <anonymous@[^\\/]+[^:]+:[0-9]+:[0-9]+> /.test(stderr))
+      assert.ok(/ exports\.automsganon | <anonymous.*> /.test(stderr))
     })
 
     describe('in strict mode library', function () {
@@ -212,7 +212,7 @@ describe('deprecate(message)', function () {
         var stderr = captureStderr(callold)
         assert.notStrictEqual(stderr.indexOf(basename(__filename)), -1)
         assert.notStrictEqual(stderr.indexOf('deprecated'), -1)
-        assert.ok(/ exports\.automsganon | <anonymous@[^\\/]+[^:]+:[0-9]+:[0-9]+> /.test(stderr))
+        assert.ok(/ exports\.automsganon | <anonymous.*> /.test(stderr))
       })
     })
   })
@@ -371,7 +371,7 @@ describe('deprecate.function(fn, message)', function () {
       var stderr = captureStderr(callold)
       assert.notStrictEqual(stderr.indexOf(basename(__filename)), -1)
       assert.notStrictEqual(stderr.indexOf('deprecated'), -1)
-      assert.ok(/ <anonymous@[^\\/]+[^:]+my\.js:[0-9]+:[0-9]+> /.test(stderr))
+      assert.ok(/ <anonymous.*> /.test(stderr))
       assert.ok(/ at [^\\/]+[^:]+test\.js:/.test(stderr))
     })
 
@@ -390,7 +390,7 @@ describe('deprecate.function(fn, message)', function () {
         var stderr = captureStderr(callold)
         assert.notStrictEqual(stderr.indexOf(basename(__filename)), -1)
         assert.notStrictEqual(stderr.indexOf('deprecated'), -1)
-        assert.ok(/ <anonymous@[^\\/]+[^:]+strict\.js:[0-9]+:[0-9]+> /.test(stderr))
+        assert.ok(/ <anonymous.*> /.test(stderr))
         assert.ok(/ at [^\\/]+[^:]+test\.js:/.test(stderr))
       })
     })
@@ -485,7 +485,7 @@ describe('deprecate.property(obj, prop, message)', function () {
       function callprop () { return mylib.fnprop.propautomsg }
       var stderr = captureStderr(callprop)
       assert.notStrictEqual(stderr.indexOf(' deprecated '), -1)
-      assert.notStrictEqual(stderr.indexOf(' thefn.propautomsg '), -1)
+      assert.notStrictEqual(stderr.indexOf(' propautomsg '), -1)
     })
 
     describe('in strict mode library', function () {
@@ -500,7 +500,7 @@ describe('deprecate.property(obj, prop, message)', function () {
         function callprop () { return strictlib.fnprop.propautomsg }
         var stderr = captureStderr(callprop)
         assert.notStrictEqual(stderr.indexOf(' deprecated '), -1)
-        assert.notStrictEqual(stderr.indexOf(' thefn.propautomsg '), -1)
+        assert.notStrictEqual(stderr.indexOf(' propautomsg '), -1)
       })
     })
   })