CLI class refactoring

This commit is contained in:
sanex3339
2016-07-05 16:59:28 +03:00
parent 6abd041ff0
commit 452d76280c
2 changed files with 8 additions and 6 deletions
+4 -3
View File
@@ -1070,6 +1070,7 @@ var path = __webpack_require__(47);
var child_process_1 = __webpack_require__(43);
var DefaultPreset_1 = __webpack_require__(14);
var JavaScriptObfuscator_1 = __webpack_require__(9);
var Utils_1 = __webpack_require__(0);
var JavaScriptObfuscatorCLI = function () {
function JavaScriptObfuscatorCLI(argv) {
@@ -1084,7 +1085,7 @@ var JavaScriptObfuscatorCLI = function () {
key: 'run',
value: function run() {
this.configureCommands();
if (!this.arguments.length || this.arguments.indexOf('--help') >= 0) {
if (!this.arguments.length || Utils_1.Utils.arrayContains(this.arguments, '--help')) {
this.commands.outputHelp();
return;
}
@@ -1101,7 +1102,7 @@ var JavaScriptObfuscatorCLI = function () {
if (!this.commands.hasOwnProperty(option)) {
continue;
}
if (availableOptions.indexOf(option) === -1) {
if (!Utils_1.Utils.arrayContains(availableOptions, option)) {
continue;
}
options[option] = this.commands[option];
@@ -1133,7 +1134,7 @@ var JavaScriptObfuscatorCLI = function () {
if (!JavaScriptObfuscatorCLI.isFilePath(inputPath)) {
throw new ReferenceError('First argument must be a valid file path');
}
if (JavaScriptObfuscatorCLI.availableInputExtensions.indexOf(path.extname(inputPath)) === -1) {
if (!Utils_1.Utils.arrayContains(JavaScriptObfuscatorCLI.availableInputExtensions, path.extname(inputPath))) {
throw new ReferenceError('Input file must have .js extension');
}
return inputPath;
+4 -3
View File
@@ -9,6 +9,7 @@ import { IOptionsPreset } from "../interfaces/IOptionsPreset";
import { DEFAULT_PRESET } from "../preset-options/DefaultPreset";
import { JavaScriptObfuscator } from "../JavaScriptObfuscator";
import { Utils } from "../Utils";
export class JavaScriptObfuscatorCLI {
/**
@@ -92,7 +93,7 @@ export class JavaScriptObfuscatorCLI {
public run (): void {
this.configureCommands();
if (!this.arguments.length || this.arguments.indexOf('--help') >= 0) {
if (!this.arguments.length || Utils.arrayContains(this.arguments, '--help')) {
this.commands.outputHelp();
return;
@@ -116,7 +117,7 @@ export class JavaScriptObfuscatorCLI {
continue;
}
if (availableOptions.indexOf(option) === -1) {
if (!Utils.arrayContains(availableOptions, option)) {
continue;
}
@@ -166,7 +167,7 @@ export class JavaScriptObfuscatorCLI {
throw new ReferenceError(`First argument must be a valid file path`);
}
if (JavaScriptObfuscatorCLI.availableInputExtensions.indexOf(path.extname(inputPath)) === -1) {
if (!Utils.arrayContains(JavaScriptObfuscatorCLI.availableInputExtensions, path.extname(inputPath))) {
throw new ReferenceError(`Input file must have .js extension`);
}