js-beautify 1.13.13 → 1.14.2

package/README.md

@@ -1,16 +1,12 @@
-# JS Beautifier
-![CI](https://github.com/beautify-web/js-beautify/workflows/CI/badge.svg)
+<p align="center"><img src="https://raw.githubusercontent.com/beautify-web/js-beautify/7db71fc/web/wordmark-light.svg" height="200px" align="center" alt="JS Beautifier"/></p>
 
-[![PyPI version](https://img.shields.io/pypi/v/jsbeautifier.svg)](https://pypi.python.org/pypi/jsbeautifier)
-[![CDNJS version](https://img.shields.io/cdnjs/v/js-beautify.svg)](https://cdnjs.com/libraries/js-beautify)
-[![NPM @latest](https://img.shields.io/npm/v/js-beautify.svg)](https://www.npmjs.com/package/js-beautify)
-[![NPM @next](https://img.shields.io/npm/v/js-beautify/next.svg)](https://www.npmjs.com/package/js-beautify?activeTab=versions)
+<p align="center"><a href="https://github.com/beautify-web/js-beautify/actions/workflows/main.yml"><img alt="CI" src="https://github.com/beautify-web/js-beautify/workflows/CI/badge.svg"/></a>&#32;<a href="https://greenkeeper.io/" target="_blank"><img alt="Greenkeeper badge" src="https://badges.greenkeeper.io/beautify-web/js-beautify.svg"/></a></p>
 
-[![Join the chat at https://gitter.im/beautify-web/js-beautify](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/beautify-web/js-beautify?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Twitter Follow](https://img.shields.io/twitter/follow/js_beautifier.svg?style=social&label=Follow)](https://twitter.com/intent/user?screen_name=js_beautifier)
+<p align="center"><a href="https://pypi.python.org/pypi/jsbeautifier" target="_blank"><img alt="PyPI version" src="https://img.shields.io/pypi/v/jsbeautifier.svg"/></a>&#32;<a href="https://cdnjs.com/libraries/js-beautify" target="_blank"><img alt="CDNJS version" src="https://img.shields.io/cdnjs/v/js-beautify.svg"/></a>&#32;<a href="https://www.npmjs.com/package/js-beautify" target="_blank"><img alt="NPM @latest" src="https://img.shields.io/npm/v/js-beautify.svg"/></a>&#32;<a href="https://www.npmjs.com/package/js-beautify?activeTab=versions" target="_blank"><img alt="NPM @next" src="https://img.shields.io/npm/v/js-beautify/next.svg"/></a></p>
 
-[![NPM stats](https://nodei.co/npm/js-beautify.svg?downloadRank=true&downloads=true)](https://www.npmjs.org/package/js-beautify) [![Greenkeeper badge](https://badges.greenkeeper.io/beautify-web/js-beautify.svg)](https://greenkeeper.io/)
+<p align="center"><a href="https://gitter.im/beautify-web/js-beautify?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge" target="_blank"><img alt="Join the chat at https://gitter.im/beautify-web/js-beautify" src="https://badges.gitter.im/Join%20Chat.svg"></a>&#32;<a href="https://twitter.com/intent/user?screen_name=js_beautifier" target="_blank"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/js_beautifier.svg?style=social&label=Follow"/></a></p>
 
+<p align="center"><a href="https://www.npmjs.org/package/js-beautify" target="_blank"><img alt="NPM stats" src=https://nodei.co/npm/js-beautify.svg?downloadRank=true&downloads=true"/></a></p>
 
 This little beautifier will reformat and re-indent bookmarklets, ugly
 JavaScript, unpack scripts packed by Dean Edward’s popular packer,
@@ -19,6 +15,7 @@ as well as partly deobfuscate scripts processed by the npm package
 
 Open [beautifier.io](https://beautifier.io/) to try it out.  Options are available via the UI.
 
+
 # Contributors Needed
 I'm putting this front and center above because existing owners have very limited time to work on this project currently.
 This is a popular project and widely used but it desperately needs contributors who have time to commit to fixing both
@@ -61,17 +58,17 @@ JS Beautifier is hosted on two CDN services: [cdnjs](https://cdnjs.com/libraries
 
 To pull the latest version from one of these services include one set of the script tags below in your document:
 ```html
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.13/beautify.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.13/beautify-css.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.13/beautify-html.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.2/beautify.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.2/beautify-css.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.2/beautify-html.js"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.13/beautify.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.13/beautify-css.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.13/beautify-html.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.2/beautify.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.2/beautify-css.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.2/beautify-html.min.js"></script>
 
-<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.13.13/js/lib/beautify.js"></script>
-<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.13.13/js/lib/beautify-css.js"></script>
-<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.13.13/js/lib/beautify-html.js"></script>
+<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.14.2/js/lib/beautify.js"></script>
+<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.14.2/js/lib/beautify-css.js"></script>
+<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.14.2/js/lib/beautify-html.js"></script>
 ```
 
 Older versions are available by changing the version number.
@@ -404,4 +401,4 @@ Thanks also to Jason Diamond, Patrick Hof, Nochum Sossonko, Andreas Schneider, D
 Vasilevsky, Vital Batmanov, Ron Baldwin, Gabriel Harrison, Chris J. Shull,
 Mathias Bynens, Vittorio Gambaletta and others.
 
-(README.md: js-beautify@1.13.13)
+(README.md: js-beautify@1.14.2)

package/js/lib/beautifier.js

@@ -94,8 +94,8 @@ module.exports.html = style_html;
 
 
 
-var Beautifier = __webpack_require__(2).Beautifier,
-  Options = __webpack_require__(6).Options;
+var Beautifier = (__webpack_require__(2).Beautifier),
+  Options = (__webpack_require__(6).Options);
 
 function js_beautify(js_source_text, options) {
   var beautifier = new Beautifier(js_source_text, options);
@@ -142,14 +142,14 @@ module.exports.defaultOptions = function() {
 
 
 
-var Output = __webpack_require__(3).Output;
-var Token = __webpack_require__(4).Token;
+var Output = (__webpack_require__(3).Output);
+var Token = (__webpack_require__(4).Token);
 var acorn = __webpack_require__(5);
-var Options = __webpack_require__(6).Options;
-var Tokenizer = __webpack_require__(8).Tokenizer;
-var line_starters = __webpack_require__(8).line_starters;
-var positionable_operators = __webpack_require__(8).positionable_operators;
-var TOKEN = __webpack_require__(8).TOKEN;
+var Options = (__webpack_require__(6).Options);
+var Tokenizer = (__webpack_require__(8).Tokenizer);
+var line_starters = (__webpack_require__(8).line_starters);
+var positionable_operators = (__webpack_require__(8).positionable_operators);
+var TOKEN = (__webpack_require__(8).TOKEN);
 
 
 function in_array(what, arr) {
@@ -305,6 +305,7 @@ Beautifier.prototype.create_flags = function(flags_base, mode) {
     in_case_statement: false, // switch(..){ INSIDE HERE }
     in_case: false, // we're on the exact line with "case 0:"
     case_body: false, // the indented case-action block
+    case_block: false, // the indented case-action block is wrapped with {}
     indentation_level: next_indent_level,
     alignment: 0,
     line_indent_level: flags_base ? flags_base.line_indent_level : next_indent_level,
@@ -983,7 +984,7 @@ Beautifier.prototype.handle_word = function(current_token) {
 
   if (this._flags.in_case_statement && reserved_array(current_token, ['case', 'default'])) {
     this.print_newline();
-    if (this._flags.last_token.type !== TOKEN.END_BLOCK && (this._flags.case_body || this._options.jslint_happy)) {
+    if (!this._flags.case_block && (this._flags.case_body || this._options.jslint_happy)) {
       // switch cases following one another
       this.deindent();
     }
@@ -1297,7 +1298,9 @@ Beautifier.prototype.handle_operator = function(current_token) {
     if (this._tokens.peek().type !== TOKEN.START_BLOCK) {
       this.indent();
       this.print_newline();
+      this._flags.case_block = false;
     } else {
+      this._flags.case_block = true;
       this._output.space_before_token = true;
     }
     return;
@@ -1395,7 +1398,7 @@ Beautifier.prototype.handle_operator = function(current_token) {
 
     // http://www.ecma-international.org/ecma-262/5.1/#sec-7.9.1
     // if there is a newline between -- or ++ and anything else we should preserve it.
-    if (current_token.newlines && (current_token.text === '--' || current_token.text === '++')) {
+    if (current_token.newlines && (current_token.text === '--' || current_token.text === '++' || current_token.text === '~')) {
       this.print_newline(false, true);
     }
 
@@ -2155,7 +2158,7 @@ exports.allLineBreaks = new RegExp(exports.lineBreak.source, 'g');
 
 
 
-var BaseOptions = __webpack_require__(7).Options;
+var BaseOptions = (__webpack_require__(7).Options);
 
 var validPositionValues = ['before-newline', 'after-newline', 'preserve-newline'];
 
@@ -2453,13 +2456,13 @@ module.exports.mergeOpts = _mergeOpts;
 
 
 
-var InputScanner = __webpack_require__(9).InputScanner;
-var BaseTokenizer = __webpack_require__(10).Tokenizer;
-var BASETOKEN = __webpack_require__(10).TOKEN;
-var Directives = __webpack_require__(14).Directives;
+var InputScanner = (__webpack_require__(9).InputScanner);
+var BaseTokenizer = (__webpack_require__(10).Tokenizer);
+var BASETOKEN = (__webpack_require__(10).TOKEN);
+var Directives = (__webpack_require__(14).Directives);
 var acorn = __webpack_require__(5);
-var Pattern = __webpack_require__(13).Pattern;
-var TemplatablePattern = __webpack_require__(15).TemplatablePattern;
+var Pattern = (__webpack_require__(13).Pattern);
+var TemplatablePattern = (__webpack_require__(15).TemplatablePattern);
 
 
 function in_array(what, arr) {
@@ -2491,7 +2494,7 @@ var TOKEN = {
 
 var directives_core = new Directives(/\/\*/, /\*\//);
 
-var number_pattern = /0[xX][0123456789abcdefABCDEF]*|0[oO][01234567]*|0[bB][01]*|\d+n|(?:\.\d+|\d+\.?\d*)(?:[eE][+-]?\d+)?/;
+var number_pattern = /0[xX][0123456789abcdefABCDEF_]*n?|0[oO][01234567_]*n?|0[bB][01_]*n?|\d[\d_]*n|(?:\.\d[\d_]*|\d[\d_]*\.?[\d_]*)(?:[eE][+-]?[\d_]+)?/;
 
 var digit = /[0-9]/;
 
@@ -2551,7 +2554,7 @@ var Tokenizer = function(input_string, options) {
     html_comment_end: pattern_reader.matching(/-->/),
     include: pattern_reader.starting_with(/#include/).until_after(acorn.lineBreak),
     shebang: pattern_reader.starting_with(/#!/).until_after(acorn.lineBreak),
-    xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\]|)(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{[\s\S]+?}))*\s*(\/?)\s*>/),
+    xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[^}]+?}|!\[CDATA\[[^\]]*?\]\]|)(\s*{[^}]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{([^{}]|{[^}]+?})+?}))*\s*(\/?)\s*>/),
     single_quote: templatable.until(/['\\\n\r\u2028\u2029]/),
     double_quote: templatable.until(/["\\\n\r\u2028\u2029]/),
     template_text: templatable.until(/[`\\$]/),
@@ -3223,10 +3226,10 @@ module.exports.InputScanner = InputScanner;
 
 
 
-var InputScanner = __webpack_require__(9).InputScanner;
-var Token = __webpack_require__(4).Token;
-var TokenStream = __webpack_require__(11).TokenStream;
-var WhitespacePattern = __webpack_require__(12).WhitespacePattern;
+var InputScanner = (__webpack_require__(9).InputScanner);
+var Token = (__webpack_require__(4).Token);
+var TokenStream = (__webpack_require__(11).TokenStream);
+var WhitespacePattern = (__webpack_require__(12).WhitespacePattern);
 
 var TOKEN = {
   START: 'TK_START',
@@ -3453,7 +3456,7 @@ module.exports.TokenStream = TokenStream;
 
 
 
-var Pattern = __webpack_require__(13).Pattern;
+var Pattern = (__webpack_require__(13).Pattern);
 
 function WhitespacePattern(input_scanner, parent) {
   Pattern.call(this, input_scanner, parent);
@@ -3732,7 +3735,7 @@ module.exports.Directives = Directives;
 
 
 
-var Pattern = __webpack_require__(13).Pattern;
+var Pattern = (__webpack_require__(13).Pattern);
 
 
 var template_names = {
@@ -3949,8 +3952,8 @@ module.exports.TemplatablePattern = TemplatablePattern;
 
 
 
-var Beautifier = __webpack_require__(17).Beautifier,
-  Options = __webpack_require__(18).Options;
+var Beautifier = (__webpack_require__(17).Beautifier),
+  Options = (__webpack_require__(18).Options);
 
 function css_beautify(source_text, options) {
   var beautifier = new Beautifier(source_text, options);
@@ -3997,10 +4000,10 @@ module.exports.defaultOptions = function() {
 
 
 
-var Options = __webpack_require__(18).Options;
-var Output = __webpack_require__(3).Output;
-var InputScanner = __webpack_require__(9).InputScanner;
-var Directives = __webpack_require__(14).Directives;
+var Options = (__webpack_require__(18).Options);
+var Output = (__webpack_require__(3).Output);
+var InputScanner = (__webpack_require__(9).InputScanner);
+var Directives = (__webpack_require__(14).Directives);
 
 var directives_core = new Directives(/\/\*/, /\*\//);
 
@@ -4402,7 +4405,7 @@ Beautifier.prototype.beautify = function() {
     } else if (this._ch === ',') {
       this.print_string(this._ch);
       this.eatWhitespace(true);
-      if (this._options.selector_separator_newline && !insidePropertyValue && parenLevel === 0 && !insideAtImport) {
+      if (this._options.selector_separator_newline && !insidePropertyValue && parenLevel === 0 && !insideAtImport && !insideAtExtend) {
         this._output.add_new_line();
       } else {
         this._output.space_before_token = true;
@@ -4483,7 +4486,7 @@ module.exports.Beautifier = Beautifier;
 
 
 
-var BaseOptions = __webpack_require__(7).Options;
+var BaseOptions = (__webpack_require__(7).Options);
 
 function Options(options) {
   BaseOptions.call(this, options, 'css');
@@ -4545,8 +4548,8 @@ module.exports.Options = Options;
 
 
 
-var Beautifier = __webpack_require__(20).Beautifier,
-  Options = __webpack_require__(21).Options;
+var Beautifier = (__webpack_require__(20).Beautifier),
+  Options = (__webpack_require__(21).Options);
 
 function style_html(html_source, options, js_beautify, css_beautify) {
   var beautifier = new Beautifier(html_source, options, js_beautify, css_beautify);
@@ -4593,10 +4596,10 @@ module.exports.defaultOptions = function() {
 
 
 
-var Options = __webpack_require__(21).Options;
-var Output = __webpack_require__(3).Output;
-var Tokenizer = __webpack_require__(22).Tokenizer;
-var TOKEN = __webpack_require__(22).TOKEN;
+var Options = (__webpack_require__(21).Options);
+var Output = (__webpack_require__(3).Output);
+var Tokenizer = (__webpack_require__(22).Tokenizer);
+var TOKEN = (__webpack_require__(22).TOKEN);
 
 var lineBreak = /\r\n|[\r\n]/;
 var allLineBreaks = /\r\n|[\r\n]/g;
@@ -5177,7 +5180,7 @@ var TagOpenParserToken = function(parent, raw_token) {
 
       // handle "{{#> myPartial}}
       if (raw_token.text === '{{#>' && this.tag_check === '>' && raw_token.next !== null) {
-        this.tag_check = raw_token.next.text;
+        this.tag_check = raw_token.next.text.split(' ')[0];
       }
     }
     this.tag_check = this.tag_check.toLowerCase();
@@ -5464,7 +5467,7 @@ module.exports.Beautifier = Beautifier;
 
 
 
-var BaseOptions = __webpack_require__(7).Options;
+var BaseOptions = (__webpack_require__(7).Options);
 
 function Options(options) {
   BaseOptions.call(this, options, 'html');
@@ -5561,11 +5564,11 @@ module.exports.Options = Options;
 
 
 
-var BaseTokenizer = __webpack_require__(10).Tokenizer;
-var BASETOKEN = __webpack_require__(10).TOKEN;
-var Directives = __webpack_require__(14).Directives;
-var TemplatablePattern = __webpack_require__(15).TemplatablePattern;
-var Pattern = __webpack_require__(13).Pattern;
+var BaseTokenizer = (__webpack_require__(10).Tokenizer);
+var BASETOKEN = (__webpack_require__(10).TOKEN);
+var Directives = (__webpack_require__(14).Directives);
+var TemplatablePattern = (__webpack_require__(15).TemplatablePattern);
+var Pattern = (__webpack_require__(13).Pattern);
 
 var TOKEN = {
   TAG_OPEN: 'TK_TAG_OPEN',