admin/javascript-obfuscator-javascript-obfuscator
1
0
Fork 0
mirror of https://github.com/javascript-obfuscator/javascript-obfuscator synced 2026-08-09 12:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed stringArrayWrappersCount behaviour with arrow function scope without statements

Browse Source
This commit is contained in:
sanex
2020-09-12 13:59:07 +03:00
parent 78383e7cb3
commit 09e89f8fe6
13 changed files with 121 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/node-transformers/string-array-transformers/StringArrayTransformer.ts
+32 -14
View File
@@ -5,6 +5,7 @@ import * as ESTree from 'estree';
import { TInitialData } from '../../types/TInitialData';
import { TNodeWithLexicalScope } from '../../types/node/TNodeWithLexicalScope';
import { TNodeWithLexicalScopeAndStatements } from '../../types/node/TNodeWithLexicalScopeAndStatements';
import { TStatement } from '../../types/node/TStatement';
import { TStringArrayEncoding } from '../../types/options/TStringArrayEncoding';
import { TStringArrayScopeCallsWrapperDataByEncoding } from '../../types/node-transformers/string-array-transformers/TStringArrayScopeCallsWrapperDataByEncoding';
@@ -122,6 +123,31 @@ export class StringArrayTransformer extends AbstractNodeTransformer {
this.stringArrayTransformerCustomNodeFactory = stringArrayTransformerCustomNodeFactory;
}
/**
* @param {Node} node
* @returns {boolean}
*/
private static isValidLexicalScopeNode (node: ESTree.Node): node is TNodeWithLexicalScopeAndStatements {
if (!NodeGuards.isNodeWithLexicalScope(node)) {
return false;
}
const lexicalScopeBodyNode: ESTree.Program | ESTree.BlockStatement | ESTree.Expression =
NodeGuards.isProgramNode(node)
? node
: node.body;
// invalid lexical scope node
if (
!lexicalScopeBodyNode.parentNode
|| !NodeGuards.isNodeWithLexicalScopeStatements(lexicalScopeBodyNode, lexicalScopeBodyNode.parentNode)
) {
return false;
}
return true;
}
/**
* @param {NodeTransformationStage} nodeTransformationStage
* @returns {IVisitor | null}
@@ -135,7 +161,7 @@ export class StringArrayTransformer extends AbstractNodeTransformer {
this.prepareNode(node);
}
if (NodeGuards.isNodeWithLexicalScope(node)) {
if (StringArrayTransformer.isValidLexicalScopeNode(node)) {
this.onLexicalScopeNodeEnter(node);
}
@@ -144,7 +170,7 @@ export class StringArrayTransformer extends AbstractNodeTransformer {
}
},
leave: (node: ESTree.Node): ESTree.Node | undefined => {
if (NodeGuards.isNodeWithLexicalScope(node)) {
if (StringArrayTransformer.isValidLexicalScopeNode(node)) {
this.onLexicalScopeNodeLeave();
return this.transformLexicalScopeNode(node);
@@ -297,27 +323,19 @@ export class StringArrayTransformer extends AbstractNodeTransformer {
}
/**
* @param {TNodeWithLexicalScope} lexicalScopeNode
* @returns {TNodeWithLexicalScope}
* @param {TNodeWithLexicalScopeAndStatements} lexicalScopeNode
* @returns {TNodeWithLexicalScopeAndStatements}
*/
private transformLexicalScopeNode (lexicalScopeNode: TNodeWithLexicalScope): TNodeWithLexicalScope {
private transformLexicalScopeNode (lexicalScopeNode: TNodeWithLexicalScopeAndStatements): TNodeWithLexicalScopeAndStatements {
if (!this.options.stringArrayWrappersCount) {
return lexicalScopeNode;
}
const lexicalScopeBodyNode: ESTree.Program | ESTree.BlockStatement | ESTree.Expression =
const lexicalScopeBodyNode: ESTree.Program | ESTree.BlockStatement =
NodeGuards.isProgramNode(lexicalScopeNode)
? lexicalScopeNode
: lexicalScopeNode.body;
// invalid lexical scope node
if (
!lexicalScopeBodyNode.parentNode
|| !NodeGuards.isNodeWithLexicalScopeStatements(lexicalScopeBodyNode, lexicalScopeBodyNode.parentNode)
) {
return lexicalScopeNode;
}
const stringArrayScopeCallsWrapperDataByEncoding: TStringArrayScopeCallsWrapperDataByEncoding | null =
this.stringArrayScopeCallsWrapperDataByEncodingMap.get(lexicalScopeNode) ?? null;
src/types/node/TNodeWithLexicalScopeAndStatements.ts
+8
View File
@@ -0,0 +1,8 @@
import * as ESTree from 'estree';
import { TNodeWithLexicalScope } from './TNodeWithLexicalScope';
export type TNodeWithLexicalScopeAndStatements = TNodeWithLexicalScope
& {
body: ESTree.Program | ESTree.BlockStatement;
};