Use Prettier JS (#5017)

* Adds prettier

* Run lint before tests
This commit is contained in:
Florent Vilmart
2018-09-01 13:58:06 -04:00
committed by GitHub
parent 189cd259ee
commit d83a0b6808
240 changed files with 41098 additions and 29020 deletions

View File

@@ -9,12 +9,20 @@ Command.prototype.loadDefinitions = function(definitions) {
_definitions = definitions;
Object.keys(definitions).reduce((program, opt) => {
if (typeof definitions[opt] == "object") {
if (typeof definitions[opt] == 'object') {
const additionalOptions = definitions[opt];
if (additionalOptions.required === true) {
return program.option(`--${opt} <${opt}>`, additionalOptions.help, additionalOptions.action);
return program.option(
`--${opt} <${opt}>`,
additionalOptions.help,
additionalOptions.action
);
} else {
return program.option(`--${opt} [${opt}]`, additionalOptions.help, additionalOptions.action);
return program.option(
`--${opt} [${opt}]`,
additionalOptions.help,
additionalOptions.action
);
}
}
return program.option(`--${opt} [${opt}]`);
@@ -22,7 +30,7 @@ Command.prototype.loadDefinitions = function(definitions) {
_reverseDefinitions = Object.keys(definitions).reduce((object, key) => {
let value = definitions[key];
if (typeof value == "object") {
if (typeof value == 'object') {
value = value.env;
}
if (value) {
@@ -32,17 +40,17 @@ Command.prototype.loadDefinitions = function(definitions) {
}, {});
_defaults = Object.keys(definitions).reduce((defs, opt) => {
if(_definitions[opt].default) {
if (_definitions[opt].default) {
defs[opt] = _definitions[opt].default;
}
return defs;
}, {});
/* istanbul ignore next */
this.on('--help', function(){
this.on('--help', function() {
console.log(' Configure From Environment:');
console.log('');
Object.keys(_reverseDefinitions).forEach((key) => {
Object.keys(_reverseDefinitions).forEach(key => {
console.log(` $ ${key}='${_reverseDefinitions[key]}'`);
});
console.log('');
@@ -53,8 +61,8 @@ function parseEnvironment(env = {}) {
return Object.keys(_reverseDefinitions).reduce((options, key) => {
if (env[key]) {
const originalKey = _reverseDefinitions[key];
let action = (option) => (option);
if (typeof _definitions[originalKey] === "object") {
let action = option => option;
if (typeof _definitions[originalKey] === 'object') {
action = _definitions[originalKey].action || action;
}
options[_reverseDefinitions[key]] = action(env[key]);
@@ -77,7 +85,7 @@ function parseConfigFile(program) {
} else {
options = jsonConfig;
}
Object.keys(options).forEach((key) => {
Object.keys(options).forEach(key => {
const value = options[key];
if (!_definitions[key]) {
throw `error: unknown option ${key}`;
@@ -87,13 +95,13 @@ function parseConfigFile(program) {
options[key] = action(value);
}
});
console.log(`Configuration loaded from ${jsonPath}`)
console.log(`Configuration loaded from ${jsonPath}`);
}
return options;
}
Command.prototype.setValuesIfNeeded = function(options) {
Object.keys(options).forEach((key) => {
Object.keys(options).forEach(key => {
if (!this.hasOwnProperty(key)) {
this[key] = options[key];
}

View File

@@ -1,16 +1,15 @@
import program from './commander';
function logStartupOptions(options) {
for (const key in options) {
let value = options[key];
if (key == "masterKey") {
value = "***REDACTED***";
if (key == 'masterKey') {
value = '***REDACTED***';
}
if (typeof value === 'object') {
try {
value = JSON.stringify(value)
} catch(e) {
value = JSON.stringify(value);
} catch (e) {
if (value && value.constructor && value.constructor.name) {
value = value.constructor.name;
}
@@ -22,12 +21,7 @@ function logStartupOptions(options) {
}
}
export default function({
definitions,
help,
usage,
start
}) {
export default function({ definitions, help, usage, start }) {
program.loadDefinitions(definitions);
if (usage) {
program.usage(usage);