mirror of
https://github.com/jashkenas/coffeescript.git
synced 2022-11-09 12:23:24 -05:00

* Make `addLocationDataFn` more DRY * Style fixes * Provide access to full parser inside our custom function running in parser.js; rename the function to lay the groundwork for adding data aside from location data * Fix style. * Fix style. * Label test comments * Update grammar to remove comment tokens; update DSL to call new helper function that preserves comments through parsing * New implementation of compiling block comments: the lexer pulls them out of the token stream, attaching them as a property to a token; the rewriter moves the attachment around so it lives on a token that is destined to make it through to compilation (and in a good placement); and the nodes render the block comment. All tests but one pass (commented out). * If a comment follows a class declaration, move the comment inside the class body * Style * Improve indentation of multiline comments * Fix indentation for block comments, at least in the cases covered by the one failing test * Don’t reverse the order of unshifted comments * Simplify rewriter’s handling of comments, generalizing the special case * Expand the list of tokens we need to avoid for passing comments through the parser; get some literal tokens to have nodes created for them so that the comments pass through * Improve comments; fix multiline flag * Prepare HereComments for processing line comments * Line comments, first draft: the tests pass, but the line comments aren’t indented and sometimes trail previous lines when they shouldn’t; updated compiler output in following commit * Updated compiler, now with line comments * `process` doesn’t exist in the browser, so we should check for its existence first * Update parser output * Test that proves #4290 is fixed * Indent line comments, first pass * Compiled output with indented line comments * Comments that start a new line shouldn’t trail; don’t skip comments attached to generated tokens; stop looking for indentation once we hit a newline * Revised output * Cleanup * Split “multiline” line comment tokens, shifting them forward or back as appropriate * Fix comments in module specifiers * Abstract attaching comments to a node * Line comments in interpolated strings * Line comments can’t be multiline anymore * Improve handling of blank lines and indentation of following comments that start a new line (i.e. don’t trail) * Make comments compilation more object-oriented * Remove lots of dead code that we don’t need anymore because a comment is never a node, only a fragment * Improve eqJS helper * Fix #4290 definitively, with improved output for arrays with interspersed block comments * Add support for line comments output interspersed within arrays * Fix mistake, don’t lose the variable we’re working on * Remove redundant replacements * Check for indentation only from the start of the string * Indentations in generated JS are always multiples of two spaces (never tabs) so just look for 2+ spaces * Update package versions; run Babel twice, once for each preset, temporarily until a Babili bug is fixed that prevents it from running with the env preset * Don’t rely on `fragment.type`, which can break when the compiler is minified * Updated generated docs and browser compiler * Output block comments after function arguments * Comments appear above scope `var` declarations; better tracking of generated `JS` tokens created only to shepherd comments through to the output * Create new FuncGlyph node, to hold comments we want to output near the function parameters * Block comments between `)` and `->`/`=>` get output between `)` and `{`. * Fix indentation of comments that are the first line inside a bare mode block * Updated output * Full Flow example * Updated browser compiler * Abstract and organize comment fragment generation code; store more properties on the comment fragment objects; make `throw` behave like `return` * Abstract token insertion code * Add missing locationData to STRING_START token, giving it the locationData of the overall StringWithInterpolations token so that comments attached to STRING_START end up on the StringWithInterpolations node * Allow `SUPER` tokens to carry comments * Rescue comments from `Existence` nodes and `If` nodes’ conditions * Rescue comments after `\` line continuation tokens * Updated compiled output * Updated browser compiler * Output block comments in the same `compileFragments` method as line comments, except for inline block comments * Comments before splice * Updated browser compiler * Track compiledComments as a property of Base, to ensure that it’s not a global variable * Docs: split up the Usage section * Docs for type annotations via Flow; updated docs output * Update regular comments documentation * Updated browser compiler * Comments before soak * Comments before static methods, and probably before `@variable =` (this) assignments generally * Comments before ‘if exists?’, refactor comment before ‘if this.var’ to be more precise, improve helper methods * Comments before a method that contains ‘super()’ should output above the method property, not above the ‘super.method()’ call * Fix missing comments before `if not` (i.e. before a UNARY token) * Fix comments before ‘for’; add test for comment before assignment if (fixed in earlier commit) * Comments within heregexes * Updated browser compiler * Update description to reflect what’s now happening in compileCommentFragments * Preserve blank lines between line comments; output “whitespace-only” line comments as blank lines, rather than `//` following by whitespace * Better future-proof comments tests * Comments before object destructuring; abstract method for setting comments aside before compilation * Handle more cases of comments before or after `for` loop declaration lines * Fix indentation of comments preceding `for` loops * Fix comment before splat function parameter * Catch another RegexWithInterpolations comment edge case * Updated browser compiler * Change heregex example to one that’s more readable; update output * Remove a few last references to the defunct HERECOMMENT token * Abstract location hash creation into a function * Improved clarity per code review notes * Updated browser compiler
141 lines
4.8 KiB
JavaScript
141 lines
4.8 KiB
JavaScript
// Generated by CoffeeScript 2.0.0-beta3
|
||
(function() {
|
||
// This **Browser** compatibility layer extends core CoffeeScript functions
|
||
// to make things work smoothly when compiling code directly in the browser.
|
||
// We add support for loading remote Coffee scripts via **XHR**, and
|
||
// `text/coffeescript` script tags, source maps via data-URLs, and so on.
|
||
var CoffeeScript, compile, runScripts,
|
||
indexOf = [].indexOf;
|
||
|
||
CoffeeScript = require('./coffeescript');
|
||
|
||
compile = CoffeeScript.compile;
|
||
|
||
// Use standard JavaScript `eval` to eval code.
|
||
CoffeeScript.eval = function(code, options = {}) {
|
||
if (options.bare == null) {
|
||
options.bare = true;
|
||
}
|
||
return eval(compile(code, options));
|
||
};
|
||
|
||
// Running code does not provide access to this scope.
|
||
CoffeeScript.run = function(code, options = {}) {
|
||
options.bare = true;
|
||
options.shiftLine = true;
|
||
return Function(compile(code, options))();
|
||
};
|
||
|
||
// Export this more limited `CoffeeScript` than what is exported by
|
||
// `index.coffee`, which is intended for a Node environment.
|
||
module.exports = CoffeeScript;
|
||
|
||
// If we’re not in a browser environment, we’re finished with the public API.
|
||
if (typeof window === "undefined" || window === null) {
|
||
return;
|
||
}
|
||
|
||
// Include source maps where possible. If we’ve got a base64 encoder, a
|
||
// JSON serializer, and tools for escaping unicode characters, we’re good to go.
|
||
// Ported from https://developer.mozilla.org/en-US/docs/DOM/window.btoa
|
||
if ((typeof btoa !== "undefined" && btoa !== null) && (typeof JSON !== "undefined" && JSON !== null)) {
|
||
compile = function(code, options = {}) {
|
||
options.inlineMap = true;
|
||
return CoffeeScript.compile(code, options);
|
||
};
|
||
}
|
||
|
||
// Load a remote script from the current domain via XHR.
|
||
CoffeeScript.load = function(url, callback, options = {}, hold = false) {
|
||
var xhr;
|
||
options.sourceFiles = [url];
|
||
xhr = window.ActiveXObject ? new window.ActiveXObject('Microsoft.XMLHTTP') : new window.XMLHttpRequest();
|
||
xhr.open('GET', url, true);
|
||
if ('overrideMimeType' in xhr) {
|
||
xhr.overrideMimeType('text/plain');
|
||
}
|
||
xhr.onreadystatechange = function() {
|
||
var param, ref;
|
||
if (xhr.readyState === 4) {
|
||
if ((ref = xhr.status) === 0 || ref === 200) {
|
||
param = [xhr.responseText, options];
|
||
if (!hold) {
|
||
CoffeeScript.run(...param);
|
||
}
|
||
} else {
|
||
throw new Error(`Could not load ${url}`);
|
||
}
|
||
if (callback) {
|
||
return callback(param);
|
||
}
|
||
}
|
||
};
|
||
return xhr.send(null);
|
||
};
|
||
|
||
// Activate CoffeeScript in the browser by having it compile and evaluate
|
||
// all script tags with a content-type of `text/coffeescript`.
|
||
// This happens on page load.
|
||
runScripts = function() {
|
||
var coffees, coffeetypes, execute, fn, i, index, j, len, s, script, scripts;
|
||
scripts = window.document.getElementsByTagName('script');
|
||
coffeetypes = ['text/coffeescript', 'text/literate-coffeescript'];
|
||
coffees = (function() {
|
||
var j, len, ref, results;
|
||
results = [];
|
||
for (j = 0, len = scripts.length; j < len; j++) {
|
||
s = scripts[j];
|
||
if (ref = s.type, indexOf.call(coffeetypes, ref) >= 0) {
|
||
results.push(s);
|
||
}
|
||
}
|
||
return results;
|
||
})();
|
||
index = 0;
|
||
execute = function() {
|
||
var param;
|
||
param = coffees[index];
|
||
if (param instanceof Array) {
|
||
CoffeeScript.run(...param);
|
||
index++;
|
||
return execute();
|
||
}
|
||
};
|
||
fn = function(script, i) {
|
||
var options, source;
|
||
options = {
|
||
literate: script.type === coffeetypes[1]
|
||
};
|
||
source = script.src || script.getAttribute('data-src');
|
||
if (source) {
|
||
options.filename = source;
|
||
return CoffeeScript.load(source, function(param) {
|
||
coffees[i] = param;
|
||
return execute();
|
||
}, options, true);
|
||
} else {
|
||
// `options.filename` defines the filename the source map appears as
|
||
// in Developer Tools. If a script tag has an `id`, use that as the
|
||
// filename; otherwise use `coffeescript`, or `coffeescript1` etc.,
|
||
// leaving the first one unnumbered for the common case that there’s
|
||
// only one CoffeeScript script block to parse.
|
||
options.filename = script.id && script.id !== '' ? script.id : `coffeescript${(i !== 0 ? i : '')}`;
|
||
options.sourceFiles = ['embedded'];
|
||
return coffees[i] = [script.innerHTML, options];
|
||
}
|
||
};
|
||
for (i = j = 0, len = coffees.length; j < len; i = ++j) {
|
||
script = coffees[i];
|
||
fn(script, i);
|
||
}
|
||
return execute();
|
||
};
|
||
|
||
// Listen for window load, both in decent browsers and in IE.
|
||
if (window.addEventListener) {
|
||
window.addEventListener('DOMContentLoaded', runScripts, false);
|
||
} else {
|
||
window.attachEvent('onload', runScripts);
|
||
}
|
||
|
||
}).call(this);
|