vitalif-js
/
prettier
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename detailOptions to detailedOptions

master
Simon Lydell 2017-09-12 18:06:24 +02:00 committed by Ika
parent 661c029036
commit 602c2a2774
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cli-constant.js
View File

@ -61,7 +61,7 @@ const CATEGORY_OTHER = "Other";
*
* Note: The options below are sorted alphabetically.
*/
const detailOptions = normalizeDetailOptions({
const detailedOptions = normalizeDetailedOptions({
"bracket-spacing": {
type: "boolean",
category: CATEGORY_FORMAT,
@ -259,20 +259,20 @@ const detailOptions = normalizeDetailOptions({
});
const minimistOptions = {
boolean: detailOptions
boolean: detailedOptions
.filter(option => option.type === "boolean")
.map(option => option.name),
string: detailOptions
string: detailedOptions
.filter(option => option.type !== "boolean")
.map(option => option.name),
default: detailOptions
default: detailedOptions
.filter(option => option.default !== undefined)
.reduce(
(current, option) =>
Object.assign({ [option.name]: option.default }, current),
{}
),
alias: detailOptions
alias: detailedOptions
.filter(option => option.alias !== undefined)
.reduce(
(current, option) =>
@ -296,11 +296,11 @@ function kebabToCamel(str) {
return str.replace(/-([a-z])/g, (_, char) => char.toUpperCase());
}
function normalizeDetailOptions(rawDetailOptions) {
const names = Object.keys(rawDetailOptions).sort();
function normalizeDetailedOptions(rawDetailedOptions) {
const names = Object.keys(rawDetailedOptions).sort();
const normalized = names.map(name => {
const option = rawDetailOptions[name];
const option = rawDetailedOptions[name];
return Object.assign({}, option, {
name,
category: option.category || CATEGORY_OTHER,
@ -321,7 +321,7 @@ function normalizeDetailOptions(rawDetailOptions) {
return normalized;
}
const detailOptionMap = detailOptions.reduce(
const detailedOptionMap = detailedOptions.reduce(
(current, option) => Object.assign(current, { [option.name]: option }),
{}
);
@ -332,6 +332,6 @@ module.exports = {
CATEGORY_FORMAT,
CATEGORY_OTHER,
minimistOptions,
detailOptions,
detailOptionMap
detailedOptions,
detailedOptionMap
};

6
src/cli-util.js
View File

@ -20,7 +20,7 @@ const apiDefaultOptions = require("./options").defaults;
const OPTION_USAGE_THRESHOLD = 25;
function getOptions(argv) {
return constant.detailOptions
return constant.detailedOptions
.filter(option => option.forwardToApi)
.reduce(
(current, option) =>
@ -327,7 +327,7 @@ function formatFiles(argv) {
}
function createUsage() {
const options = constant.detailOptions;
const options = constant.detailedOptions;
// Add --no-foo after --foo.
const optionsWithOpposites = options.map(option => [
option.description ? option : null,
@ -435,7 +435,7 @@ function normalizeArgv(rawArgv, options) {
return;
}
const option = constant.detailOptionMap[key];
const option = constant.detailedOptionMap[key];
if (option === undefined) {
// unknown option