From 80e5b515ecde5012f31ab7da80c3546864d62d2e Mon Sep 17 00:00:00 2001 From: ikatyang Date: Thu, 7 Sep 2017 11:30:04 +0800 Subject: [PATCH] refactor: rename variable --- src/cli-constant.js | 22 +++++++++++----------- src/cli.js | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/cli-constant.js b/src/cli-constant.js index 921e64df..bc3205ef 100644 --- a/src/cli-constant.js +++ b/src/cli-constant.js @@ -1,6 +1,6 @@ "use strict"; -const _options = { +const options = { "bracket-spacing": { type: "boolean", isFormatOption: true @@ -111,16 +111,16 @@ const _options = { } }; -const _optionArray = Object.keys(_options).reduce( - (current, name) => current.concat(Object.assign({ name }, _options[name])), +const optionArray = Object.keys(options).reduce( + (current, name) => current.concat(Object.assign({ name }, options[name])), [] ); -const booleanOptionNames = _optionArray +const booleanOptionNames = optionArray .filter(option => option.isFormatOption && option.type === "boolean") .map(option => option.name); -const stringOptionNames = _optionArray +const stringOptionNames = optionArray .filter(option => option.isFormatOption && option.type !== "boolean") .map(option => option.name); @@ -130,21 +130,21 @@ const defaultOptions = { parser: "babylon" }; -const options = { - boolean: _optionArray +const minimistOptions = { + boolean: optionArray .filter(option => option.type === "boolean") .map(option => option.name), - string: _optionArray + string: optionArray .filter(option => option.type !== "boolean") .map(option => option.name), - default: _optionArray + default: optionArray .filter(option => option.default !== undefined) .reduce( (current, option) => Object.assign({ [option.name]: option.default }, current), {} ), - alias: _optionArray + alias: optionArray .filter(option => option.alias !== undefined) .reduce( (current, option) => @@ -211,6 +211,6 @@ module.exports = { booleanOptionNames, stringOptionNames, defaultOptions, - options, + minimistOptions, usage }; diff --git a/src/cli.js b/src/cli.js index 66c7bb25..af64cd9e 100644 --- a/src/cli.js +++ b/src/cli.js @@ -8,7 +8,7 @@ const util = require("./cli-util"); const validator = require("./cli-validator"); function run(args) { - const argv = minimist(args, constant.options); + const argv = minimist(args, constant.minimistOptions); argv.__args = args; argv.__filePatterns = argv["_"];