General Type Maintenance (#8462)

Author: JoshRosenstein

packages/babel-plugin-jest-hoist/src/index.ts

@@ -88,9 +88,10 @@ const IDVisitor = {
   blacklist: ['TypeAnnotation', 'TSTypeAnnotation', 'TSTypeReference'],
 };
 
-const FUNCTIONS: {
-  [key: string]: (args: Array<NodePath>) => boolean;
-} = Object.create(null);
+const FUNCTIONS: Record<
+  string,
+  (args: Array<NodePath>) => boolean
+> = Object.create(null);
 
 FUNCTIONS.mock = (args: Array<NodePath>) => {
   if (args.length === 1) {

packages/expect/src/asymmetricMatchers.ts

@@ -158,8 +158,8 @@ class ObjectContaining extends AsymmetricMatcher<Record<string, any>> {
       for (const property in this.sample) {
         if (
           hasProperty(other, property) &&
-          equals((this.sample as any)[property], other[property]) &&
-          !emptyObject((this.sample as any)[property]) &&
+          equals(this.sample[property], other[property]) &&
+          !emptyObject(this.sample[property]) &&
           !emptyObject(other[property])
         ) {
           return false;
@@ -171,7 +171,7 @@ class ObjectContaining extends AsymmetricMatcher<Record<string, any>> {
       for (const property in this.sample) {
         if (
           !hasProperty(other, property) ||
-          !equals((this.sample as any)[property], other[property])
+          !equals(this.sample[property], other[property])
         ) {
           return false;
         }

packages/expect/src/index.ts

@@ -299,7 +299,7 @@ const makeThrowingMatcher = (
 
     const handlError = (error: Error) => {
       if (
-        (matcher as any)[INTERNAL_MATCHER_FLAG] === true &&
+        matcher[INTERNAL_MATCHER_FLAG] === true &&
         !(error instanceof JestAssertionError) &&
         error.name !== 'PrettyFormatPluginError' &&
         // Guard for some environments (browsers) that do not support this feature.
@@ -314,10 +314,7 @@ const makeThrowingMatcher = (
     let potentialResult: ExpectationResult;
 
     try {
-      potentialResult = matcher.apply(
-        matcherContext,
-        ([actual] as any).concat(args),
-      );
+      potentialResult = matcher.call(matcherContext, actual, ...args);
 
       if (isPromise(potentialResult)) {
         const asyncResult = potentialResult as AsyncExpectationResult;
@@ -340,7 +337,7 @@ const makeThrowingMatcher = (
   };
 
 expect.extend = (matchers: MatchersObject): void =>
-  setMatchers(matchers, false, expect as any);
+  setMatchers(matchers, false, expect);
 
 expect.anything = anything;
 expect.any = any;

packages/expect/src/jasmineUtils.ts

@@ -208,7 +208,8 @@ function keys(
     return keys.concat(
       (Object.getOwnPropertySymbols(o) as Array<any>).filter(
         symbol =>
-          (Object.getOwnPropertyDescriptor(o, symbol) as any).enumerable,
+          (Object.getOwnPropertyDescriptor(o, symbol) as PropertyDescriptor)
+            .enumerable,
       ),
     );
   })(obj);

packages/expect/src/jestMatchersObject.ts

@@ -17,7 +17,7 @@ const JEST_MATCHERS_OBJECT = Symbol.for('$$jest-matchers-object');
 // Jest may override the stack trace of Errors thrown by internal matchers.
 export const INTERNAL_MATCHER_FLAG = Symbol.for('$$jest-internal-matcher');
 
-if (!(global as any)[JEST_MATCHERS_OBJECT]) {
+if (!global.hasOwnProperty(JEST_MATCHERS_OBJECT)) {
   Object.defineProperty(global, JEST_MATCHERS_OBJECT, {
     value: {
       matchers: Object.create(null),

packages/expect/src/types.ts

@@ -7,6 +7,7 @@
  */
 import {Config} from '@jest/types';
 import * as jestMatcherUtils from 'jest-matcher-utils';
+import {INTERNAL_MATCHER_FLAG} from './jestMatchersObject';
 
 export type SyncExpectationResult = {
   pass: boolean;
@@ -17,11 +18,10 @@ export type AsyncExpectationResult = Promise<SyncExpectationResult>;
 
 export type ExpectationResult = SyncExpectationResult | AsyncExpectationResult;
 
-export type RawMatcherFn = (
-  received: any,
-  expected: any,
-  options?: any,
-) => ExpectationResult;
+export type RawMatcherFn = {
+  (received: any, expected: any, options?: any): ExpectationResult;
+  [INTERNAL_MATCHER_FLAG]?: boolean;
+};
 
 export type ThrowingMatcherFn = (actual: any) => void;
 export type PromiseMatcherFn = (actual: any) => Promise<void>;

packages/expect/src/utils.ts

@@ -49,7 +49,7 @@ export const hasOwnProperty = (object: object, key: string) =>
   hasGetterFromConstructor(object, key);
 
 export const getPath = (
-  object: object,
+  object: Record<string, any>,
   propertyPath: string | Array<string>,
 ): GetPath => {
   if (!Array.isArray(propertyPath)) {
@@ -59,7 +59,7 @@ export const getPath = (
   if (propertyPath.length) {
     const lastProp = propertyPath.length === 1;
     const prop = propertyPath[0];
-    const newObject = (object as any)[prop];
+    const newObject = object[prop];
 
     if (!lastProp && (newObject === null || newObject === undefined)) {
       // This is not the last prop in the chain. If we keep recursing it will

packages/jest-circus/src/formatNodeAssertErrors.ts

@@ -20,14 +20,14 @@ interface AssertionErrorWithStack extends AssertionError {
   stack: string;
 }
 
-const assertOperatorsMap: {[key: string]: string} = {
+const assertOperatorsMap: Record<string, string> = {
   '!=': 'notEqual',
   '!==': 'notStrictEqual',
   '==': 'equal',
   '===': 'strictEqual',
 };
 
-const humanReadableOperators: {[key: string]: string} = {
+const humanReadableOperators: Record<string, string> = {
   deepEqual: 'to deeply equal',
   deepStrictEqual: 'to deeply and strictly equal',
   equal: 'to be equal',

packages/jest-cli/src/init/generate_config_file.ts

@@ -31,7 +31,7 @@ const stringifyOption = (
   );
 };
 
-const generateConfigFile = (results: {[key: string]: unknown}): string => {
+const generateConfigFile = (results: Record<string, unknown>): string => {
   const {coverage, clearMocks, environment} = results;
 
   const overrides: Record<string, any> = {};

packages/jest-cli/src/init/types.ts

@@ -9,5 +9,5 @@ import {Config} from '@jest/types';
 
 export type ProjectPackageJson = {
   jest?: Partial<Config.InitialOptions>;
-  scripts?: {[key: string]: string};
+  scripts?: Record<string, string>;
 };