Merge pull request #6 from javascript-obfuscator/class-static-block

sanex3339 · web-flow · commit 40bc9c6a5ecc · 2022-01-29T14:06:14.000+03:00
Class static block support
diff --git a/escodegen.js b/escodegen.js
@@ -1506,6 +1506,13 @@
             return result;
         },
 
+        StaticBlock: function (stmt, flags) {
+            return [
+                'static' + space,
+                this.BlockStatement(stmt, flags)
+            ];
+        },
+
         ThrowStatement: function (stmt, flags) {
             return [join(
                 'throw',
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
         "escodegen.js",
         "package.json"
     ],
-    "version": "2.2.2",
+    "version": "2.3.0",
     "engines": {
         "node": ">=6.0"
     },
@@ -40,7 +40,7 @@
         "source-map": "~0.6.1"
     },
     "devDependencies": {
-        "acorn": "^8.2.2",
+        "acorn": "^8.7.0",
         "bluebird": "^3.4.7",
         "bower-registry-client": "^1.0.0",
         "chai": "^4.2.0",
diff --git a/test/compare-acorn-es2022/class-features.expected.js b/test/compare-acorn-es2022/class-features.expected.js
@@ -44,4 +44,18 @@ class C13 {
 }
 class C14 {
     #𩸽;
+}
+class C15 {
+    static aaa;
+    static {
+        C15.aaa = 1;
+    }
+}
+class C16 {
+    static {
+        C15.aaa = 1;
+    }
+    static {
+        C15.bbb = 2;
+    }
 }
diff --git a/test/compare-acorn-es2022/class-features.expected.min.js b/test/compare-acorn-es2022/class-features.expected.min.js
@@ -1 +1 @@
-class C1{aaa;}class C2{A;}class C3{'0';}class C4{100;}class C5{[0];}class C6{aaa=bbb;}class C7{aaa=()=>0;}class C8{static aaa;}class C9{static aaa=bbb;}class C10{static aaa=1;bbb=2;}class C11{get;set;static;async;}class C12{#aaa;#bbb=this.#aaa;}class C13{#A;}class C14{#𩸽;}
+class C1{aaa;}class C2{A;}class C3{'0';}class C4{100;}class C5{[0];}class C6{aaa=bbb;}class C7{aaa=()=>0;}class C8{static aaa;}class C9{static aaa=bbb;}class C10{static aaa=1;bbb=2;}class C11{get;set;static;async;}class C12{#aaa;#bbb=this.#aaa;}class C13{#A;}class C14{#𩸽;}class C15{static aaa;static{C15.aaa=1}}class C16{static{C15.aaa=1}static{C15.bbb=2}}
diff --git a/test/compare-acorn-es2022/class-features.js b/test/compare-acorn-es2022/class-features.js
@@ -12,4 +12,7 @@ class C11 { get; set; static; async }
 
 class C12 { #aaa; #bbb = this.#aaa; }
 class C13 { #\u0041; }
-class C14 { #𩸽; }
+class C14 { #𩸽; }
+
+class C15 { static aaa; static { C15.aaa = 1; } }
+class C16 { static { C15.aaa = 1; } static { C15.bbb = 2; } }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-class C1{aaa;}class C2{A;}class C3{'0';}class C4{100;}class C5{[0];}class C6{aaa=bbb;}class C7{aaa=()=>0;}class C8{static aaa;}class C9{static aaa=bbb;}class C10{static aaa=1;bbb=2;}class C11{get;set;static;async;}class C12{#aaa;#bbb=this.#aaa;}class C13{#A;}class C14{#𩸽;}`
	`1`	`+class C1{aaa;}class C2{A;}class C3{'0';}class C4{100;}class C5{[0];}class C6{aaa=bbb;}class C7{aaa=()=>0;}class C8{static aaa;}class C9{static aaa=bbb;}class C10{static aaa=1;bbb=2;}class C11{get;set;static;async;}class C12{#aaa;#bbb=this.#aaa;}class C13{#A;}class C14{#𩸽;}class C15{static aaa;static{C15.aaa=1}}class C16{static{C15.aaa=1}static{C15.bbb=2}}`