obfuscator: Split variable declarations before processing string array #114

Signed-off-by: echo094 <20028238+echo094@users.noreply.github.com>

Author: echo094

src/plugin/obfuscator.js

@@ -944,6 +944,12 @@ module.exports = function (code) {
   // IllegalReturn
   const deleteIllegalReturn = require('../visitor/delete-illegal-return')
   traverse(ast, deleteIllegalReturn)
+  // Lint before split statements
+  const lintIfStatement = require('../visitor/lint-if-statement')
+  traverse(ast, lintIfStatement)
+  // Split declarations to avoid bugs
+  const splitVarDeclaration = require('../visitor/split-variable-declaration')
+  traverse(ast, splitVarDeclaration)
   // 清理二进制显示内容
   traverse(ast, {
     StringLiteral: ({ node }) => {

src/visitor/lint-if-statement.js

@@ -0,0 +1,22 @@
+const t = require('@babel/types')
+
+function LintIfStatement(path) {
+  let { test, consequent, alternate } = path.node
+  let changed = false
+  if (!t.isBlockStatement(consequent)) {
+    consequent = t.blockStatement([consequent])
+    changed = true
+  }
+  if (alternate && !t.isBlockStatement(alternate)) {
+    alternate = t.blockStatement([alternate])
+    changed = true
+  }
+  if (!changed) {
+    return
+  }
+  path.replaceWith(t.ifStatement(test, consequent, alternate))
+}
+
+module.exports = {
+  IfStatement: { exit: LintIfStatement },
+}