admin/javascript-obfuscator-javascript-obfuscator
1
0
Fork 0
mirror of https://github.com/javascript-obfuscator/javascript-obfuscator synced 2026-08-09 12:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/593

Browse Source
This commit is contained in:
sanex3339
2020-04-10 20:11:03 +03:00
parent 173b2b83b8
commit e2d97841c4
10 changed files with 200 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/JavaScriptObfuscatorCLI.ts
+13 -25
View File
@@ -97,24 +97,18 @@ export class JavaScriptObfuscatorCLI implements IInitializable {
/**
* @param {TInputCLIOptions} inputOptions
* @param {string} inputCodePath
* @returns {TInputOptions}
*/
private static buildOptions (
inputOptions: TInputCLIOptions,
inputCodePath: string
): TInputOptions {
private static buildOptions (inputOptions: TInputCLIOptions): TInputOptions {
const inputCLIOptions: TInputOptions = JavaScriptObfuscatorCLI.filterOptions(inputOptions);
const configFilePath: string | undefined = inputOptions.config;
const configFileLocation: string = configFilePath ? path.resolve(configFilePath, '.') : '';
const configFileOptions: TInputOptions = configFileLocation ? CLIUtils.getUserConfig(configFileLocation) : {};
const inputFileName: string = path.basename(inputCodePath);
return {
...DEFAULT_PRESET,
...configFileOptions,
...inputCLIOptions,
inputFileName
...inputCLIOptions
};
}
@@ -145,7 +139,7 @@ export class JavaScriptObfuscatorCLI implements IInitializable {
this.configureCommands();
this.configureHelp();
this.inputCLIOptions = this.commands.opts();
this.inputCLIOptions = JavaScriptObfuscatorCLI.buildOptions(this.commands.opts());
this.sourceCodeReader = new SourceCodeReader(
this.inputPath,
this.inputCLIOptions
@@ -403,22 +397,16 @@ export class JavaScriptObfuscatorCLI implements IInitializable {
outputCodePath: string,
sourceCodeIndex: number | null
): void {
let options: TInputOptions = JavaScriptObfuscatorCLI.buildOptions(
this.inputCLIOptions,
inputCodePath
);
if (sourceCodeIndex !== null) {
const identifiersPrefix: string = Utils.getIdentifiersPrefixForMultipleSources(
this.inputCLIOptions.identifiersPrefix,
sourceCodeIndex
);
options = {
...options,
identifiersPrefix
};
}
const options: TInputOptions = {
...this.inputCLIOptions,
inputFileName: path.basename(inputCodePath),
...sourceCodeIndex !== null && {
identifiersPrefix: Utils.getIdentifiersPrefixForMultipleSources(
this.inputCLIOptions.identifiersPrefix,
sourceCodeIndex
)
}
};
if (options.sourceMap) {
this.processSourceCodeWithSourceMap(sourceCode, outputCodePath, options);