Changed option name: `stringArrayIntermediateCalls` -> `stringArrayIntermediateVariablesCount`

CHANGELOG.md

@@ -2,7 +2,7 @@ Change Log
 
 v2.2.0
 ---
-* **New option:** `stringArrayIntermediateCalls` sets the passed amount of intermediate variables for the `string array`
+* **New option:** `stringArrayIntermediateVariablesCount` sets the passed amount of intermediate variables for the `string array`
 
 v2.1.0
 ---

README.md

@@ -360,7 +360,7 @@ Following options are available for the JS Obfuscator:
     splitStringsChunkLength: 10,
     stringArray: true,
     stringArrayEncoding: [],
-    stringArrayIntermediateCalls: true,
+    stringArrayIntermediateVariablesCount: true,
     stringArrayThreshold: 0.75,
     target: 'browser',
     transformObjectKeys: false,
@@ -409,7 +409,7 @@ Following options are available for the JS Obfuscator:
     --split-strings-chunk-length <number>
     --string-array <boolean>
     --string-array-encoding '<list>' (comma separated) [none, base64, rc4]
-    --string-array-intermediate-calls <number>
+    --string-array-intermediate-variables-count <number>
     --string-array-threshold <number>
     --target <string> [browser, browser-no-eval, node]
     --transform-object-keys <boolean>
