Skip to content

Commit

Permalink
chore(tsutils): rename to utils (#398)
Browse files Browse the repository at this point in the history
  • Loading branch information
G-Rath committed Aug 16, 2019
1 parent 26756b6 commit 78ac3cc
Show file tree
Hide file tree
Showing 43 changed files with 41 additions and 43 deletions.
2 changes: 1 addition & 1 deletion src/index.ts
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion 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: {
Expand Down
2 changes: 1 addition & 1 deletion 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: {
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/expect-expect.ts
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/lowercase-name.ts
Expand Up @@ -11,7 +11,7 @@ import {
createRule,
isDescribe,
isTestCase,
} from './tsUtils';
} from './utils';

type ArgumentLiteral = TSESTree.Literal | TSESTree.TemplateLiteral;

Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion 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(
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/no-expect-resolves.ts
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion src/rules/no-export.ts
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/no-focused-tests.ts
Expand Up @@ -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']);

Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/no-identical-title.ts
Expand Up @@ -5,7 +5,7 @@ import {
isStringNode,
isTemplateLiteral,
isTestCase,
} from './tsUtils';
} from './utils';

interface DescribeContext {
describeTitles: string[];
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/no-large-snapshots.ts
Expand Up @@ -9,7 +9,7 @@ import {
getAccessorValue,
isExpectMember,
isSupportedAccessor,
} from './tsUtils';
} from './utils';

interface RuleOptions {
maxSize?: number;
Expand Down
2 changes: 1 addition & 1 deletion 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__';

Expand Down
2 changes: 1 addition & 1 deletion src/rules/no-standalone-expect.ts
Expand Up @@ -9,7 +9,7 @@ import {
isExpectCall,
isFunction,
isTestCase,
} from './tsUtils';
} from './utils';

const getBlockType = (
stmt: TSESTree.BlockStatement,
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion 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';
Expand Down
2 changes: 1 addition & 1 deletion 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({
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/prefer-expect-assertions.ts
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/prefer-spy-on.ts
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion 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,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/prefer-to-be-null.ts
Expand Up @@ -9,7 +9,7 @@ import {
isExpectCall,
isParsedEqualityMatcherCall,
parseExpectCall,
} from './tsUtils';
} from './utils';

interface NullLiteral extends TSESTree.Literal {
value: null;
Expand Down
2 changes: 1 addition & 1 deletion src/rules/prefer-to-be-undefined.ts
Expand Up @@ -9,7 +9,7 @@ import {
isExpectCall,
isParsedEqualityMatcherCall,
parseExpectCall,
} from './tsUtils';
} from './utils';

interface UndefinedIdentifier extends TSESTree.Identifier {
name: 'undefined';
Expand Down
2 changes: 1 addition & 1 deletion src/rules/prefer-to-contain.ts
Expand Up @@ -16,7 +16,7 @@ import {
isParsedEqualityMatcherCall,
isSupportedAccessor,
parseExpectCall,
} from './tsUtils';
} from './utils';

interface BooleanLiteral extends TSESTree.Literal {
value: boolean;
Expand Down
2 changes: 1 addition & 1 deletion src/rules/prefer-to-have-length.ts
Expand Up @@ -5,7 +5,7 @@ import {
isParsedEqualityMatcherCall,
isSupportedAccessor,
parseExpectCall,
} from './tsUtils';
} from './utils';

export default createRule({
name: __filename,
Expand Down
2 changes: 1 addition & 1 deletion src/rules/prefer-todo.ts
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion src/rules/require-tothrow-message.ts
Expand Up @@ -3,7 +3,7 @@ import {
createRule,
isExpectCall,
parseExpectCall,
} from './tsUtils';
} from './utils';

export default createRule({
name: __filename,
Expand Down
2 changes: 0 additions & 2 deletions src/rules/util.js

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion src/rules/valid-describe.ts
Expand Up @@ -8,7 +8,7 @@ import {
isFunction,
isStringNode,
isSupportedAccessor,
} from './tsUtils';
} from './utils';

const paramsLocation = (
params: TSESTree.Expression[] | TSESTree.Parameter[],
Expand Down
2 changes: 1 addition & 1 deletion src/rules/valid-expect-in-promise.ts
Expand Up @@ -13,7 +13,7 @@ import {
isExpectMember,
isFunction,
isSupportedAccessor,
} from './tsUtils';
} from './utils';

type MessageIds = 'returnPromise';
type RuleContext = TSESLint.RuleContext<MessageIds, unknown[]>;
Expand Down
2 changes: 1 addition & 1 deletion src/rules/valid-expect.ts
Expand Up @@ -15,7 +15,7 @@ import {
isExpectMember,
isSupportedAccessor,
parseExpectCall,
} from './tsUtils';
} from './utils';

/**
* Async assertions might be called in Promise
Expand Down

0 comments on commit 78ac3cc

Please sign in to comment.