javascript-obfuscator · sanex3339 · Mar 4, 2020 · Mar 4, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Change Log
 
+v0.25.3
+---
+* Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/568
+
 v0.25.2
 ---
 * Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/563

diff --git a/README.md b/README.md
@@ -270,6 +270,13 @@ For example:
 
 Kind of variables of inserted nodes will auto-detected, based on most prevailing kind of variables of source code.
 
+## Conflicts of identifier names between different files
+
+During obfuscation of the different files, the same names can be generated for the global identifiers between these files.
+To prevent this set the unique prefix for all global identifiers for each obfuscated file with [`identifiersPrefix`](#identifiersPrefix) option. 
+
+When using CLI this prefix will be added automatically.
+
 ## Antiviruses false positive virus alerts
 
 Some input source code that will obfuscated with some obfuscation options can trigger false positive alerts in a few antiviruses. If you will get this false positive triggers, try to play with obfuscation options.

diff --git a/dist/index.browser.js b/dist/index.browser.js
diff --git a/dist/index.cli.js b/dist/index.cli.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "javascript-obfuscator",
-  "version": "0.25.2",
+  "version": "0.25.3",
   "description": "JavaScript obfuscator",
   "keywords": [
     "obfuscator",
@@ -23,7 +23,7 @@
   "dependencies": {
     "@gradecam/tsenum": "1.2.0",
     "@nuxtjs/opencollective": "0.2.2",
-    "acorn": "7.1.0",
+    "acorn": "7.1.1",
     "acorn-import-meta": "1.0.0",
     "chalk": "3.0.0",
     "chance": "1.1.4",
@@ -45,28 +45,28 @@
     "tslib": "1.11.1"
   },
   "devDependencies": {
-    "@types/chai": "4.2.9",
+    "@types/chai": "4.2.10",
     "@types/chance": "1.0.8",
     "@types/escodegen": "0.0.6",
     "@types/eslint-scope": "3.7.0",
     "@types/estraverse": "0.0.6",
     "@types/estree": "0.0.42",
     "@types/md5": "2.1.33",
     "@types/mkdirp": "1.0.0",
-    "@types/mocha": "7.0.1",
+    "@types/mocha": "7.0.2",
     "@types/multimatch": "4.0.0",
     "@types/node": "12.12.14",
     "@types/rimraf": "2.0.3",
     "@types/sinon": "7.5.2",
     "@types/string-template": "1.0.2",
     "@types/webpack-env": "1.15.1",
-    "@typescript-eslint/eslint-plugin": "2.21.0",
-    "@typescript-eslint/parser": "2.21.0",
+    "@typescript-eslint/eslint-plugin": "2.22.0",
+    "@typescript-eslint/parser": "2.22.0",
     "chai": "4.2.0",
     "coveralls": "3.0.9",
     "eslint": "6.8.0",
     "eslint-plugin-import": "2.20.1",
-    "eslint-plugin-jsdoc": "21.0.0",
+    "eslint-plugin-jsdoc": "22.0.0",
     "eslint-plugin-no-null": "1.0.2",
     "eslint-plugin-prefer-arrow": "1.1.7",
     "eslint-plugin-unicorn": "16.1.1",
@@ -81,8 +81,8 @@
     "threads": "1.3.0",
     "ts-loader": "6.2.1",
     "ts-node": "6.1.0",
-    "typescript": "3.8.2",
-    "webpack": "4.41.6",
+    "typescript": "3.8.3",
+    "webpack": "4.42.0",
     "webpack-cli": "3.3.11",
     "webpack-node-externals": "1.7.2"
   },

diff --git a/src/custom-code-helpers/domain-lock/group/DomainLockCustomCodeHelperGroup.ts b/src/custom-code-helpers/domain-lock/group/DomainLockCustomCodeHelperGroup.ts
@@ -84,11 +84,11 @@ export class DomainLockCustomCodeHelperGroup extends AbstractCustomCodeHelperGro
         const domainLockFunctionName: string = domainLockFunctionLexicalScopeNode
             && NodeGuards.isProgramNode(domainLockFunctionLexicalScopeNode)
             ? this.identifierNamesGenerator.generate(domainLockFunctionLexicalScopeNode)
-            : this.randomGenerator.getRandomString(5);
+            : this.identifierNamesGenerator.generateNext();
         const callsControllerFunctionName: string = domainLockFunctionLexicalScopeNode
             && NodeGuards.isProgramNode(domainLockFunctionLexicalScopeNode)
             ? this.identifierNamesGenerator.generate(domainLockFunctionLexicalScopeNode)
-            : this.randomGenerator.getRandomString(5);
+            : this.identifierNamesGenerator.generateNext();
 
         // domainLock helper nodes append
         this.appendCustomNodeIfExist(

diff --git a/src/custom-code-helpers/self-defending/group/SelfDefendingCodeHelperGroup.ts b/src/custom-code-helpers/self-defending/group/SelfDefendingCodeHelperGroup.ts
@@ -82,10 +82,10 @@ export class SelfDefendingCodeHelperGroup extends AbstractCustomCodeHelperGroup
 
         const selfDefendingFunctionName: string = selfDefendingFunctionLexicalScopeNode
             ? this.identifierNamesGenerator.generate(selfDefendingFunctionLexicalScopeNode)
-            : this.identifierNamesGenerator.generateForGlobalScope();
+            : this.identifierNamesGenerator.generateNext();
         const callsControllerFunctionName: string = selfDefendingFunctionLexicalScopeNode
             ? this.identifierNamesGenerator.generate(selfDefendingFunctionLexicalScopeNode)
-            : this.identifierNamesGenerator.generateForGlobalScope();
+            : this.identifierNamesGenerator.generateNext();
 
         // selfDefendingUnicode helper nodes append
         this.appendCustomNodeIfExist(

diff --git a/src/custom-code-helpers/string-array/StringArrayRotateFunctionCodeHelper.ts b/src/custom-code-helpers/string-array/StringArrayRotateFunctionCodeHelper.ts
@@ -90,8 +90,8 @@ export class StringArrayRotateFunctionCodeHelper extends AbstractCustomCodeHelpe
      * @returns {string}
      */
     protected getCodeHelperTemplate (): string {
-        const timesName: string = this.identifierNamesGenerator.generateForGlobalScope();
-        const whileFunctionName: string = this.identifierNamesGenerator.generateForGlobalScope();
+        const timesName: string = this.identifierNamesGenerator.generateNext();
+        const whileFunctionName: string = this.identifierNamesGenerator.generateNext();
         const preservedNames: string[] = [`^${this.stringArrayName}$`];
 
         let code: string = '';

diff --git a/src/generators/identifier-names-generators/AbstractIdentifierNamesGenerator.ts b/src/generators/identifier-names-generators/AbstractIdentifierNamesGenerator.ts
@@ -138,5 +138,5 @@ export abstract class AbstractIdentifierNamesGenerator implements IIdentifierNam
      * @param {number} nameLength
      * @returns {string}
      */
-    public abstract generateWithPrefix (nameLength?: number): string;
+    public abstract generateNext (nameLength?: number): string;
 }
diff --git a/src/generators/identifier-names-generators/DictionaryIdentifierNamesGenerator.ts b/src/generators/identifier-names-generators/DictionaryIdentifierNamesGenerator.ts
@@ -69,7 +69,7 @@ export class DictionaryIdentifierNamesGenerator extends AbstractIdentifierNamesG
         return null;
     }
 
-    public generateForGlobalScope (): string {
+    public generateNext (): string {
         const identifierName: string = this.generateNewDictionaryName();
 
         this.preserveName(identifierName);
@@ -78,42 +78,42 @@ export class DictionaryIdentifierNamesGenerator extends AbstractIdentifierNamesG
     }
 
     /**
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
      * @returns {string}
      */
-    public generateForLexicalScope (lexicalScopeNode: TNodeWithLexicalScope): string {
-        const lexicalScopes: TNodeWithLexicalScope[] = [
-            lexicalScopeNode,
-            ...NodeLexicalScopeUtils.getLexicalScopes(lexicalScopeNode)
-        ];
+    public generateForGlobalScope (): string {
+        const prefix: string = this.options.identifiersPrefix ?
+            `${this.options.identifiersPrefix}`
+            : '';
         const identifierName: string = this.generateNewDictionaryName();
+        const identifierNameWithPrefix: string = `${prefix}${identifierName}`;
 
-        if (!this.isValidIdentifierNameInLexicalScopes(identifierName, lexicalScopes)) {
-            return this.generateForLexicalScope(lexicalScopeNode);
+        if (!this.isValidIdentifierName(identifierNameWithPrefix)) {
+            return this.generateForGlobalScope();
         }
 
-        this.preserveNameForLexicalScope(identifierName, lexicalScopeNode);
+        this.preserveName(identifierNameWithPrefix);
 
-        return identifierName;
+        return identifierNameWithPrefix;
     }
 
     /**
+     * @param {TNodeWithLexicalScope} lexicalScopeNode
      * @returns {string}
      */
-    public generateWithPrefix (): string {
-        const prefix: string = this.options.identifiersPrefix ?
-            `${this.options.identifiersPrefix}`
-            : '';
+    public generateForLexicalScope (lexicalScopeNode: TNodeWithLexicalScope): string {
+        const lexicalScopes: TNodeWithLexicalScope[] = [
+            lexicalScopeNode,
+            ...NodeLexicalScopeUtils.getLexicalScopes(lexicalScopeNode)
+        ];
         const identifierName: string = this.generateNewDictionaryName();
-        const identifierNameWithPrefix: string = `${prefix}${identifierName}`;
 
-        if (!this.isValidIdentifierName(identifierNameWithPrefix)) {
-            return this.generateWithPrefix();
+        if (!this.isValidIdentifierNameInLexicalScopes(identifierName, lexicalScopes)) {
+            return this.generateForLexicalScope(lexicalScopeNode);
         }
 
-        this.preserveName(identifierNameWithPrefix);
+        this.preserveNameForLexicalScope(identifierName, lexicalScopeNode);
 
-        return identifierNameWithPrefix;
+        return identifierName;
     }
 
     /**

diff --git a/src/generators/identifier-names-generators/HexadecimalIdentifierNamesGenerator.ts b/src/generators/identifier-names-generators/HexadecimalIdentifierNamesGenerator.ts
@@ -32,7 +32,7 @@ export class HexadecimalIdentifierNamesGenerator extends AbstractIdentifierNames
      * @param {number} nameLength
      * @returns {string}
      */
-    public generateForGlobalScope (nameLength?: number): string {
+    public generateNext (nameLength?: number): string {
         const rangeMinInteger: number = 10000;
         const rangeMaxInteger: number = 99_999_999;
         const randomInteger: number = this.randomGenerator.getRandomInteger(rangeMinInteger, rangeMaxInteger);
@@ -45,7 +45,7 @@ export class HexadecimalIdentifierNamesGenerator extends AbstractIdentifierNames
         const identifierName: string = `_${Utils.hexadecimalPrefix}${baseIdentifierName}`;
 
         if (!this.isValidIdentifierName(identifierName)) {
-            return this.generateForGlobalScope(nameLength);
+            return this.generateNext(nameLength);
         }
 
         this.preserveName(identifierName);
@@ -54,21 +54,21 @@ export class HexadecimalIdentifierNamesGenerator extends AbstractIdentifierNames
     }
 
     /**
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
      * @param {number} nameLength
      * @returns {string}
      */
-    public generateForLexicalScope (lexicalScopeNode: TNodeWithLexicalScope, nameLength?: number): string {
-        return this.generateForGlobalScope(nameLength);
+    public generateForGlobalScope (nameLength?: number): string {
+        const identifierName: string = this.generateNext(nameLength);
+
+        return `${this.options.identifiersPrefix}${identifierName}`.replace('__', '_');
     }
 
     /**
+     * @param {TNodeWithLexicalScope} lexicalScopeNode
      * @param {number} nameLength
      * @returns {string}
      */
-    public generateWithPrefix (nameLength?: number): string {
-        const identifierName: string = this.generateForGlobalScope(nameLength);
-
-        return `${this.options.identifiersPrefix}${identifierName}`.replace('__', '_');
+    public generateForLexicalScope (lexicalScopeNode: TNodeWithLexicalScope, nameLength?: number): string {
+        return this.generateNext(nameLength);
     }
 }
diff --git a/src/generators/identifier-names-generators/MangledIdentifierNamesGenerator.ts b/src/generators/identifier-names-generators/MangledIdentifierNamesGenerator.ts
@@ -58,7 +58,7 @@ export class MangledIdentifierNamesGenerator extends AbstractIdentifierNamesGene
      * @param {number} nameLength
      * @returns {string}
      */
-    public generateForGlobalScope (nameLength?: number): string {
+    public generateNext (nameLength?: number): string {
         const identifierName: string = this.generateNewMangledName(this.previousMangledName);
 
         this.previousMangledName = identifierName;
@@ -67,6 +67,28 @@ export class MangledIdentifierNamesGenerator extends AbstractIdentifierNamesGene
         return identifierName;
     }
 
+    /**
+     * @param {number} nameLength
+     * @returns {string}
+     */
+    public generateForGlobalScope (nameLength?: number): string {
+        const prefix: string = this.options.identifiersPrefix ?
+            `${this.options.identifiersPrefix}`
+            : '';
+        const identifierName: string = this.generateNewMangledName(this.previousMangledName);
+        const identifierNameWithPrefix: string = `${prefix}${identifierName}`;
+
+        this.previousMangledName = identifierName;
+
+        if (!this.isValidIdentifierName(identifierNameWithPrefix)) {
+            return this.generateForGlobalScope(nameLength);
+        }
+
+        this.preserveName(identifierNameWithPrefix);
+
+        return identifierNameWithPrefix;
+    }
+
     /**
      * @param {TNodeWithLexicalScope} lexicalScopeNode
      * @param {number} nameLength
@@ -93,28 +115,6 @@ export class MangledIdentifierNamesGenerator extends AbstractIdentifierNamesGene
         return identifierName;
     }
 
-    /**
-     * @param {number} nameLength
-     * @returns {string}
-     */
-    public generateWithPrefix (nameLength?: number): string {
-        const prefix: string = this.options.identifiersPrefix ?
-            `${this.options.identifiersPrefix}`
-            : '';
-        const identifierName: string = this.generateNewMangledName(this.previousMangledName);
-        const identifierNameWithPrefix: string = `${prefix}${identifierName}`;
-
-        this.previousMangledName = identifierName;
-
-        if (!this.isValidIdentifierName(identifierNameWithPrefix)) {
-            return this.generateWithPrefix(nameLength);
-        }
-
-        this.preserveName(identifierNameWithPrefix);
-
-        return identifierNameWithPrefix;
-    }
-
     /**
      * @param {string} mangledName
      * @returns {boolean}

diff --git a/src/interfaces/generators/identifier-names-generators/IIdentifierNamesGenerator.ts b/src/interfaces/generators/identifier-names-generators/IIdentifierNamesGenerator.ts
@@ -26,7 +26,7 @@ export interface IIdentifierNamesGenerator {
      * @param {number} nameLength
      * @returns {string}
      */
-    generateWithPrefix (nameLength?: number): string;
+    generateNext (nameLength?: number): string;
 
     /**
      * @param {string} identifierName

diff --git a/...fuscating-replacers/identifier-obfuscating-replacers/BaseIdentifierObfuscatingReplacer.ts b/...fuscating-replacers/identifier-obfuscating-replacers/BaseIdentifierObfuscatingReplacer.ts
@@ -72,7 +72,7 @@ export class BaseIdentifierObfuscatingReplacer extends AbstractObfuscatingReplac
             return;
         }
 
-        const newIdentifierName: string = this.identifierNamesGenerator.generateWithPrefix();
+        const newIdentifierName: string = this.identifierNamesGenerator.generateForGlobalScope();
 
         if (!this.blockScopesMap.has(lexicalScopeNode)) {
             this.blockScopesMap.set(lexicalScopeNode, new Map());

diff --git a/src/node/NodeUtils.ts b/src/node/NodeUtils.ts
@@ -10,8 +10,8 @@ import { NodeMetadata } from './NodeMetadata';
 
 export class NodeUtils {
     /**
-     * @param {T} literalNode
-     * @returns {T}
+     * @param {ESTree.Literal} literalNode
+     * @returns {ESTree.Literal}
      */
     public static addXVerbatimPropertyTo (literalNode: ESTree.Literal): ESTree.Literal {
         literalNode['x-verbatim-property'] = {
@@ -32,7 +32,7 @@ export class NodeUtils {
 
     /**
      * @param {string} code
-     * @returns {Statement[]}
+     * @returns {ESTree.Statement[]}
      */
     public static convertCodeToStructure (code: string): ESTree.Statement[] {
         const structure: ESTree.Program = ASTParserFacade.parse(

diff --git a/src/storages/string-array/StringArrayStorage.ts b/src/storages/string-array/StringArrayStorage.ts
@@ -162,7 +162,7 @@ export class StringArrayStorage extends MapStorage <string, IStringArrayStorageI
     public getStorageId (): string {
         if (!this.stringArrayStorageName) {
             this.stringArrayStorageName = this.identifierNamesGenerator
-                .generateWithPrefix(StringArrayStorage.stringArrayNameLength);
+                .generateForGlobalScope(StringArrayStorage.stringArrayNameLength);
         }
 
         return this.stringArrayStorageName;
@@ -174,7 +174,7 @@ export class StringArrayStorage extends MapStorage <string, IStringArrayStorageI
     public getStorageCallsWrapperName (): string {
         if (!this.stringArrayStorageCallsWrapperName) {
             this.stringArrayStorageCallsWrapperName = this.identifierNamesGenerator
-                .generateWithPrefix(StringArrayStorage.stringArrayNameLength);
+                .generateForGlobalScope(StringArrayStorage.stringArrayNameLength);
         }
 
         return this.stringArrayStorageCallsWrapperName;