Migrate expect to typescript

packages/expect/src/index.ts

@@ -405,6 +405,6 @@ expect.assertions = assertions;
 expect.hasAssertions = hasAssertions;
 expect.getState = getState;
 expect.setState = setState;
-(expect as any).extractExpectedAssertionsErrors = extractExpectedAssertionsErrors;
+expect.extractExpectedAssertionsErrors = extractExpectedAssertionsErrors;
 
 export = expect as Expect;

packages/expect/src/jestMatchersObject.ts

@@ -53,16 +53,16 @@ export const setMatchers = (
     if (!isInternal) {
       // expect is defined
 
-      class CustomMatcher extends AsymmetricMatcher<Array<unknown>> {
-        constructor(inverse: boolean = false, ...sample: Array<unknown>) {
+      class CustomMatcher extends AsymmetricMatcher<[unknown, unknown]> {
+        constructor(inverse: boolean = false, ...sample: [unknown, unknown]) {
           super(sample);
           this.inverse = inverse;
         }
 
         asymmetricMatch(other: unknown) {
           const {pass} = matcher(
             other,
-            ...(this.sample as [unknown, unknown]),
+            ...this.sample,
           ) as SyncExpectationResult;
 
           return this.inverse ? !pass : pass;
@@ -81,12 +81,12 @@ export const setMatchers = (
         }
       }
 
-      expect[key] = (...sample: Array<unknown>) =>
+      expect[key] = (...sample: [unknown, unknown]) =>
         new CustomMatcher(false, ...sample);
       if (!expect.not) {
         expect.not = {};
       }
-      expect.not[key] = (...sample: Array<unknown>) =>
+      expect.not[key] = (...sample: [unknown, unknown]) =>
         new CustomMatcher(true, ...sample);
     }
   });

packages/expect/src/matchers.ts

@@ -566,7 +566,7 @@ const matchers: MatchersObject = {
   toHaveProperty(
     this: MatcherState,
     object: object,
-    keyPath: string | Array<any>,
+    keyPath: string | Array<string>,
     value?: unknown,
   ) {
     const valuePassed = arguments.length === 3;
@@ -655,11 +655,7 @@ const matchers: MatchersObject = {
     return {message, pass};
   },
 
-  toMatch(
-    this: MatcherState,
-    received: string,
-    expected: string | RegExp | any,
-  ) {
+  toMatch(this: MatcherState, received: string, expected: string | RegExp) {
     if (typeof received !== 'string') {
       throw new Error(
         matcherErrorMessage(
@@ -673,8 +669,8 @@ const matchers: MatchersObject = {
     }
 
     if (
-      !(expected && typeof expected.test === 'function') &&
-      !(typeof expected === 'string')
+      !(typeof expected === 'string') &&
+      !(expected && typeof expected.test === 'function')
     ) {
       throw new Error(
         matcherErrorMessage(

packages/expect/src/types.ts

@@ -6,6 +6,7 @@
  *
  */
 import {Config} from '@jest/types';
+import * as jestMatcherUtils from 'jest-matcher-utils';
 
 export type SyncExpectationResult = {
   pass: boolean;
@@ -45,11 +46,7 @@ export type MatcherState = {
   promise: string;
   suppressedErrors: Array<Error>;
   testPath?: Config.Path;
-  // This is output from `jest-matcher-utils` plus iterableEquality, subsetEquality
-  // Type it correctly when moving it to `expect`
-  utils: {
-    printExpected: (value: unknown) => string;
-    printReceived: (value: unknown) => string;
+  utils: typeof jestMatcherUtils & {
     iterableEquality: Tester;
     subsetEquality: Tester;
   };

packages/jest-snapshot/src/index.ts

@@ -20,6 +20,7 @@ import SnapshotState from './State';
 import {addSerializer, getSerializers} from './plugins';
 import * as utils from './utils';
 
+// TODO: use MatcherState directly from `expect` once whole project is migrated
 type Context = Matchers.MatcherState & {
   snapshotState: SnapshotState;
 };

packages/jest-types/src/Matchers.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// TODO: Move this to `expect` when it's migrated
+// TODO: Remove this when whole project is migrated
 
 import {Path} from './Config';