chore(deps): lock file maintenance (#490)

Co-authored-by: WhiteSource Renovate <renovatebot@gmail.com> Co-authored-by: Gareth Jones <Jones258@Gmail.com>
jest-community · Jan 19, 2020 · 95cce6b · 95cce6b
1 parent 735f143
commit 95cce6b
Show file tree

Hide file tree

Showing 6 changed files with 1,024 additions and 926 deletions.
diff --git a/src/rules/no-focused-tests.ts b/src/rules/no-focused-tests.ts
@@ -17,7 +17,7 @@ const testFunctions = new Set<string>([
   ...validTestCaseNames,
 ]);
 
-interface ConcurrentExpression extends TSESTree.MemberExpression {
+interface ConcurrentExpression extends TSESTree.MemberExpressionComputedName {
   parent: TSESTree.MemberExpression;
 }
 

diff --git a/src/rules/prefer-to-be-null.ts b/src/rules/prefer-to-be-null.ts
@@ -13,11 +13,7 @@ import {
   parseExpectCall,
 } from './utils';
 
-interface NullLiteral extends TSESTree.Literal {
-  value: null;
-}
-
-const isNullLiteral = (node: TSESTree.Node): node is NullLiteral =>
+const isNullLiteral = (node: TSESTree.Node): node is TSESTree.NullLiteral =>
   node.type === AST_NODE_TYPES.Literal && node.value === null;
 
 /**
@@ -30,7 +26,7 @@ const isNullLiteral = (node: TSESTree.Node): node is NullLiteral =>
  */
 const isNullEqualityMatcher = (
   matcher: ParsedExpectMatcher,
-): matcher is ParsedEqualityMatcherCall<MaybeTypeCast<NullLiteral>> =>
+): matcher is ParsedEqualityMatcherCall<MaybeTypeCast<TSESTree.NullLiteral>> =>
   isParsedEqualityMatcherCall(matcher) &&
   isNullLiteral(followTypeAssertionChain(matcher.arguments[0]));
 

diff --git a/src/rules/prefer-to-contain.ts b/src/rules/prefer-to-contain.ts
@@ -20,15 +20,13 @@ import {
   parseExpectCall,
 } from './utils';
 
-interface BooleanLiteral extends TSESTree.Literal {
-  value: boolean;
-}
-
-const isBooleanLiteral = (node: TSESTree.Node): node is BooleanLiteral =>
+const isBooleanLiteral = (
+  node: TSESTree.Node,
+): node is TSESTree.BooleanLiteral =>
   node.type === AST_NODE_TYPES.Literal && typeof node.value === 'boolean';
 
 type ParsedBooleanEqualityMatcherCall = ParsedEqualityMatcherCall<
-  MaybeTypeCast<BooleanLiteral>
+  MaybeTypeCast<TSESTree.BooleanLiteral>
 >;
 
 /**

diff --git a/src/rules/utils.ts b/src/rules/utils.ts
@@ -53,7 +53,7 @@ export const followTypeAssertionChain = <
  * A `Literal` with a `value` of type `string`.
  */
 interface StringLiteral<Value extends string = string>
-  extends TSESTree.Literal {
+  extends TSESTree.StringLiteral {
   value: Value;
 }
 
@@ -145,7 +145,7 @@ export const getStringValue = <S extends string>(node: StringNode<S>): S =>
  * Represents a `MemberExpression` with a "known" `property`.
  */
 interface KnownMemberExpression<Name extends string = string>
-  extends TSESTree.MemberExpression {
+  extends TSESTree.MemberExpressionComputedName {
   property: AccessorNode<Name>;
 }
 

diff --git a/src/rules/valid-title.ts b/src/rules/valid-title.ts
@@ -4,6 +4,7 @@ import {
 } from '@typescript-eslint/experimental-utils';
 import {
   DescribeAlias,
+  StringNode,
   TestCaseName,
   createRule,
   getJestFunctionArguments,
@@ -31,6 +32,11 @@ const doesBinaryExpressionContainStringNode = (
   return isStringNode(binaryExp.left);
 };
 
+const quoteStringValue = (node: StringNode): string =>
+  node.type === AST_NODE_TYPES.TemplateLiteral
+    ? `\`${node.quasis[0].value.raw}\``
+    : node.raw;
+
 export default createRule({
   name: __filename,
   meta: {
@@ -111,21 +117,14 @@ export default createRule({
           context.report({
             messageId: 'accidentalSpace',
             node: argument,
-            fix(fixer) {
-              const stringValue =
-                argument.type === AST_NODE_TYPES.TemplateLiteral
-                  ? `\`${argument.quasis[0].value.raw}\``
-                  : argument.raw;
-
-              return [
-                fixer.replaceTextRange(
-                  argument.range,
-                  stringValue
-                    .replace(/^([`'"]) +?/u, '$1')
-                    .replace(/ +?([`'"])$/u, '$1'),
-                ),
-              ];
-            },
+            fix: fixer => [
+              fixer.replaceTextRange(
+                argument.range,
+                quoteStringValue(argument)
+                  .replace(/^([`'"]) +?/u, '$1')
+                  .replace(/ +?([`'"])$/u, '$1'),
+              ),
+            ],
           });
         }
 
@@ -136,19 +135,12 @@ export default createRule({
           context.report({
             messageId: 'duplicatePrefix',
             node: argument,
-            fix(fixer) {
-              const stringValue =
-                argument.type === AST_NODE_TYPES.TemplateLiteral
-                  ? `\`${argument.quasis[0].value.raw}\``
-                  : argument.raw;
-
-              return [
-                fixer.replaceTextRange(
-                  argument.range,
-                  stringValue.replace(/^([`'"]).+? /u, '$1'),
-                ),
-              ];
-            },
+            fix: fixer => [
+              fixer.replaceTextRange(
+                argument.range,
+                quoteStringValue(argument).replace(/^([`'"]).+? /u, '$1'),
+              ),
+            ],
           });
         }
       },