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

added support for JSON string value for --options CLI argument #1047

Merged
merged 3 commits into from
Sep 30, 2019
Merged

added support for JSON string value for --options CLI argument #1047

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e735d1
added support for JSON string for --options cli argument
knidarkness Sep 30, 2019
c0a4bb7
removed redundant variable
knidarkness Sep 30, 2019
38483a4
added try/catch for JSON parsing and fail fast approach if JSON is in…
knidarkness Sep 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions cli/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@ YargsParser.command(
watch: argv.watch as boolean,
templateFileName: argv.template as string,
templateOptions: argv.templateOptions || {},
redocOptions: argv.options || {},
redocOptions: getObjectOrJSON(argv.options),
};

console.log(config);

try {
await serve(argv.port as number, argv.spec as string, config);
} catch (e) {
Expand Down Expand Up @@ -124,7 +126,7 @@ YargsParser.command(
disableGoogleFont: argv.disableGoogleFont as boolean,
templateFileName: argv.template as string,
templateOptions: argv.templateOptions || {},
redocOptions: argv.options || {},
redocOptions: getObjectOrJSON(argv.options),
};

try {
Expand Down Expand Up @@ -353,3 +355,15 @@ function handleError(error: Error) {
console.error(error.stack);
process.exit(1);
}

function getObjectOrJSON(options) {
try {
return options && typeof options === 'string'
? JSON.parse(options) : options
? options
: {};
} catch (e) {
console.log(`Encountered error:\n${options}\nis not a valid JSON.`);
handleError(e);
}
}