js-beautify 1.8.4 → 1.8.8

package/js/lib/beautify-html.js

@@ -31,8 +31,8 @@
 
   Written by Nochum Sossonko, (nsossonko@hotmail.com)
 
-  Based on code initially developed by: Einar Lielmanis, <einar@jsbeautifier.org>
-    http://jsbeautifier.org/
+  Based on code initially developed by: Einar Lielmanis, <einar@beautifier.io>
+    https://beautifier.io/
 
   Usage:
     style_html(html_source);
@@ -479,6 +479,7 @@ Output.prototype.ensure_empty_line_above = function(starts_with, ends_with) {
 
 module.exports.Output = Output;
 
+
 /***/ }),
 /* 3 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -539,6 +540,7 @@ function Token(type, text, newlines, whitespace_before) {
 
 module.exports.Token = Token;
 
+
 /***/ }),
 /* 4 */,
 /* 5 */,
@@ -577,8 +579,7 @@ module.exports.Token = Token;
 
 
 function Options(options, merge_child_field) {
-  options = _mergeOpts(options, merge_child_field);
-  this.raw_options = _normalizeOpts(options);
+  this.raw_options = _mergeOpts(options, merge_child_field);
 
   // Support passing the source text back with no change
   this.disabled = this._get_boolean('disabled');
@@ -689,10 +690,10 @@ Options.prototype._is_valid_selection = function(result, selection_list) {
 // Example: obj = {a: 1, b: {a: 2}}
 //          mergeOpts(obj, 'b')
 //
-//          Returns: {a: 2, b: {a: 2}}
+//          Returns: {a: 2}
 function _mergeOpts(allOptions, childFieldName) {
   var finalOpts = {};
-  allOptions = allOptions || {};
+  allOptions = _normalizeOpts(allOptions);
   var name;
 
   for (name in allOptions) {
@@ -725,6 +726,7 @@ module.exports.Options = Options;
 module.exports.normalizeOpts = _normalizeOpts;
 module.exports.mergeOpts = _mergeOpts;
 
+
 /***/ }),
 /* 7 */,
 /* 8 */
@@ -880,6 +882,7 @@ InputScanner.prototype.lookBack = function(testVal) {
 
 module.exports.InputScanner = InputScanner;
 
+
 /***/ }),
 /* 9 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1038,6 +1041,7 @@ Tokenizer.prototype._readWhitespace = function() {
 module.exports.Tokenizer = Tokenizer;
 module.exports.TOKEN = TOKEN;
 
+
 /***/ }),
 /* 10 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1122,6 +1126,7 @@ TokenStream.prototype.add = function(token) {
 
 module.exports.TokenStream = TokenStream;
 
+
 /***/ }),
 /* 11 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1190,6 +1195,7 @@ Directives.prototype.readIgnored = function(input) {
 
 module.exports.Directives = Directives;
 
+
 /***/ }),
 /* 12 */,
 /* 13 */,
@@ -1237,6 +1243,7 @@ function style_html(html_source, options, js_beautify, css_beautify) {
 
 module.exports = style_html;
 
+
 /***/ }),
 /* 16 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1304,23 +1311,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);
     }
@@ -1485,6 +1494,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() {
@@ -1583,25 +1594,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;
@@ -1615,17 +1638,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);
@@ -1709,7 +1729,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;
   }
 
@@ -1979,6 +1999,7 @@ Beautifier.prototype._do_optional_end_element = function(parser_token) {
 
 module.exports.Beautifier = Beautifier;
 
+
 /***/ }),
 /* 17 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -2025,7 +2046,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']);
 
@@ -2067,6 +2088,7 @@ Options.prototype = new BaseOptions();
 
 module.exports.Options = Options;
 
+
 /***/ }),
 /* 18 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -2361,6 +2383,7 @@ Tokenizer.prototype._read_content_word = function() {
 module.exports.Tokenizer = Tokenizer;
 module.exports.TOKEN = TOKEN;
 
+
 /***/ })
 /******/ ]);
 var style_html = legacy_beautify_html;

package/js/lib/beautify.js

