typescript-eslint · bradzacher · Feb 2, 2024 · Feb 2, 2024 · Feb 2, 2024
diff --git a/packages/parser/jest.config.js b/packages/parser/jest.config.js
@@ -4,5 +4,5 @@
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
   ...require('../../jest.config.base.js'),
-  testRegex: './tests/lib/.+\\.ts$',
+  testRegex: './tests/lib/.+\\.test\\.ts$',
 };
diff --git a/.../tests/lib/__snapshots__/services.ts.snap → ...s/lib/__snapshots__/services.test.ts.snap b/.../tests/lib/__snapshots__/services.ts.snap → ...s/lib/__snapshots__/services.test.ts.snap
diff --git a/packages/parser/tests/lib/parser.ts → packages/parser/tests/lib/parser.test.ts b/packages/parser/tests/lib/parser.ts → packages/parser/tests/lib/parser.test.ts
diff --git a/packages/parser/tests/lib/services.ts → packages/parser/tests/lib/services.test.ts b/packages/parser/tests/lib/services.ts → packages/parser/tests/lib/services.test.ts
@@ -8,7 +8,7 @@ import {
   createSnapshotTestBlock,
   formatSnapshotName,
   testServices,
-} from '../tools/test-utils';
+} from '../test-utils/test-utils';
 
 //------------------------------------------------------------------------------
 // Setup

diff --git a/packages/parser/tests/lib/tsx.ts → packages/parser/tests/lib/tsx.test.ts b/packages/parser/tests/lib/tsx.ts → packages/parser/tests/lib/tsx.test.ts
@@ -1,7 +1,7 @@
 import type { ParserOptions } from '@typescript-eslint/types';
 
 import { parseForESLint } from '../../src/parser';
-import { serializer } from '../tools/ts-error-serializer';
+import { serializer } from '../test-utils/ts-error-serializer';
 
 //------------------------------------------------------------------------------
 // Tests

diff --git a/packages/parser/tests/tools/test-utils.ts → ...ges/parser/tests/test-utils/test-utils.ts b/packages/parser/tests/tools/test-utils.ts → ...ges/parser/tests/test-utils/test-utils.ts
diff --git a/...parser/tests/tools/ts-error-serializer.ts → ...r/tests/test-utils/ts-error-serializer.ts b/...parser/tests/tools/ts-error-serializer.ts → ...r/tests/test-utils/ts-error-serializer.ts
diff --git a/packages/scope-manager/jest.config.js b/packages/scope-manager/jest.config.js
@@ -9,6 +9,6 @@ module.exports = {
   ...baseConfig,
   setupFilesAfterEnv: [
     ...baseConfig.setupFilesAfterEnv,
-    './tests/util/serializers/index.ts',
+    './tests/test-utils/serializers/index.ts',
   ],
 };
