Skip to content

Commit 8552813

Browse files
freaktechnikfreaktechnik
committed
chore: update eslint-plugin-eslint-plugin and swwitch to messageIds
1 parent 24eadb4 commit 8552813

14 files changed

+79
-50
lines changed

‎package-lock.json‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"eclint": "^2.8.1",
2020
"eslint": "^8.20.0",
2121
"eslint-ava-rule-tester": "^4.0.0",
22-
"eslint-plugin-eslint-plugin": "^4.4.1",
22+
"eslint-plugin-eslint-plugin": "^5.0.1",
2323
"eslint-plugin-optimize-regex": "^1.2.1",
2424
"nyc": "^15.1.0",
2525
"typescript": "^4.7.4"

‎rules/avoid-reverse.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ module.exports = {
1919
},
2020
schema: [],
2121
fixable: "code",
22-
type: "suggestion"
22+
type: "suggestion",
23+
messages: {
24+
avoidReverse: "Prefer using {{ reversed }} over reversing the array and {{ methodName }}"
25+
}
2326
},
2427
create(context) {
2528
return {
@@ -37,7 +40,11 @@ module.exports = {
3740
start: parent.callee.property.loc.start,
3841
end: node.callee.property.loc.end
3942
},
40-
message: `Prefer using ${reversed} over reversing the array and ${node.callee.property.name}`,
43+
messageId: "avoidReverse",
44+
data: {
45+
reversed,
46+
methodName: node.callee.property.name
47+
},
4148
fix(fixer) {
4249
const [ propertyStart ] = parent.callee.property.range,
4350
[

‎rules/from-map.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ module.exports = {
1414
},
1515
fixable: "code",
1616
type: "suggestion",
17-
schema: []
17+
schema: [],
18+
messages: {
19+
useMapCb: "Use mapFn callback of Array.from instead of map()"
20+
}
1821
},
1922
create(context) {
2023
return {
@@ -29,7 +32,7 @@ module.exports = {
2932
start: parent.callee.loc.start,
3033
end: callee.loc.end
3134
},
32-
message: "Use mapFn callback of Array.from instead of map()",
35+
messageId: "useMapCb",
3336
fix(fixer) {
3437
const HAS_CBK = 2,
3538
PARAM_SEPARATOR = ", ",

‎rules/no-unnecessary-this-arg.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const {
3636
context.report({
3737
node: argument,
3838
loc: argument.loc,
39-
message: "Unnecessary this argument '{{ argument }}' with arrow function as callback to Array.{{ name }}",
39+
messageId: "unnecessaryThisArgStatic",
4040
data: {
4141
name: node.callee.property.name,
4242
argument: argument.name
@@ -64,7 +64,7 @@ const {
6464
context.report({
6565
node: argument,
6666
loc: argument.loc,
67-
message: "Unnecessary this argument '{{ argument }}' with an arrow function as callback to {{ name }}",
67+
messageId: "unnecessaryThisArgMethod",
6868
data: {
6969
name: node.callee.property.name,
7070
argument: argument.name || argument.value || argument.raw
@@ -80,7 +80,11 @@ module.exports = {
8080
},
8181
schema: [],
8282
fixable: "code",
83-
type: "suggestion"
83+
type: "suggestion",
84+
messages: {
85+
unnecessaryThisArgMethod: "Unnecessary this argument '{{ argument }}' with an arrow function as callback to {{ name }}",
86+
unnecessaryThisArgStatic: "Unnecessary this argument '{{ argument }}' with arrow function as callback to Array.{{ name }}"
87+
}
8488
},
8589
create(context) {
8690
return {

‎rules/prefer-array-from.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,18 @@ module.exports = {
1717
},
1818
schema: [],
1919
fixable: "code",
20-
type: "problem"
20+
type: "problem",
21+
messages: {
22+
preferArrayFrom: "Use Array.from to convert from iterable to array"
23+
}
2124
},
2225
create(context) {
2326
return {
2427
"ArrayExpression > SpreadElement:first-child:last-child"(node) {
2528
node = node.parent;
2629
context.report({
2730
node,
28-
message: "Use Array.from to convert from iterable to array",
31+
messageId: 'preferArrayFrom',
2932
fix(fixer) {
3033
const sourceCode = context.getSourceCode();
3134
return fixer.replaceText(node, `Array.from(${sourceCode.getText(firstElement(node.elements).argument)})`);

‎rules/prefer-flat-map.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ module.exports = {
1212
},
1313
fixable: "code",
1414
schema: [],
15-
type: "suggestion"
15+
type: "suggestion",
16+
messages: {
17+
preferFlatMap: "Use flatMap instead of .map().flat()"
18+
}
1619
},
1720
create(context) {
1821
return {
@@ -25,7 +28,7 @@ module.exports = {
2528
start: node.callee.property.loc.start,
2629
end: callee.loc.end
2730
},
28-
message: "Use flatMap instead of .map().flat()",
31+
messageId: "preferFlatMap",
2932
fix(fixer) {
3033
const [
3134
, endOfMap

‎rules/prefer-flat.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,23 @@ const
1515
module.exports = {
1616
meta: {
1717
docs: {
18-
description: "Prefer using .flat() over concating to flatten an array.",
18+
description: "Prefer using .flat() over concatenating to flatten an array.",
1919
recommended: true
2020
},
2121
schema: [],
2222
fixable: "code",
23-
type: "suggestion"
23+
type: "suggestion",
24+
messages: {
25+
preferFlat: "Use flat to flatten an array"
26+
}
2427
},
2528
create(context) {
2629
return {
2730
'CallExpression[callee.type="MemberExpression"][callee.property.name="concat"][callee.object.type="ArrayExpression"][callee.object.elements.length=0] > SpreadElement'(node) {
2831
node = node.parent;
2932
context.report({
3033
node,
31-
message: "Use flat to flatten an array",
34+
messageId: "preferFlat",
3235
fix(fixer) {
3336
const sourceCode = context.getSourceCode();
3437
//TODO could be an iterable, so Array.from may be needed.
@@ -47,7 +50,7 @@ module.exports = {
4750
) {
4851
context.report({
4952
node: node.parent.parent,
50-
message: "Use flat to flatten an array",
53+
messageId: "preferFlat",
5154
fix(fixer) {
5255
const sourceCode = context.getSourceCode();
5356
return fixer.replaceText(node.parent.parent, `${sourceCode.getText(node.parent.parent.callee.object)}.flat()`);

‎test/helpers/from-map-test-cases.mjs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default {
88
{
99
code: 'Array.from(iterable).map((t) => t.id)',
1010
errors: [ {
11-
message: 'Use mapFn callback of Array.from instead of map()',
11+
messageId: 'useMapCb',
1212
column: 1,
1313
line: 1
1414
} ],
@@ -17,7 +17,7 @@ export default {
1717
{
1818
code: 'Array.from(iterable, (t) => t.id, a).map((t) => t[0], b)',
1919
errors: [ {
20-
message: 'Use mapFn callback of Array.from instead of map()',
20+
messageId: 'useMapCb',
2121
column: 1,
2222
line: 1
2323
} ],
@@ -26,7 +26,7 @@ export default {
2626
{
2727
code: 'Array.from(iterable, function(t) { return t.id; }, a).map((t) => t[0])',
2828
errors: [ {
29-
message: 'Use mapFn callback of Array.from instead of map()',
29+
messageId: 'useMapCb',
3030
column: 1,
3131
line: 1
3232
} ],
@@ -35,7 +35,7 @@ export default {
3535
{
3636
code: 'Array.from(iterable, function(t) { return t.id; }, a).map(function(t) { return t[0]; }, b)',
3737
errors: [ {
38-
message: 'Use mapFn callback of Array.from instead of map()',
38+
messageId: 'useMapCb',
3939
column: 1,
4040
line: 1
4141
} ],
@@ -44,7 +44,7 @@ export default {
4444
{
4545
code: 'Array.from(iterable, function(u) { return u.id; }, a).map(function(t, i) { return t[0]; }, b)',
4646
errors: [ {
47-
message: 'Use mapFn callback of Array.from instead of map()',
47+
messageId: 'useMapCb',
4848
column: 1,
4949
line: 1
5050
} ],
@@ -53,7 +53,7 @@ export default {
5353
{
5454
code: 'Array.from(iterable, function(u, i) { return u.id; }, a).map(function(t) { return t[0]; }, b)',
5555
errors: [ {
56-
message: 'Use mapFn callback of Array.from instead of map()',
56+
messageId: 'useMapCb',
5757
column: 1,
5858
line: 1
5959
} ],

‎test/rules/avoid-reverse.mjs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,26 @@ ruleTester.run('avoid-reverse', rule, {
2121
{
2222
code: 'array.reverse().reduce((p, c) => p + c, 0)',
2323
errors: [ {
24-
message: 'Prefer using reduceRight over reversing the array and reduce',
24+
messageId: 'avoidReverse',
2525
column: 7,
26-
line: 1
26+
line: 1,
27+
data: {
28+
reversed: 'reduceRight',
29+
methodName: 'reduce'
30+
}
2731
} ],
2832
output: 'array.reduceRight((p, c) => p + c, 0)'
2933
},
3034
{
3135
code: 'array.reverse().reduceRight((p, c) => p + c, 0)',
3236
errors: [ {
33-
message: 'Prefer using reduce over reversing the array and reduceRight',
37+
messageId: 'avoidReverse',
3438
column: 7,
35-
line: 1
39+
line: 1,
40+
data: {
41+
reversed: 'reduce',
42+
methodName: 'reduceRight'
43+
}
3644
} ],
3745
output: 'array.reduce((p, c) => p + c, 0)'
3846
}

0 commit comments

Comments
 (0)