@@ -950,7 +950,7 @@ stringArrayEncoding: [
 ]
 ```
 
-### `stringArrayIntermediateCalls`
+### `stringArrayIntermediateVariablesCount`
 Type: `number` Default: `0`
 
 ##### :warning: [`stringArray`](#stringarray) option must be enabled
@@ -966,7 +966,7 @@ const baz = 'baz';
 
 console.log(foo, bar, baz);
 
-// Output, stringArrayIntermediateCalls: 5
+// Output, stringArrayIntermediateVariablesCount: 5
 const _0x513c = [
     'foo',
     'bar',
@@ -1086,7 +1086,7 @@ Performance will 50-100% slower than without obfuscation
     splitStringsChunkLength: 5,
     stringArray: true,
     stringArrayEncoding: ['rc4'],
-    stringArrayIntermediateCalls: 10,
+    stringArrayIntermediateVariablesCount: 10,
     stringArrayThreshold: 1,
     transformObjectKeys: true,
     unicodeEscapeSequence: false
@@ -1119,7 +1119,7 @@ Performance will 30-35% slower than without obfuscation
     splitStringsChunkLength: 10,
     stringArray: true,
     stringArrayEncoding: ['base64'],
-    stringArrayIntermediateCalls: 5,
+    stringArrayIntermediateVariablesCount: 5,
     stringArrayThreshold: 0.75,
     transformObjectKeys: true,
     unicodeEscapeSequence: false
@@ -1149,7 +1149,7 @@ Performance will slightly slower than without obfuscation
     splitStrings: false,
     stringArray: true,
     stringArrayEncoding: [],
-    stringArrayIntermediateCalls: 0,
+    stringArrayIntermediateVariablesCount: 0,
     stringArrayThreshold: 0.75,
     unicodeEscapeSequence: false
 }
@@ -1176,7 +1176,7 @@ Performance will slightly slower than without obfuscation
     splitStrings: false,
     stringArray: true,
     stringArrayEncoding: [],
-    stringArrayIntermediateCalls: 0,
+    stringArrayIntermediateVariablesCount: 0,
     stringArrayThreshold: 0.75,
     unicodeEscapeSequence: false
 }

src/cli/JavaScriptObfuscatorCLI.ts

@@ -340,7 +340,7 @@ export class JavaScriptObfuscatorCLI implements IInitializable {
                 ArraySanitizer
             )
             .option(
-                '--string-array-intermediate-calls <number>',
+                '--string-array-intermediate-variables-count <number>',
                 'Sets the passed amount of intermediate variables for the string array.',
                 parseInt
             )

src/interfaces/options/IOptions.ts

@@ -41,7 +41,7 @@ export interface IOptions {
     readonly splitStringsChunkLength: number;
     readonly stringArray: boolean;
     readonly stringArrayEncoding: TStringArrayEncoding[];
-    readonly stringArrayIntermediateCalls: number;
+    readonly stringArrayIntermediateVariablesCount: number;
     readonly stringArrayThreshold: number;
     readonly target: TypeFromEnum<typeof ObfuscationTarget>;
     readonly transformObjectKeys: boolean;

src/options/Options.ts

@@ -302,7 +302,7 @@ export class Options implements IOptions {
      */
     @IsNumber()
     @Min(0)
-    public readonly stringArrayIntermediateCalls!: number;
+    public readonly stringArrayIntermediateVariablesCount!: number;
 
     /**
      * @type {number}

src/options/normalizer-rules/StringArrayRule.ts

@@ -18,7 +18,7 @@ export const StringArrayRule: TOptionsNormalizerRule = (options: IOptions): IOpt
             stringArrayEncoding: [
                 StringArrayEncoding.None
             ],
-            stringArrayIntermediateCalls: 0,
+            stringArrayIntermediateVariablesCount: 0,
             stringArrayThreshold: 0
         };
     }

src/options/normalizer-rules/StringArrayThresholdRule.ts

@@ -17,7 +17,7 @@ export const StringArrayThresholdRule: TOptionsNormalizerRule = (options: IOptio
             stringArrayEncoding: [
                 StringArrayEncoding.None
             ],
-            stringArrayIntermediateCalls: 0,
+            stringArrayIntermediateVariablesCount: 0,
             stringArrayThreshold: 0
         };
     }

src/options/presets/Default.ts

@@ -44,7 +44,7 @@ export const DEFAULT_PRESET: TInputOptions = Object.freeze({
     stringArrayEncoding: [
         StringArrayEncoding.None
     ],
-    stringArrayIntermediateCalls: 0,
+    stringArrayIntermediateVariablesCount: 0,
     stringArrayThreshold: 0.75,
     target: ObfuscationTarget.Browser,
     transformObjectKeys: false,

src/options/presets/HighObfuscation.ts

@@ -16,6 +16,6 @@ export const HIGH_OBFUSCATION_PRESET: TInputOptions = Object.freeze({
     stringArrayEncoding: [
         StringArrayEncoding.Rc4
     ],
-    stringArrayIntermediateCalls: 10,
+    stringArrayIntermediateVariablesCount: 10,
     stringArrayThreshold: 1
 });

src/options/presets/MediumObfuscation.ts

@@ -16,6 +16,6 @@ export const MEDIUM_OBFUSCATION_PRESET: TInputOptions = Object.freeze({
     stringArrayEncoding: [
         StringArrayEncoding.Base64
     ],
-    stringArrayIntermediateCalls: 5,
+    stringArrayIntermediateVariablesCount: 5,
     transformObjectKeys: true
 });

src/options/presets/NoCustomNodes.ts

@@ -41,7 +41,7 @@ export const NO_ADDITIONAL_NODES_PRESET: TInputOptions = Object.freeze({
     stringArrayEncoding: [
         StringArrayEncoding.None
     ],
-    stringArrayIntermediateCalls: 0,
+    stringArrayIntermediateVariablesCount: 0,
     stringArrayThreshold: 0,
     target: ObfuscationTarget.Browser,
     transformObjectKeys: false,

src/storages/string-array/StringArrayStorage.ts

@@ -337,7 +337,7 @@ export class StringArrayStorage extends MapStorage <string, IStringArrayStorageI
         return {
             name: this.identifierNamesGenerator.generateForGlobalScope(StringArrayStorage.stringArrayNameLength),
             intermediateNames: Array.from(
-                {length: this.options.stringArrayIntermediateCalls},
+                {length: this.options.stringArrayIntermediateVariablesCount},
                 () => this.identifierNamesGenerator.generateForGlobalScope(StringArrayStorage.stringArrayNameLength)
             )
         };

test/dev/dev.ts

@@ -19,7 +19,7 @@ import { StringArrayEncoding } from '../../src/enums/StringArrayEncoding';
             compact: false,
             stringArray: true,
             stringArrayThreshold: 1,
-            stringArrayIntermediateCalls: 2,
+            stringArrayIntermediateVariablesCount: 2,
             stringArrayEncoding: [
                 StringArrayEncoding.Rc4
             ]

test/functional-tests/custom-code-helpers/string-array/StringArrayCallsWrapperCodeHelper.spec.ts

@@ -53,7 +53,7 @@ describe('StringArrayCallsWrapperCodeHelper', () => {
         });
     });
 
-    describe('`stringArrayIntermediateCalls` option is set', () => {
+    describe('`stringArrayIntermediateVariablesCount` option is set', () => {
         const stringArrayCallRegExp: RegExp = new RegExp(
                 'return _0x([a-f0-9]){4,6};' +
             '};' +
@@ -74,7 +74,7 @@ describe('StringArrayCallsWrapperCodeHelper', () => {
                     ...NO_ADDITIONAL_NODES_PRESET,
                     stringArray: true,
                     stringArrayThreshold: 1,
-                    stringArrayIntermediateCalls: 3
+                    stringArrayIntermediateVariablesCount: 3
                 }
             ).getObfuscatedCode();
         });

test/functional-tests/javascript-obfuscator/JavaScriptObfuscator.spec.ts

@@ -848,7 +848,7 @@ describe('JavaScriptObfuscator', () => {
                             StringArrayEncoding.Base64,
                             StringArrayEncoding.Rc4
                         ],
-                        stringArrayIntermediateCalls: 10,
+                        stringArrayIntermediateVariablesCount: 10,
                         stringArrayThreshold: 1,
                         transformObjectKeys: true,
                         unicodeEscapeSequence: false

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

@@ -63,7 +63,7 @@ describe('StringArrayTransformer', function () {
         });
     });
 
-    describe('Variant #3: `stringArrayIntermediateCalls` option is enabled', () => {
+    describe('Variant #3: `stringArrayIntermediateVariablesCount` option is enabled', () => {
         describe('Variant #1: correct amount of intermediate calls', () => {
             const stringArrayCallRegExp: RegExp = new RegExp(
                     'return _0x([a-f0-9]){4,6};' +
@@ -85,7 +85,7 @@ describe('StringArrayTransformer', function () {
                         ...NO_ADDITIONAL_NODES_PRESET,
                         stringArray: true,
                         stringArrayThreshold: 1,
-                        stringArrayIntermediateCalls: 3
+                        stringArrayIntermediateVariablesCount: 3
                     }
                 ).getObfuscatedCode();
             });
@@ -100,7 +100,7 @@ describe('StringArrayTransformer', function () {
             let evaluationResult: number;
 
             before(() => {
-                const code: string = readFileAsString(__dirname + '/fixtures/intermediate-calls-eval.js');
+                const code: string = readFileAsString(__dirname + '/fixtures/intermediate-variables-count-eval.js');
 
                 const obfuscatedCode: string = JavaScriptObfuscator.obfuscate(
                     code,
@@ -108,7 +108,7 @@ describe('StringArrayTransformer', function () {
                         ...NO_ADDITIONAL_NODES_PRESET,
                         stringArray: true,
                         stringArrayThreshold: 1,
-                        stringArrayIntermediateCalls: 5
+                        stringArrayIntermediateVariablesCount: 5
                     }
                 ).getObfuscatedCode();
 
@@ -395,7 +395,7 @@ describe('StringArrayTransformer', function () {
             });
         });
 
-        describe('Variant #2: `stringArrayIntermediateCalls` option is enabled', () => {
+        describe('Variant #2: `stringArrayIntermediateVariablesCount` option is enabled', () => {
             const stringArrayIntermediateCallRegExp: RegExp = new RegExp(
                     'return _0x([a-f0-9]){4,6};' +
                 '};' +
@@ -422,7 +422,7 @@ describe('StringArrayTransformer', function () {
                             StringArrayEncoding.None,
                             StringArrayEncoding.Base64
                         ],
-                        stringArrayIntermediateCalls: 3,
+                        stringArrayIntermediateVariablesCount: 3,
                         stringArrayThreshold: 1
                     }
                 ).getObfuscatedCode();

test/functional-tests/options/OptionsNormalizer.spec.ts

@@ -544,7 +544,7 @@ describe('OptionsNormalizer', () => {
                     shuffleStringArray: true,
                     stringArray: false,
                     stringArrayEncoding: [StringArrayEncoding.Rc4],
-                    stringArrayIntermediateCalls: 5,
+                    stringArrayIntermediateVariablesCount: 5,
                     stringArrayThreshold: 0.5,
                     rotateStringArray: true
                 });
@@ -554,7 +554,7 @@ describe('OptionsNormalizer', () => {
                     shuffleStringArray: false,
                     stringArray: false,
                     stringArrayEncoding: [StringArrayEncoding.None],
-                    stringArrayIntermediateCalls: 0,
+                    stringArrayIntermediateVariablesCount: 0,
                     stringArrayThreshold: 0,
                     rotateStringArray: false
                 };
@@ -592,7 +592,7 @@ describe('OptionsNormalizer', () => {
                     rotateStringArray: true,
                     shuffleStringArray: true,
                     stringArray: true,
-                    stringArrayIntermediateCalls: 5,
+                    stringArrayIntermediateVariablesCount: 5,
                     stringArrayThreshold: 0
                 });
 
@@ -601,7 +601,7 @@ describe('OptionsNormalizer', () => {
                     rotateStringArray: false,
                     shuffleStringArray: false,
                     stringArray: false,
-                    stringArrayIntermediateCalls: 0,
+                    stringArrayIntermediateVariablesCount: 0,
                     stringArrayThreshold: 0
                 };
             });

test/runtime-tests/JavaScriptObfuscatorRuntime.spec.ts

@@ -39,7 +39,7 @@ describe('JavaScriptObfuscator runtime eval', function () {
             StringArrayEncoding.Base64,
             StringArrayEncoding.Rc4
         ],
-        stringArrayIntermediateCalls: 20,
+        stringArrayIntermediateVariablesCount: 20,
         stringArrayThreshold: 1,
         transformObjectKeys: true,
         unicodeEscapeSequence: true