simplifying array expressions

ben-sb · May 18, 2022 · cbb6462 · cbb6462
1 parent 11e2e30
commit cbb6462
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "javascript-deobfuscator",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/modifications/expressions/expressionSimplifier.ts b/src/modifications/expressions/expressionSimplifier.ts
@@ -111,8 +111,34 @@ export default class ExpressionSimplifier extends Modification {
                 return `"${value}"`;
 
             case 'LiteralNumericExpression':
+            case 'LiteralBooleanExpression':
                 return expression.value.toString();
 
+            case 'ArrayExpression':
+                if (expression.elements.length == 0) {
+                    return '[]';
+                } else if (expression.elements.every(e => !e || e.type.startsWith('Literal'))) {
+                    let content = '';
+                    for (let i=0; i<expression.elements.length; i++) {
+                        if (expression.elements[i]) {
+                            content += `${this.getExpressionValueAsString(expression.elements[i] as Shift.Expression)},`;
+                        } else {
+                            content += ',';
+                        }
+                    }
+                    return `[${content.substring(0, content.length - 1)}]`;
+                } else {
+                    return null;
+                }
+
+            case 'ObjectExpression':
+                if (expression.properties.length == 0) {
+                    expression.properties
+                    return '[]';
+                } else {
+                    return null;
+                }
+
             case 'UnaryExpression':
                 const operand = this.getExpressionValueAsString(expression.operand);
                 return operand != null
@@ -157,4 +183,8 @@ export default class ExpressionSimplifier extends Modification {
                 return null;
         }
     }
+
+    private isSimpleArray(array: Shift.ArrayExpression): boolean {
+        return array.elements.every(e => !e || e.type.startsWith('Literal'));
+    }
 }