js-beautify 1.8.8 → 1.8.9

package/js/src/css/index.js

@@ -28,7 +28,8 @@
 
 'use strict';
 
-var Beautifier = require('./beautifier').Beautifier;
+var Beautifier = require('./beautifier').Beautifier,
+  Options = require('./options').Options;
 
 function css_beautify(source_text, options) {
   var beautifier = new Beautifier(source_text, options);
@@ -36,3 +37,6 @@ function css_beautify(source_text, options) {
 }
 
 module.exports = css_beautify;
+module.exports.defaultOptions = function() {
+  return new Options();
+};

package/js/src/html/beautifier.js

@@ -311,7 +311,10 @@ Beautifier.prototype.beautify = function() {
 };
 
 Beautifier.prototype._handle_tag_close = function(printer, raw_token, last_tag_token) {
-  var parser_token = { text: raw_token.text, type: raw_token.type };
+  var parser_token = {
+    text: raw_token.text,
+    type: raw_token.type
+  };
   printer.alignment_size = 0;
   last_tag_token.tag_complete = true;
 
@@ -339,7 +342,10 @@ Beautifier.prototype._handle_tag_close = function(printer, raw_token, last_tag_t
 };
 
 Beautifier.prototype._handle_inside_tag = function(printer, raw_token, last_tag_token, tokens) {
-  var parser_token = { text: raw_token.text, type: raw_token.type };
+  var parser_token = {
+    text: raw_token.text,
+    type: raw_token.type
+  };
   printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== '');
   if (last_tag_token.is_unformatted) {
     printer.add_raw_token(raw_token);
@@ -403,7 +409,10 @@ Beautifier.prototype._handle_inside_tag = function(printer, raw_token, last_tag_
 };
 
 Beautifier.prototype._handle_text = function(printer, raw_token, last_tag_token) {
-  var parser_token = { text: raw_token.text, type: 'TK_CONTENT' };
+  var parser_token = {
+    text: raw_token.text,
+    type: 'TK_CONTENT'
+  };
   if (last_tag_token.custom_beautifier) { //check if we need to format javascript
     this._print_custom_beatifier_text(printer, raw_token, last_tag_token);
   } else if (last_tag_token.is_unformatted || last_tag_token.is_content_unformatted) {

package/js/src/html/index.js

@@ -28,7 +28,8 @@
 
 'use strict';
 
-var Beautifier = require('./beautifier').Beautifier;
+var Beautifier = require('./beautifier').Beautifier,
+  Options = require('./options').Options;
 
 function style_html(html_source, options, js_beautify, css_beautify) {
   var beautifier = new Beautifier(html_source, options, js_beautify, css_beautify);
@@ -36,3 +37,6 @@ function style_html(html_source, options, js_beautify, css_beautify) {
 }
 
 module.exports = style_html;
+module.exports.defaultOptions = function() {
+  return new Options();
+};

package/js/src/index.js

@@ -37,6 +37,7 @@ function style_html(html_source, options, js, css) {
   css = css || css_beautify;
   return html_beautify(html_source, options, js, css);
 }
+style_html.defaultOptions = html_beautify.defaultOptions;
 
 module.exports.js = js_beautify;
 module.exports.css = css_beautify;

package/js/src/javascript/beautifier.js

@@ -571,13 +571,24 @@ Beautifier.prototype.handle_start_expr = function(current_token) {
       // function name() vs function name ()
       // function* name() vs function* name ()
       // async name() vs async name ()
-      if (this._options.space_after_named_function) {
+      // In ES6, you can also define the method properties of an object
+      // var obj = {a: function() {}}
+      // It can be abbreviated
+      // var obj = {a() {}}
+      // var obj = { a() {}} vs var obj = { a () {}}
+      // var obj = { * a() {}} vs var obj = { * a () {}}
+      var peek_back_two = this._tokens.peek(-3);
+      if (this._options.space_after_named_function && peek_back_two) {
         // 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 === '*')) {
+          (peek_back_two.text === '*' && reserved_array(peek_back_three, ['async', 'function']))) {
           this._output.space_before_token = true;
+        } else if (this._flags.mode === MODE.ObjectLiteral) {
+          if ((peek_back_two.text === '{' || peek_back_two.text === ',') ||
+            (peek_back_two.text === '*' && (peek_back_three.text === '{' || peek_back_three.text === ','))) {
+            this._output.space_before_token = true;
+          }
         }
       }
     } else {
@@ -595,10 +606,8 @@ Beautifier.prototype.handle_start_expr = function(current_token) {
       (this._flags.last_token.text === '*' &&
         (in_array(this._last_last_text, ['function', 'yield']) ||
           (this._flags.mode === MODE.ObjectLiteral && in_array(this._last_last_text, ['{', ',']))))) {
-
       this._output.space_before_token = this._options.space_after_anon_function;
     }
-
   }
 
   if (this._flags.last_token.text === ';' || this._flags.last_token.type === TOKEN.START_BLOCK) {
@@ -749,6 +758,11 @@ Beautifier.prototype.handle_start_block = function(current_token) {
   }
   this.print_token(current_token);
   this.indent();
+
+  // Except for specific cases, open braces are followed by a new line.
+  if (!empty_braces && !(this._options.brace_preserve_inline && this._flags.inline_frame)) {
+    this.print_newline();
+  }
 };
 
 Beautifier.prototype.handle_end_block = function(current_token) {

package/js/src/javascript/index.js

@@ -28,7 +28,8 @@
 
 'use strict';
 
-var Beautifier = require('./beautifier').Beautifier;
+var Beautifier = require('./beautifier').Beautifier,
+  Options = require('./options').Options;
 
 function js_beautify(js_source_text, options) {
   var beautifier = new Beautifier(js_source_text, options);
@@ -36,3 +37,6 @@ function js_beautify(js_source_text, options) {
 }
 
 module.exports = js_beautify;
+module.exports.defaultOptions = function() {
+  return new Options();
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-beautify",
-  "version": "1.8.8",
+  "version": "1.8.9",
   "description": "beautifier.io for node",
   "main": "js/index.js",
   "bin": {
@@ -45,8 +45,9 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "config-chain": "~1.1.5",
-    "editorconfig": "^0.15.0",
+    "config-chain": "^1.1.12",
+    "editorconfig": "^0.15.2",
+    "glob": "^7.1.3",
     "mkdirp": "~0.5.0",
     "nopt": "~4.0.1"
   },
@@ -54,10 +55,10 @@
     "benchmark": "^2.1.4",
     "jshint": "^2.9.6",
     "mocha": "^5.2.0",
-    "mustache": "^2.3.2",
-    "node-static": "^0.7.10",
+    "mustache": "^3.0.1",
+    "node-static": "^0.7.11",
     "requirejs": "^2.3.6",
-    "webpack": "^4.17.1",
-    "webpack-command": "^0.4.1"
+    "webpack": "^4.26.0",
+    "webpack-command": "^0.4.2"
   }
 }