Update deps, changes for commander opts

This commit is contained in:
Will Boyd
2025-01-16 08:52:58 -05:00
parent 41457d6190
commit de420fa8dd
3 changed files with 743 additions and 815 deletions
+727 -798
View File
File diff suppressed because it is too large Load Diff
+8 -8
View File
@@ -20,19 +20,19 @@
"node": ">= 12.14.0" "node": ">= 12.14.0"
}, },
"dependencies": { "dependencies": {
"axios": "^1.7.1", "axios": "^1.7.9",
"camelcase": "^6.0.0", "camelcase": "^6.3.0",
"chalk": "^4.0.0", "chalk": "^4.1.2",
"commander": "^5.0.0", "commander": "^13.0.0",
"inquirer": "^7.1.0", "inquirer": "^8.2.6",
"luxon": "^3.4.4", "luxon": "^3.5.0",
"require-directory": "^2.1.1", "require-directory": "^2.1.1",
"turndown": "^7.1.2", "turndown": "^7.2.0",
"turndown-plugin-gfm": "^1.0.2", "turndown-plugin-gfm": "^1.0.2",
"xml2js": "^0.6.2" "xml2js": "^0.6.2"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^6.8.0" "eslint": "^9.18.0"
}, },
"bin": { "bin": {
"wordpress-export-to-markdown": "./index.js" "wordpress-export-to-markdown": "./index.js"
+8 -9
View File
@@ -80,10 +80,10 @@ const options = [
async function getConfig(argv) { async function getConfig(argv) {
extendOptionsData(); extendOptionsData();
const unaliasedArgv = replaceAliases(argv); const unaliasedArgv = replaceAliases(argv);
const program = parseCommandLine(unaliasedArgv); const opts = parseCommandLine(unaliasedArgv);
let answers; let answers;
if (program.wizard) { if (opts.wizard) {
console.log('\nStarting wizard...'); console.log('\nStarting wizard...');
const questions = options.map(option => ({ const questions = options.map(option => ({
when: option.name !== 'wizard' && !option.isProvided, when: option.name !== 'wizard' && !option.isProvided,
@@ -102,7 +102,7 @@ async function getConfig(argv) {
answers = {}; answers = {};
} }
const config = { ...program.opts(), ...answers }; const config = { ...opts, ...answers };
return config; return config;
} }
@@ -158,13 +158,11 @@ function replaceAliases(argv) {
function parseCommandLine(argv) { function parseCommandLine(argv) {
// setup for help output // setup for help output
commander commander.program
.name('node index.js') .name('node index.js')
.version('v' + package.version, '-v, --version', 'Display version number') .version('v' + package.version, '-v, --version', 'Display version number')
.helpOption('-h, --help', 'See the thing you\'re looking at right now') .helpOption('-h, --help', 'See the thing you\'re looking at right now')
.on('--help', () => { .addHelpText('after', '\nMore documentation is at https://github.com/lonekorean/wordpress-export-to-markdown');
console.log('\nMore documentation is at https://github.com/lonekorean/wordpress-export-to-markdown');
});
options.forEach(input => { options.forEach(input => {
const flag = '--' + input.name + ' <' + input.type + '>'; const flag = '--' + input.name + ' <' + input.type + '>';
@@ -174,10 +172,11 @@ function parseCommandLine(argv) {
input.isProvided = true; input.isProvided = true;
return input.coerce(value); return input.coerce(value);
}; };
commander.option(flag, input.description, coerce, input.default); commander.program.option(flag, input.description, coerce, input.default);
}); });
return commander.parse(argv); commander.program.parse(argv);
return commander.program.opts();
} }
function coerceBoolean(value) { function coerceBoolean(value) {