Added more tests that are covering `forceTransformStrings` option priorities

src/enums/node/ObfuscatingGuardResult.ts

@@ -1,5 +1,5 @@
 export enum ObfuscatingGuardResult {
     ForceTransform = 'ForceTransform',
     Ignore = 'Ignore',
-    Obfuscate = 'Obfuscate'
+    Transform = 'Transform'
 }

src/node-transformers/preparing-transformers/obfuscating-guards/BlackListObfuscatingGuard.ts

@@ -37,6 +37,6 @@ export class BlackListObfuscatingGuard implements IObfuscatingGuard {
             }
         }
 
-        return ObfuscatingGuardResult.Obfuscate;
+        return ObfuscatingGuardResult.Transform;
     }
 }

src/node-transformers/preparing-transformers/obfuscating-guards/ConditionalCommentObfuscatingGuard.ts

@@ -48,7 +48,7 @@ export class ConditionalCommentObfuscatingGuard implements IObfuscatingGuard {
         }
 
         return this.obfuscationAllowed
-            ? ObfuscatingGuardResult.Obfuscate
+            ? ObfuscatingGuardResult.Transform
             : ObfuscatingGuardResult.Ignore;
     }
 

src/node-transformers/preparing-transformers/obfuscating-guards/ForceTransformStringObfuscatingGuard.ts

@@ -38,11 +38,11 @@ export class ForceTransformStringObfuscatingGuard implements IObfuscatingGuard {
             && typeof node.value === 'string'
         ) {
             return !this.isForceTransformString(node.value)
-                ? ObfuscatingGuardResult.Obfuscate
+                ? ObfuscatingGuardResult.Transform
                 : ObfuscatingGuardResult.ForceTransform;
         }
 
-        return ObfuscatingGuardResult.Obfuscate;
+        return ObfuscatingGuardResult.Transform;
     }
 
     /**

src/node-transformers/preparing-transformers/obfuscating-guards/ReservedStringObfuscatingGuard.ts

@@ -38,11 +38,11 @@ export class ReservedStringObfuscatingGuard implements IObfuscatingGuard {
             && typeof node.value === 'string'
         ) {
             return !this.isReservedString(node.value)
-                ? ObfuscatingGuardResult.Obfuscate
+                ? ObfuscatingGuardResult.Transform
                 : ObfuscatingGuardResult.Ignore;
         }
 
-        return ObfuscatingGuardResult.Obfuscate;
+        return ObfuscatingGuardResult.Transform;
     }
 
     /**

test/functional-tests/node-transformers/string-array-transformers/string-array-transformer/StringArrayTransformer.spec.ts

@@ -717,6 +717,74 @@ describe('StringArrayTransformer', function () {
                 });
             });
         });
+
+        describe('Variant #4: Priority over `reservedStrings` option', () => {
+            describe('Variant #1: base case', () => {
+                const stringLiteralRegExp1: RegExp = /const foo *= *'foo';/;
+                const stringLiteralRegExp2: RegExp = /const bar *= *_0x([a-f0-9]){4}\('0x0'\);/;
+
+                let obfuscatedCode: string;
+
+                before(() => {
+                    const code: string = readFileAsString(__dirname + '/fixtures/force-transform-strings-option.js');
+
+                    obfuscatedCode = JavaScriptObfuscator.obfuscate(
+                        code,
+                        {
+                            ...NO_ADDITIONAL_NODES_PRESET,
+                            forceTransformStrings: ['bar'],
+                            reservedStrings: ['foo', 'bar'],
+                            stringArray: true,
+                            stringArrayThreshold: 1
+                        }
+                    ).getObfuscatedCode();
+                });
+
+                it('match #1: should not transform string', () => {
+                    assert.match(obfuscatedCode, stringLiteralRegExp1);
+                });
+
+                it('match #2: should transform string', () => {
+                    assert.match(obfuscatedCode, stringLiteralRegExp2);
+                });
+            });
+        });
+
+        describe('Variant #5: Priority on conditional comments', () => {
+            describe('Variant #1: base case', () => {
+                const stringLiteralRegExp1: RegExp = /const foo *= *'foo';/;
+                const stringLiteralRegExp2: RegExp = /const bar *= *'bar';/;
+                const stringLiteralRegExp3: RegExp = /const baz *= *_0x([a-f0-9]){4}\('0x0'\);/;
+
+                let obfuscatedCode: string;
+
+                before(() => {
+                    const code: string = readFileAsString(__dirname + '/fixtures/force-transform-strings-option-conditional-comments.js');
+
+                    obfuscatedCode = JavaScriptObfuscator.obfuscate(
+                        code,
+                        {
+                            ...NO_ADDITIONAL_NODES_PRESET,
+                            forceTransformStrings: ['bar'],
+                            stringArray: true,
+                            stringArrayThreshold: 1
+                        }
+                    ).getObfuscatedCode();
+                });
+
+                it('match #1: should not transform string', () => {
+                    assert.match(obfuscatedCode, stringLiteralRegExp1);
+                });
+
+                it('match #2: should not transform string', () => {
+                    assert.match(obfuscatedCode, stringLiteralRegExp2);
+                });
+
+                it('match #3: should transform string', () => {
+                    assert.match(obfuscatedCode, stringLiteralRegExp3);
+                });
+            });
+        });
     });
 
     describe('Variant #14: object expression key literal', () => {

test/functional-tests/node-transformers/string-array-transformers/string-array-transformer/fixtures/force-transform-strings-option-conditional-comments.js

@@ -0,0 +1,5 @@
+// javascript-obfuscator:disable
+const foo = 'foo';
+const bar = 'bar';
+// javascript-obfuscator:enable
+const baz = 'baz';