From 78ac3cce382565baa589e3269454ce4ba26b75f8 Mon Sep 17 00:00:00 2001
From: Gareth Jones <Jones258@Gmail.com>
Date: Fri, 16 Aug 2019 17:01:19 +1200
Subject: [PATCH] chore(tsutils): rename to `utils` (#398)

---
 src/index.ts                               | 2 +-
 src/rules/__tests__/lowercase-name.test.ts | 2 +-
 src/rules/__tests__/no-hooks.test.ts       | 2 +-
 src/rules/consistent-test-it.ts            | 2 +-
 src/rules/expect-expect.ts                 | 2 +-
 src/rules/lowercase-name.ts                | 2 +-
 src/rules/no-alias-methods.ts              | 2 +-
 src/rules/no-commented-out-tests.ts        | 2 +-
 src/rules/no-disabled-tests.ts             | 2 +-
 src/rules/no-duplicate-hooks.ts            | 2 +-
 src/rules/no-empty-title.ts                | 2 +-
 src/rules/no-expect-resolves.ts            | 2 +-
 src/rules/no-export.ts                     | 2 +-
 src/rules/no-focused-tests.ts              | 2 +-
 src/rules/no-hooks.ts                      | 2 +-
 src/rules/no-identical-title.ts            | 2 +-
 src/rules/no-if.ts                         | 2 +-
 src/rules/no-jasmine-globals.ts            | 2 +-
 src/rules/no-jest-import.ts                | 2 +-
 src/rules/no-large-snapshots.ts            | 2 +-
 src/rules/no-mocks-import.ts               | 2 +-
 src/rules/no-standalone-expect.ts          | 2 +-
 src/rules/no-test-callback.ts              | 2 +-
 src/rules/no-test-prefixes.ts              | 2 +-
 src/rules/no-test-return-statement.ts      | 2 +-
 src/rules/no-truthy-falsy.ts               | 2 +-
 src/rules/no-try-expect.ts                 | 2 +-
 src/rules/prefer-called-with.ts            | 2 +-
 src/rules/prefer-expect-assertions.ts      | 2 +-
 src/rules/prefer-inline-snapshots.ts       | 2 +-
 src/rules/prefer-spy-on.ts                 | 2 +-
 src/rules/prefer-strict-equal.ts           | 2 +-
 src/rules/prefer-to-be-null.ts             | 2 +-
 src/rules/prefer-to-be-undefined.ts        | 2 +-
 src/rules/prefer-to-contain.ts             | 2 +-
 src/rules/prefer-to-have-length.ts         | 2 +-
 src/rules/prefer-todo.ts                   | 2 +-
 src/rules/require-tothrow-message.ts       | 2 +-
 src/rules/util.js                          | 2 --
 src/rules/{tsUtils.ts => utils.ts}         | 0
 src/rules/valid-describe.ts                | 2 +-
 src/rules/valid-expect-in-promise.ts       | 2 +-
 src/rules/valid-expect.ts                  | 2 +-
 43 files changed, 41 insertions(+), 43 deletions(-)
 delete mode 100644 src/rules/util.js
 rename src/rules/{tsUtils.ts => utils.ts} (100%)

diff --git a/src/index.ts b/src/index.ts
index 6965c42e6..b58109fce 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -13,7 +13,7 @@ const importDefault = (moduleName: string) =>
   interopRequireDefault(require(moduleName)).default;
 
 const rulesDir = join(__dirname, 'rules');
-const excludedFiles = ['__tests__', 'util', 'tsUtils'];
+const excludedFiles = ['__tests__', 'utils'];
 
 const rules = readdirSync(rulesDir)
   .map(rule => parse(rule).name)
diff --git a/src/rules/__tests__/lowercase-name.test.ts b/src/rules/__tests__/lowercase-name.test.ts
index 68d3d8eb9..bbf68cb14 100644
--- a/src/rules/__tests__/lowercase-name.test.ts
+++ b/src/rules/__tests__/lowercase-name.test.ts
@@ -1,6 +1,6 @@
 import { TSESLint } from '@typescript-eslint/experimental-utils';
 import rule from '../lowercase-name';
-import { DescribeAlias, TestCaseName } from '../tsUtils';
+import { DescribeAlias, TestCaseName } from '../utils';
 
 const ruleTester = new TSESLint.RuleTester({
   parserOptions: {
diff --git a/src/rules/__tests__/no-hooks.test.ts b/src/rules/__tests__/no-hooks.test.ts
index c12156197..0b8de3ded 100644
--- a/src/rules/__tests__/no-hooks.test.ts
+++ b/src/rules/__tests__/no-hooks.test.ts
@@ -1,6 +1,6 @@
 import { TSESLint } from '@typescript-eslint/experimental-utils';
 import rule from '../no-hooks';
-import { HookName } from '../tsUtils';
+import { HookName } from '../utils';
 
 const ruleTester = new TSESLint.RuleTester({
   parserOptions: {
diff --git a/src/rules/consistent-test-it.ts b/src/rules/consistent-test-it.ts
index 9c02bd5ce..9dc45d71e 100644
--- a/src/rules/consistent-test-it.ts
+++ b/src/rules/consistent-test-it.ts
@@ -1,5 +1,5 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
-import { createRule, getNodeName, isDescribe, isTestCase } from './tsUtils';
+import { createRule, getNodeName, isDescribe, isTestCase } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/expect-expect.ts b/src/rules/expect-expect.ts
index 36468000f..784c67642 100644
--- a/src/rules/expect-expect.ts
+++ b/src/rules/expect-expect.ts
@@ -7,7 +7,7 @@ import {
   AST_NODE_TYPES,
   TSESTree,
 } from '@typescript-eslint/experimental-utils';
-import { createRule, getNodeName } from './tsUtils';
+import { createRule, getNodeName } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/lowercase-name.ts b/src/rules/lowercase-name.ts
index 718360aaa..37c113b72 100644
--- a/src/rules/lowercase-name.ts
+++ b/src/rules/lowercase-name.ts
@@ -11,7 +11,7 @@ import {
   createRule,
   isDescribe,
   isTestCase,
-} from './tsUtils';
+} from './utils';
 
 type ArgumentLiteral = TSESTree.Literal | TSESTree.TemplateLiteral;
 
diff --git a/src/rules/no-alias-methods.ts b/src/rules/no-alias-methods.ts
index 158254b6e..64ef512e7 100644
--- a/src/rules/no-alias-methods.ts
+++ b/src/rules/no-alias-methods.ts
@@ -1,4 +1,4 @@
-import { createRule, isExpectCall, parseExpectCall } from './tsUtils';
+import { createRule, isExpectCall, parseExpectCall } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/no-commented-out-tests.ts b/src/rules/no-commented-out-tests.ts
index 69c3a34cc..5d093ff5d 100644
--- a/src/rules/no-commented-out-tests.ts
+++ b/src/rules/no-commented-out-tests.ts
@@ -1,5 +1,5 @@
 import { TSESTree } from '@typescript-eslint/experimental-utils';
-import { createRule } from './tsUtils';
+import { createRule } from './utils';
 
 function hasTests(node: TSESTree.Comment) {
   return /^\s*(x|f)?(test|it|describe)(\.\w+|\[['"]\w+['"]\])?\s*\(/m.test(
diff --git a/src/rules/no-disabled-tests.ts b/src/rules/no-disabled-tests.ts
index d6b2f4576..68fac8e1c 100644
--- a/src/rules/no-disabled-tests.ts
+++ b/src/rules/no-disabled-tests.ts
@@ -1,4 +1,4 @@
-import { createRule, getNodeName, scopeHasLocalReference } from './tsUtils';
+import { createRule, getNodeName, scopeHasLocalReference } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/no-duplicate-hooks.ts b/src/rules/no-duplicate-hooks.ts
index dbfe24afd..10a688170 100644
--- a/src/rules/no-duplicate-hooks.ts
+++ b/src/rules/no-duplicate-hooks.ts
@@ -1,4 +1,4 @@
-import { createRule, isDescribe, isHook } from './tsUtils';
+import { createRule, isDescribe, isHook } from './utils';
 
 const newHookContext = () => ({
   beforeAll: 0,
diff --git a/src/rules/no-empty-title.ts b/src/rules/no-empty-title.ts
index e18ab07a2..42f693fe7 100644
--- a/src/rules/no-empty-title.ts
+++ b/src/rules/no-empty-title.ts
@@ -1,4 +1,4 @@
-import { createRule, isDescribe, isStringNode, isTestCase } from './tsUtils';
+import { createRule, isDescribe, isStringNode, isTestCase } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/no-expect-resolves.ts b/src/rules/no-expect-resolves.ts
index 586ca26c2..b701f8fae 100644
--- a/src/rules/no-expect-resolves.ts
+++ b/src/rules/no-expect-resolves.ts
@@ -2,7 +2,7 @@ import {
   AST_NODE_TYPES,
   TSESTree,
 } from '@typescript-eslint/experimental-utils';
-import { createRule, isExpectCall } from './tsUtils';
+import { createRule, isExpectCall } from './utils';
 
 function isIdentifierResolves(node: TSESTree.MemberExpression) {
   return (
diff --git a/src/rules/no-export.ts b/src/rules/no-export.ts
index 9925fd7c7..d50c3eed1 100644
--- a/src/rules/no-export.ts
+++ b/src/rules/no-export.ts
@@ -2,7 +2,7 @@ import {
   AST_NODE_TYPES,
   TSESTree,
 } from '@typescript-eslint/experimental-utils';
-import { createRule, isTestCase } from './tsUtils';
+import { createRule, isTestCase } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/no-focused-tests.ts b/src/rules/no-focused-tests.ts
index 0880c5a22..df826987b 100644
--- a/src/rules/no-focused-tests.ts
+++ b/src/rules/no-focused-tests.ts
@@ -2,7 +2,7 @@ import {
   AST_NODE_TYPES,
   TSESTree,
 } from '@typescript-eslint/experimental-utils';
-import { DescribeAlias, TestCaseName, createRule } from './tsUtils';
+import { DescribeAlias, TestCaseName, createRule } from './utils';
 
 const testFunctions = new Set(['describe', 'it', 'test']);
 
diff --git a/src/rules/no-hooks.ts b/src/rules/no-hooks.ts
index 7f9e330b4..9c5c12038 100644
--- a/src/rules/no-hooks.ts
+++ b/src/rules/no-hooks.ts
@@ -1,4 +1,4 @@
-import { HookName, createRule, isHook } from './tsUtils';
+import { HookName, createRule, isHook } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/no-identical-title.ts b/src/rules/no-identical-title.ts
index abd07d9f0..e1453dc76 100644
--- a/src/rules/no-identical-title.ts
+++ b/src/rules/no-identical-title.ts
@@ -5,7 +5,7 @@ import {
   isStringNode,
   isTemplateLiteral,
   isTestCase,
-} from './tsUtils';
+} from './utils';
 
 interface DescribeContext {
   describeTitles: string[];
diff --git a/src/rules/no-if.ts b/src/rules/no-if.ts
index e448a882c..ce8ccc145 100644
--- a/src/rules/no-if.ts
+++ b/src/rules/no-if.ts
@@ -1,4 +1,4 @@
-import { TestCaseName, createRule, getNodeName, isTestCase } from './tsUtils';
+import { TestCaseName, createRule, getNodeName, isTestCase } from './utils';
 import {
   AST_NODE_TYPES,
   TSESTree,
diff --git a/src/rules/no-jasmine-globals.ts b/src/rules/no-jasmine-globals.ts
index 5cc6a191d..298ea8bf6 100644
--- a/src/rules/no-jasmine-globals.ts
+++ b/src/rules/no-jasmine-globals.ts
@@ -1,5 +1,5 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
-import { createRule, getNodeName, scopeHasLocalReference } from './tsUtils';
+import { createRule, getNodeName, scopeHasLocalReference } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/no-jest-import.ts b/src/rules/no-jest-import.ts
index 20a50f7e5..3399f328f 100644
--- a/src/rules/no-jest-import.ts
+++ b/src/rules/no-jest-import.ts
@@ -1,5 +1,5 @@
 import { TSESTree } from '@typescript-eslint/experimental-utils';
-import { createRule } from './tsUtils';
+import { createRule } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/no-large-snapshots.ts b/src/rules/no-large-snapshots.ts
index e853aaffb..58d568655 100644
--- a/src/rules/no-large-snapshots.ts
+++ b/src/rules/no-large-snapshots.ts
@@ -9,7 +9,7 @@ import {
   getAccessorValue,
   isExpectMember,
   isSupportedAccessor,
-} from './tsUtils';
+} from './utils';
 
 interface RuleOptions {
   maxSize?: number;
diff --git a/src/rules/no-mocks-import.ts b/src/rules/no-mocks-import.ts
index c2f7b3af0..d232f28b3 100644
--- a/src/rules/no-mocks-import.ts
+++ b/src/rules/no-mocks-import.ts
@@ -1,6 +1,6 @@
 import { TSESTree } from '@typescript-eslint/experimental-utils';
 import { posix } from 'path';
-import { createRule, getStringValue, isStringNode } from './tsUtils';
+import { createRule, getStringValue, isStringNode } from './utils';
 
 const mocksDirName = '__mocks__';
 
diff --git a/src/rules/no-standalone-expect.ts b/src/rules/no-standalone-expect.ts
index d753e5562..ef8dae9c2 100644
--- a/src/rules/no-standalone-expect.ts
+++ b/src/rules/no-standalone-expect.ts
@@ -9,7 +9,7 @@ import {
   isExpectCall,
   isFunction,
   isTestCase,
-} from './tsUtils';
+} from './utils';
 
 const getBlockType = (
   stmt: TSESTree.BlockStatement,
diff --git a/src/rules/no-test-callback.ts b/src/rules/no-test-callback.ts
index 362ebd6ac..9625ba1b9 100644
--- a/src/rules/no-test-callback.ts
+++ b/src/rules/no-test-callback.ts
@@ -1,4 +1,4 @@
-import { createRule, isFunction, isTestCase } from './tsUtils';
+import { createRule, isFunction, isTestCase } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/no-test-prefixes.ts b/src/rules/no-test-prefixes.ts
index 7da5bfea6..b74cd2925 100644
--- a/src/rules/no-test-prefixes.ts
+++ b/src/rules/no-test-prefixes.ts
@@ -1,4 +1,4 @@
-import { createRule, getNodeName, isDescribe, isTestCase } from './tsUtils';
+import { createRule, getNodeName, isDescribe, isTestCase } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/no-test-return-statement.ts b/src/rules/no-test-return-statement.ts
index 708557114..0548f3085 100644
--- a/src/rules/no-test-return-statement.ts
+++ b/src/rules/no-test-return-statement.ts
@@ -1,4 +1,4 @@
-import { createRule, isFunction, isTestCase } from './tsUtils';
+import { createRule, isFunction, isTestCase } from './utils';
 import { TSESTree } from '@typescript-eslint/experimental-utils';
 
 const RETURN_STATEMENT = 'ReturnStatement';
diff --git a/src/rules/no-truthy-falsy.ts b/src/rules/no-truthy-falsy.ts
index 53e32cd23..62fdf8649 100644
--- a/src/rules/no-truthy-falsy.ts
+++ b/src/rules/no-truthy-falsy.ts
@@ -1,4 +1,4 @@
-import { createRule, isExpectCall, parseExpectCall } from './tsUtils';
+import { createRule, isExpectCall, parseExpectCall } from './utils';
 
 // todo: refactor into "ban-matchers"
 export default createRule({
diff --git a/src/rules/no-try-expect.ts b/src/rules/no-try-expect.ts
index 97a0c0f92..efe85d328 100644
--- a/src/rules/no-try-expect.ts
+++ b/src/rules/no-try-expect.ts
@@ -1,5 +1,5 @@
 import { TSESTree } from '@typescript-eslint/experimental-utils';
-import { createRule, isExpectCall, isTestCase } from './tsUtils';
+import { createRule, isExpectCall, isTestCase } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/prefer-called-with.ts b/src/rules/prefer-called-with.ts
index 57324f38a..f907cba40 100644
--- a/src/rules/prefer-called-with.ts
+++ b/src/rules/prefer-called-with.ts
@@ -1,4 +1,4 @@
-import { createRule, isExpectCall, parseExpectCall } from './tsUtils';
+import { createRule, isExpectCall, parseExpectCall } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/prefer-expect-assertions.ts b/src/rules/prefer-expect-assertions.ts
index f6184032e..dec94b67f 100644
--- a/src/rules/prefer-expect-assertions.ts
+++ b/src/rules/prefer-expect-assertions.ts
@@ -2,7 +2,7 @@ import {
   AST_NODE_TYPES,
   TSESTree,
 } from '@typescript-eslint/experimental-utils';
-import { createRule, getAccessorValue, isSupportedAccessor } from './tsUtils';
+import { createRule, getAccessorValue, isSupportedAccessor } from './utils';
 
 const isExpectAssertionsOrHasAssertionsCall = (expression: TSESTree.Node) => {
   if (
diff --git a/src/rules/prefer-inline-snapshots.ts b/src/rules/prefer-inline-snapshots.ts
index 2edc82285..e00d3e81a 100644
--- a/src/rules/prefer-inline-snapshots.ts
+++ b/src/rules/prefer-inline-snapshots.ts
@@ -1,5 +1,5 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
-import { createRule } from './tsUtils';
+import { createRule } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/prefer-spy-on.ts b/src/rules/prefer-spy-on.ts
index 247704fce..085694217 100644
--- a/src/rules/prefer-spy-on.ts
+++ b/src/rules/prefer-spy-on.ts
@@ -2,7 +2,7 @@ import {
   AST_NODE_TYPES,
   TSESTree,
 } from '@typescript-eslint/experimental-utils';
-import { createRule, getNodeName } from './tsUtils';
+import { createRule, getNodeName } from './utils';
 
 const findNodeObject = (
   node: TSESTree.CallExpression | TSESTree.MemberExpression,
diff --git a/src/rules/prefer-strict-equal.ts b/src/rules/prefer-strict-equal.ts
index 671650c14..616ea6668 100644
--- a/src/rules/prefer-strict-equal.ts
+++ b/src/rules/prefer-strict-equal.ts
@@ -1,4 +1,4 @@
-import { createRule, isExpectCall, parseExpectCall } from './tsUtils';
+import { createRule, isExpectCall, parseExpectCall } from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/prefer-to-be-null.ts b/src/rules/prefer-to-be-null.ts
index b78ee4b5a..4d2d67f5a 100644
--- a/src/rules/prefer-to-be-null.ts
+++ b/src/rules/prefer-to-be-null.ts
@@ -9,7 +9,7 @@ import {
   isExpectCall,
   isParsedEqualityMatcherCall,
   parseExpectCall,
-} from './tsUtils';
+} from './utils';
 
 interface NullLiteral extends TSESTree.Literal {
   value: null;
diff --git a/src/rules/prefer-to-be-undefined.ts b/src/rules/prefer-to-be-undefined.ts
index d4c196a81..fc31c4647 100644
--- a/src/rules/prefer-to-be-undefined.ts
+++ b/src/rules/prefer-to-be-undefined.ts
@@ -9,7 +9,7 @@ import {
   isExpectCall,
   isParsedEqualityMatcherCall,
   parseExpectCall,
-} from './tsUtils';
+} from './utils';
 
 interface UndefinedIdentifier extends TSESTree.Identifier {
   name: 'undefined';
diff --git a/src/rules/prefer-to-contain.ts b/src/rules/prefer-to-contain.ts
index 9182911aa..4ae5a370b 100644
--- a/src/rules/prefer-to-contain.ts
+++ b/src/rules/prefer-to-contain.ts
@@ -16,7 +16,7 @@ import {
   isParsedEqualityMatcherCall,
   isSupportedAccessor,
   parseExpectCall,
-} from './tsUtils';
+} from './utils';
 
 interface BooleanLiteral extends TSESTree.Literal {
   value: boolean;
diff --git a/src/rules/prefer-to-have-length.ts b/src/rules/prefer-to-have-length.ts
index 4ff4d38f0..f0bd52939 100644
--- a/src/rules/prefer-to-have-length.ts
+++ b/src/rules/prefer-to-have-length.ts
@@ -5,7 +5,7 @@ import {
   isParsedEqualityMatcherCall,
   isSupportedAccessor,
   parseExpectCall,
-} from './tsUtils';
+} from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/prefer-todo.ts b/src/rules/prefer-todo.ts
index 02a377aeb..65b62ef71 100644
--- a/src/rules/prefer-todo.ts
+++ b/src/rules/prefer-todo.ts
@@ -13,7 +13,7 @@ import {
   isFunction,
   isStringNode,
   isTestCase,
-} from './tsUtils';
+} from './utils';
 
 function isFunctionBodyEmpty(node: FunctionExpression) {
   /* istanbul ignore if https://github.com/typescript-eslint/typescript-eslint/issues/734 */
diff --git a/src/rules/require-tothrow-message.ts b/src/rules/require-tothrow-message.ts
index 6f3644dd9..13282e4fc 100644
--- a/src/rules/require-tothrow-message.ts
+++ b/src/rules/require-tothrow-message.ts
@@ -3,7 +3,7 @@ import {
   createRule,
   isExpectCall,
   parseExpectCall,
-} from './tsUtils';
+} from './utils';
 
 export default createRule({
   name: __filename,
diff --git a/src/rules/util.js b/src/rules/util.js
deleted file mode 100644
index 20540da90..000000000
--- a/src/rules/util.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const argument = node =>
-  node.parent.parent.arguments && node.parent.parent.arguments[0];
diff --git a/src/rules/tsUtils.ts b/src/rules/utils.ts
similarity index 100%
rename from src/rules/tsUtils.ts
rename to src/rules/utils.ts
diff --git a/src/rules/valid-describe.ts b/src/rules/valid-describe.ts
index 6dc94a785..478826772 100644
--- a/src/rules/valid-describe.ts
+++ b/src/rules/valid-describe.ts
@@ -8,7 +8,7 @@ import {
   isFunction,
   isStringNode,
   isSupportedAccessor,
-} from './tsUtils';
+} from './utils';
 
 const paramsLocation = (
   params: TSESTree.Expression[] | TSESTree.Parameter[],
diff --git a/src/rules/valid-expect-in-promise.ts b/src/rules/valid-expect-in-promise.ts
index 73f7d017b..55a827404 100644
--- a/src/rules/valid-expect-in-promise.ts
+++ b/src/rules/valid-expect-in-promise.ts
@@ -13,7 +13,7 @@ import {
   isExpectMember,
   isFunction,
   isSupportedAccessor,
-} from './tsUtils';
+} from './utils';
 
 type MessageIds = 'returnPromise';
 type RuleContext = TSESLint.RuleContext<MessageIds, unknown[]>;
diff --git a/src/rules/valid-expect.ts b/src/rules/valid-expect.ts
index d602aaa89..b1bde0ab1 100644
--- a/src/rules/valid-expect.ts
+++ b/src/rules/valid-expect.ts
@@ -15,7 +15,7 @@ import {
   isExpectMember,
   isSupportedAccessor,
   parseExpectCall,
-} from './tsUtils';
+} from './utils';
 
 /**
  * Async assertions might be called in Promise