js-beautify 1.8.4 → 1.8.8

package/js/src/core/output.js

@@ -306,4 +306,4 @@ Output.prototype.ensure_empty_line_above = function(starts_with, ends_with) {
   }
 };
 
-module.exports.Output = Output;
+module.exports.Output = Output;

package/js/src/core/token.js

@@ -51,4 +51,4 @@ function Token(type, text, newlines, whitespace_before) {
 }
 
 
-module.exports.Token = Token;
+module.exports.Token = Token;

package/js/src/core/tokenizer.js

@@ -149,4 +149,4 @@ Tokenizer.prototype._readWhitespace = function() {
 
 
 module.exports.Tokenizer = Tokenizer;
-module.exports.TOKEN = TOKEN;
+module.exports.TOKEN = TOKEN;

package/js/src/core/tokenstream.js

@@ -75,4 +75,4 @@ TokenStream.prototype.add = function(token) {
   this.__tokens_length += 1;
 };
 
-module.exports.TokenStream = TokenStream;
+module.exports.TokenStream = TokenStream;

package/js/src/css/beautifier.js

@@ -373,7 +373,7 @@ Beautifier.prototype.beautify = function() {
         this.print_string(this._ch);
         this.eatWhitespace();
         this._ch = this._input.next();
-        if (this._ch === ')' || this._ch === '"' || this._ch !== '\'') {
+        if (this._ch === ')' || this._ch === '"' || this._ch === '\'') {
           this._input.back();
           parenLevel++;
         } else if (this._ch) {
@@ -435,4 +435,4 @@ Beautifier.prototype.beautify = function() {
   return sweetCode;
 };
 
-module.exports.Beautifier = Beautifier;
+module.exports.Beautifier = Beautifier;

package/js/src/css/index.js

@@ -35,4 +35,4 @@ function css_beautify(source_text, options) {
   return beautifier.beautify();
 }
 
-module.exports = css_beautify;
+module.exports = css_beautify;

package/js/src/css/options.js

@@ -43,4 +43,4 @@ Options.prototype = new BaseOptions();
 
 
 
-module.exports.Options = Options;
+module.exports.Options = Options;

package/js/src/css/tokenizer.js

@@ -26,4 +26,4 @@
   SOFTWARE.
 */
 
-'use strict';
+'use strict';

package/js/src/html/beautifier.js

@@ -60,23 +60,25 @@ Printer.prototype.add_raw_token = function(token) {
   this._output.add_raw_token(token);
 };
 
-Printer.prototype.traverse_whitespace = function(raw_token) {
-  if (raw_token.whitespace_before || raw_token.newlines) {
-    var newlines = 0;
+Printer.prototype.print_preserved_newlines = function(raw_token) {
+  var newlines = 0;
+  if (raw_token.type !== TOKEN.TEXT && raw_token.previous.type !== TOKEN.TEXT) {
+    newlines = raw_token.newlines ? 1 : 0;
+  }
 
-    if (raw_token.type !== TOKEN.TEXT && raw_token.previous.type !== TOKEN.TEXT) {
-      newlines = raw_token.newlines ? 1 : 0;
-    }
+  if (this.preserve_newlines) {
+    newlines = raw_token.newlines < this.max_preserve_newlines + 1 ? raw_token.newlines : this.max_preserve_newlines + 1;
+  }
+  for (var n = 0; n < newlines; n++) {
+    this.print_newline(n > 0);
+  }
 
-    if (this.preserve_newlines) {
-      newlines = raw_token.newlines < this.max_preserve_newlines + 1 ? raw_token.newlines : this.max_preserve_newlines + 1;
-    }
+  return newlines !== 0;
+};
 
-    if (newlines) {
-      for (var n = 0; n < newlines; n++) {
-        this.print_newline(n > 0);
-      }
-    } else {
+Printer.prototype.traverse_whitespace = function(raw_token) {
+  if (raw_token.whitespace_before || raw_token.newlines) {
+    if (!this.print_preserved_newlines(raw_token)) {
       this._output.space_before_token = true;
       this.print_space_or_wrap(raw_token.text);
     }
@@ -241,6 +243,8 @@ function Beautifier(source_text, options, js_beautify, css_beautify) {
   this._is_wrap_attributes_force_expand_multiline = (this._options.wrap_attributes === 'force-expand-multiline');
   this._is_wrap_attributes_force_aligned = (this._options.wrap_attributes === 'force-aligned');
   this._is_wrap_attributes_aligned_multiple = (this._options.wrap_attributes === 'aligned-multiple');
+  this._is_wrap_attributes_preserve = this._options.wrap_attributes.substr(0, 'preserve'.length) === 'preserve';
+  this._is_wrap_attributes_preserve_aligned = (this._options.wrap_attributes === 'preserve-aligned');
 }
 
 Beautifier.prototype.beautify = function() {
@@ -339,25 +343,37 @@ Beautifier.prototype._handle_inside_tag = function(printer, raw_token, last_tag_
   printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== '');
   if (last_tag_token.is_unformatted) {
     printer.add_raw_token(raw_token);
+  } else if (last_tag_token.tag_start_char === '{' && raw_token.type === TOKEN.TEXT) {
+    // For the insides of handlebars allow newlines or a single space between open and contents
+    if (printer.print_preserved_newlines(raw_token)) {
+      printer.print_raw_text(raw_token.whitespace_before + raw_token.text);
+    } else {
+      printer.print_token(raw_token.text);
+    }
   } else {
-    if (last_tag_token.tag_start_char === '<') {
-      if (raw_token.type === TOKEN.ATTRIBUTE) {
-        printer.set_space_before_token(true);
-        last_tag_token.attr_count += 1;
-      } else if (raw_token.type === TOKEN.EQUALS) { //no space before =
-        printer.set_space_before_token(false);
-      } else if (raw_token.type === TOKEN.VALUE && raw_token.previous.type === TOKEN.EQUALS) { //no space before value
-        printer.set_space_before_token(false);
-      }
+    if (raw_token.type === TOKEN.ATTRIBUTE) {
+      printer.set_space_before_token(true);
+      last_tag_token.attr_count += 1;
+    } else if (raw_token.type === TOKEN.EQUALS) { //no space before =
+      printer.set_space_before_token(false);
+    } else if (raw_token.type === TOKEN.VALUE && raw_token.previous.type === TOKEN.EQUALS) { //no space before value
+      printer.set_space_before_token(false);
     }
 
     if (printer._output.space_before_token && last_tag_token.tag_start_char === '<') {
+      // Allow the current attribute to wrap
+      // Set wrapped to true if the line is wrapped
       var wrapped = printer.print_space_or_wrap(raw_token.text);
       if (raw_token.type === TOKEN.ATTRIBUTE) {
-        var indentAttrs = wrapped && !this._is_wrap_attributes_force;
+        if (this._is_wrap_attributes_preserve || this._is_wrap_attributes_preserve_aligned) {
+          printer.traverse_whitespace(raw_token);
+          wrapped = wrapped || raw_token.newlines !== 0;
+        }
+        // Save whether we have wrapped any attributes
+        last_tag_token.has_wrapped_attrs = last_tag_token.has_wrapped_attrs || wrapped;
 
         if (this._is_wrap_attributes_force) {
-          var force_first_attr_wrap = false;
+          var force_attr_wrap = last_tag_token.attr_count > 1;
           if (this._is_wrap_attributes_force_expand_multiline && last_tag_token.attr_count === 1) {
             var is_only_attribute = true;
             var peek_index = 0;
@@ -371,17 +387,14 @@ Beautifier.prototype._handle_inside_tag = function(printer, raw_token, last_tag_
               peek_index += 1;
             } while (peek_index < 4 && peek_token.type !== TOKEN.EOF && peek_token.type !== TOKEN.TAG_CLOSE);
 
-            force_first_attr_wrap = !is_only_attribute;
+            force_attr_wrap = !is_only_attribute;
           }
 
-          if (last_tag_token.attr_count > 1 || force_first_attr_wrap) {
+          if (force_attr_wrap) {
             printer.print_newline(false);
-            indentAttrs = true;
+            last_tag_token.has_wrapped_attrs = true;
           }
         }
-        if (indentAttrs) {
-          last_tag_token.has_wrapped_attrs = true;
-        }
       }
     }
     printer.print_token(raw_token.text);
@@ -465,7 +478,7 @@ Beautifier.prototype._handle_tag_open = function(printer, raw_token, last_tag_to
   }
 
   //indent attributes an auto, forced, aligned or forced-align line-wrap
-  if (this._is_wrap_attributes_force_aligned || this._is_wrap_attributes_aligned_multiple) {
+  if (this._is_wrap_attributes_force_aligned || this._is_wrap_attributes_aligned_multiple || this._is_wrap_attributes_preserve_aligned) {
     parser_token.alignment_size = raw_token.text.length + 1;
   }
 
@@ -733,4 +746,4 @@ Beautifier.prototype._do_optional_end_element = function(parser_token) {
 
 };
 
-module.exports.Beautifier = Beautifier;
+module.exports.Beautifier = Beautifier;

package/js/src/html/index.js

@@ -35,4 +35,4 @@ function style_html(html_source, options, js_beautify, css_beautify) {
   return beautifier.beautify();
 }
 
-module.exports = style_html;
+module.exports = style_html;

package/js/src/html/options.js

@@ -39,7 +39,7 @@ function Options(options) {
 
   this.indent_handlebars = this._get_boolean('indent_handlebars', true);
   this.wrap_attributes = this._get_selection('wrap_attributes',
-    ['auto', 'force', 'force-aligned', 'force-expand-multiline', 'aligned-multiple']);
+    ['auto', 'force', 'force-aligned', 'force-expand-multiline', 'aligned-multiple', 'preserve', 'preserve-aligned']);
   this.wrap_attributes_indent_size = this._get_number('wrap_attributes_indent_size', this.indent_size);
   this.extra_liners = this._get_array('extra_liners', ['head', 'body', '/html']);
 
@@ -79,4 +79,4 @@ Options.prototype = new BaseOptions();
 
 
 
-module.exports.Options = Options;
+module.exports.Options = Options;

package/js/src/html/tokenizer.js

@@ -285,4 +285,4 @@ Tokenizer.prototype._read_content_word = function() {
 };
 
 module.exports.Tokenizer = Tokenizer;
-module.exports.TOKEN = TOKEN;
+module.exports.TOKEN = TOKEN;

package/js/src/index.js

@@ -40,4 +40,4 @@ function style_html(html_source, options, js, css) {
 
 module.exports.js = js_beautify;
 module.exports.css = css_beautify;
-module.exports.html = style_html;
+module.exports.html = style_html;

package/js/src/javascript/acorn.js

@@ -53,4 +53,4 @@ exports.newline = /[\n\r\u2028\u2029]/;
 // in javascript, these two differ
 // in python they are the same, different methods are called on them
 exports.lineBreak = new RegExp('\r\n|' + exports.newline.source);
-exports.allLineBreaks = new RegExp(exports.lineBreak.source, 'g');
+exports.allLineBreaks = new RegExp(exports.lineBreak.source, 'g');

package/js/src/javascript/beautifier.js

@@ -473,7 +473,7 @@ Beautifier.prototype.start_of_statement = function(current_token) {
   var start = false;
   start = start || reserved_array(this._flags.last_token, ['var', 'let', 'const']) && current_token.type === TOKEN.WORD;
   start = start || reserved_word(this._flags.last_token, 'do');
-  start = start || (reserved_array(this._flags.last_token, newline_restricted_tokens) && !current_token.newlines);
+  start = start || (!(this._flags.parent.mode === MODE.ObjectLiteral && this._flags.mode === MODE.Statement)) && reserved_array(this._flags.last_token, newline_restricted_tokens) && !current_token.newlines;
   start = start || reserved_word(this._flags.last_token, 'else') &&
     !(reserved_word(current_token, 'if') && !current_token.comments_before);
   start = start || (this._flags.last_token.type === TOKEN.END_EXPR && (this._previous_flags.mode === MODE.ForInitializer || this._previous_flags.mode === MODE.Conditional));
@@ -567,6 +567,19 @@ Beautifier.prototype.handle_start_expr = function(current_token) {
       }
     } else if (this._flags.last_token.type === TOKEN.WORD) {
       this._output.space_before_token = false;
+
+      // function name() vs function name ()
+      // function* name() vs function* name ()
+      // async name() vs async name ()
+      if (this._options.space_after_named_function) {
+        // peek starts at next character so -1 is current token
+        var peek_back_three = this._tokens.peek(-4);
+        var peek_back_two = this._tokens.peek(-3);
+        if (reserved_array(peek_back_two, ['async', 'function']) ||
+          (reserved_array(peek_back_three, ['async', 'function']) && peek_back_two.text === '*')) {
+          this._output.space_before_token = true;
+        }
+      }
     } else {
       // Support preserving wrapped arrow function expressions
       // a.b('c',
@@ -776,6 +789,8 @@ Beautifier.prototype.handle_word = function(current_token) {
   if (current_token.type === TOKEN.RESERVED) {
     if (in_array(current_token.text, ['set', 'get']) && this._flags.mode !== MODE.ObjectLiteral) {
       current_token.type = TOKEN.WORD;
+    } else if (current_token.text === 'import' && this._tokens.peek().text === '(') {
+      current_token.type = TOKEN.WORD;
     } else if (in_array(current_token.text, ['as', 'from']) && !this._flags.import_block) {
       current_token.type = TOKEN.WORD;
     } else if (this._flags.mode === MODE.ObjectLiteral) {
@@ -866,6 +881,9 @@ Beautifier.prototype.handle_word = function(current_token) {
         this._output.space_before_token = true;
       } else if (reserved_word(this._flags.last_token, 'default') && this._last_last_text === 'export') {
         this._output.space_before_token = true;
+      } else if (this._flags.last_token.text === 'declare') {
+        // accomodates Typescript declare function formatting
+        this._output.space_before_token = true;
       } else {
         this.print_newline();
       }
@@ -954,6 +972,9 @@ Beautifier.prototype.handle_word = function(current_token) {
     if (reserved_array(this._flags.last_token, special_words)) {
       // no newline between 'return nnn'
       this._output.space_before_token = true;
+    } else if (this._flags.last_token.text === 'declare' && reserved_array(current_token, ['var', 'let', 'const'])) {
+      // accomodates Typescript declare formatting
+      this._output.space_before_token = true;
     } else if (this._flags.last_token.type !== TOKEN.END_EXPR) {
       if ((this._flags.last_token.type !== TOKEN.START_EXPR || !reserved_array(current_token, ['var', 'let', 'const'])) && this._flags.last_token.text !== ':') {
         // no need to force newline on 'var': for (var x = 0...)
@@ -1386,4 +1407,4 @@ Beautifier.prototype.handle_eof = function(current_token) {
   this.handle_whitespace_and_comments(current_token);
 };
 
-module.exports.Beautifier = Beautifier;
+module.exports.Beautifier = Beautifier;

package/js/src/javascript/index.js

@@ -35,4 +35,4 @@ function js_beautify(js_source_text, options) {
   return beautifier.beautify();
 }
 
-module.exports = js_beautify;
+module.exports = js_beautify;

package/js/src/javascript/options.js

@@ -69,6 +69,7 @@ function Options(options) {
   this.space_in_empty_paren = this._get_boolean('space_in_empty_paren');
   this.jslint_happy = this._get_boolean('jslint_happy');
   this.space_after_anon_function = this._get_boolean('space_after_anon_function');
+  this.space_after_named_function = this._get_boolean('space_after_named_function');
   this.keep_array_indentation = this._get_boolean('keep_array_indentation');
   this.space_before_conditional = this._get_boolean('space_before_conditional', true);
   this.unescape_strings = this._get_boolean('unescape_strings');
@@ -83,9 +84,10 @@ function Options(options) {
   if (this.jslint_happy) {
     this.space_after_anon_function = true;
   }
+
 }
 Options.prototype = new BaseOptions();
 
 
 
-module.exports.Options = Options;
+module.exports.Options = Options;

package/js/src/javascript/tokenizer.js

@@ -87,6 +87,8 @@ punct = punct.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&");
 punct = punct.replace(/ /g, '|');
 
 var punct_pattern = new RegExp(punct, 'g');
+var shebang_pattern = /#![^\n\r\u2028\u2029]*(?:\r\n|[\n\r\u2028\u2029])?/g;
+var include_pattern = /#include[^\n\r\u2028\u2029]*(?:\r\n|[\n\r\u2028\u2029])?/g;
 
 // words which should always start on new line.
 var line_starters = 'continue,try,throw,return,var,let,const,if,switch,case,default,for,while,break,function,import,export'.split(',');
@@ -213,18 +215,23 @@ Tokenizer.prototype._read_non_javascript = function(c) {
   var resulting_string = '';
 
   if (c === '#') {
-    c = this._input.next();
+    if (this._is_first_token()) {
+      resulting_string = this._input.read(shebang_pattern);
 
-    if (this._is_first_token() && this._input.peek() === '!') {
-      // shebang
-      resulting_string = c;
-      while (this._input.hasNext() && c !== '\n') {
-        c = this._input.next();
-        resulting_string += c;
+      if (resulting_string) {
+        return this._create_token(TOKEN.UNKNOWN, resulting_string.trim() + '\n');
       }
+    }
+
+    // handles extendscript #includes
+    resulting_string = this._input.read(include_pattern);
+
+    if (resulting_string) {
       return this._create_token(TOKEN.UNKNOWN, resulting_string.trim() + '\n');
     }
 
+    c = this._input.next();
+
     // Spidermonkey-specific sharp variables for circular references. Considered obsolete.
     var sharp = '#';
     if (this._input.hasNext() && this._input.testChar(digit)) {
@@ -531,4 +538,4 @@ Tokenizer.prototype._read_string_recursive = function(delimiter, allow_unescaped
 module.exports.Tokenizer = Tokenizer;
 module.exports.TOKEN = TOKEN;
 module.exports.positionable_operators = positionable_operators.slice();
-module.exports.line_starters = line_starters.slice();
+module.exports.line_starters = line_starters.slice();

package/js/src/unpackers/javascriptobfuscator_unpacker.js

@@ -27,7 +27,7 @@
 
 //
 // simple unpacker/deobfuscator for scripts messed up with javascriptobfuscator.com
-// written by Einar Lielmanis <einar@jsbeautifier.org>
+// written by Einar Lielmanis <einar@beautifier.io>
 //
 // usage:
 //
@@ -129,4 +129,4 @@ var JavascriptObfuscator = {
   }
 
 
-};
+};

package/js/src/unpackers/myobfuscate_unpacker.js

@@ -43,7 +43,7 @@
 
 */
 //
-// written by Einar Lielmanis <einar@jsbeautifier.org>
+// written by Einar Lielmanis <einar@beautifier.io>
 //
 // usage:
 //
@@ -116,4 +116,4 @@ var MyObfuscate = {
   }
 
 
-};
+};

package/js/src/unpackers/p_a_c_k_e_r_unpacker.js

@@ -108,4 +108,4 @@ var P_A_C_K_E_R = {
   }
 
 
-};
+};

package/js/src/unpackers/urlencode_unpacker.js

@@ -30,7 +30,7 @@
 
 //
 // trivial bookmarklet/escaped script detector for the javascript beautifier
-// written by Einar Lielmanis <einar@jsbeautifier.org>
+// written by Einar Lielmanis <einar@beautifier.io>
 //
 // usage:
 //
@@ -101,4 +101,4 @@ var Urlencoded = {
 
 if (isNode) {
   module.exports = Urlencoded;
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-beautify",
-  "version": "1.8.4",
-  "description": "jsbeautifier.org for node",
+  "version": "1.8.8",
+  "description": "beautifier.io for node",
   "main": "js/index.js",
   "bin": {
     "css-beautify": "./js/bin/css-beautify.js",
@@ -21,7 +21,7 @@
   ],
   "scripts": {},
   "bugs": "https://github.com/beautify-web/js-beautify/issues",
-  "homepage": "http://jsbeautifier.org/",
+  "homepage": "https://beautifier.io/",
   "repository": {
     "type": "git",
     "url": "git://github.com/beautify-web/js-beautify.git"
@@ -31,7 +31,7 @@
     "beautifier",
     "code-quality"
   ],
-  "author": "Einar Lielmanis <einar@jsbeautifier.org>",
+  "author": "Einar Lielmanis <einar@beautifier.io>",
   "contributors": [
     "Vital Batmanov <vital76@gmail.com>",
     "Chris J. Shull <chrisjshull@gmail.com>",
@@ -41,7 +41,7 @@
     "Daniel Stockman <daniel.stockman@gmail.com>",
     "Harutyun Amirjanyan <amirjanyan@gmail.com>",
     "Nochum Sossonko <nsossonko@hotmail.com>",
-    "Liam Newman <bitwiseman@gmail.com>"
+    "Liam Newman <bitwiseman@beautifier.io>"
   ],
   "license": "MIT",
   "dependencies": {