feat(jest): migrate Jest matchers to @jest/globals types

packages/aws-sdk-client-mock-jest/package.json

@@ -39,13 +39,16 @@
     "dist"
   ],
   "dependencies": {
-    "@types/jest": "^28.1.3",
+    "expect": ">28.1.3",
     "tslib": "^2.1.0"
   },
   "devDependencies": {
     "@aws-sdk/client-sns": "3.363.0",
+    "@jest/globals": "29.7.0",
     "@smithy/types": "1.1.0",
+    "@types/jest": "29.5.11",
     "aws-sdk-client-mock": "workspace:*",
+    "expect": "29.7.0",
     "jest-serializer-ansi-escapes": "2.0.1"
   },
   "peerDependencies": {

packages/aws-sdk-client-mock-jest/src/jestMatchers.ts

@@ -1,10 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-interface */
 import assert from 'assert';
 import type {MetadataBearer} from '@smithy/types';
-import type {AwsCommand, AwsStub} from 'aws-sdk-client-mock';
+import {AwsCommand, AwsStub} from 'aws-sdk-client-mock';
 import type {SinonSpyCall} from 'sinon';
+import {expect} from 'expect';
+import type {ExpectationResult, MatcherContext, MatcherFunction} from 'expect';
 
-interface AwsSdkJestMockBaseMatchers<R> extends Record<string, any> {
+interface AwsSdkJestMockBaseMatchers<R> extends Record<string, Function> {
     /**
      * Asserts {@link AwsStub Aws Client Mock} received a {@link command} exact number of {@link times}
      *
@@ -69,7 +71,7 @@ interface AwsSdkJestMockBaseMatchers<R> extends Record<string, any> {
     ): R;
 }
 
-interface AwsSdkJestMockAliasMatchers<R> {
+interface AwsSdkJestMockAliasMatchers<R> extends Record<string, Function> {
     /**
      * Asserts {@link AwsStub Aws Client Mock} received a {@link command} exact number of {@link times}
      *
@@ -162,17 +164,27 @@ interface AwsSdkJestMockAliasMatchers<R> {
  * });
  * ```
  */
-export interface AwsSdkJestMockMatchers<R> extends AwsSdkJestMockBaseMatchers<R>, AwsSdkJestMockAliasMatchers<R>, Record<string, any> {
+export interface AwsSdkJestMockMatchers<R> extends AwsSdkJestMockBaseMatchers<R>, AwsSdkJestMockAliasMatchers<R>, Record<string, Function> {
 }
 
+/**
+ * Types for @types/jest
+ */
 declare global {
     namespace jest {
         interface Matchers<R = void> extends AwsSdkJestMockMatchers<R> {
         }
     }
 }
 
-type ClientMock = AwsStub<any, any, any>;
+/**
+ * Types for @jest/globals
+ */
+declare module 'expect' {
+    interface Matchers<R = void> extends AwsSdkJestMockMatchers<R> {
+    }
+}
+
 type AnyCommand = AwsCommand<any, any>;
 type AnySpyCall = SinonSpyCall<[AnyCommand]>;
 type MessageFunctionParams<CheckData> = {
@@ -186,7 +198,7 @@ type MessageFunctionParams<CheckData> = {
 /**
  * Prettyprints command calls for message
  */
-const printCalls = (ctx: jest.MatcherContext, calls: AnySpyCall[]): string[] =>
+const printCalls = (ctx: MatcherContext, calls: AnySpyCall[]): string[] =>
     calls.length > 0
         ? [
             '',
@@ -200,15 +212,16 @@ const printCalls = (ctx: jest.MatcherContext, calls: AnySpyCall[]): string[] =>
         : [];
 
 const processMatch = <CheckData = undefined>({ctx, mockClient, command, check, message}: {
-    ctx: jest.MatcherContext;
-    mockClient: ClientMock;
+    ctx: MatcherContext;
+    mockClient: unknown;
     command: new () => AnyCommand;
     check: (params: { calls: AnySpyCall[]; commandCalls: AnySpyCall[] }) => {
         pass: boolean;
         data: CheckData;
     };
     message: (params: MessageFunctionParams<CheckData>) => string[];
-}): jest.CustomMatcherResult => {
+}): ExpectationResult => {
+    assert(mockClient instanceof AwsStub, 'The actual must be a client mock instance');
     assert(
         command &&
         typeof command === 'function' &&
@@ -241,13 +254,13 @@ const processMatch = <CheckData = undefined>({ctx, mockClient, command, check, m
     return {pass, message: msg};
 };
 
-const baseMatchers: { [P in keyof AwsSdkJestMockBaseMatchers<unknown>]: jest.CustomMatcher } = {
+const baseMatchers: { [P in keyof AwsSdkJestMockBaseMatchers<unknown>]: MatcherFunction<any[]> } = {
     /**
      * implementation of {@link AwsSdkJestMockMatchers.toHaveReceivedCommand} matcher
      */
     toHaveReceivedCommand(
-        this: jest.MatcherContext,
-        mockClient: ClientMock,
+        this: MatcherContext,
+        mockClient: unknown,
         command: new () => AnyCommand,
     ) {
         return processMatch({
@@ -265,8 +278,8 @@ const baseMatchers: { [P in keyof AwsSdkJestMockBaseMatchers<unknown>]: jest.Cus
      * implementation of {@link AwsSdkJestMockMatchers.toHaveReceivedCommandTimes} matcher
      */
     toHaveReceivedCommandTimes(
-        this: jest.MatcherContext,
-        mockClient: ClientMock,
+        this: MatcherContext,
+        mockClient: unknown,
         command: new () => AnyCommand,
         expectedCalls: number,
     ) {
@@ -285,8 +298,8 @@ const baseMatchers: { [P in keyof AwsSdkJestMockBaseMatchers<unknown>]: jest.Cus
      * implementation of {@link AwsSdkJestMockMatchers.toHaveReceivedCommandWith} matcher
      */
     toHaveReceivedCommandWith(
-        this: jest.MatcherContext,
-        mockClient: ClientMock,
+        this: MatcherContext,
+        mockClient: unknown,
         command: new () => AnyCommand,
         input: Record<string, unknown>,
     ) {
@@ -321,11 +334,11 @@ const baseMatchers: { [P in keyof AwsSdkJestMockBaseMatchers<unknown>]: jest.Cus
      * implementation of {@link AwsSdkJestMockMatchers.toHaveReceivedNthCommandWith} matcher
      */
     toHaveReceivedNthCommandWith(
-        this: jest.MatcherContext,
-        mockClient: ClientMock,
+        this: MatcherContext,
+        mockClient: unknown,
         call: number,
         command: new () => AnyCommand,
-        input?: Record<string, unknown>,
+        input: Record<string, unknown>,
     ) {
         assert(
             call && typeof call === 'number' && call > 0,
@@ -380,11 +393,11 @@ const baseMatchers: { [P in keyof AwsSdkJestMockBaseMatchers<unknown>]: jest.Cus
      * implementation of {@link AwsSdkJestMockMatchers.toHaveReceivedNthSpecificCommandWith} matcher
      */
     toHaveReceivedNthSpecificCommandWith(
-        this: jest.MatcherContext,
-        mockClient: ClientMock,
+        this: MatcherContext,
+        mockClient: unknown,
         call: number,
         command: new () => AnyCommand,
-        input?: Record<string, unknown>,
+        input: Record<string, unknown>,
     ) {
         assert(
             call && typeof call === 'number' && call > 0,
@@ -438,7 +451,7 @@ const baseMatchers: { [P in keyof AwsSdkJestMockBaseMatchers<unknown>]: jest.Cus
 };
 
 /* typing ensures keys matching */
-const aliasMatchers: { [P in keyof AwsSdkJestMockAliasMatchers<unknown>]: jest.CustomMatcher } = {
+const aliasMatchers: { [P in keyof AwsSdkJestMockAliasMatchers<unknown>]: MatcherFunction<any[]> } = {
     toReceiveCommandTimes: baseMatchers.toHaveReceivedCommandTimes,
     toReceiveCommand: baseMatchers.toHaveReceivedCommand,
     toReceiveCommandWith: baseMatchers.toHaveReceivedCommandWith,

packages/aws-sdk-client-mock-jest/test-d/types.ts

@@ -1,8 +1,11 @@
 import {mockClient} from 'aws-sdk-client-mock';
 import {PublishCommand, SNSClient} from '@aws-sdk/client-sns';
+import {expect as globalsExpect} from '@jest/globals';
 import {expectError} from 'tsd';
 import '../src';
 
+expect(1).toHaveReceivedCommand(PublishCommand);
+
 expect(mockClient(SNSClient)).toHaveReceivedCommand(PublishCommand);
 expectError(expect(mockClient(SNSClient)).toHaveReceivedCommand(String));
 
@@ -14,3 +17,5 @@ expectError(expect(mockClient(SNSClient)).toHaveReceivedCommandWith(PublishComma
 
 expect(mockClient(SNSClient)).toHaveReceivedNthCommandWith(1, PublishCommand, {Message: ''});
 expectError(expect(mockClient(SNSClient)).toHaveReceivedNthCommandWith(1, PublishCommand, {Foo: ''}));
+
+globalsExpect(mockClient(SNSClient)).toHaveReceivedCommand(PublishCommand);

packages/aws-sdk-client-mock-jest/test/jestGlobals.test.ts

@@ -0,0 +1,14 @@
+import {mockClient} from 'aws-sdk-client-mock';
+import {PublishCommand, SNSClient} from '@aws-sdk/client-sns';
+import {publishCmd1} from 'aws-sdk-client-mock/test/fixtures';
+import {expect, it} from '@jest/globals';
+import '../src';
+
+const snsMock = mockClient(SNSClient);
+
+it('passes using @jest/globals', async () => {
+    const sns = new SNSClient({});
+    await sns.send(publishCmd1);
+
+    expect(() => expect(snsMock).toHaveReceivedCommand(PublishCommand)).not.toThrow();
+});