Merge branch 'release-2.0.2'

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="2.0.2"></a>
+## [2.0.2](https://github.com/poppinss/youch/compare/v2.0.0...v2.0.2) (2017-01-27)
+
+
+### Bug Fixes
+
+* **package:** fix path to main file ([5ad3b4a](https://github.com/poppinss/youch/commit/5ad3b4a))
+
+
+
 <a name="2.0.1"></a>
 ## [2.0.1](https://github.com/poppinss/youch/compare/v2.0.0...v2.0.1) (2017-01-26)
 

README.md

@@ -4,8 +4,8 @@
 <br />
 
 <p>
-  <a href="http://res.cloudinary.com/adonisjs/image/upload/v1485019153/Youch_g3vj4f.jpg">
-    <img src="http://res.cloudinary.com/adonisjs/image/upload/v1485019153/Youch_g3vj4f.jpg" style="width: 600px;" />
+  <a href="http://res.cloudinary.com/adonisjs/image/upload/v1485520687/Screen_Shot_2017-01-27_at_6.07.28_PM_blcaau.png">
+    <img src="http://res.cloudinary.com/adonisjs/image/upload/v1485520687/Screen_Shot_2017-01-27_at_6.07.28_PM_blcaau.png" style="width: 600px;" />
   </a>
 </p>
 

examples/index.js

@@ -17,7 +17,6 @@ function foo () {
 }
 
 http.createServer((req, res) => {
-
   let youch = null
   try {
     foo ()

package.json

@@ -1,11 +1,8 @@
 {
   "name": "youch",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "HTML Pretty error stack viewer",
-  "main": "index.js",
-  "bin": {
-    "youch": "src/Youch/index.js"
-  },
+  "main": "src/Youch/index.js",
   "directories": {
     "example": "examples"
   },
@@ -24,7 +21,7 @@
   },
   "dependencies": {
     "mustache": "^2.3.0",
-    "stackman": "^1.2.7"
+    "stack-trace": "0.0.9"
   },
   "repository": {
     "type": "git",

src/Youch/index.js

@@ -11,34 +11,65 @@
 
 const Mustache = require('mustache')
 const path = require('path')
+const stackTrace = require('stack-trace')
 const fs = require('fs')
 const VIEW_PATH = '../resources/error.mustache'
+const startingSlashRegex = new RegExp(`^${path.sep}`)
 
 const viewTemplate = fs.readFileSync(path.join(__dirname, VIEW_PATH), 'utf-8')
 
 class Youch {
   constructor (error, request) {
-    const options = {
-      context: 5
-    }
-
+    this.codeContext = 5
     this._filterHeaders = ['cookie', 'connection']
-    this.stackman = require('stackman')(options)
     this.error = error
     this.request = request
   }
 
+  /**
+   * Returns the source code for a given file. It unable to
+   * read file it resolves the promise with a null.
+   *
+   * @param  {Object} frame
+   * @return {Promise}
+   */
+  _getFrameSource (frame) {
+    return new Promise((resolve, reject) => {
+      fs.readFile(frame.getFileName(), 'utf-8', (error, contents) => {
+        if (error) {
+          resolve(null)
+        }
+
+        const lines = contents.split(/\r?\n/)
+        const lineNumber = frame.getLineNumber()
+
+        resolve({
+          pre: lines.slice(Math.max(0, lineNumber - (this.codeContext + 1)), lineNumber - 1),
+          line: lines[lineNumber - 1],
+          post: lines.slice(lineNumber, lineNumber + this.codeContext)
+        })
+      })
+    })
+  }
+
   /**
    * Parses the error stack and returns serialized
    * frames out of it.
    *
    * @return {Object}
    */
   _parseError () {
-    return new Promise((resolve) => {
-      this.stackman(this.error, (stack) => {
-        resolve(stack)
-      })
+    return new Promise((resolve, reject) => {
+      const stack = stackTrace.parse(this.error)
+      Promise.all(stack.map((frame) => {
+        if (this._isNode(frame)) {
+          return Promise.resolve(frame)
+        }
+        return this._getFrameSource(frame).then((context) => {
+          frame.context = context
+          return frame
+        })
+      })).then(resolve).catch(reject)
     })
   }
 
@@ -77,7 +108,7 @@ class Youch {
       classes.push('active')
     }
 
-    if (!frame.isApp()) {
+    if (!this._isApp(frame)) {
       classes.push('native-frame')
     }
 
@@ -104,15 +135,47 @@ class Youch {
    * @return {Object}
    */
   _serializeFrame (frame) {
+    const relativeFileName = frame.getFileName().indexOf(process.cwd()) > -1 ?
+      frame.getFileName().replace(process.cwd(), '').replace(startingSlashRegex, '') :
+      frame.getFileName()
+
     return {
-      file: frame.getRelativeFileName(),
-      method: frame.getFunctionNameSanitized(),
+      file: relativeFileName,
+      method: frame.getFunctionName(),
       line: frame.getLineNumber(),
       column: frame.getColumnNumber(),
       context: this._getContext(frame)
     }
   }
 
+  /**
+   * Returns whether frame belongs to nodejs
+   * or not.
+   *
+   * @return {Boolean} [description]
+   */
+  _isNode (frame) {
+    if (frame.isNative()) {
+      return true
+    }
+
+    const filename = frame.getFileName() || ''
+    return !path.isAbsolute(filename) && filename[0] !== '.'
+  }
+
+  /**
+   * Returns whether code belongs to the app
+   * or not.
+   *
+   * @return {Boolean} [description]
+   */
+  _isApp (frame) {
+    if (this._isNode(frame)) {
+      return false
+    }
+    return !~(frame.getFileName() || '').indexOf('node_modules' + path.sep)
+  }
+
   /**
    * Serializes stack to Mustache friendly object to
    * be used within the view. Optionally can pass
@@ -129,7 +192,7 @@ class Youch {
       message: this.error.message,
       name: this.error.name,
       status: this.error.status,
-      frames: stack.frames.map(callback)
+      frames: stack instanceof Array === true ? stack.filter((frame) => frame.getFileName()).map(callback) : []
     }
   }