js-beautify 1.10.2 → 1.13.0

package/js/src/javascript/tokenizer.js

@@ -75,7 +75,7 @@ var dot_pattern = /[^\d\.]/;
 
 var positionable_operators = (
   ">>> === !== " +
-  "<< && >= ** != == <= >> || " +
+  "<< && >= ** != == <= >> || ?? |> " +
   "< / - + > : & % ? ^ | *").split(' ');
 
 // IMPORTANT: this must be sorted longest to shortest or tokenizing many not work.
@@ -83,10 +83,12 @@ var positionable_operators = (
 var punct =
   ">>>= " +
   "... >>= <<= === >>> !== **= " +
-  "=> ^= :: /= << <= == && -= >= >> != -- += ** || ++ %= &= *= |= " +
+  "=> ^= :: /= << <= == && -= >= >> != -- += ** || ?? ++ %= &= *= |= |> " +
   "= ! ? > < : / ^ - + * & % ~ |";
 
 punct = punct.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&");
+// ?. but not if followed by a number 
+punct = '\\?\\.(?!\\d) ' + punct;
 punct = punct.replace(/ /g, '|');
 
 var punct_pattern = new RegExp(punct);
@@ -163,13 +165,13 @@ Tokenizer.prototype._get_next_token = function(previous_token, open_token) { //
     return this._create_token(TOKEN.EOF, '');
   }
 
+  token = token || this._read_non_javascript(c);
   token = token || this._read_string(c);
   token = token || this._read_word(previous_token);
   token = token || this._read_singles(c);
   token = token || this._read_comment(c);
   token = token || this._read_regexp(c, previous_token);
   token = token || this._read_xml(c, previous_token);
-  token = token || this._read_non_javascript(c);
   token = token || this._read_punctuation();
   token = token || this._create_token(TOKEN.UNKNOWN, this._input.next());
 
@@ -228,6 +230,8 @@ Tokenizer.prototype._read_punctuation = function() {
   if (resulting_string !== '') {
     if (resulting_string === '=') {
       return this._create_token(TOKEN.EQUALS, resulting_string);
+    } else if (resulting_string === '?.') {
+      return this._create_token(TOKEN.DOT, resulting_string);
     } else {
       return this._create_token(TOKEN.OPERATOR, resulting_string);
     }

package/js/src/unpackers/p_a_c_k_e_r_unpacker.js

@@ -100,6 +100,14 @@ var P_A_C_K_E_R = {
     t.expect(pk1, unpk1);
     t.expect(pk2, unpk2);
     t.expect(pk3, unpk3);
+    t.expect("function test (){alert ('This is a test!')}; " +
+      "eval(function(p,a,c,k,e,r){e=String;if(!''.replace(/^/,String))" +
+      "{while(c--)r[c]=k[c]||c;k=[function(e){return r[e]}];e=function" +
+      "(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp(" +
+      "'\\b'+e(c)+'\\b','g'),k[c]);return p}('0 2=\\\'{Íâ–+›ï;ã†Ù¥#\\\'',3,3," +
+      "'var||a'.split('|'),0,{}))",
+      "function test (){alert ('This is a test!')}; var a='{Íâ–+›ï;ã†Ù¥#'");
+
 
     var filler = '\nfiller\n';
     t.expect(filler + pk1 + "\n" + pk_broken + filler + pk2 + filler, filler + unpk1 + "\n" + pk_broken + filler + unpk2 + filler);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-beautify",
-  "version": "1.10.2",
+  "version": "1.13.0",
   "description": "beautifier.io for node",
   "main": "js/index.js",
   "bin": {
@@ -48,19 +48,20 @@
     "config-chain": "^1.1.12",
     "editorconfig": "^0.15.3",
     "glob": "^7.1.3",
-    "mkdirp": "~0.5.1",
-    "nopt": "~4.0.1"
+    "mkdirp": "^1.0.4",
+    "nopt": "^5.0.0"
   },
   "devDependencies": {
     "benchmark": "^2.1.4",
-    "codemirror": "^5.48.2",
-    "jquery": "^3.4.1",
-    "jshint": "^2.10.2",
-    "mocha": "^6.1.4",
-    "mustache": "^3.0.1",
-    "node-static": "^0.7.11",
+    "codemirror": "^5.56.0",
+    "jquery": "^3.5.1",
+    "jshint": "^2.12.0",
+    "minimist": ">=1.2.5",
+    "mocha": "^8.1.1",
+    "mustache": "^4.0.1",
+    "serve": "^11.3.2",
     "requirejs": "^2.3.6",
-    "webpack": "^4.36.1",
-    "webpack-cli": "^3.3.5"
+    "webpack": "^4.44.1",
+    "webpack-cli": "^3.3.12"
   }
 }