Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update commander #1339

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update commander #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9385b6d
update commander
Gray5 Feb 4, 2023
36c28f7
Merge branch 'master' into commander
fabiosantoscode May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
102 changes: 53 additions & 49 deletions lib/cli.js
View file
Open in desktop
Expand Up @@ -23,8 +23,6 @@ export async function run_cli({ program, packageJson, fs, path }) {
};
const default_options = await _default_options();
program.version(packageJson.name + " " + packageJson.version);
program.parseArgv = program.parse;
program.parse = undefined;

if (process.argv.includes("ast")) program.helpInformation = describe_ast;
else if (process.argv.includes("options")) program.helpInformation = function() {
Expand All @@ -37,6 +35,7 @@ export async function run_cli({ program, packageJson, fs, path }) {
return text.join("\n");
};

program.combineFlagAndOptionalValue(false);
program.option("-p, --parse <options>", "Specify parser options.", parse_js());
program.option("-c, --compress [options]", "Enable compressor/specify compressor options.", parse_js());
program.option("-m, --mangle [options]", "Mangle names/specify mangler options.", parse_js());
Expand All @@ -61,11 +60,13 @@ export async function run_cli({ program, packageJson, fs, path }) {
program.option("--timings", "Display operations run time on STDERR.");
program.option("--toplevel", "Compress and/or mangle variables in toplevel scope.");
program.option("--wrap <name>", "Embed everything as a function with “exports” corresponding to “name” globally.");
program.arguments("[files...]").parseArgv(process.argv);
if (program.configFile) {
options = JSON.parse(read_file(program.configFile));
program.arguments("[files...]").parse(process.argv);

const cliOpts = program.opts();
if (cliOpts.configFile) {
options = JSON.parse(read_file(cliOpts.configFile));
}
if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
if (!cliOpts.output && cliOpts.sourceMap && cliOpts.sourceMap.url != "inline") {
fatal("ERROR: cannot write source map to STDOUT");
}

Expand All @@ -80,76 +81,76 @@ export async function run_cli({ program, packageJson, fs, path }) {
"toplevel",
"wrap"
].forEach(function(name) {
if (name in program) {
options[name] = program[name];
if (name in cliOpts) {
options[name] = cliOpts[name];
}
});

if ("ecma" in program) {
if (program.ecma != (program.ecma | 0)) fatal("ERROR: ecma must be an integer");
const ecma = program.ecma | 0;
if ("ecma" in cliOpts) {
if (cliOpts.ecma != (cliOpts.ecma | 0)) fatal("ERROR: ecma must be an integer");
const ecma = cliOpts.ecma | 0;
if (ecma > 5 && ecma < 2015)
options.ecma = ecma + 2009;
else
options.ecma = ecma;
}
if (program.format || program.beautify) {
const chosenOption = program.format || program.beautify;
if (cliOpts.format || cliOpts.beautify) {
const chosenOption = cliOpts.format || cliOpts.beautify;
options.format = typeof chosenOption === "object" ? chosenOption : {};
}
if (program.comments) {
if (cliOpts.comments) {
if (typeof options.format != "object") options.format = {};
options.format.comments = typeof program.comments == "string" ? (program.comments == "false" ? false : program.comments) : "some";
options.format.comments = typeof cliOpts.comments == "string" ? (cliOpts.comments == "false" ? false : cliOpts.comments) : "some";
}
if (program.define) {
if (cliOpts.define) {
if (typeof options.compress != "object") options.compress = {};
if (typeof options.compress.global_defs != "object") options.compress.global_defs = {};
for (var expr in program.define) {
options.compress.global_defs[expr] = program.define[expr];
for (var expr in cliOpts.define) {
options.compress.global_defs[expr] = cliOpts.define[expr];
}
}
if (program.keepClassnames) {
if (cliOpts.keepClassnames) {
options.keep_classnames = true;
}
if (program.keepFnames) {
if (cliOpts.keepFnames) {
options.keep_fnames = true;
}
if (program.mangleProps) {
if (program.mangleProps.domprops) {
delete program.mangleProps.domprops;
if (cliOpts.mangleProps) {
if (cliOpts.mangleProps.domprops) {
delete cliOpts.mangleProps.domprops;
} else {
if (typeof program.mangleProps != "object") program.mangleProps = {};
if (!Array.isArray(program.mangleProps.reserved)) program.mangleProps.reserved = [];
if (typeof cliOpts.mangleProps != "object") cliOpts.mangleProps = {};
if (!Array.isArray(cliOpts.mangleProps.reserved)) cliOpts.mangleProps.reserved = [];
}
if (typeof options.mangle != "object") options.mangle = {};
options.mangle.properties = program.mangleProps;
options.mangle.properties = cliOpts.mangleProps;
}
if (program.nameCache) {
options.nameCache = JSON.parse(read_file(program.nameCache, "{}"));
if (cliOpts.nameCache) {
options.nameCache = JSON.parse(read_file(cliOpts.nameCache, "{}"));
}
if (program.output == "ast") {
if (cliOpts.output == "ast") {
options.format = {
ast: true,
code: false
};
}
if (program.parse) {
if (!program.parse.acorn && !program.parse.spidermonkey) {
options.parse = program.parse;
} else if (program.sourceMap && program.sourceMap.content == "inline") {
if (cliOpts.parse) {
if (!cliOpts.parse.acorn && !cliOpts.parse.spidermonkey) {
options.parse = cliOpts.parse;
} else if (cliOpts.sourceMap && cliOpts.sourceMap.content == "inline") {
fatal("ERROR: inline source map only works with built-in parser");
}
}
if (~program.rawArgs.indexOf("--rename")) {
options.rename = true;
} else if (!program.rename) {
} else if (!cliOpts.rename) {
options.rename = false;
}

let convert_path = name => name;
if (typeof program.sourceMap == "object" && "base" in program.sourceMap) {
if (typeof cliOpts.sourceMap == "object" && "base" in cliOpts.sourceMap) {
convert_path = function() {
var base = program.sourceMap.base;
var base = cliOpts.sourceMap.base;
delete options.sourceMap.base;
return function(name) {
return path.relative(base, name);
Expand Down Expand Up @@ -191,25 +192,25 @@ export async function run_cli({ program, packageJson, fs, path }) {
}

async function run_cli() {
var content = program.sourceMap && program.sourceMap.content;
var content = cliOpts.sourceMap && cliOpts.sourceMap.content;
if (content && content !== "inline") {
options.sourceMap.content = read_file(content, content);
}
if (program.timings) options.timings = true;
if (cliOpts.timings) options.timings = true;

try {
if (program.parse) {
if (program.parse.acorn) {
if (cliOpts.parse) {
if (cliOpts.parse.acorn) {
files = convert_ast(function(toplevel, name) {
return require("acorn").parse(files[name], {
ecmaVersion: 2018,
locations: true,
program: toplevel,
sourceFile: name,
sourceType: options.module || program.parse.module ? "module" : "script"
sourceType: options.module || cliOpts.parse.module ? "module" : "script"
});
});
} else if (program.parse.spidermonkey) {
} else if (cliOpts.parse.spidermonkey) {
files = convert_ast(function(toplevel, name) {
var obj = JSON.parse(files[name]);
if (!toplevel) return obj;
Expand Down Expand Up @@ -253,7 +254,7 @@ export async function run_cli({ program, packageJson, fs, path }) {
return;
}

if (program.output == "ast") {
if (cliOpts.output == "ast") {
if (!options.compress && !options.mangle) {
result.ast.figure_out_scope({});
}
Expand Down Expand Up @@ -287,7 +288,7 @@ export async function run_cli({ program, packageJson, fs, path }) {
}
return value;
}, 2));
} else if (program.output == "spidermonkey") {
} else if (cliOpts.output == "spidermonkey") {
try {
const minified = await minify(
result.code,
Expand All @@ -306,16 +307,16 @@ export async function run_cli({ program, packageJson, fs, path }) {
fatal(ex);
return;
}
} else if (program.output) {
fs.writeFileSync(program.output, result.code);
} else if (cliOpts.output) {
fs.writeFileSync(cliOpts.output, result.code);
if (options.sourceMap && options.sourceMap.url !== "inline" && result.map) {
fs.writeFileSync(program.output + ".map", result.map);
fs.writeFileSync(cliOpts.output + ".map", result.map);
}
} else {
console.log(result.code);
}
if (program.nameCache) {
fs.writeFileSync(program.nameCache, JSON.stringify(options.nameCache));
if (cliOpts.nameCache) {
fs.writeFileSync(cliOpts.nameCache, JSON.stringify(options.nameCache));
}
if (result.timings) for (var phase in result.timings) {
print_error("- " + phase + ": " + result.timings[phase].toFixed(3) + "s");
Expand Down Expand Up @@ -370,6 +371,9 @@ export async function run_cli({ program, packageJson, fs, path }) {

function parse_js(flag) {
return function(value, options) {
if(value === undefined) {
return true;
}
options = options || {};
try {
walk(parse(value, { expression: true }), node => {
Expand Down
17 changes: 10 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Expand Up @@ -44,9 +44,9 @@
"main.js"
],
"dependencies": {
"@jridgewell/source-map": "^0.3.3",
"acorn": "^8.8.2",
"commander": "^2.20.0",
"@jridgewell/source-map": "^0.3.2",
"acorn": "^8.5.0",
"commander": "^8.0.0",
"source-map-support": "~0.5.20"
},
"devDependencies": {
Expand All @@ -65,6 +65,7 @@
"test": "node test/compress.js && mocha test/mocha",
"test:compress": "node test/compress.js",
"test:mocha": "mocha test/mocha",
"test:mocha:build": "npm run build && mocha test/mocha",
"lint": "eslint lib",
"lint-fix": "eslint --fix lib",
"ls-lint": "ls-lint",
Expand Down