octoleo/nativefier
2
2
Fork 0
mirror of https://github.com/Llewellynvdm/nativefier.git synced 2025-02-13 08:18:31 +00:00
Code Issues Releases Activity

Log a helpful error when failing to parse JSON arg (fix #928)

Browse Source
This commit is contained in:
Ronan Jouchet 2020-03-20 21:03:37 -04:00
parent 9f11976b3c
commit 86cf42844f
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/cli.ts
View File

@ -6,6 +6,7 @@ import * as dns from 'dns';
import * as log from 'loglevel'; import * as log from 'loglevel';
import { buildNativefierApp } from './main'; import { buildNativefierApp } from './main';
import { isWindows } from './helpers/helpers';
// package.json is `require`d to let tsc strip the `src` folder by determining // package.json is `require`d to let tsc strip the `src` folder by determining
// baseUrl=src. A static import would prevent that and cause an ugly extra "src" folder // baseUrl=src. A static import would prevent that and cause an ugly extra "src" folder
@ -29,7 +30,22 @@ function parseBooleanOrString(val: string): boolean | string {
function parseJson(val: string): any { function parseJson(val: string): any {
if (!val) return {}; if (!val) return {};
try {
return JSON.parse(val); return JSON.parse(val);
} catch (err) {
const windowsShellHint = isWindows()
? `\n In particular, Windows cmd doesn't have single quotes, so you have to use only double-quotes plus escaping: "{\\"someKey\\": \\"someValue\\"}"`
: '';
log.error(
`Unable to parse JSON value: ${val}\n` +
`JSON should look like {"someString": "someValue", "someBoolean": true, "someArray": [1,2,3]}.\n` +
` - Only double quotes are allowed, single quotes are not.\n` +
` - Learn how your shell behaves and escapes characters.${windowsShellHint}\n` +
` - If unsure, validate your JSON using an online service.`,
);
throw err;
}
} }
function getProcessEnvs(val: string): any { function getProcessEnvs(val: string): any {
@ -70,7 +86,7 @@ if (require.main === module) {
targetUrl: '', targetUrl: '',
out: '', out: '',
}; };
commander const args = commander
.name('nativefier') .name('nativefier')
.version(packageJson.version, '-v, --version') .version(packageJson.version, '-v, --version')
.arguments('<targetUrl> [dest]') .arguments('<targetUrl> [dest]')
@ -262,8 +278,14 @@ if (require.main === module) {
.option( .option(
'--darwin-dark-mode-support', '--darwin-dark-mode-support',
'(macOS only) enable Dark Mode support on macOS 10.14+', '(macOS only) enable Dark Mode support on macOS 10.14+',
) );
.parse(sanitizedArgs);
try {
args.parse(sanitizedArgs);
} catch (err) {
log.error('Failed to parse command-line arguments. Aborting.');
process.exit(1);
}
if (!process.argv.slice(2).length) { if (!process.argv.slice(2).length) {
commander.help(); commander.help();