Skip to content

Rewrite toString to match Node internals #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eriwen merged 8 commits into from
Sep 14, 2019
Merged

Rewrite toString to match Node internals #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dcb6417
Rewrite toString to match Node internals
niftylettuce Sep 13, 2019
1503a03
Fixed toString issue with prefixed " at "
niftylettuce Sep 13, 2019
c155969
Fixed this.isEval to this.getIsEval
niftylettuce Sep 13, 2019
a94646b
Fixed tests
niftylettuce Sep 13, 2019
691fb8c
Added dist to gitignore (closes #24)
niftylettuce Sep 13, 2019
87cdab5
Fix trusty > xenial per <https://travis-ci.community/t/travis-is-down…
niftylettuce Sep 13, 2019
67715cc
fix: fixed xvfb
niftylettuce Sep 13, 2019
c772aa8
fix: set travis to v8
niftylettuce Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ coverage

.idea
.coveralls.yml
dist
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js
sudo: required
dist: trusty
node_js: stable
dist: xenial
node_js: 8
addons:
sauce_connect: true
firefox: latest
Expand All @@ -10,10 +10,11 @@ addons:
- google-chrome
packages:
- google-chrome-stable
services:
- xvfb
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
before_script:
- npm install
script:
Expand Down
6 changes: 3 additions & 3 deletions spec/stackframe-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ describe('StackFrame', function() {
});

describe('#toString', function() {
it('represents empty StackFrame as "{anonymous}()"', function() {
expect(new StackFrame().toString()).toEqual('{anonymous}()');
it('represents empty StackFrame as "::"', function() {
expect(new StackFrame().toString()).toEqual('::');
});
it('represents complete StackFrame same as old stacktrace.js', function() {
var unit = new StackFrame({
Expand All @@ -172,7 +172,7 @@ describe('StackFrame', function() {
isNative: false,
source: 'SOURCE'
});
expect(unit.toString()).toEqual('fun(arg1,arg2)@http://site.com/path.js:1:4567');
expect(unit.toString()).toEqual('fun (http://site.com/path.js:1:4567)');
});
});
});
20 changes: 14 additions & 6 deletions stackframe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,20 @@
},

toString: function() {
var functionName = this.getFunctionName() || '{anonymous}';
var args = '(' + (this.getArgs() || []).join(',') + ')';
var fileName = this.getFileName() ? ('@' + this.getFileName()) : '';
var lineNumber = _isNumber(this.getLineNumber()) ? (':' + this.getLineNumber()) : '';
var columnNumber = _isNumber(this.getColumnNumber()) ? (':' + this.getColumnNumber()) : '';
return functionName + args + fileName + lineNumber + columnNumber;
var fileName = this.getFileName() || '';
var lineNumber = this.getLineNumber() || '';
var columnNumber = this.getColumnNumber() || '';
var functionName = this.getFunctionName() || '';
if (this.getIsEval()) {
if (fileName) {
return '[eval] (' + fileName + ':' + lineNumber + ':' + columnNumber + ')';
}
return '[eval]:' + lineNumber + ':' + columnNumber;
}
if (functionName) {
return functionName + ' (' + fileName + ':' + lineNumber + ':' + columnNumber + ')';
}
return fileName + ':' + lineNumber + ':' + columnNumber;
}
};

Expand Down