coffee-script - npm Package Compare versions

Comparing version 1.12.4 to 1.12.5

lib/coffee-script/browser.js

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

lib/coffee-script/cake.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.4
+// Generated by CoffeeScript 1.12.5
 (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,2 +0,2 @@
-// Generated by CoffeeScript 1.12.4
+// Generated by CoffeeScript 1.12.5
 (function() {
@@ -3,0 +3,0 @@ var Lexer, SourceMap, base64encode, compile, ext, fn1, formatSourcePosition, fs, getSourceMap, helpers, i, len, lexer, packageJson, parser, path, ref, sourceMaps, sources, vm, withPrettyErrors,

lib/coffee-script/command.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.4
+// Generated by CoffeeScript 1.12.5
 (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.4
+// Generated by CoffeeScript 1.12.5
 (function() {
@@ -398,2 +398,4 @@ var Parser, alt, alternatives, grammar, name, o, operators, token, tokens, unwrap;
         return new ExportSpecifier(new Literal($1));
+      }), o('DEFAULT AS Identifier', function() {
+        return new ExportSpecifier(new Literal($1), $3);
       })
@@ -400,0 +402,0 @@ ],

lib/coffee-script/helpers.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.4
+// Generated by CoffeeScript 1.12.5
 (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.4
+// Generated by CoffeeScript 1.12.5
 (function() {
@@ -3,0 +3,0 @@ var key, ref, val;

lib/coffee-script/lexer.js

@@ -1,4 +0,4 @@
-// Generated by CoffeeScript 1.12.4
+// Generated by CoffeeScript 1.12.5
 (function() {
-  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,
+  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, 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, REGEX_INVALID_ESCAPE, RELATION, RESERVED, Rewriter, SHIFT, SIMPLE_STRING_OMIT, STRICT_PROSCRIBED, STRING_DOUBLE, STRING_INVALID_ESCAPE, 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,
     indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
@@ -30,2 +30,3 @@ slice = [].slice;
       this.seenExport = false;
+      this.importSpecifierList = false;
       this.exportSpecifierList = false;
@@ -73,3 +74,3 @@ this.chunkLine = opts.line || 0;
     Lexer.prototype.identifierToken = function() {
-      var alias, colon, colonOffset, id, idLength, input, match, poppedToken, prev, ref2, ref3, ref4, ref5, ref6, ref7, tag, tagToken;
+      var alias, colon, colonOffset, id, idLength, input, match, poppedToken, prev, ref2, ref3, ref4, ref5, ref6, ref7, ref8, ref9, tag, tagToken;
       if (!(match = IDENTIFIER.exec(this.chunk))) {
@@ -100,15 +101,15 @@ return 0;
       }
-      if (id === 'as' && this.seenExport && this.tag() === 'IDENTIFIER') {
+      if (id === 'as' && this.seenExport && ((ref4 = this.tag()) === 'IDENTIFIER' || ref4 === 'DEFAULT')) {
         this.token('AS', id);
         return id.length;
       }
-      if (id === 'default' && this.seenExport) {
+      if (id === 'default' && this.seenExport && ((ref5 = this.tag()) === 'EXPORT' || ref5 === 'AS')) {
         this.token('DEFAULT', id);
         return id.length;
       }
-      ref4 = this.tokens, prev = ref4[ref4.length - 1];
-      tag = colon || (prev != null) && (((ref5 = prev[0]) === '.' || ref5 === '?.' || ref5 === '::' || ref5 === '?::') || !prev.spaced && prev[0] === '@') ? 'PROPERTY' : 'IDENTIFIER';
+      ref6 = this.tokens, prev = ref6[ref6.length - 1];
+      tag = colon || (prev != null) && (((ref7 = prev[0]) === '.' || ref7 === '?.' || ref7 === '::' || ref7 === '?::') || !prev.spaced && prev[0] === '@') ? 'PROPERTY' : 'IDENTIFIER';
       if (tag === 'IDENTIFIER' && (indexOf.call(JS_KEYWORDS, id) >= 0 || indexOf.call(COFFEE_KEYWORDS, id) >= 0) && !(this.exportSpecifierList && indexOf.call(COFFEE_KEYWORDS, id) >= 0)) {
         tag = id.toUpperCase();
-        if (tag === 'WHEN' && (ref6 = this.tag(), indexOf.call(LINE_BREAK, ref6) >= 0)) {
+        if (tag === 'WHEN' && (ref8 = this.tag(), indexOf.call(LINE_BREAK, ref8) >= 0)) {
           tag = 'LEADING_WHEN';
@@ -178,3 +179,3 @@ } else if (tag === 'FOR') {
       if (poppedToken) {
-        ref7 = [poppedToken[2].first_line, poppedToken[2].first_column], tagToken[2].first_line = ref7[0], tagToken[2].first_column = ref7[1];
+        ref9 = [poppedToken[2].first_line, poppedToken[2].first_column], tagToken[2].first_line = ref9[0], tagToken[2].first_column = ref9[1];
       }
@@ -432,2 +433,8 @@ if (colon) {
       this.seenFor = false;
+      if (!this.importSpecifierList) {
+        this.seenImport = false;
+      }
+      if (!this.exportSpecifierList) {
+        this.seenExport = false;
+      }
       size = indent.length - 1 - indent.lastIndexOf('\n');
@@ -574,3 +581,7 @@ noNewlines = this.unfinished();
       }
-      if (value === '{' && (prev != null ? prev[0] : void 0) === 'EXPORT') {
+      if (value === '{' && this.seenImport) {
+        this.importSpecifierList = true;
+      } else if (this.importSpecifierList && value === '}') {
+        this.importSpecifierList = false;
+      } else if (value === '{' && (prev != null ? prev[0] : void 0) === 'EXPORT') {
         this.exportSpecifierList = true;
@@ -877,7 +888,8 @@ } else if (this.exportSpecifierList && value === '}') {
     Lexer.prototype.validateEscapes = function(str, options) {
-      var before, hex, invalidEscape, match, message, octal, ref2, unicode;
+      var before, hex, invalidEscape, invalidEscapeRegex, match, message, octal, ref2, unicode;
       if (options == null) {
         options = {};
       }
-      match = INVALID_ESCAPE.exec(str);
+      invalidEscapeRegex = options.isRegex ? REGEX_INVALID_ESCAPE : STRING_INVALID_ESCAPE;
+      match = invalidEscapeRegex.exec(str);
       if (!match) {
@@ -887,5 +899,2 @@ return;
       match[0], before = match[1], octal = match[2], hex = match[3], unicode = match[4];
-      if (options.isRegex && octal && octal.charAt(0) !== '0') {
-        return;
-      }
       message = octal ? "octal escape sequences are not allowed" : "invalid escape sequence";
@@ -1078,4 +1087,6 @@ invalidEscape = "\\" + (octal || hex || unicode);
 
-  INVALID_ESCAPE = /((?:^|[^\\])(?:\\\\)*)\\(?:(0[0-7]|[1-7])|(x(?![\da-fA-F]{2}).{0,2})|(u(?![\da-fA-F]{4}).{0,4}))/;
+  STRING_INVALID_ESCAPE = /((?:^|[^\\])(?:\\\\)*)\\(?:(0[0-7]|[1-7])|(x(?![\da-fA-F]{2}).{0,2})|(u(?![\da-fA-F]{4}).{0,4}))/;
 
+  REGEX_INVALID_ESCAPE = /((?:^|[^\\])(?:\\\\)*)\\(?:(0[0-7])|(x(?![\da-fA-F]{2}).{0,2})|(u(?![\da-fA-F]{4}).{0,4}))/;
+
   LEADING_BLANK_LINE = /^[^\n\S]*\n/;
@@ -1082,0 +1093,0 @@

lib/coffee-script/optparse.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.12.4
+// Generated by CoffeeScript 1.12.5
 (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.4
+// Generated by CoffeeScript 1.12.5
 (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.4
+// Generated by CoffeeScript 1.12.5
 (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.4
+// Generated by CoffeeScript 1.12.5
 (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.4
+// Generated by CoffeeScript 1.12.5
 (function() {
@@ -3,0 +3,0 @@ var Scope,

lib/coffee-script/sourcemap.js

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

package.json

@@ -11,3 +11,3 @@ {
   "author": "Jeremy Ashkenas",
-  "version": "1.12.4",
+  "version": "1.12.5",
   "license": "MIT",
@@ -44,8 +44,8 @@ "engines": {
     "docco": "~0.7.0",
-    "google-closure-compiler-js": "^20170124.0.0",
-    "highlight.js": "~9.9.0",
+    "google-closure-compiler-js": "^20170218.0.0",
+    "highlight.js": "~9.10.0",
     "jison": ">=0.4.17",
-    "marked": "^0.3.6",
+    "markdown-it": "^8.3.1",
     "underscore": "~1.8.3"
   }
 }

No alert changes

Improved metrics

Total package byte prevSize

394379

0.25%

Lines of code

8959

0.18%

No dependency changes