@@ -29,12 +29,12 @@
 ---------------
 
 
-  Written by Einar Lielmanis, <einar@jsbeautifier.org>
-      http://jsbeautifier.org/
+  Written by Einar Lielmanis, <einar@beautifier.io>
+      https://beautifier.io/
 
   Originally converted to javascript by Vital, <vital76@gmail.com>
   "End braces on own line" added by Chris J. Shull, <chrisjshull@gmail.com>
-  Parsing improvements for brace-less statements by Liam Newman <bitwiseman@gmail.com>
+  Parsing improvements for brace-less statements by Liam Newman <bitwiseman@beautifier.io>
 
 
   Usage:
@@ -219,6 +219,7 @@ function js_beautify(js_source_text, options) {
 
 module.exports = js_beautify;
 
+
 /***/ }),
 /* 1 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -699,7 +700,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));
@@ -793,6 +794,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',
@@ -1002,6 +1016,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) {
@@ -1092,6 +1108,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();
       }
@@ -1180,6 +1199,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...)
@@ -1614,6 +1636,7 @@ Beautifier.prototype.handle_eof = function(current_token) {
 
 module.exports.Beautifier = Beautifier;
 
+
 /***/ }),
 /* 2 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1929,6 +1952,7 @@ Output.prototype.ensure_empty_line_above = function(starts_with, ends_with) {
 
 module.exports.Output = Output;
 
+
 /***/ }),
 /* 3 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -1989,6 +2013,7 @@ function Token(type, text, newlines, whitespace_before) {
 
 module.exports.Token = Token;
 
+
 /***/ }),
 /* 4 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -2051,6 +2076,7 @@ exports.newline = /[\n\r\u2028\u2029]/;
 exports.lineBreak = new RegExp('\r\n|' + exports.newline.source);
 exports.allLineBreaks = new RegExp(exports.lineBreak.source, 'g');
 
+
 /***/ }),
 /* 5 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -2127,6 +2153,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');
@@ -2141,6 +2168,7 @@ function Options(options) {
   if (this.jslint_happy) {
     this.space_after_anon_function = true;
   }
+
 }
 Options.prototype = new BaseOptions();
 
@@ -2148,6 +2176,7 @@ Options.prototype = new BaseOptions();
 
 module.exports.Options = Options;
 
+
 /***/ }),
 /* 6 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -2184,8 +2213,7 @@ module.exports.Options = Options;
 
 
 function Options(options, merge_child_field) {
-  options = _mergeOpts(options, merge_child_field);
-  this.raw_options = _normalizeOpts(options);
+  this.raw_options = _mergeOpts(options, merge_child_field);
 
   // Support passing the source text back with no change
   this.disabled = this._get_boolean('disabled');
@@ -2296,10 +2324,10 @@ Options.prototype._is_valid_selection = function(result, selection_list) {
 // Example: obj = {a: 1, b: {a: 2}}
 //          mergeOpts(obj, 'b')
 //
-//          Returns: {a: 2, b: {a: 2}}
+//          Returns: {a: 2}
 function _mergeOpts(allOptions, childFieldName) {
   var finalOpts = {};
-  allOptions = allOptions || {};
+  allOptions = _normalizeOpts(allOptions);
   var name;
 
   for (name in allOptions) {
@@ -2332,6 +2360,7 @@ module.exports.Options = Options;
 module.exports.normalizeOpts = _normalizeOpts;
 module.exports.mergeOpts = _mergeOpts;
 
+
 /***/ }),
 /* 7 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -2426,6 +2455,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(',');
@@ -2552,18 +2583,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)) {
@@ -2872,6 +2908,7 @@ module.exports.TOKEN = TOKEN;
 module.exports.positionable_operators = positionable_operators.slice();
 module.exports.line_starters = line_starters.slice();
 
+
 /***/ }),
 /* 8 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -3026,6 +3063,7 @@ InputScanner.prototype.lookBack = function(testVal) {
 
 module.exports.InputScanner = InputScanner;
 
+
 /***/ }),
 /* 9 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -3184,6 +3222,7 @@ Tokenizer.prototype._readWhitespace = function() {
 module.exports.Tokenizer = Tokenizer;
 module.exports.TOKEN = TOKEN;
 
+
 /***/ }),
 /* 10 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -3268,6 +3307,7 @@ TokenStream.prototype.add = function(token) {
 
 module.exports.TokenStream = TokenStream;
 
+
 /***/ }),
 /* 11 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -3336,6 +3376,7 @@ Directives.prototype.readIgnored = function(input) {
 
 module.exports.Directives = Directives;
 
+
 /***/ })
 /******/ ]);
 var js_beautify = legacy_beautify_js;

