Skip to content

Adds filename to JSXTransform error messages #731

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
sophiebits merged 3 commits into from
Jan 20, 2014
Merged

Adds filename to JSXTransform error messages #731

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1a949e
Adds the filename to JSXTransform error message, making it easier to …
fabiomcosta Dec 28, 2013
d829d1a
Adding current page's url for inline code and code improvement
fabiomcosta Dec 28, 2013
de7a92a
Updating error message to also show part of the code, making it easie…
fabiomcosta Dec 30, 2013
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
60 changes: 57 additions & 3 deletions vendor/browser-transforms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,65 @@ exports.exec = function(code) {

var inlineScriptCount = 0;

// This method returns a nicely formated line of code pointing the
// exactly location of the error `e`.
// The line is limited in size so big lines of code are also shown
// in a readable way.
// Example:
//
// ... x', overflow:'scroll'}} id={} onScroll={this.scroll} class=" ...
// ^
var createSourceCodeErrorMessage = function(code, e) {
var sourceLines = code.split('\n');
var erroneousLine = sourceLines[e.lineNumber - 1];

// Removes any leading indenting spaces and gets the number of
// chars indenting the `erroneousLine`
var indentation = 0;
erroneousLine = erroneousLine.replace(/^\s+/, function(leadingSpaces) {
indentation = leadingSpaces.length;
return '';
});

// Defines the number of characters that are going to show
// before and after the erroneous code
var LIMIT = 30;
var errorColumn = e.column - indentation;

if (errorColumn > LIMIT) {
erroneousLine = '... ' + erroneousLine.slice(errorColumn - LIMIT);
errorColumn = 4 + LIMIT;
}
if (erroneousLine.length - errorColumn > LIMIT) {
erroneousLine = erroneousLine.slice(0, errorColumn + LIMIT) + ' ...';
}
var message = '\n\n' + erroneousLine + '\n';
message += new Array(errorColumn - 1).join(' ') + '^';
return message;
};

var transformCode = function(code, source) {
var jsx = docblock.parseAsObject(docblock.extract(code)).jsx;

if (jsx) {
var transformed = transformReact(code);
try {
var transformed = transformReact(code);
} catch(e) {
e.message += '\n at ';
if (source) {
if ('fileName' in e) {
// We set `fileName` if it's supported by this error object and
// a `source` was provided.
// The error will correctly point to `source` in Firefox.
e.fileName = source;
}
e.message += source + ':' + e.lineNumber + ':' + e.column;
} else {
e.message += location.href;
}
e.message += createSourceCodeErrorMessage(code, e);
throw e;
}

var map = transformed.sourceMap.toJSON();
if (source == null) {
Expand Down Expand Up @@ -98,15 +152,15 @@ var load = exports.load = function(url, callback) {

runScripts = function() {
var scripts = document.getElementsByTagName('script');

// Array.prototype.slice cannot be used on NodeList on IE8
var jsxScripts = [];
for (var i = 0; i < scripts.length; i++) {
if (scripts.item(i).type === 'text/jsx') {
jsxScripts.push(scripts.item(i));
}
}

console.warn("You are using the in-browser JSX transformer. Be sure to precompile your JSX for production - http://facebook.github.io/react/docs/tooling-integration.html#jsx");

jsxScripts.forEach(function(script) {
Expand Down