[pull] master from javascript-obfuscator:master

CHANGELOG.md

@@ -1,5 +1,9 @@
 Change Log
 
+v5.4.6
+---
+* Fixed unicode (`\uXXXX`, `\u{XXXX}`) and hex (`\xXX`) escape sequences of string literals being un-escaped into their literal characters during obfuscation. Fixes https://github.com/javascript-obfuscator/javascript-obfuscator/issues/345
+
 v5.4.5
 ---
 * Fixed `controlFlowFlattening` intermittently dropping arguments of a spread call (e.g. `foo(...args)`) when it reused a control flow wrapper of a same-arity plain call. Fixes https://github.com/javascript-obfuscator/javascript-obfuscator/issues/1423

package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-obfuscator",
-  "version": "5.4.5",
+  "version": "5.4.6",
   "description": "JavaScript obfuscator",
   "keywords": [
     "obfuscator",

src/interfaces/storages/string-array-transformers/ILiteralNodesCacheStorage.ts

@@ -5,11 +5,14 @@ import { IStringArrayStorageItemData } from './IStringArrayStorageItem';
 
 export interface ILiteralNodesCacheStorage extends IMapStorage<string, ESTree.Node> {
     /**
-     * @param {string} literalValue
+     * @param {Literal} literalNode
      * @param {IStringArrayStorageItemData | undefined} stringArrayStorageItemData
      * @returns {string}
      */
-    buildKey(literalValue: string, stringArrayStorageItemData: IStringArrayStorageItemData | undefined): string;
+    buildKey(
+        literalNode: ESTree.Literal,
+        stringArrayStorageItemData: IStringArrayStorageItemData | undefined
+    ): string;
 
     /**
      * @param {string} key

src/interfaces/utils/IEscapeSequenceEncoder.ts

@@ -5,4 +5,12 @@ export interface IEscapeSequenceEncoder {
      * @returns {string}
      */
     encode(string: string, encodeAllSymbols: boolean): string;
+
+    /**
+     * @param {string} value
+     * @param {string | undefined} rawValue
+     * @param {boolean} encodeAllSymbols
+     * @returns {string}
+     */
+    encodeLiteral(value: string, rawValue: string | undefined, encodeAllSymbols: boolean): string;
 }

src/node-transformers/finalizing-transformers/EscapeSequenceTransformer.ts

@@ -75,8 +75,9 @@ export class EscapeSequenceTransformer extends AbstractNodeTransformer {
             return literalNode;
         }
 
-        const encodedValue: string = this.escapeSequenceEncoder.encode(
+        const encodedValue: string = this.escapeSequenceEncoder.encodeLiteral(
             literalNode.value,
+            literalNode.raw,
             this.options.unicodeEscapeSequence
         );
         const newLiteralNode: ESTree.Literal = NodeFactory.literalNode(encodedValue);

src/node-transformers/string-array-transformers/StringArrayTransformer.ts

@@ -184,11 +184,9 @@ export class StringArrayTransformer extends AbstractNodeTransformer {
             return literalNode;
         }
 
-        const literalValue: ESTree.SimpleLiteral['value'] = literalNode.value;
-
         const stringArrayStorageItemData: IStringArrayStorageItemData | undefined =
             this.stringArrayStorageAnalyzer.getItemDataForLiteralNode(literalNode);
-        const cacheKey: string = this.literalNodesCacheStorage.buildKey(literalValue, stringArrayStorageItemData);
+        const cacheKey: string = this.literalNodesCacheStorage.buildKey(literalNode, stringArrayStorageItemData);
         const useCachedValue: boolean = this.literalNodesCacheStorage.shouldUseCachedValue(
             cacheKey,
             stringArrayStorageItemData

src/storages/string-array-transformers/LiteralNodesCacheStorage.ts

@@ -27,12 +27,17 @@ export class LiteralNodesCacheStorage extends MapStorage<string, ESTree.Node> im
     }
 
     /**
-     * @param {string} literalValue
+     * @param {Literal} literalNode
      * @param {IStringArrayStorageItemData | undefined} stringArrayStorageItemData
      * @returns {string}
      */
-    public buildKey(literalValue: string, stringArrayStorageItemData: IStringArrayStorageItemData | undefined): string {
-        return `${literalValue}-${Boolean(stringArrayStorageItemData)}`;
+    public buildKey(
+        literalNode: ESTree.Literal,
+        stringArrayStorageItemData: IStringArrayStorageItemData | undefined
+    ): string {
+        // `raw` value is a part of the key to keep literals that share the same decoded value but
+        // have a different source representation (e.g. `'😃'` and `'😃'`) separate
+        return `${String(literalNode.value)}-${String(literalNode.raw)}-${Boolean(stringArrayStorageItemData)}`;
     }
 
     /**