diff --git a/lib/augmentConfig.js b/lib/augmentConfig.js index 5ee8140606..0bd4317a88 100644 --- a/lib/augmentConfig.js +++ b/lib/augmentConfig.js @@ -4,9 +4,8 @@ const _ = require('lodash'); const configurationError = require('./utils/configurationError'); const getModulePath = require('./utils/getModulePath'); const globjoin = require('globjoin'); -const normalizeRuleSettings = require('./normalizeRuleSettings'); +const normalizeAllRuleSettings = require('./normalizeAllRuleSettings'); const path = require('path'); -const rules = require('./rules'); /** @typedef {import('stylelint').StylelintConfigPlugins} StylelintConfigPlugins */ /** @typedef {import('stylelint').StylelintConfigProcessor} StylelintConfigProcessor */ @@ -294,37 +293,6 @@ function addPluginFunctions(config) { return config; } -/** - * @param {StylelintConfig} config - * @return {StylelintConfig} - */ -function normalizeAllRuleSettings(config) { - /** @type {StylelintConfigRules} */ - const normalizedRules = {}; - - if (!config.rules) return config; - - Object.keys(config.rules).forEach((ruleName) => { - const rawRuleSettings = _.get(config, ['rules', ruleName]); - - const rule = rules[ruleName] || _.get(config, ['pluginFunctions', ruleName]); - - if (!rule) { - normalizedRules[ruleName] = []; - } else { - normalizedRules[ruleName] = normalizeRuleSettings( - rawRuleSettings, - ruleName, - _.get(rule, 'primaryOptionArray'), - ); - } - }); - - config.rules = normalizedRules; - - return config; -} - /** * Given an array of processors strings, we want to add two * properties to the augmented config: diff --git a/lib/normalizeAllRuleSettings.js b/lib/normalizeAllRuleSettings.js new file mode 100644 index 0000000000..990608e3fb --- /dev/null +++ b/lib/normalizeAllRuleSettings.js @@ -0,0 +1,41 @@ +'use strict'; + +const _ = require('lodash'); +const normalizeRuleSettings = require('./normalizeRuleSettings'); +const rules = require('./rules'); + +/** @typedef {import('stylelint').StylelintConfigRules} StylelintConfigRules */ +/** @typedef {import('stylelint').StylelintConfig} StylelintConfig */ + +/** + * @param {StylelintConfig} config + * @return {StylelintConfig} + */ +function normalizeAllRuleSettings(config) { + /** @type {StylelintConfigRules} */ + const normalizedRules = {}; + + if (!config.rules) return config; + + Object.keys(config.rules).forEach((ruleName) => { + const rawRuleSettings = _.get(config, ['rules', ruleName]); + + const rule = rules[ruleName] || _.get(config, ['pluginFunctions', ruleName]); + + if (!rule) { + normalizedRules[ruleName] = []; + } else { + normalizedRules[ruleName] = normalizeRuleSettings( + rawRuleSettings, + ruleName, + _.get(rule, 'primaryOptionArray'), + ); + } + }); + + config.rules = normalizedRules; + + return config; +} + +module.exports = normalizeAllRuleSettings;