package/js/lib/cli.js

@@ -78,13 +78,14 @@ var path = require('path'),
     "space_in_empty_paren": Boolean,
     "jslint_happy": Boolean,
     "space_after_anon_function": Boolean,
+    "space_after_named_function": Boolean,
     "brace_style": "brace_style", //See above for validation
     "unindent_chained_methods": Boolean,
     "break_chained_methods": Boolean,
     "keep_array_indentation": Boolean,
     "unescape_strings": Boolean,
     "wrap_line_length": Number,
-    "wrap_attributes": ["auto", "force", "force-aligned", "force-expand-multiline", "aligned-multiple"],
+    "wrap_attributes": ["auto", "force", "force-aligned", "force-expand-multiline", "aligned-multiple", "preserve", "preserve-aligned"],
     "wrap_attributes_indent_size": Number,
     "e4x": Boolean,
     "end_with_newline": Boolean,
@@ -354,6 +355,7 @@ function usage(err) {
       msg.push('  -E, --space-in-empty-paren        Add a single space inside empty paren, ie. f( )');
       msg.push('  -j, --jslint-happy                Enable jslint-stricter mode');
       msg.push('  -a, --space-after-anon-function   Add a space before an anonymous function\'s parens, ie. function ()');
+      msg.push('  --space_after_named_function      Add a space before a named function\'s parens, ie. function example ()');
       msg.push('  -b, --brace-style                 [collapse|expand|end-expand|none][,preserve-inline] [collapse,preserve-inline]');
       msg.push('  -u, --unindent-chained-methods    Don\'t indent chained method calls');
       msg.push('  -B, --break-chained-methods       Break chained method calls across subsequent lines');
@@ -371,7 +373,7 @@ function usage(err) {
       msg.push('  -H, --indent-handlebars           Indent handlebars. Default is false.');
       msg.push('  -S, --indent-scripts              [keep|separate|normal] ["normal"]');
       msg.push('  -w, --wrap-line-length            Wrap lines at next opportunity after N characters [0]');
-      msg.push('  -A, --wrap-attributes             Wrap html tag attributes to new lines [auto|force] ["auto"]');
+      msg.push('  -A, --wrap-attributes             Wrap html tag attributes to new lines [auto|force|force-aligned|force-expand-multiline|aligned-multiple|preserve|preserve-aligned] ["auto"]');
       msg.push('  -i, --wrap-attributes-indent-size Indent wrapped tags to after N characters [indent-level]');
       msg.push('  -p, --preserve-newlines           Preserve line-breaks (--no-preserve-newlines disables)');
       msg.push('  -m, --max-preserve-newlines       Number of line-breaks to be preserved in one chunk [10]');
@@ -637,4 +639,4 @@ function logToStdout(str, config) {
   if (typeof config.quiet === "undefined" || !config.quiet) {
     console.log(str);
   }
-}
+}

package/js/lib/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/lib/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/lib/unpackers/p_a_c_k_e_r_unpacker.js

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

package/js/lib/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/js/src/cli.js

@@ -78,13 +78,14 @@ var path = require('path'),
     "space_in_empty_paren": Boolean,
     "jslint_happy": Boolean,
     "space_after_anon_function": Boolean,
+    "space_after_named_function": Boolean,
     "brace_style": "brace_style", //See above for validation
     "unindent_chained_methods": Boolean,
     "break_chained_methods": Boolean,
     "keep_array_indentation": Boolean,
     "unescape_strings": Boolean,
     "wrap_line_length": Number,
-    "wrap_attributes": ["auto", "force", "force-aligned", "force-expand-multiline", "aligned-multiple"],
+    "wrap_attributes": ["auto", "force", "force-aligned", "force-expand-multiline", "aligned-multiple", "preserve", "preserve-aligned"],
     "wrap_attributes_indent_size": Number,
     "e4x": Boolean,
     "end_with_newline": Boolean,
@@ -354,6 +355,7 @@ function usage(err) {
       msg.push('  -E, --space-in-empty-paren        Add a single space inside empty paren, ie. f( )');
       msg.push('  -j, --jslint-happy                Enable jslint-stricter mode');
       msg.push('  -a, --space-after-anon-function   Add a space before an anonymous function\'s parens, ie. function ()');
+      msg.push('  --space_after_named_function      Add a space before a named function\'s parens, ie. function example ()');
       msg.push('  -b, --brace-style                 [collapse|expand|end-expand|none][,preserve-inline] [collapse,preserve-inline]');
       msg.push('  -u, --unindent-chained-methods    Don\'t indent chained method calls');
       msg.push('  -B, --break-chained-methods       Break chained method calls across subsequent lines');
@@ -371,7 +373,7 @@ function usage(err) {
       msg.push('  -H, --indent-handlebars           Indent handlebars. Default is false.');
       msg.push('  -S, --indent-scripts              [keep|separate|normal] ["normal"]');
       msg.push('  -w, --wrap-line-length            Wrap lines at next opportunity after N characters [0]');
-      msg.push('  -A, --wrap-attributes             Wrap html tag attributes to new lines [auto|force] ["auto"]');
+      msg.push('  -A, --wrap-attributes             Wrap html tag attributes to new lines [auto|force|force-aligned|force-expand-multiline|aligned-multiple|preserve|preserve-aligned] ["auto"]');
       msg.push('  -i, --wrap-attributes-indent-size Indent wrapped tags to after N characters [indent-level]');
       msg.push('  -p, --preserve-newlines           Preserve line-breaks (--no-preserve-newlines disables)');
       msg.push('  -m, --max-preserve-newlines       Number of line-breaks to be preserved in one chunk [10]');
@@ -637,4 +639,4 @@ function logToStdout(str, config) {
   if (typeof config.quiet === "undefined" || !config.quiet) {
     console.log(str);
   }
-}
+}

package/js/src/core/directives.js

@@ -59,4 +59,4 @@ Directives.prototype.readIgnored = function(input) {
 };
 
 
-module.exports.Directives = Directives;
+module.exports.Directives = Directives;

package/js/src/core/inputscanner.js

@@ -145,4 +145,4 @@ InputScanner.prototype.lookBack = function(testVal) {
 };
 
 
-module.exports.InputScanner = InputScanner;
+module.exports.InputScanner = InputScanner;

package/js/src/core/options.js

@@ -29,8 +29,7 @@
 'use strict';
 
 function Options(options, merge_child_field) {
-  options = _mergeOpts(options, merge_child_field);
-  this.raw_options = _normalizeOpts(options);
+  this.raw_options = _mergeOpts(options, merge_child_field);
 
   // Support passing the source text back with no change
   this.disabled = this._get_boolean('disabled');
@@ -141,10 +140,10 @@ Options.prototype._is_valid_selection = function(result, selection_list) {
 // Example: obj = {a: 1, b: {a: 2}}
 //          mergeOpts(obj, 'b')
 //
-//          Returns: {a: 2, b: {a: 2}}
+//          Returns: {a: 2}
 function _mergeOpts(allOptions, childFieldName) {
   var finalOpts = {};
-  allOptions = allOptions || {};
+  allOptions = _normalizeOpts(allOptions);
   var name;
 
   for (name in allOptions) {
@@ -175,4 +174,4 @@ function _normalizeOpts(options) {
 
 module.exports.Options = Options;
 module.exports.normalizeOpts = _normalizeOpts;
-module.exports.mergeOpts = _mergeOpts;
+module.exports.mergeOpts = _mergeOpts;