diff --git a/packages/scope-manager/tests/eslint-scope/arguments.test.ts b/packages/scope-manager/tests/eslint-scope/arguments.test.ts
@@ -3,7 +3,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('arguments', () => {
   it('arguments are correctly materialized', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/catch-scope.test.ts b/packages/scope-manager/tests/eslint-scope/catch-scope.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('catch', () => {
   it('creates scope', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/child-visitor-keys.test.ts b/packages/scope-manager/tests/eslint-scope/child-visitor-keys.test.ts
@@ -1,7 +1,7 @@
 import type { TSESTree } from '@typescript-eslint/types';
 
 import { analyze } from '../../src/analyze';
-import { parse } from '../util';
+import { parse } from '../test-utils';
 
 describe('childVisitorKeys option', () => {
   it('should not visit to properties which are not given.', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/class-fields.test.ts b/packages/scope-manager/tests/eslint-scope/class-fields.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   expectToBeIdentifier,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('Class fields', () => {
   it('class C { f = g }', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-arrow-function-expression.test.ts b/packages/scope-manager/tests/eslint-scope/es6-arrow-function-expression.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 arrow function expression', () => {
   it('materialize scope for arrow function expression', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-block-scope.test.ts b/packages/scope-manager/tests/eslint-scope/es6-block-scope.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 block scope', () => {
   it('let is materialized in ES6 block scope#1', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-catch.test.ts b/packages/scope-manager/tests/eslint-scope/es6-catch.test.ts
@@ -6,7 +6,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 catch', () => {
   it('takes binding pattern', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-class.test.ts b/packages/scope-manager/tests/eslint-scope/es6-class.test.ts
@@ -6,7 +6,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 class', () => {
   it('declaration name creates class scope', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-default-parameters.test.ts b/packages/scope-manager/tests/eslint-scope/es6-default-parameters.test.ts
@@ -1,4 +1,4 @@
-import { getRealVariables, parseAndAnalyze } from '../util';
+import { getRealVariables, parseAndAnalyze } from '../test-utils';
 
 function forEach<T extends string>(
   obj: Record<T, string>,

diff --git a/packages/scope-manager/tests/eslint-scope/es6-destructuring-assignments.test.ts b/packages/scope-manager/tests/eslint-scope/es6-destructuring-assignments.test.ts
@@ -7,7 +7,7 @@ import {
   expectToBeParameterDefinition,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 destructuring assignments', () => {
   it('Pattern in var in ForInStatement', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-export.test.ts b/packages/scope-manager/tests/eslint-scope/es6-export.test.ts
@@ -6,7 +6,7 @@ import {
   expectToBeVariableDefinition,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('export declaration', () => {
   // http://people.mozilla.org/~jorendorff/es6-draft.html#sec-static-and-runtme-semantics-module-records

diff --git a/packages/scope-manager/tests/eslint-scope/es6-import.test.ts b/packages/scope-manager/tests/eslint-scope/es6-import.test.ts
@@ -4,8 +4,8 @@ import {
   expectToBeModuleScope,
   expectToBeVariableDefinition,
   getRealVariables,
-} from '../util';
-import { parseAndAnalyze } from '../util/parse';
+} from '../test-utils';
+import { parseAndAnalyze } from '../test-utils/parse';
 
 describe('import declaration', () => {
   // http://people.mozilla.org/~jorendorff/es6-draft.html#sec-static-and-runtme-semantics-module-records

diff --git a/packages/scope-manager/tests/eslint-scope/es6-iteration-scope.test.ts b/packages/scope-manager/tests/eslint-scope/es6-iteration-scope.test.ts
@@ -6,7 +6,7 @@ import {
   expectToBeVariableDefinition,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 iteration scope', () => {
   it('let materialize iteration scope for ForInStatement#1', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-new-target.test.ts b/packages/scope-manager/tests/eslint-scope/es6-new-target.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeFunctionScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 new.target', () => {
   it('should not make references of new.target', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-object.test.ts b/packages/scope-manager/tests/eslint-scope/es6-object.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 object', () => {
   it('method definition', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-rest-args.test.ts b/packages/scope-manager/tests/eslint-scope/es6-rest-args.test.ts
@@ -7,7 +7,7 @@ import {
   expectToBeParameterDefinition,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 rest arguments', () => {
   it('materialize rest argument in scope', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-super.test.ts b/packages/scope-manager/tests/eslint-scope/es6-super.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 super', () => {
   it('is not handled as reference', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-switch.test.ts b/packages/scope-manager/tests/eslint-scope/es6-switch.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeSwitchScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 switch', () => {
   it('materialize scope', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/es6-template-literal.test.ts b/packages/scope-manager/tests/eslint-scope/es6-template-literal.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 template literal', () => {
   it('refer variables', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/function-expression-name.test.ts b/packages/scope-manager/tests/eslint-scope/function-expression-name.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('function name', () => {
   it('should create its special scope', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/get-declared-variables.test.ts b/packages/scope-manager/tests/eslint-scope/get-declared-variables.test.ts
@@ -3,7 +3,7 @@ import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { simpleTraverse } from '@typescript-eslint/typescript-estree';
 
 import { analyze } from '../../src/analyze';
-import { parse } from '../util/parse';
+import { parse } from '../test-utils/parse';
 
 describe('ScopeManager.prototype.getDeclaredVariables', () => {
   function verify(

diff --git a/packages/scope-manager/tests/eslint-scope/global-increment.test.ts b/packages/scope-manager/tests/eslint-scope/global-increment.test.ts
@@ -2,7 +2,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('global increment', () => {
   it('becomes read/write', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/global-return.test.ts b/packages/scope-manager/tests/eslint-scope/global-return.test.ts
@@ -6,8 +6,8 @@ import {
   expectToBeImportBindingDefinition,
   expectToBeModuleScope,
   getRealVariables,
-} from '../util';
-import { parseAndAnalyze } from '../util/parse';
+} from '../test-utils';
+import { parseAndAnalyze } from '../test-utils/parse';
 
 describe('gloablReturn option', () => {
   it('creates a function scope following the global scope immediately', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts b/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('implicit global reference', () => {
   it('assignments global scope', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/implied-strict.test.ts b/packages/scope-manager/tests/eslint-scope/implied-strict.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   expectToBeModuleScope,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('impliedStrict option', () => {
   it('ensures all user scopes are strict', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/label.test.ts b/packages/scope-manager/tests/eslint-scope/label.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('label', () => {
   it('should not create variables', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/references.test.ts b/packages/scope-manager/tests/eslint-scope/references.test.ts
@@ -1,4 +1,4 @@
-import { getRealVariables, parseAndAnalyze } from '../util';
+import { getRealVariables, parseAndAnalyze } from '../test-utils';
 
 describe('References:', () => {
   describe('When there is a `let` declaration on global,', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/typescript.test.ts b/packages/scope-manager/tests/eslint-scope/typescript.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('typescript', () => {
   describe('multiple call signatures', () => {

diff --git a/packages/scope-manager/tests/eslint-scope/with-scope.test.ts b/packages/scope-manager/tests/eslint-scope/with-scope.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeWithScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('with', () => {
   it('creates scope', () => {

diff --git a/packages/scope-manager/tests/fixtures.test.ts b/packages/scope-manager/tests/fixtures.test.ts
@@ -3,8 +3,8 @@ import glob = require('glob');
 import makeDir from 'make-dir';
 import path from 'path';
 
-import type { AnalyzeOptions } from './util';
-import { parseAndAnalyze } from './util';
+import type { AnalyzeOptions } from './test-utils';
+import { parseAndAnalyze } from './test-utils';
 
 // Assign a segment set to this variable to limit the test to only this segment
 // This is super helpful if you need to debug why a specific fixture isn't producing the correct output

diff --git a/packages/scope-manager/tests/lib.test.ts b/packages/scope-manager/tests/lib.test.ts
@@ -1,5 +1,5 @@
 import { ImplicitLibVariable } from '../src';
-import { parseAndAnalyze } from './util';
+import { parseAndAnalyze } from './test-utils';
 
 describe('implicit lib definitions', () => {
   it('should define no implicit variables if provided an empty array', () => {

diff --git a/packages/scope-manager/tests/util/expect.ts → .../scope-manager/tests/test-utils/expect.ts b/packages/scope-manager/tests/util/expect.ts → .../scope-manager/tests/test-utils/expect.ts
diff --git a/...ope-manager/tests/util/getSpecificNode.ts → ...nager/tests/test-utils/getSpecificNode.ts b/...ope-manager/tests/util/getSpecificNode.ts → ...nager/tests/test-utils/getSpecificNode.ts
diff --git a/packages/scope-manager/tests/util/index.ts → ...s/scope-manager/tests/test-utils/index.ts b/packages/scope-manager/tests/util/index.ts → ...s/scope-manager/tests/test-utils/index.ts
diff --git a/packages/scope-manager/tests/util/misc.ts → ...es/scope-manager/tests/test-utils/misc.ts b/packages/scope-manager/tests/util/misc.ts → ...es/scope-manager/tests/test-utils/misc.ts
diff --git a/packages/scope-manager/tests/util/parse.ts → ...s/scope-manager/tests/test-utils/parse.ts b/packages/scope-manager/tests/util/parse.ts → ...s/scope-manager/tests/test-utils/parse.ts
diff --git a/.../tests/util/serializers/DefinitionBase.ts → .../test-utils/serializers/DefinitionBase.ts b/.../tests/util/serializers/DefinitionBase.ts → .../test-utils/serializers/DefinitionBase.ts
diff --git a/...nager/tests/util/serializers/Reference.ts → ...tests/test-utils/serializers/Reference.ts b/...nager/tests/util/serializers/Reference.ts → ...tests/test-utils/serializers/Reference.ts
diff --git a/...nager/tests/util/serializers/ScopeBase.ts → ...tests/test-utils/serializers/ScopeBase.ts b/...nager/tests/util/serializers/ScopeBase.ts → ...tests/test-utils/serializers/ScopeBase.ts
diff --git a/...er/tests/util/serializers/ScopeManager.ts → ...ts/test-utils/serializers/ScopeManager.ts b/...er/tests/util/serializers/ScopeManager.ts → ...ts/test-utils/serializers/ScopeManager.ts
diff --git a/...er/tests/util/serializers/TSESTreeNode.ts → ...ts/test-utils/serializers/TSESTreeNode.ts b/...er/tests/util/serializers/TSESTreeNode.ts → ...ts/test-utils/serializers/TSESTreeNode.ts
diff --git a/...anager/tests/util/serializers/Variable.ts → .../tests/test-utils/serializers/Variable.ts b/...anager/tests/util/serializers/Variable.ts → .../tests/test-utils/serializers/Variable.ts
diff --git a/.../tests/util/serializers/baseSerializer.ts → .../test-utils/serializers/baseSerializer.ts b/.../tests/util/serializers/baseSerializer.ts → .../test-utils/serializers/baseSerializer.ts
diff --git a/...e-manager/tests/util/serializers/index.ts → ...ger/tests/test-utils/serializers/index.ts b/...e-manager/tests/util/serializers/index.ts → ...ger/tests/test-utils/serializers/index.ts
diff --git a/packages/scope-manager/tests/types/reference-type.test.ts b/packages/scope-manager/tests/types/reference-type.test.ts
@@ -1,6 +1,6 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 
-import { getSpecificNode, parseAndAnalyze } from '../util';
+import { getSpecificNode, parseAndAnalyze } from '../test-utils';
 
 describe('referencing a type - positive', () => {
   it('records a reference when a type is referenced from a type', () => {

diff --git a/packages/scope-manager/tests/types/variable-definition.test.ts b/packages/scope-manager/tests/types/variable-definition.test.ts
@@ -1,6 +1,6 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 
-import { getSpecificNode, parseAndAnalyze } from '../util';
+import { getSpecificNode, parseAndAnalyze } from '../test-utils';
 
 describe('variable definition', () => {
   it('defines a variable for a type declaration', () => {

diff --git a/packages/typescript-estree/tests/lib/semanticInfo.test.ts b/packages/typescript-estree/tests/lib/semanticInfo.test.ts
@@ -9,12 +9,12 @@ import type { ParseAndGenerateServicesResult } from '../../src/parser';
 import { parseAndGenerateServices } from '../../src/parser';
 import type { TSESTreeOptions } from '../../src/parser-options';
 import type { TSESTree } from '../../src/ts-estree';
+import { expectToHaveParserServices } from '../test-utils/expectToHaveParserServices';
 import {
   createSnapshotTestBlock,
   formatSnapshotName,
   parseCodeAndGenerateServices,
-} from '../../tools/test-utils';
-import { expectToHaveParserServices } from './test-utils/expectToHaveParserServices';
+} from '../test-utils/test-utils';
 
 const FIXTURES_DIR = './tests/fixtures/semanticInfo';
 const testFiles = glob.sync(`**/*.src.ts`, {

diff --git a/.../test-utils/expectToHaveParserServices.ts → .../test-utils/expectToHaveParserServices.ts b/.../test-utils/expectToHaveParserServices.ts → .../test-utils/expectToHaveParserServices.ts
@@ -1,7 +1,7 @@
 import type {
   ParserServices,
   ParserServicesWithTypeInformation,
-} from '../../../src';
+} from '../../src';
 
 export function expectToHaveParserServices(
   services: ParserServices | null | undefined,

diff --git a/...ges/typescript-estree/tools/test-utils.ts → ...ipt-estree/tests/test-utils/test-utils.ts b/...ges/typescript-estree/tools/test-utils.ts → ...ipt-estree/tests/test-utils/test-utils.ts
@@ -2,8 +2,8 @@ import type {
   ParseAndGenerateServicesResult,
   TSESTree,
   TSESTreeOptions,
-} from '../src';
-import { parse as parserParse, parseAndGenerateServices } from '../src';
+} from '../../src';
+import { parse as parserParse, parseAndGenerateServices } from '../../src';
 
 export function parseCodeAndGenerateServices(
   code: string,

diff --git a/...script-estree/tools/tserror-serializer.ts → ...ee/tests/test-utils/tserror-serializer.ts b/...script-estree/tools/tserror-serializer.ts → ...ee/tests/test-utils/tserror-serializer.ts
@@ -1,6 +1,6 @@
 import type { Plugin } from 'pretty-format';
 
-import { TSError } from '../src/node-utils';
+import { TSError } from '../../src/node-utils';
 
 export const serializer: Plugin = {
   test: (val: unknown): val is TSError => val instanceof TSError,