Skip to content

Commit 0d85360

Browse files
JoshuaKGoldbergJoshuaKGoldberg
committed
Merge branch 'main' into v8
2 parents b765f7b + 7ce6acd commit 0d85360

File tree

7 files changed

+382
-13
lines changed

7 files changed

+382
-13
lines changed

‎docs/packages/Rule_Tester.mdx

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,27 @@ RuleTester.itOnly = vitest.it.only;
233233
RuleTester.describe = vitest.describe;
234234
```
235235

236+
#### Node built-in test runner
237+
238+
Consider setting up `RuleTester`'s static properties in a preloaded module using the [`--import`](https://nodejs.org/api/cli.html#--importmodule) or [`--require`](https://nodejs.org/api/cli.html#-r---require-module) flag:
239+
240+
```ts
241+
// setup.js
242+
import * as test from 'node:test';
243+
import { RuleTester } from '@typescript-eslint/rule-tester';
244+
245+
RuleTester.afterAll = test.afterAll;
246+
RuleTester.describe = test.describe;
247+
RuleTester.it = test.it;
248+
RuleTester.itOnly = test.it.only;
249+
```
250+
251+
Tests can then be [run from the command line](https://nodejs.org/api/test.html#running-tests-from-the-command-line) like so:
252+
253+
```sh
254+
node --import setup.js --test
255+
```
256+
236257
## Options
237258

238259
### `RuleTester` constructor options

‎packages/rule-tester/src/RuleTester.ts

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import { satisfiesAllDependencyConstraints } from './utils/dependencyConstraints
3838
import { freezeDeeply } from './utils/freezeDeeply';
3939
import { getRuleOptionsSchema } from './utils/getRuleOptionsSchema';
4040
import { hasOwnProperty } from './utils/hasOwnProperty';
41-
import { interpolate } from './utils/interpolate';
41+
import { getPlaceholderMatcher, interpolate } from './utils/interpolate';
4242
import { isReadonlyArray } from './utils/isReadonlyArray';
4343
import * as SourceCodeFixer from './utils/SourceCodeFixer';
4444
import {
@@ -73,6 +73,45 @@ let defaultConfig = deepMerge(
7373
testerDefaultConfig,
7474
) as TesterConfigWithDefaults;
7575

76+
/**
77+
* Extracts names of {{ placeholders }} from the reported message.
78+
* @param message Reported message
79+
* @returns Array of placeholder names
80+
*/
81+
function getMessagePlaceholders(message: string): string[] {
82+
const matcher = getPlaceholderMatcher();
83+
84+
return Array.from(message.matchAll(matcher), ([, name]) => name.trim());
85+
}
86+
87+
/**
88+
* Returns the placeholders in the reported messages but
89+
* only includes the placeholders available in the raw message and not in the provided data.
90+
* @param message The reported message
91+
* @param raw The raw message specified in the rule meta.messages
92+
* @param data The passed
93+
* @returns Missing placeholder names
94+
*/
95+
function getUnsubstitutedMessagePlaceholders(
96+
message: string,
97+
raw: string,
98+
data: Record<string, unknown> = {},
99+
): string[] {
100+
const unsubstituted = getMessagePlaceholders(message);
101+
102+
if (unsubstituted.length === 0) {
103+
return [];
104+
}
105+
106+
// Remove false positives by only counting placeholders in the raw message, which were not provided in the data matcher or added with a data property
107+
const known = getMessagePlaceholders(raw);
108+
const provided = Object.keys(data);
109+
110+
return unsubstituted.filter(
111+
name => known.includes(name) && !provided.includes(name),
112+
);
113+
}
114+
76115
export class RuleTester extends TestFramework {
77116
readonly #testerConfig: TesterConfigWithDefaults;
78117
readonly #rules: Record<string, AnyRuleCreateFunction | AnyRuleModule> = {};
@@ -812,6 +851,19 @@ export class RuleTester extends TestFramework {
812851
error.messageId,
813852
`messageId '${message.messageId}' does not match expected messageId '${error.messageId}'.`,
814853
);
854+
855+
const unsubstitutedPlaceholders =
856+
getUnsubstitutedMessagePlaceholders(
857+
message.message,
858+
rule.meta.messages[message.messageId],
859+
error.data,
860+
);
861+
862+
assert.ok(
863+
unsubstitutedPlaceholders.length === 0,
864+
`The reported message has ${unsubstitutedPlaceholders.length > 1 ? `unsubstituted placeholders: ${unsubstitutedPlaceholders.map(name => `'${name}'`).join(', ')}` : `an unsubstituted placeholder '${unsubstitutedPlaceholders[0]}'`}. Please provide the missing ${unsubstitutedPlaceholders.length > 1 ? 'values' : 'value'} via the 'data' property in the context.report() call.`,
865+
);
866+
815867
if (hasOwnProperty(error, 'data')) {
816868
/*
817869
* if data was provided, then directly compare the returned message to a synthetic
@@ -957,6 +1009,19 @@ export class RuleTester extends TestFramework {
9571009
expectedSuggestion.messageId,
9581010
`${suggestionPrefix} messageId should be '${expectedSuggestion.messageId}' but got '${actualSuggestion.messageId}' instead.`,
9591011
);
1012+
1013+
const unsubstitutedPlaceholders =
1014+
getUnsubstitutedMessagePlaceholders(
1015+
actualSuggestion.desc,
1016+
rule.meta.messages[expectedSuggestion.messageId],
1017+
expectedSuggestion.data,
1018+
);
1019+
1020+
assert.ok(
1021+
unsubstitutedPlaceholders.length === 0,
1022+
`The message of the suggestion has ${unsubstitutedPlaceholders.length > 1 ? `unsubstituted placeholders: ${unsubstitutedPlaceholders.map(name => `'${name}'`).join(', ')}` : `an unsubstituted placeholder '${unsubstitutedPlaceholders[0]}'`}. Please provide the missing ${unsubstitutedPlaceholders.length > 1 ? 'values' : 'value'} via the 'data' property for the suggestion in the context.report() call.`,
1023+
);
1024+
9601025
if (hasOwnProperty(expectedSuggestion, 'data')) {
9611026
const unformattedMetaMessage =
9621027
rule.meta.messages[expectedSuggestion.messageId];

‎packages/rule-tester/src/utils/interpolate.ts

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
import type { ReportDescriptorMessageData } from '@typescript-eslint/utils/ts-eslint';
44

5+
/**
6+
* Returns a global expression matching placeholders in messages.
7+
*/
8+
export function getPlaceholderMatcher(): RegExp {
9+
return /\{\{([^{}]+?)\}\}/gu;
10+
}
11+
512
export function interpolate(
613
text: string,
714
data: ReportDescriptorMessageData | undefined,
@@ -10,18 +17,17 @@ export function interpolate(
1017
return text;
1118
}
1219

20+
const matcher = getPlaceholderMatcher();
21+
1322
// Substitution content for any {{ }} markers.
14-
return text.replace(
15-
/\{\{([^{}]+?)\}\}/gu,
16-
(fullMatch, termWithWhitespace: string) => {
17-
const term = termWithWhitespace.trim();
23+
return text.replace(matcher, (fullMatch, termWithWhitespace: string) => {
24+
const term = termWithWhitespace.trim();
1825

19-
if (term in data) {
20-
return String(data[term]);
21-
}
26+
if (term in data) {
27+
return String(data[term]);
28+
}
2229

23-
// Preserve old behavior: If parameter name not provided, don't replace it.
24-
return fullMatch;
25-
},
26-
);
30+
// Preserve old behavior: If parameter name not provided, don't replace it.
31+
return fullMatch;
32+
});
2733
}

‎packages/rule-tester/tests/eslint-base/eslint-base.test.js

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,6 +1686,63 @@ describe("RuleTester", () => {
16861686
}, "Hydrated message \"Avoid using variables named 'notFoo'.\" does not match \"Avoid using variables named 'foo'.\"");
16871687
});
16881688

1689+
it("should throw if the message has a single unsubstituted placeholder when data is not specified", () => {
1690+
assert.throws(() => {
1691+
ruleTester.run("foo", require("./fixtures/messageId").withMissingData, {
1692+
valid: [],
1693+
invalid: [{ code: "foo", errors: [{ messageId: "avoidFoo" }] }]
1694+
});
1695+
}, "The reported message has an unsubstituted placeholder 'name'. Please provide the missing value via the 'data' property in the context.report() call.");
1696+
});
1697+
1698+
it("should throw if the message has a single unsubstituted placeholders when data is specified", () => {
1699+
assert.throws(() => {
1700+
ruleTester.run("foo", require("./fixtures/messageId").withMissingData, {
1701+
valid: [],
1702+
invalid: [{ code: "foo", errors: [{ messageId: "avoidFoo", data: { name: "name" } }] }]
1703+
});
1704+
}, "Hydrated message \"Avoid using variables named 'name'.\" does not match \"Avoid using variables named '{{ name }}'.");
1705+
});
1706+
1707+
it("should throw if the message has multiple unsubstituted placeholders when data is not specified", () => {
1708+
assert.throws(() => {
1709+
ruleTester.run("foo", require("./fixtures/messageId").withMultipleMissingDataProperties, {
1710+
valid: [],
1711+
invalid: [{ code: "foo", errors: [{ messageId: "avoidFoo" }] }]
1712+
});
1713+
}, "The reported message has unsubstituted placeholders: 'type', 'name'. Please provide the missing values via the 'data' property in the context.report() call.");
1714+
});
1715+
1716+
it("should not throw if the data in the message contains placeholders not present in the raw message", () => {
1717+
ruleTester.run("foo", require("./fixtures/messageId").withPlaceholdersInData, {
1718+
valid: [],
1719+
invalid: [{ code: "foo", errors: [{ messageId: "avoidFoo" }] }]
1720+
});
1721+
});
1722+
1723+
it("should throw if the data in the message contains the same placeholder and data is not specified", () => {
1724+
assert.throws(() => {
1725+
ruleTester.run("foo", require("./fixtures/messageId").withSamePlaceholdersInData, {
1726+
valid: [],
1727+
invalid: [{ code: "foo", errors: [{ messageId: "avoidFoo" }] }]
1728+
});
1729+
}, "The reported message has an unsubstituted placeholder 'name'. Please provide the missing value via the 'data' property in the context.report() call.");
1730+
});
1731+
1732+
it("should not throw if the data in the message contains the same placeholder and data is specified", () => {
1733+
ruleTester.run("foo", require("./fixtures/messageId").withSamePlaceholdersInData, {
1734+
valid: [],
1735+
invalid: [{ code: "foo", errors: [{ messageId: "avoidFoo", data: { name: "{{ name }}" } }] }]
1736+
});
1737+
});
1738+
1739+
it("should not throw an error for specifying non-string data values", () => {
1740+
ruleTester.run("foo", require("./fixtures/messageId").withNonStringData, {
1741+
valid: [],
1742+
invalid: [{ code: "0", errors: [{ messageId: "avoid", data: { value: 0 } }] }]
1743+
});
1744+
});
1745+
16891746
// messageId/message misconfiguration cases
16901747
it("should throw if user tests for both message and messageId", () => {
16911748
assert.throws(() => {
@@ -1854,6 +1911,61 @@ describe("RuleTester", () => {
18541911
});
18551912
});
18561913

1914+
it("should fail with a single missing data placeholder when data is not specified", () => {
1915+
assert.throws(() => {
1916+
ruleTester.run("suggestions-messageIds", require("../../fixtures/testers/rule-tester/suggestions").withMissingPlaceholderData, {
1917+
valid: [],
1918+
invalid: [{
1919+
code: "var foo;",
1920+
errors: [{
1921+
messageId: "avoidFoo",
1922+
suggestions: [{
1923+
messageId: "renameFoo",
1924+
output: "var bar;"
1925+
}]
1926+
}]
1927+
}]
1928+
});
1929+
}, "The message of the suggestion has an unsubstituted placeholder 'newName'. Please provide the missing value via the 'data' property for the suggestion in the context.report() call.");
1930+
});
1931+
1932+
it("should fail with a single missing data placeholder when data is specified", () => {
1933+
assert.throws(() => {
1934+
ruleTester.run("suggestions-messageIds", require("../../fixtures/testers/rule-tester/suggestions").withMissingPlaceholderData, {
1935+
valid: [],
1936+
invalid: [{
1937+
code: "var foo;",
1938+
errors: [{
1939+
messageId: "avoidFoo",
1940+
suggestions: [{
1941+
messageId: "renameFoo",
1942+
data: { other: "name" },
1943+
output: "var bar;"
1944+
}]
1945+
}]
1946+
}]
1947+
});
1948+
}, "The message of the suggestion has an unsubstituted placeholder 'newName'. Please provide the missing value via the 'data' property for the suggestion in the context.report() call.");
1949+
});
1950+
1951+
it("should fail with multiple missing data placeholders when data is not specified", () => {
1952+
assert.throws(() => {
1953+
ruleTester.run("suggestions-messageIds", require("../../fixtures/testers/rule-tester/suggestions").withMultipleMissingPlaceholderDataProperties, {
1954+
valid: [],
1955+
invalid: [{
1956+
code: "var foo;",
1957+
errors: [{
1958+
messageId: "avoidFoo",
1959+
suggestions: [{
1960+
messageId: "rename",
1961+
output: "var bar;"
1962+
}]
1963+
}]
1964+
}]
1965+
});
1966+
}, "The message of the suggestion has unsubstituted placeholders: 'currentName', 'newName'. Please provide the missing values via the 'data' property for the suggestion in the context.report() call.");
1967+
});
1968+
18571969

18581970
it("should pass when tested using empty suggestion test objects if the array length is correct", () => {
18591971
ruleTester.run("suggestions-messageIds", require("./fixtures/suggestions").withMessageIds, {

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy