aws-sdk-vitest-mock 0.2.0 → 0.3.0

package/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("vitest"),P=require("node:fs"),R=require("node:path"),N=require("node:stream"),W=require("./matchers-G36N2DNa.cjs");class d extends Error{constructor(e,s,c,n){super(e),this.name="AwsError",this.code=s,this.statusCode=c,this.retryable=n}}const C=t=>{const e=t?`The specified key does not exist. Key: ${t}`:"The specified key does not exist.";return new d(e,"NoSuchKey",404,!1)},M=t=>{const e=t?`The specified bucket does not exist. Bucket: ${t}`:"The specified bucket does not exist.";return new d(e,"NoSuchBucket",404,!1)},$=t=>{const e=t?`Access Denied for resource: ${t}`:"Access Denied";return new d(e,"AccessDenied",403,!1)},D=t=>{const e=t?`Requested resource not found: ${t}`:"Requested resource not found";return new d(e,"ResourceNotFoundException",400,!1)},I=()=>new d("The conditional request failed","ConditionalCheckFailedException",400,!1),O=()=>new d("Rate exceeded","Throttling",400,!0),T=()=>new d("We encountered an internal error. Please try again.","InternalServerError",500,!0);function k(){return{enabled:!1,log(t,e){this.enabled&&(e===void 0?console.log(`[aws-sdk-vitest-mock](Debug) ${t}`):console.log(`[aws-sdk-vitest-mock](Debug) ${t}`,e))}}}function y(t){t.enabled=!0}function v(t){t.enabled=!1}function F(t){const e=R.resolve(t),s=P.readFileSync(e,"utf8");return t.endsWith(".json")?JSON.parse(s):s}function L(t,e={}){const{pageSize:s=10,tokenKey:c="NextToken",itemsKey:n="Items"}=e;if(t.length===0)return[{[n]:[]}];const o=[];for(let r=0;r<t.length;r+=s){const u=t.slice(r,r+s),i=r+s<t.length,l={[n]:u};if(i){const a=l;a[c]=`token-${r+s}`}o.push(l)}return o}function A(){return typeof process<"u"&&process.versions?.node?"node":typeof process<"u"&&process.versions?.bun?"bun":"browser"}function K(t){const e=typeof t=="string"?Buffer.from(t,"utf8"):Buffer.from(t);return new N.Readable({read(){this.push(e),this.push(void 0)}})}function q(t){let e;return typeof t=="string"?e=new TextEncoder().encode(t):t instanceof Buffer?e=new Uint8Array(t):e=t,new ReadableStream({start(s){s.enqueue(e),s.close()}})}function m(t){const e=A();return e==="node"||e==="bun"?K(t):q(t)}function w(t,e){return Object.keys(e).every(s=>{const c=e[s],n=t[s];return c&&typeof c=="object"&&!Array.isArray(c)?typeof n!="object"||n===null?!1:w(n,c):n===c})}function j(t,e){if(t===e)return!0;if(typeof t!="object"||t===null||typeof e!="object"||e===null)return t===e;const s=Object.keys(t),c=Object.keys(e);return s.length!==c.length?!1:c.every(n=>{if(!Object.prototype.hasOwnProperty.call(t,n))return!1;const o=t,r=e,u=o[n],i=r[n];return typeof u=="object"&&u!==null&&typeof i=="object"&&i!==null?j(u,i):u===i})}function S(t){return async function(e){const s=()=>this;t.debugLogger.log(`Received command: ${e.constructor.name}`,e.input);const c=t.map.get(e.constructor);if(c){t.debugLogger.log(`Found ${c.length} mock(s) for ${e.constructor.name}`);const n=c.findIndex(o=>o.strict?o.matcher&&j(e.input,o.matcher):!o.matcher||w(e.input,o.matcher));if(n===-1)t.debugLogger.log(`No matching mock found for ${e.constructor.name}`,e.input);else{const o=c[n];if(!o)throw new Error(`Mock at index ${n} not found`);return t.debugLogger.log(`Using mock at index ${n} for ${e.constructor.name}`),o.once&&(c.splice(n,1),t.debugLogger.log(`Removed one-time mock for ${e.constructor.name}`)),o.handler(e.input,s)}}else t.debugLogger.log(`No mocks configured for ${e.constructor.name}`);throw new Error(`No mock configured for command: ${e.constructor.name}`)}}function x(t,e,s,c={}){const n=(r,u)=>{const i={matcher:s,handler:r,once:u,strict:!!c.strict},l=t.map.get(e)??[];if(u){const a=l.findIndex(f=>!f.once);a===-1?l.push(i):l.splice(a,0,i),t.map.set(e,l)}else{const a=l.filter(f=>f.once||JSON.stringify(f.matcher)!==JSON.stringify(s));a.push(i),t.map.set(e,a)}},o={resolves(r){return n(()=>Promise.resolve(r),!1),o},rejects(r){return n(()=>{const u=typeof r=="string"?new Error(r):r;return Promise.reject(u)},!1),o},callsFake(r){return n(r,!1),o},resolvesOnce(r){return n(()=>Promise.resolve(r),!0),o},rejectsOnce(r){return n(()=>{const u=typeof r=="string"?new Error(r):r;return Promise.reject(u)},!0),o},callsFakeOnce(r){return n(r,!0),o},resolvesStream(r){return n(()=>Promise.resolve({Body:m(r)}),!1),o},resolvesStreamOnce(r){return n(()=>Promise.resolve({Body:m(r)}),!0),o},resolvesWithDelay(r,u){const i=l=>{setTimeout(()=>l(r),u)};return n(()=>new Promise(i),!1),o},rejectsWithDelay(r,u){const i=typeof r=="string"?new Error(r):r,l=(a,f)=>{setTimeout(()=>f(i),u)};return n(()=>new Promise(l),!1),o},rejectsWithNoSuchKey(r){return n(()=>Promise.reject(C(r)),!1),o},rejectsWithNoSuchBucket(r){return n(()=>Promise.reject(M(r)),!1),o},rejectsWithAccessDenied(r){return n(()=>Promise.reject($(r)),!1),o},rejectsWithResourceNotFound(r){return n(()=>Promise.reject(D(r)),!1),o},rejectsWithConditionalCheckFailed(){return n(()=>Promise.reject(I()),!1),o},rejectsWithThrottling(){return n(()=>Promise.reject(O()),!1),o},rejectsWithInternalServerError(){return n(()=>Promise.reject(T()),!1),o},resolvesPaginated(r,u={}){const i=L(r,u);let l=0;return n(a=>{const f=u.tokenKey||"NextToken",p=a[f];if(p){const g=/token-(\d+)/.exec(p);if(g&&g[1]){const E=g[1];l=Math.floor(Number.parseInt(E,10)/(u.pageSize||10))}}else l=0;const h=i[l]||i[i.length-1]||i[0];if(!h)throw new Error("No paginated responses available");return l=Math.min(l+1,i.length-1),Promise.resolve(h)},!1),o},resolvesFromFile(r){return n(()=>{const u=F(r);return Promise.resolve(u)},!1),o}};return o}const B=t=>{const e={map:new WeakMap,debugLogger:k()},s=t.prototype,c=b.vi.spyOn(s,"send").mockImplementation(S(e));return{client:void 0,on:(o,r,u)=>x(e,o,r,u),reset:()=>{c.mockClear(),e.map=new WeakMap},restore:()=>{c.mockRestore(),e.map=new WeakMap},calls:()=>c.mock.calls,enableDebug:()=>{y(e.debugLogger)},disableDebug:()=>{v(e.debugLogger)}}},V=t=>{const e={map:new WeakMap,debugLogger:k()},s=b.vi.spyOn(t,"send").mockImplementation(S(e));return{client:t,on:(n,o,r)=>x(e,n,o,r),reset:()=>{s.mockClear(),e.map=new WeakMap},restore:()=>{s.mockRestore(),e.map=new WeakMap},calls:()=>s.mock.calls,enableDebug:()=>{y(e.debugLogger)},disableDebug:()=>{v(e.debugLogger)}}};exports.matchers=W.matchers;exports.mockClient=B;exports.mockClientInstance=V;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("vitest"),P=require("node:fs"),R=require("node:path"),N=require("node:stream"),C=require("./matchers-Rq18z2C7.cjs");class d extends Error{constructor(e,s,c,n){super(e),this.name="AwsError",this.code=s,this.statusCode=c,this.retryable=n}}const W=t=>{const e=t?`The specified key does not exist. Key: ${t}`:"The specified key does not exist.";return new d(e,"NoSuchKey",404,!1)},M=t=>{const e=t?`The specified bucket does not exist. Bucket: ${t}`:"The specified bucket does not exist.";return new d(e,"NoSuchBucket",404,!1)},$=t=>{const e=t?`Access Denied for resource: ${t}`:"Access Denied";return new d(e,"AccessDenied",403,!1)},D=t=>{const e=t?`Requested resource not found: ${t}`:"Requested resource not found";return new d(e,"ResourceNotFoundException",400,!1)},I=()=>new d("The conditional request failed","ConditionalCheckFailedException",400,!1),O=()=>new d("Rate exceeded","Throttling",400,!0),T=()=>new d("We encountered an internal error. Please try again.","InternalServerError",500,!0);function k(){return{enabled:!1,log(t,e){this.enabled&&(e===void 0?console.log(`[aws-sdk-vitest-mock](Debug) ${t}`):console.log(`[aws-sdk-vitest-mock](Debug) ${t}`,e))}}}function y(t){t.enabled=!0}function v(t){t.enabled=!1}function F(t){const e=R.resolve(t),s=P.readFileSync(e,"utf8");return t.endsWith(".json")?JSON.parse(s):s}function L(t,e={}){const{pageSize:s=10,tokenKey:c="NextToken",itemsKey:n="Items"}=e;if(t.length===0)return[{[n]:[]}];const o=[];for(let r=0;r<t.length;r+=s){const u=t.slice(r,r+s),i=r+s<t.length,l={[n]:u};if(i){const a=l;a[c]=`token-${r+s}`}o.push(l)}return o}function A(){return typeof process<"u"&&process.versions?.node?"node":typeof process<"u"&&process.versions?.bun?"bun":"browser"}function K(t){const e=typeof t=="string"?Buffer.from(t,"utf8"):Buffer.from(t);return new N.Readable({read(){this.push(e),this.push(void 0)}})}function q(t){let e;return typeof t=="string"?e=new TextEncoder().encode(t):t instanceof Buffer?e=new Uint8Array(t):e=t,new ReadableStream({start(s){s.enqueue(e),s.close()}})}function h(t){const e=A();return e==="node"||e==="bun"?K(t):q(t)}function w(t,e){return Object.keys(e).every(s=>{const c=e[s],n=t[s];return c&&typeof c=="object"&&!Array.isArray(c)?typeof n!="object"||n===null?!1:w(n,c):n===c})}function j(t,e){if(t===e)return!0;if(typeof t!="object"||t===null||typeof e!="object"||e===null)return t===e;const s=Object.keys(t),c=Object.keys(e);return s.length!==c.length?!1:c.every(n=>{if(!Object.prototype.hasOwnProperty.call(t,n))return!1;const o=t,r=e,u=o[n],i=r[n];return typeof u=="object"&&u!==null&&typeof i=="object"&&i!==null?j(u,i):u===i})}function S(t){return async function(e){const s=()=>this;t.debugLogger.log(`Received command: ${e.constructor.name}`,e.input);const c=t.map.get(e.constructor);if(c){t.debugLogger.log(`Found ${c.length} mock(s) for ${e.constructor.name}`);const n=c.findIndex(o=>o.strict?o.matcher&&j(e.input,o.matcher):!o.matcher||w(e.input,o.matcher));if(n===-1)t.debugLogger.log(`No matching mock found for ${e.constructor.name}`,e.input);else{const o=c[n];if(!o)throw new Error(`Mock at index ${n} not found`);return t.debugLogger.log(`Using mock at index ${n} for ${e.constructor.name}`),o.once&&(c.splice(n,1),t.debugLogger.log(`Removed one-time mock for ${e.constructor.name}`)),o.handler(e.input,s())}}else t.debugLogger.log(`No mocks configured for ${e.constructor.name}`);throw new Error(`No mock configured for command: ${e.constructor.name}`)}}function x(t,e,s,c={}){const n=(r,u)=>{const i={matcher:s,handler:r,once:u,strict:!!c.strict},l=t.map.get(e)??[];if(u){const a=l.findIndex(f=>!f.once);a===-1?l.push(i):l.splice(a,0,i),t.map.set(e,l)}else{const a=l.filter(f=>f.once||JSON.stringify(f.matcher)!==JSON.stringify(s));a.push(i),t.map.set(e,a)}},o={resolves(r){return n(()=>Promise.resolve(r),!1),o},rejects(r){return n(()=>{const u=typeof r=="string"?new Error(r):r;return Promise.reject(u)},!1),o},callsFake(r){return n(r,!1),o},resolvesOnce(r){return n(()=>Promise.resolve(r),!0),o},rejectsOnce(r){return n(()=>{const u=typeof r=="string"?new Error(r):r;return Promise.reject(u)},!0),o},callsFakeOnce(r){return n(r,!0),o},resolvesStream(r){return n(()=>Promise.resolve({Body:h(r)}),!1),o},resolvesStreamOnce(r){return n(()=>Promise.resolve({Body:h(r)}),!0),o},resolvesWithDelay(r,u){const i=l=>{setTimeout(()=>l(r),u)};return n(()=>new Promise(i),!1),o},rejectsWithDelay(r,u){const i=typeof r=="string"?new Error(r):r,l=(a,f)=>{setTimeout(()=>f(i),u)};return n(()=>new Promise(l),!1),o},rejectsWithNoSuchKey(r){return n(()=>Promise.reject(W(r)),!1),o},rejectsWithNoSuchBucket(r){return n(()=>Promise.reject(M(r)),!1),o},rejectsWithAccessDenied(r){return n(()=>Promise.reject($(r)),!1),o},rejectsWithResourceNotFound(r){return n(()=>Promise.reject(D(r)),!1),o},rejectsWithConditionalCheckFailed(){return n(()=>Promise.reject(I()),!1),o},rejectsWithThrottling(){return n(()=>Promise.reject(O()),!1),o},rejectsWithInternalServerError(){return n(()=>Promise.reject(T()),!1),o},resolvesPaginated(r,u={}){const i=L(r,u);let l=0;return n(a=>{const f=u.tokenKey||"NextToken",p=a[f];if(p){const g=/token-(\d+)/.exec(p);if(g&&g[1]){const E=g[1];l=Math.floor(Number.parseInt(E,10)/(u.pageSize||10))}}else l=0;const m=i[l]||i[i.length-1]||i[0];if(!m)throw new Error("No paginated responses available");return l=Math.min(l+1,i.length-1),Promise.resolve(m)},!1),o},resolvesFromFile(r){return n(()=>{const u=F(r);return Promise.resolve(u)},!1),o}};return o}const B=t=>{const e={map:new WeakMap,debugLogger:k()},s=t.prototype,c=b.vi.spyOn(s,"send").mockImplementation(S(e));return{client:void 0,on:(o,r,u)=>x(e,o,r,u),reset:()=>{c.mockClear(),e.map=new WeakMap},restore:()=>{c.mockRestore(),e.map=new WeakMap},calls:()=>c.mock.calls.map(o=>o[0]),__rawCalls:()=>c.mock.calls,enableDebug:()=>{y(e.debugLogger)},disableDebug:()=>{v(e.debugLogger)}}},_=t=>{const e={map:new WeakMap,debugLogger:k()},s=b.vi.spyOn(t,"send").mockImplementation(S(e));return{client:t,on:(n,o,r)=>x(e,n,o,r),reset:()=>{s.mockClear(),e.map=new WeakMap},restore:()=>{s.mockRestore(),e.map=new WeakMap},calls:()=>s.mock.calls.map(n=>n[0]),__rawCalls:()=>s.mock.calls,enableDebug:()=>{y(e.debugLogger)},disableDebug:()=>{v(e.debugLogger)}}};exports.matchers=C.matchers;exports.mockClient=B;exports.mockClientInstance=_;

