Skip to content

Commit b522b03

Browse files
SimenBSimenB
authored
chore: lint more packages with types (#14516)
1 parent be7e797 commit b522b03

File tree

13 files changed

+239
-390
lines changed

13 files changed

+239
-390
lines changed

‎packages/jest-diff/src/getAlignedDiffs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ const concatenateRelevantDiffs = (
3131
// Encapsulate change lines until either a common newline or the end.
3232
class ChangeBuffer {
3333
private readonly op: number;
34-
private line: Array<Diff>; // incomplete line
35-
private lines: Array<Diff>; // complete lines
34+
private readonly line: Array<Diff>; // incomplete line
35+
private readonly lines: Array<Diff>; // complete lines
3636
private readonly changeColor: DiffOptionsColor;
3737

3838
constructor(op: number, changeColor: DiffOptionsColor) {

‎packages/jest-environment-jsdom/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default class JSDOMEnvironment implements JestEnvironment<number> {
3838
private errorEventListener: ((event: Event & {error: Error}) => void) | null;
3939
moduleMocker: ModuleMocker | null;
4040
customExportConditions = ['browser'];
41-
private _configuredExportConditions?: Array<string>;
41+
private readonly _configuredExportConditions?: Array<string>;
4242

4343
constructor(config: JestEnvironmentConfig, context: EnvironmentContext) {
4444
const {projectConfig} = config;

‎packages/jest-environment-node/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export default class NodeEnvironment implements JestEnvironment<Timer> {
6767
global: Global.Global;
6868
moduleMocker: ModuleMocker | null;
6969
customExportConditions = ['node', 'node-addons'];
70-
private _configuredExportConditions?: Array<string>;
70+
private readonly _configuredExportConditions?: Array<string>;
7171

7272
// while `context` is unused, it should always be passed
7373
constructor(config: JestEnvironmentConfig, _context: EnvironmentContext) {

‎packages/jest-fake-timers/src/legacyFakeTimers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export default class FakeTimers<TimerRef = unknown> {
7070
private _disposed: boolean;
7171
private _fakeTimerAPIs!: FakeTimerAPI;
7272
private _fakingTime = false;
73-
private _global: typeof globalThis;
73+
private readonly _global: typeof globalThis;
7474
private _immediates!: Array<Tick>;
7575
private readonly _maxLoops: number;
7676
private readonly _moduleMocker: ModuleMocker;

‎packages/jest-haste-map/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ class HasteMap extends EventEmitter implements IHasteMap {
215215
private _changeInterval?: ReturnType<typeof setInterval>;
216216
private readonly _console: Console;
217217
private _isWatchmanInstalledPromise: Promise<boolean> | null = null;
218-
private _options: InternalOptions;
218+
private readonly _options: InternalOptions;
219219
private _watchers: Array<Watcher> = [];
220220
private _worker: JestWorkerFarm<HasteWorker> | HasteWorker | null = null;
221221

‎packages/jest-jasmine2/src/jasmine/Env.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,9 +688,9 @@ export default function jasmineEnv(j$: Jasmine) {
688688
const check = isError(error);
689689

690690
checkIsError = check.isError;
691-
message = check.message;
691+
message = check.message || undefined;
692692
}
693-
const errorAsErrorObject = checkIsError ? error : new Error(message!);
693+
const errorAsErrorObject = checkIsError ? error : new Error(message);
694694
const runnable = currentRunnable();
695695

696696
if (!runnable) {

‎packages/jest-reporters/src/NotifyReporter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const icon = path.resolve(__dirname, '../assets/jest_logo.png');
2121
export default class NotifyReporter extends BaseReporter {
2222
private readonly _notifier = loadNotifier();
2323
private readonly _globalConfig: Config.GlobalConfig;
24-
private _context: ReporterContext;
24+
private readonly _context: ReporterContext;
2525

2626
static readonly filename = __filename;
2727

‎packages/jest-reporters/src/__tests__/GitHubActionsReporter.test.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ describe('annotations', () => {
9090

9191
describe('logs error annotation', () => {
9292
test('when an expectation fails to pass', () => {
93-
reporter['generateAnnotations'](testMeta, {
93+
reporter.generateAnnotations(testMeta, {
9494
testResults: [
9595
{
9696
...testCaseResult,
@@ -104,7 +104,7 @@ describe('annotations', () => {
104104
});
105105

106106
test('when a test has reference error', () => {
107-
reporter['generateAnnotations'](
107+
reporter.generateAnnotations(
108108
{...testMeta, path: '/user/project/__tests__/example.test.js:25:12'},
109109
{
110110
testResults: [
@@ -121,7 +121,7 @@ describe('annotations', () => {
121121
});
122122

123123
test('when test is wrapped in describe block', () => {
124-
reporter['generateAnnotations'](testMeta, {
124+
reporter.generateAnnotations(testMeta, {
125125
testResults: [
126126
{
127127
...testCaseResult,
@@ -137,7 +137,7 @@ describe('annotations', () => {
137137

138138
describe('logs warning annotation before logging errors', () => {
139139
test('when test result includes retry reasons', () => {
140-
reporter['generateAnnotations'](testMeta, {
140+
reporter.generateAnnotations(testMeta, {
141141
testResults: [
142142
{
143143
...testCaseResult,
@@ -198,7 +198,7 @@ describe('logs', () => {
198198
silent: false,
199199
});
200200

201-
const generated = gha['getResultTree'](testResults, '/', suitePerf);
201+
const generated = gha.getResultTree(testResults, '/', suitePerf);
202202

203203
expect(mockedStderrWrite).not.toHaveBeenCalled();
204204
expect(generated).toEqual(expectedResults);
@@ -241,7 +241,7 @@ describe('logs', () => {
241241
silent: false,
242242
});
243243

244-
const generated = gha['getResultTree'](testResults, '/', suitePerf);
244+
const generated = gha.getResultTree(testResults, '/', suitePerf);
245245

246246
expect(mockedStderrWrite).not.toHaveBeenCalled();
247247
expect(generated).toEqual(expectedResults);
@@ -290,7 +290,7 @@ describe('logs', () => {
290290
silent: false,
291291
});
292292

293-
const generated = gha['getResultTree'](testResults, '/', suitePerf);
293+
const generated = gha.getResultTree(testResults, '/', suitePerf);
294294

295295
expect(mockedStderrWrite).not.toHaveBeenCalled();
296296
expect(generated).toEqual(expectedResults);
@@ -339,7 +339,7 @@ describe('logs', () => {
339339
silent: false,
340340
});
341341

342-
const generated = gha['getResultTree'](testResults, '/', suitePerf);
342+
const generated = gha.getResultTree(testResults, '/', suitePerf);
343343

344344
expect(mockedStderrWrite).not.toHaveBeenCalled();
345345
expect(generated).toEqual(expectedResults);
@@ -400,7 +400,7 @@ describe('logs', () => {
400400
silent: false,
401401
});
402402

403-
const generated = gha['getResultTree'](testResults, '/', suitePerf);
403+
const generated = gha.getResultTree(testResults, '/', suitePerf);
404404

405405
expect(mockedStderrWrite).not.toHaveBeenCalled();
406406
expect(generated).toEqual(expectedResults);
@@ -431,7 +431,7 @@ describe('logs', () => {
431431
silent: false,
432432
});
433433

434-
gha['printResultTree'](generatedTree);
434+
gha.printResultTree(generatedTree);
435435

436436
expect(mockedStderrWrite.mock.calls).toMatchSnapshot();
437437
});
@@ -459,7 +459,7 @@ describe('logs', () => {
459459
silent: false,
460460
});
461461

462-
gha['printResultTree'](generatedTree);
462+
gha.printResultTree(generatedTree);
463463

464464
expect(mockedStderrWrite.mock.calls).toMatchSnapshot();
465465
});
@@ -493,7 +493,7 @@ describe('logs', () => {
493493
silent: false,
494494
});
495495

496-
gha['printResultTree'](generatedTree);
496+
gha.printResultTree(generatedTree);
497497

498498
expect(mockedStderrWrite.mock.calls).toMatchSnapshot();
499499
});
@@ -527,7 +527,7 @@ describe('logs', () => {
527527
silent: false,
528528
});
529529

530-
gha['printResultTree'](generatedTree);
530+
gha.printResultTree(generatedTree);
531531

532532
expect(mockedStderrWrite.mock.calls).toMatchSnapshot();
533533
});
@@ -561,7 +561,7 @@ describe('logs', () => {
561561
silent: false,
562562
});
563563

564-
gha['printResultTree'](generatedTree);
564+
gha.printResultTree(generatedTree);
565565

566566
expect(mockedStderrWrite.mock.calls).toMatchSnapshot();
567567
});
@@ -595,7 +595,7 @@ describe('logs', () => {
595595
silent: false,
596596
});
597597

598-
gha['printResultTree'](generatedTree);
598+
gha.printResultTree(generatedTree);
599599

600600
expect(mockedStderrWrite.mock.calls).toMatchSnapshot();
601601
});
@@ -633,7 +633,7 @@ describe('logs', () => {
633633
const gha = new GitHubActionsReporter({} as Config.GlobalConfig, {
634634
silent: false,
635635
});
636-
gha['generateAnnotations'] = jest.fn();
636+
gha.generateAnnotations = jest.fn();
637637

638638
gha.onTestResult(
639639
mockTest as Test,
@@ -677,7 +677,7 @@ describe('logs', () => {
677677
const gha = new GitHubActionsReporter({} as Config.GlobalConfig, {
678678
silent: false,
679679
});
680-
gha['generateAnnotations'] = jest.fn();
680+
gha.generateAnnotations = jest.fn();
681681

682682
gha.onTestResult(
683683
mockTest as Test,

‎packages/jest-worker/src/workers/__tests__/ChildProcessWorker.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ it('provides stdout and stderr from the child processes', async () => {
159159
workerPath: '/tmp/foo',
160160
} as WorkerOptions);
161161

162-
const stdout = worker.getStdout() as NodeJS.ReadableStream;
163-
const stderr = worker.getStderr() as NodeJS.ReadableStream;
162+
const stdout = worker.getStdout()!;
163+
const stderr = worker.getStderr()!;
164164

165165
(forkInterface.stdout as PassThrough).end('Hello ', 'utf8');
166166
(forkInterface.stderr as PassThrough).end('Jest ', 'utf8');

‎packages/jest-worker/src/workers/__tests__/WorkerEdgeCases.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ afterAll(async () => {
5252
test.each(filesToBuild)('%s.js should exist', file => {
5353
const path = join(writeDestination, `${file}.js`);
5454

55-
expect(async () => await access(path)).not.toThrow();
55+
expect(async () => access(path)).not.toThrow();
5656
});
5757

5858
async function closeWorkerAfter(
@@ -310,9 +310,9 @@ describe.each([
310310
});
311311

312312
test('worker stays dead', async () => {
313-
await expect(
314-
async () => await worker.waitForWorkerReady(),
315-
).rejects.toThrow('Worker state means it will never be ready: shut-down');
313+
await expect(async () => worker.waitForWorkerReady()).rejects.toThrow(
314+
'Worker state means it will never be ready: shut-down',
315+
);
316316
expect(worker.isWorkerRunning()).toBeFalsy();
317317
});
318318

‎packages/jest-worker/src/workers/__tests__/threadChild.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ beforeEach(() => {
114114
);
115115

116116
messagePort = (require('worker_threads') as typeof import('worker_threads'))
117-
.parentPort as MessagePort;
117+
.parentPort!;
118118

119119
// Require the child!
120120
require('../threadChild');

‎scripts/lintTs.mjs

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,46 @@ const fix = process.argv.slice(2).some(arg => arg === '--fix');
2828
const monorepoRoot = path.resolve(url.fileURLToPath(import.meta.url), '../..');
2929

3030
// TODO: remove this list at some point and run against all packages
31-
const packagesToTest = [
32-
'babel-jest',
33-
'babel-plugin-jest-hoist',
34-
'diff-sequences',
35-
'jest',
36-
'jest-changed-files',
37-
'jest-console',
38-
'jest-docblock',
39-
'jest-environment',
40-
'jest-globals',
41-
'jest-resolve-dependencies',
42-
'jest-schemas',
43-
'jest-source-map',
44-
'jest-test-result',
45-
'jest-test-sequencer',
46-
'jest-transform',
47-
'jest-types',
48-
'jest-watcher',
49-
'test-globals',
50-
'test-utils',
31+
const packagesNotToTest = [
32+
'expect',
33+
'expect-utils',
34+
'jest-circus',
35+
'jest-cli',
36+
'jest-config',
37+
'jest-core',
38+
'jest-create-cache-key-function',
39+
'jest-diff',
40+
'jest-each',
41+
'jest-environment-jsdom',
42+
'jest-environment-node',
43+
'jest-fake-timers',
44+
'jest-get-type',
45+
'jest-haste-map',
46+
'jest-jasmine2',
47+
'jest-leak-detector',
48+
'jest-matcher-utils',
49+
'jest-message-util',
50+
'jest-mock',
51+
'jest-phabricator',
52+
'jest-regex-util',
53+
'jest-repl',
54+
'jest-reporters',
55+
'jest-resolve',
56+
'jest-runner',
57+
'jest-runtime',
58+
'jest-snapshot',
59+
'jest-util',
60+
'jest-validate',
61+
'jest-worker',
62+
'pretty-format',
5163
];
5264

5365
const packagesWithTs = getPackagesWithTsConfig()
5466
.map(({packageDir}) => packageDir)
55-
.concat(path.resolve(monorepoRoot, 'e2e'))
56-
.filter(packageDir => packagesToTest.some(pkg => packageDir.endsWith(pkg)));
67+
.filter(
68+
packageDir => !packagesNotToTest.some(pkg => packageDir.endsWith(pkg)),
69+
);
70+
// .concat(path.resolve(monorepoRoot, 'e2e'));
5771

5872
const allLintResults = [];
5973

0 commit comments

Comments
 (0)