coffee-script - npm Package Compare versions

Comparing version 1.12.2 to 1.12.3

lib/coffee-script/browser.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var CoffeeScript, compile, runScripts,

lib/coffee-script/cake.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var CoffeeScript, cakefileDirectory, fatalError, fs, helpers, missingTask, oparse, options, optparse, path, printTasks, switches, tasks;

lib/coffee-script/coffee-script.js

@@ -1,4 +0,4 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
-  var Lexer, SourceMap, base64encode, compile, ext, fn1, fs, helpers, i, len, lexer, packageJson, parser, path, ref, vm, withPrettyErrors,
+  var Lexer, SourceMap, base64encode, compile, ext, fn1, formatSourcePosition, fs, getSourceMap, helpers, i, len, lexer, packageJson, parser, path, ref, sourceMaps, sources, vm, withPrettyErrors,
     hasProp = {}.hasOwnProperty;
@@ -59,7 +59,13 @@
 
+  sources = {};
+
+  sourceMaps = {};
+
   exports.compile = compile = withPrettyErrors(function(code, options) {
-    var currentColumn, currentLine, encoded, extend, fragment, fragments, generateSourceMap, header, i, j, js, len, len1, map, merge, newLines, ref, ref1, sourceMapDataURI, sourceURL, token, tokens, v3SourceMap;
+    var currentColumn, currentLine, encoded, extend, filename, fragment, fragments, generateSourceMap, header, i, j, js, len, len1, map, merge, newLines, ref, ref1, sourceMapDataURI, sourceURL, token, tokens, v3SourceMap;
     merge = helpers.merge, extend = helpers.extend;
     options = extend({}, options);
-    generateSourceMap = options.sourceMap || options.inlineMap;
+    generateSourceMap = options.sourceMap || options.inlineMap || (options.filename == null);
+    filename = options.filename || '<anonymous>';
+    sources[filename] = code;
     if (generateSourceMap) {
@@ -123,2 +129,3 @@ map = new SourceMap;
       v3SourceMap = map.generate(options, code);
+      sourceMaps[filename] = map;
     }
@@ -160,5 +167,5 @@ if (options.inlineMap) {
     mainModule = require.main;
-    mainModule.filename = process.argv[1] = options.filename ? fs.realpathSync(options.filename) : '.';
+    mainModule.filename = process.argv[1] = options.filename ? fs.realpathSync(options.filename) : '<anonymous>';
     mainModule.moduleCache && (mainModule.moduleCache = {});
-    dir = options.filename ? path.dirname(fs.realpathSync(options.filename)) : fs.realpathSync('.');
+    dir = options.filename != null ? path.dirname(fs.realpathSync(options.filename)) : fs.realpathSync('.');
     mainModule.paths = require('module')._nodeModulePaths(dir);
@@ -327,2 +334,96 @@ if (!helpers.isCoffee(mainModule.filename) || require.extensions) {
 
+  formatSourcePosition = function(frame, getSourceMapping) {
+    var as, column, fileLocation, filename, functionName, isConstructor, isMethodCall, line, methodName, source, tp, typeName;
+    filename = void 0;
+    fileLocation = '';
+    if (frame.isNative()) {
+      fileLocation = "native";
+    } else {
+      if (frame.isEval()) {
+        filename = frame.getScriptNameOrSourceURL();
+        if (!filename) {
+          fileLocation = (frame.getEvalOrigin()) + ", ";
+        }
+      } else {
+        filename = frame.getFileName();
+      }
+      filename || (filename = "<anonymous>");
+      line = frame.getLineNumber();
+      column = frame.getColumnNumber();
+      source = getSourceMapping(filename, line, column);
+      fileLocation = source ? filename + ":" + source[0] + ":" + source[1] : filename + ":" + line + ":" + column;
+    }
+    functionName = frame.getFunctionName();
+    isConstructor = frame.isConstructor();
+    isMethodCall = !(frame.isToplevel() || isConstructor);
+    if (isMethodCall) {
+      methodName = frame.getMethodName();
+      typeName = frame.getTypeName();
+      if (functionName) {
+        tp = as = '';
+        if (typeName && functionName.indexOf(typeName)) {
+          tp = typeName + ".";
+        }
+        if (methodName && functionName.indexOf("." + methodName) !== functionName.length - methodName.length - 1) {
+          as = " [as " + methodName + "]";
+        }
+        return "" + tp + functionName + as + " (" + fileLocation + ")";
+      } else {
+        return typeName + "." + (methodName || '<anonymous>') + " (" + fileLocation + ")";
+      }
+    } else if (isConstructor) {
+      return "new " + (functionName || '<anonymous>') + " (" + fileLocation + ")";
+    } else if (functionName) {
+      return functionName + " (" + fileLocation + ")";
+    } else {
+      return fileLocation;
+    }
+  };
+
+  getSourceMap = function(filename) {
+    var answer;
+    if (sourceMaps[filename] != null) {
+      return sourceMaps[filename];
+    } else if (sourceMaps['<anonymous>'] != null) {
+      return sourceMaps['<anonymous>'];
+    } else if (sources[filename] != null) {
+      answer = compile(sources[filename], {
+        filename: filename,
+        sourceMap: true
+      });
+      return answer.sourceMap;
+    } else {
+      return null;
+    }
+  };
+
+  Error.prepareStackTrace = function(err, stack) {
+    var frame, frames, getSourceMapping;
+    getSourceMapping = function(filename, line, column) {
+      var answer, sourceMap;
+      sourceMap = getSourceMap(filename);
+      if (sourceMap != null) {
+        answer = sourceMap.sourceLocation([line - 1, column - 1]);
+      }
+      if (answer != null) {
+        return [answer[0] + 1, answer[1] + 1];
+      } else {
+        return null;
+      }
+    };
+    frames = (function() {
+      var j, len1, results;
+      results = [];
+      for (j = 0, len1 = stack.length; j < len1; j++) {
+        frame = stack[j];
+        if (frame.getFunction() === exports.run) {
+          break;
+        }
+        results.push("    at " + (formatSourcePosition(frame, getSourceMapping)));
+      }
+      return results;
+    })();
+    return (err.toString()) + "\n" + (frames.join('\n')) + "\n";
+  };
+
 }).call(this);

lib/coffee-script/command.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var BANNER, CoffeeScript, EventEmitter, SWITCHES, compileJoin, compileOptions, compilePath, compileScript, compileStdio, exec, findDirectoryIndex, forkNode, fs, helpers, hidden, joinTimeout, makePrelude, mkdirp, notSources, optionParser, optparse, opts, outputPath, parseOptions, path, printLine, printTokens, printWarn, ref, removeSource, removeSourceDir, silentUnlink, sourceCode, sources, spawn, timeLog, usage, useWinPathSep, version, wait, watch, watchDir, watchedDirs, writeJs,

lib/coffee-script/grammar.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var Parser, alt, alternatives, grammar, name, o, operators, token, tokens, unwrap;

lib/coffee-script/helpers.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var buildLocationData, extend, flatten, ref, repeat, syntaxErrorToString;

lib/coffee-script/index.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var key, ref, val;

lib/coffee-script/lexer.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var BOM, BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_ALIAS_MAP, COFFEE_KEYWORDS, COMMENT, COMPARE, COMPOUND_ASSIGN, HERECOMMENT_ILLEGAL, HEREDOC_DOUBLE, HEREDOC_INDENT, HEREDOC_SINGLE, HEREGEX, HEREGEX_OMIT, HERE_JSTOKEN, IDENTIFIER, INDENTABLE_CLOSERS, INDEXABLE, INVALID_ESCAPE, INVERSES, JSTOKEN, JS_KEYWORDS, LEADING_BLANK_LINE, LINE_BREAK, LINE_CONTINUER, Lexer, MATH, MULTI_DENT, NOT_REGEX, NUMBER, OPERATOR, POSSIBLY_DIVISION, REGEX, REGEX_FLAGS, REGEX_ILLEGAL, RELATION, RESERVED, Rewriter, SHIFT, SIMPLE_STRING_OMIT, STRICT_PROSCRIBED, STRING_DOUBLE, STRING_OMIT, STRING_SINGLE, STRING_START, TRAILING_BLANK_LINE, TRAILING_SPACES, UNARY, UNARY_MATH, VALID_FLAGS, WHITESPACE, compact, count, invertLiterate, isForFrom, isUnassignable, key, locationDataToString, ref, ref1, repeat, starts, throwSyntaxError,

lib/coffee-script/optparse.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var LONG_FLAG, MULTI_FLAG, OPTIONAL, OptionParser, SHORT_FLAG, buildRule, buildRules, normalizeArguments, repeat;

lib/coffee-script/register.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var CoffeeScript, Module, binary, child_process, ext, findExtension, fork, helpers, i, len, loadFile, path, ref;

lib/coffee-script/repl.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var CoffeeScript, addHistory, addMultilineHandler, fs, getCommandId, merge, nodeREPL, path, ref, replDefaults, runInContext, updateSyntaxError, vm;

lib/coffee-script/rewriter.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var BALANCED_PAIRS, CALL_CLOSERS, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, IMPLICIT_CALL, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INVERSES, LINEBREAKS, SINGLE_CLOSERS, SINGLE_LINERS, generate, k, left, len, ref, rite,

lib/coffee-script/scope.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var Scope,

lib/coffee-script/sourcemap.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.2
+// Generated by CoffeeScript 1.12.3
 (function() {
@@ -3,0 +3,0 @@ var LineMap, SourceMap;

package.json

@@ -11,3 +11,3 @@ {
   "author": "Jeremy Ashkenas",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "license": "MIT",
@@ -44,3 +44,3 @@ "engines": {
     "docco": "~0.7.0",
-    "google-closure-compiler-js": "^20161201.0.0",
+    "google-closure-compiler-js": "^20161201.0.1",
     "highlight.js": "~9.9.0",
@@ -47,0 +47,0 @@ "jison": ">=0.4.17",

No alert changes

Improved metrics

Total package byte prevSize

392565

increased by0.95%

Lines of code

8923

increased by1.13%

No dependency changes