Skip to content

Commit

Permalink
fix: issue with LoadConfig getting deprecated
Browse files Browse the repository at this point in the history
There was an issue where deprecated rules where not being returned like
they where suppose to.
  • Loading branch information
jnmorse committed May 30, 2019
1 parent 3aec358 commit 110a529
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
2 changes: 1 addition & 1 deletion test/findUnused.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ describe('loadConfig', () => {

it('finds unused rules that are deprecated', () => {
const unusedRules = findUnused(config, true)
assert.equal(unusedRules.size, 264)
assert.equal(unusedRules.size, 263)
})
})
3 changes: 2 additions & 1 deletion test/fixtures/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module.exports = {
rules: {
semi: ['error', 'never'],
curly: 'error'
curly: 'error',
'valid-jsdoc': 'off'
}
}
11 changes: 9 additions & 2 deletions test/load-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@ describe('Load Config', () => {
it('should have only currentRules', () => {
const { currentRules } = config

assert.hasAllKeys(currentRules, ['curly', 'semi'])
assert.equal(currentRules.size, 2)
assert.hasAllKeys(currentRules, ['curly', 'semi', 'valid-jsdoc'])
assert.equal(currentRules.size, 3)
})

it('should return deprecated rules', () => {
const { deprecated } = config

assert.equal(deprecated.size, 1)
assert.equal(deprecated.has('valid-jsdoc'), true)
})
})
8 changes: 5 additions & 3 deletions utils/load-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,18 @@ class LoadConfig {

this.currentRules = new Map()

Object.keys(rules).forEach((rule) => {
Object.keys(rules).forEach(rule => {
this.currentRules.set(rule, rules[rule])
})
}

get deprecated() {
const deprecatedRules = new Map()

this.currentRules.forEach((definition, rule) => {
if (rule.meta && rule.meta.deprecated) {
this.currentRules.forEach((value, rule) => {
const definition = this.rules.get(rule)

if (definition && definition.meta && definition.meta.deprecated) {
deprecatedRules.set(rule, definition)
}
})
Expand Down

0 comments on commit 110a529

Please sign in to comment.