Skip to content

Commit b0fc13b

Browse files
authored
refactor: migrate all message to messageId (#482)
1 parent ecbce9f commit b0fc13b

9 files changed

+47
-17
lines changed

rules/always-return.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ module.exports = {
143143
additionalProperties: false,
144144
},
145145
],
146+
messages: {
147+
thenShouldReturnOrThrow: 'Each then() should return a value or throw',
148+
},
146149
},
147150
create(context) {
148151
const options = context.options[0] || {}
@@ -242,7 +245,7 @@ module.exports = {
242245
const branch = funcInfo.branchInfoMap[id]
243246
if (!branch.good) {
244247
context.report({
245-
message: 'Each then() should return a value or throw',
248+
messageId: 'thenShouldReturnOrThrow',
246249
node: branch.node,
247250
})
248251
}

rules/avoid-new.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@ module.exports = {
1616
url: getDocsUrl('avoid-new'),
1717
},
1818
schema: [],
19+
messages: {
20+
avoidNew: 'Avoid creating new promises.',
21+
},
1922
},
2023
create(context) {
2124
return {
2225
NewExpression(node) {
2326
if (node.callee.name === 'Promise') {
24-
context.report({ node, message: 'Avoid creating new promises.' })
27+
context.report({ node, messageId: 'avoidNew' })
2528
}
2629
},
2730
}

rules/no-nesting.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ module.exports = {
1818
url: getDocsUrl('no-nesting'),
1919
},
2020
schema: [],
21+
messages: {
22+
avoidNesting: 'Avoid nesting promises.',
23+
},
2124
},
2225
create(context) {
2326
/**
@@ -112,7 +115,7 @@ module.exports = {
112115

113116
context.report({
114117
node: node.callee.property,
115-
message: 'Avoid nesting promises.',
118+
messageId: 'avoidNesting',
116119
})
117120
},
118121
}

rules/no-new-statics.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ module.exports = {
1212
},
1313
fixable: 'code',
1414
schema: [],
15+
messages: {
16+
avoidNewStatic: "Avoid calling 'new' on 'Promise.{{ name }}()'",
17+
},
1518
},
1619
create(context) {
1720
return {
@@ -23,7 +26,7 @@ module.exports = {
2326
) {
2427
context.report({
2528
node,
26-
message: "Avoid calling 'new' on 'Promise.{{ name }}()'",
29+
messageId: 'avoidNewStatic',
2730
data: { name: node.callee.property.name },
2831
fix(fixer) {
2932
return fixer.replaceTextRange(

rules/no-promise-in-callback.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ module.exports = {
1818
url: getDocsUrl('no-promise-in-callback'),
1919
},
2020
schema: [],
21+
messages: {
22+
avoidPromiseInCallback: 'Avoid using promises inside of callbacks.',
23+
},
2124
},
2225
create(context) {
2326
return {
@@ -34,7 +37,7 @@ module.exports = {
3437
if (getAncestors(context, node).some(isInsideCallback)) {
3538
context.report({
3639
node: node.callee,
37-
message: 'Avoid using promises inside of callbacks.',
40+
messageId: 'avoidPromiseInCallback',
3841
})
3942
}
4043
},

rules/no-return-in-finally.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ module.exports = {
1111
url: getDocsUrl('no-return-in-finally'),
1212
},
1313
schema: [],
14+
messages: {
15+
avoidReturnInFinally: 'No return in finally',
16+
},
1417
},
1518
create(context) {
1619
return {
@@ -35,7 +38,7 @@ module.exports = {
3538
) {
3639
context.report({
3740
node: node.callee.property,
38-
message: 'No return in finally',
41+
messageId: 'avoidReturnInFinally',
3942
})
4043
}
4144
}

rules/param-names.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ module.exports = {
2323
additionalProperties: false,
2424
},
2525
],
26+
messages: {
27+
resolveParamNames:
28+
'Promise constructor parameters must be named to match "{{ resolvePattern }}"',
29+
rejectParamNames:
30+
'Promise constructor parameters must be named to match "{{ rejectPattern }}"',
31+
},
2632
},
2733
create(context) {
2834
const options = context.options[0] || {}
@@ -45,8 +51,7 @@ module.exports = {
4551
if (resolveParamName && !resolvePattern.test(resolveParamName)) {
4652
context.report({
4753
node: params[0],
48-
message:
49-
'Promise constructor parameters must be named to match "{{ resolvePattern }}"',
54+
messageId: 'resolveParamNames',
5055
data: {
5156
resolvePattern: resolvePattern.source,
5257
},
@@ -56,8 +61,7 @@ module.exports = {
5661
if (rejectParamName && !rejectPattern.test(rejectParamName)) {
5762
context.report({
5863
node: params[1],
59-
message:
60-
'Promise constructor parameters must be named to match "{{ rejectPattern }}"',
64+
messageId: 'rejectParamNames',
6165
data: {
6266
rejectPattern: rejectPattern.source,
6367
},

rules/prefer-await-to-then.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ module.exports = {
1717
url: getDocsUrl('prefer-await-to-then'),
1818
},
1919
schema: [],
20+
messages: {
21+
preferAwaitToCallback: 'Prefer await to then()/catch()/finally().',
22+
},
2023
},
2124
create(context) {
2225
/** Returns true if node is inside yield or await expression. */
@@ -52,7 +55,7 @@ module.exports = {
5255
) {
5356
context.report({
5457
node: node.property,
55-
message: 'Prefer await to then()/catch()/finally().',
58+
messageId: 'preferAwaitToCallback',
5659
})
5760
}
5861
},

rules/valid-params.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ module.exports = {
1212
url: getDocsUrl('valid-params'),
1313
},
1414
schema: [],
15+
messages: {
16+
requireOneOptionalArgument:
17+
'Promise.{{ name }}() requires 0 or 1 arguments, but received {{ numArgs }}',
18+
requireOneArgument:
19+
'Promise.{{ name }}() requires 1 argument, but received {{ numArgs }}',
20+
requireTwoOptionalArguments:
21+
'Promise.{{ name }}() requires 1 or 2 arguments, but received {{ numArgs }}',
22+
},
1523
},
1624
create(context) {
1725
return {
@@ -30,8 +38,7 @@ module.exports = {
3038
if (numArgs > 1) {
3139
context.report({
3240
node,
33-
message:
34-
'Promise.{{ name }}() requires 0 or 1 arguments, but received {{ numArgs }}',
41+
messageId: 'requireOneOptionalArgument',
3542
data: { name, numArgs },
3643
})
3744
}
@@ -40,8 +47,7 @@ module.exports = {
4047
if (numArgs < 1 || numArgs > 2) {
4148
context.report({
4249
node,
43-
message:
44-
'Promise.{{ name }}() requires 1 or 2 arguments, but received {{ numArgs }}',
50+
messageId: 'requireTwoOptionalArguments',
4551
data: { name, numArgs },
4652
})
4753
}
@@ -55,8 +61,7 @@ module.exports = {
5561
if (numArgs !== 1) {
5662
context.report({
5763
node,
58-
message:
59-
'Promise.{{ name }}() requires 1 argument, but received {{ numArgs }}',
64+
messageId: 'requireOneArgument',
6065
data: { name, numArgs },
6166
})
6267
}

0 commit comments

Comments
 (0)