package/index.js

@@ -2,7 +2,7 @@ import { vi as b } from "vitest";
 import { readFileSync as P } from "node:fs";
 import R from "node:path";
 import { Readable as N } from "node:stream";
-import { m as X } from "./matchers-_zpN1oru.js";
+import { m as X } from "./matchers-C6AtmwWz.js";
 class d extends Error {
   constructor(e, s, c, n) {
     super(e), this.name = "AwsError", this.code = s, this.statusCode = c, this.retryable = n;
@@ -11,16 +11,16 @@ class d extends Error {
 const W = (t) => {
   const e = t ? `The specified key does not exist. Key: ${t}` : "The specified key does not exist.";
   return new d(e, "NoSuchKey", 404, !1);
-}, $ = (t) => {
+}, C = (t) => {
   const e = t ? `The specified bucket does not exist. Bucket: ${t}` : "The specified bucket does not exist.";
   return new d(e, "NoSuchBucket", 404, !1);
-}, D = (t) => {
+}, $ = (t) => {
   const e = t ? `Access Denied for resource: ${t}` : "Access Denied";
   return new d(e, "AccessDenied", 403, !1);
-}, M = (t) => {
+}, D = (t) => {
   const e = t ? `Requested resource not found: ${t}` : "Requested resource not found";
   return new d(e, "ResourceNotFoundException", 400, !1);
-}, C = () => new d(
+}, M = () => new d(
   "The conditional request failed",
   "ConditionalCheckFailedException",
   400,
@@ -42,7 +42,7 @@ function k() {
 function y(t) {
   t.enabled = !0;
 }
-function v(t) {
+function w(t) {
   t.enabled = !1;
 }
 function T(t) {
@@ -87,10 +87,10 @@ function h(t) {
   const e = L();
   return e === "node" || e === "bun" ? A(t) : K(t);
 }
-function w(t, e) {
+function v(t, e) {
   return Object.keys(e).every((s) => {
     const c = e[s], n = t[s];
-    return c && typeof c == "object" && !Array.isArray(c) ? typeof n != "object" || n === null ? !1 : w(
+    return c && typeof c == "object" && !Array.isArray(c) ? typeof n != "object" || n === null ? !1 : v(
       n,
       c
     ) : n === c;
@@ -121,7 +121,7 @@ function x(t) {
       t.debugLogger.log(
         `Found ${c.length} mock(s) for ${e.constructor.name}`
       );
-      const n = c.findIndex((o) => o.strict ? o.matcher && j(e.input, o.matcher) : !o.matcher || w(e.input, o.matcher));
+      const n = c.findIndex((o) => o.strict ? o.matcher && j(e.input, o.matcher) : !o.matcher || v(e.input, o.matcher));
       if (n === -1)
         t.debugLogger.log(
           `No matching mock found for ${e.constructor.name}`,
@@ -135,7 +135,10 @@ function x(t) {
           `Using mock at index ${n} for ${e.constructor.name}`
         ), o.once && (c.splice(n, 1), t.debugLogger.log(
           `Removed one-time mock for ${e.constructor.name}`
-        )), o.handler(e.input, s);
+        )), o.handler(
+          e.input,
+          s()
+        );
       }
     } else
       t.debugLogger.log(
@@ -153,9 +156,7 @@ function S(t, e, s, c = {}) {
       handler: r,
       once: u,
       strict: !!c.strict
-    }, l = t.map.get(
-      e
-    ) ?? [];
+    }, l = t.map.get(e) ?? [];
     if (u) {
       const a = l.findIndex((f) => !f.once);
       a === -1 ? l.push(i) : l.splice(a, 0, i), t.map.set(
@@ -224,20 +225,20 @@ function S(t, e, s, c = {}) {
       return n(() => Promise.reject(W(r)), !1), o;
     },
     rejectsWithNoSuchBucket(r) {
-      return n(() => Promise.reject($(r)), !1), o;
+      return n(() => Promise.reject(C(r)), !1), o;
     },
     rejectsWithAccessDenied(r) {
-      return n(() => Promise.reject(D(r)), !1), o;
+      return n(() => Promise.reject($(r)), !1), o;
     },
     rejectsWithResourceNotFound(r) {
       return n(
-        () => Promise.reject(M(r)),
+        () => Promise.reject(D(r)),
         !1
       ), o;
     },
     rejectsWithConditionalCheckFailed() {
       return n(
-        () => Promise.reject(C()),
+        () => Promise.reject(M()),
         !1
       ), o;
     },
@@ -281,26 +282,32 @@ function S(t, e, s, c = {}) {
   };
   return o;
 }
-const _ = (t) => {
+const U = (t) => {
   const e = {
     map: /* @__PURE__ */ new WeakMap(),
     debugLogger: k()
   }, s = t.prototype, c = b.spyOn(s, "send").mockImplementation(x(e));
   return {
     client: void 0,
-    on: (o, r, u) => S(e, o, r, u),
+    on: (o, r, u) => S(
+      e,
+      o,
+      r,
+      u
+    ),
     reset: () => {
       c.mockClear(), e.map = /* @__PURE__ */ new WeakMap();
     },
     restore: () => {
       c.mockRestore(), e.map = /* @__PURE__ */ new WeakMap();
     },
-    calls: () => c.mock.calls,
+    calls: () => c.mock.calls.map((o) => o[0]),
+    __rawCalls: () => c.mock.calls,
     enableDebug: () => {
       y(e.debugLogger);
     },
     disableDebug: () => {
-      v(e.debugLogger);
+      w(e.debugLogger);
     }
   };
 }, G = (t) => {
@@ -310,24 +317,30 @@ const _ = (t) => {
   }, s = b.spyOn(t, "send").mockImplementation(x(e));
   return {
     client: t,
-    on: (n, o, r) => S(e, n, o, r),
+    on: (n, o, r) => S(
+      e,
+      n,
+      o,
+      r
+    ),
     reset: () => {
       s.mockClear(), e.map = /* @__PURE__ */ new WeakMap();
     },
     restore: () => {
       s.mockRestore(), e.map = /* @__PURE__ */ new WeakMap();
     },
-    calls: () => s.mock.calls,
+    calls: () => s.mock.calls.map((n) => n[0]),
+    __rawCalls: () => s.mock.calls,
     enableDebug: () => {
       y(e.debugLogger);
     },
     disableDebug: () => {
-      v(e.debugLogger);
+      w(e.debugLogger);
     }
   };
 };
 export {
   X as matchers,
-  _ as mockClient,
+  U as mockClient,
   G as mockClientInstance
 };

package/lib/matchers.d.ts

@@ -1,26 +1,26 @@
-import { AwsClientStub } from './mock-client.js';
-type CommandConstructor = new (...args: unknown[]) => unknown;
+import { MetadataBearer } from '@smithy/types';
+import { AwsClientStub, CommandConstructor } from './mock-client.js';
 interface MatcherResult {
     pass: boolean;
     message: () => string;
 }
 export declare const matchers: {
-    toHaveReceivedCommand(received: AwsClientStub, command: CommandConstructor): MatcherResult;
-    toHaveReceivedCommandTimes(received: AwsClientStub, command: CommandConstructor, times: number): MatcherResult;
-    toHaveReceivedCommandWith(this: {
+    toHaveReceivedCommand<TInput extends object, TOutput extends MetadataBearer>(received: AwsClientStub, command: CommandConstructor<TInput, TOutput>): MatcherResult;
+    toHaveReceivedCommandTimes<TInput extends object, TOutput extends MetadataBearer>(received: AwsClientStub, command: CommandConstructor<TInput, TOutput>, times: number): MatcherResult;
+    toHaveReceivedCommandWith<TInput extends object, TOutput extends MetadataBearer>(this: {
         equals: (a: unknown, b: unknown) => boolean;
-    }, received: AwsClientStub, command: CommandConstructor, input: Record<string, unknown>): MatcherResult;
-    toHaveReceivedNthCommandWith(this: {
+    }, received: AwsClientStub, command: CommandConstructor<TInput, TOutput>, input: TInput): MatcherResult;
+    toHaveReceivedNthCommandWith<TInput extends object, TOutput extends MetadataBearer>(this: {
         equals: (a: unknown, b: unknown) => boolean;
-    }, received: AwsClientStub, n: number, command: CommandConstructor, input: Record<string, unknown>): MatcherResult;
-    toHaveReceivedNoOtherCommands(received: AwsClientStub, expectedCommands?: CommandConstructor[]): MatcherResult;
+    }, received: AwsClientStub, n: number, command: CommandConstructor<TInput, TOutput>, input: TInput): MatcherResult;
+    toHaveReceivedNoOtherCommands<TInput extends object, TOutput extends MetadataBearer>(received: AwsClientStub, expectedCommands?: CommandConstructor<TInput, TOutput>[]): MatcherResult;
 };
 export interface AwsSdkMatchers<R = unknown> {
-    toHaveReceivedCommand(command: CommandConstructor): R;
-    toHaveReceivedCommandTimes(command: CommandConstructor, times: number): R;
-    toHaveReceivedCommandWith(command: CommandConstructor, input: Record<string, unknown>): R;
-    toHaveReceivedNthCommandWith(n: number, command: CommandConstructor, input: Record<string, unknown>): R;
-    toHaveReceivedNoOtherCommands(expectedCommands?: CommandConstructor[]): R;
+    toHaveReceivedCommand<TInput extends object, TOutput extends MetadataBearer>(command: CommandConstructor<TInput, TOutput>): R;
+    toHaveReceivedCommandTimes<TInput extends object, TOutput extends MetadataBearer>(command: CommandConstructor<TInput, TOutput>, times: number): R;
+    toHaveReceivedCommandWith<TInput extends object, TOutput extends MetadataBearer>(command: CommandConstructor<TInput, TOutput>, input: TInput): R;
+    toHaveReceivedNthCommandWith<TInput extends object, TOutput extends MetadataBearer>(n: number, command: CommandConstructor<TInput, TOutput>, input: TInput): R;
+    toHaveReceivedNoOtherCommands<TInput extends object, TOutput extends MetadataBearer>(expectedCommands?: CommandConstructor<TInput, TOutput>[]): R;
 }
 export type { MatcherResult };
 declare module "vitest" {

package/lib/mock-client.d.ts

@@ -1,35 +1,36 @@
-import { SmithyResolvedConfiguration } from '@smithy/smithy-client';
-import { MiddlewareStack, Handler } from '@smithy/types';
+import { Command as SmithyCommand, SmithyResolvedConfiguration } from '@smithy/smithy-client';
+import { HttpHandlerOptions, MetadataBearer } from '@smithy/types';
 import { Mock } from 'vitest';
 import { PaginatorOptions } from './utils/paginator-helpers.js';
 import { StreamInput } from './utils/stream-helpers.js';
-export interface MetadataBearer {
-    $metadata?: unknown;
-}
-export interface StructuralCommand<TInput extends object, TOutput extends MetadataBearer> {
+export type StructuralCommand<TInput extends object, TOutput extends MetadataBearer> = SmithyCommand<TInput, TOutput, any, any, any> | {
     readonly input: TInput;
-    middlewareStack: MiddlewareStack<TInput, TOutput>;
-    resolveMiddleware(stack: MiddlewareStack<TInput, TOutput>, configuration: unknown, options: unknown): Handler<TInput, TOutput>;
-}
+    readonly __awsSdkVitestMockOutput?: TOutput;
+};
 export type CommandConstructor<TInput extends object, TOutput extends MetadataBearer> = new (input: TInput) => StructuralCommand<TInput, TOutput>;
+type AwsCommandConstructor = CommandConstructor<any, MetadataBearer>;
+export type CommandInputType<TCtor extends AwsCommandConstructor> = ConstructorParameters<TCtor>[0];
+export type CommandOutputType<TCtor extends AwsCommandConstructor> = InstanceType<TCtor> extends StructuralCommand<any, infer TOutput> ? TOutput : MetadataBearer;
 export type AnyClient = {
-    send(command: AnyCommand): Promise<MetadataBearer>;
-    config: SmithyResolvedConfiguration<unknown>;
+    send(command: AwsSdkCommand): Promise<MetadataBearer>;
+    config: SmithyResolvedConfiguration<HttpHandlerOptions> | Record<string, unknown>;
 };
-export type AnyCommand = StructuralCommand<object, MetadataBearer>;
-export type ClientConstructor<TClient extends AnyClient> = (abstract new (config: unknown) => TClient) | {
+export type AwsSdkCommand = StructuralCommand<object, MetadataBearer>;
+export type ClientConstructor<TClient extends AnyClient> = (abstract new (...args: unknown[]) => TClient) | {
     prototype: TClient;
 };
-type CommandHandler<TInput extends object = object, TOutput extends MetadataBearer = MetadataBearer, TClient extends AnyClient = AnyClient> = (input: TInput, getClient: () => TClient | undefined) => Promise<TOutput>;
+type CommandHandler<TInput extends object = object, TOutput extends MetadataBearer = MetadataBearer, TClient extends AnyClient = AnyClient> = (input: TInput, clientInstance: TClient | undefined) => Promise<Partial<TOutput>>;
 interface MockOptions {
     strict?: boolean;
 }
 export interface AwsClientStub<TClient extends AnyClient = AnyClient> {
     readonly client: TClient | undefined;
-    on: <TInput extends object, TOutput extends MetadataBearer>(command: CommandConstructor<TInput, TOutput>, request?: Partial<TInput>, options?: MockOptions) => AwsCommandStub<TInput, TOutput, TClient>;
+    on: <TCtor extends AwsCommandConstructor>(command: TCtor, request?: Partial<CommandInputType<TCtor>>, options?: MockOptions) => AwsCommandStub<CommandInputType<TCtor>, CommandOutputType<TCtor>, TClient>;
     reset: () => void;
     restore: () => void;
-    calls: () => ReturnType<Mock["mock"]["calls"]["slice"]>;
+    calls: () => AwsSdkCommand[];
+    /** @internal - For use by matchers only */
+    __rawCalls: () => ReturnType<Mock["mock"]["calls"]["slice"]>;
     enableDebug: () => void;
     disableDebug: () => void;
 }

package/{matchers-_zpN1oru.js → matchers-C6AtmwWz.js}

@@ -8,7 +8,7 @@ const e = {
   gray: (t) => `\x1B[90m${t}\x1B[39m`,
   bold: (t) => `\x1B[1m${t}\x1B[22m`
 }, $ = (t) => {
-  const c = t.calls();
+  const c = t.__rawCalls();
   return Array.isArray(c) ? c.filter(
     (a) => Array.isArray(a) && a.length > 0
   ) : [];
@@ -37,9 +37,7 @@ const e = {
   toHaveReceivedCommandWith(t, c, a) {
     const r = $(t).filter(
       (n) => n[0] instanceof c
-    ), m = r.some(
-      (n) => this.equals(n[0].input, a)
-    ), o = c.name;
+    ), m = r.some((n) => this.equals(n[0].input, a)), o = c.name;
     return {
       pass: m,
       message: () => {
@@ -59,9 +57,7 @@ ${u}
 
 But ${i}`;
         }
-        const n = r.map(
-          (s) => s[0].input
-        ), d = e.red(o), g = e.cyan(JSON.stringify(a, void 0, 2)), l = e.gray("But received"), h = e.yellow(o), p = e.gray("with"), S = e.yellow(
+        const n = r.map((s) => s[0].input), d = e.red(o), g = e.cyan(JSON.stringify(a, void 0, 2)), l = e.gray("But received"), h = e.yellow(o), p = e.gray("with"), S = e.yellow(
           n.map((s) => JSON.stringify(s, void 0, 2)).join(`
 
 `)

package/{matchers-G36N2DNa.cjs → matchers-Rq18z2C7.cjs}

@@ -1,4 +1,4 @@
-"use strict";const e={red:t=>`\x1B[31m${t}\x1B[39m`,green:t=>`\x1B[32m${t}\x1B[39m`,yellow:t=>`\x1B[33m${t}\x1B[39m`,blue:t=>`\x1B[34m${t}\x1B[39m`,magenta:t=>`\x1B[35m${t}\x1B[39m`,cyan:t=>`\x1B[36m${t}\x1B[39m`,gray:t=>`\x1B[90m${t}\x1B[39m`,bold:t=>`\x1B[1m${t}\x1B[22m`},$=t=>{const c=t.calls();return Array.isArray(c)?c.filter(a=>Array.isArray(a)&&a.length>0):[]},f={toHaveReceivedCommand(t,c){const a=$(t),r=a.some(o=>o[0]instanceof c),m=c.name;return{pass:r,message:()=>{if(r)return`Expected AWS SDK mock not to have received command ${e.red(m)}`;const o=a.map(n=>n[0].constructor?.name??"Unknown");return o.length===0?`Expected AWS SDK mock to have received command ${e.red(m)}, but ${e.gray("no commands were received")}`:`Expected AWS SDK mock to have received command ${e.red(m)}, but received: ${e.yellow(o.join(", "))}`}}},toHaveReceivedCommandTimes(t,c,a){const r=$(t).filter(n=>n[0]instanceof c),m=r.length===a,o=c.name;return{pass:m,message:()=>m?`Expected AWS SDK mock not to have received command ${o} ${a} times`:`Expected AWS SDK mock to have received command ${o} ${a} times, but received ${r.length} times`}},toHaveReceivedCommandWith(t,c,a){const r=$(t).filter(n=>n[0]instanceof c),m=r.some(n=>this.equals(n[0].input,a)),o=c.name;return{pass:m,message:()=>{if(m){const s=e.red(o),u=e.cyan(JSON.stringify(a,void 0,2));return`Expected AWS SDK mock not to have received command ${s} with input:
+"use strict";const e={red:t=>`\x1B[31m${t}\x1B[39m`,green:t=>`\x1B[32m${t}\x1B[39m`,yellow:t=>`\x1B[33m${t}\x1B[39m`,blue:t=>`\x1B[34m${t}\x1B[39m`,magenta:t=>`\x1B[35m${t}\x1B[39m`,cyan:t=>`\x1B[36m${t}\x1B[39m`,gray:t=>`\x1B[90m${t}\x1B[39m`,bold:t=>`\x1B[1m${t}\x1B[22m`},$=t=>{const c=t.__rawCalls();return Array.isArray(c)?c.filter(a=>Array.isArray(a)&&a.length>0):[]},f={toHaveReceivedCommand(t,c){const a=$(t),r=a.some(o=>o[0]instanceof c),m=c.name;return{pass:r,message:()=>{if(r)return`Expected AWS SDK mock not to have received command ${e.red(m)}`;const o=a.map(n=>n[0].constructor?.name??"Unknown");return o.length===0?`Expected AWS SDK mock to have received command ${e.red(m)}, but ${e.gray("no commands were received")}`:`Expected AWS SDK mock to have received command ${e.red(m)}, but received: ${e.yellow(o.join(", "))}`}}},toHaveReceivedCommandTimes(t,c,a){const r=$(t).filter(n=>n[0]instanceof c),m=r.length===a,o=c.name;return{pass:m,message:()=>m?`Expected AWS SDK mock not to have received command ${o} ${a} times`:`Expected AWS SDK mock to have received command ${o} ${a} times, but received ${r.length} times`}},toHaveReceivedCommandWith(t,c,a){const r=$(t).filter(n=>n[0]instanceof c),m=r.some(n=>this.equals(n[0].input,a)),o=c.name;return{pass:m,message:()=>{if(m){const s=e.red(o),u=e.cyan(JSON.stringify(a,void 0,2));return`Expected AWS SDK mock not to have received command ${s} with input:
 ${u}`}if(r.length===0){const s=e.red(o),u=e.cyan(JSON.stringify(a,void 0,2)),i=e.gray(`${o} was never called`);return`Expected AWS SDK mock to have received command ${s} with input:
 ${u}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-sdk-vitest-mock",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "main": "./index.cjs",
   "module": "./index.js",

package/vitest-setup.cjs

@@ -1 +1 @@
-"use strict";const e=require("vitest"),t=require("./matchers-G36N2DNa.cjs");e.expect.extend(t.matchers);
+"use strict";const e=require("vitest"),t=require("./matchers-Rq18z2C7.cjs");e.expect.extend(t.matchers);

package/vitest-setup.js

@@ -1,3 +1,3 @@
 import { expect as m } from "vitest";
-import { m as e } from "./matchers-_zpN1oru.js";
+import { m as e } from "./matchers-C6AtmwWz.js";
 m.extend(e);