@efebia/jest-match-response 0.0.2 → 0.0.4

package/lib/index.d.ts

@@ -1,2 +1,9 @@
 export { buildToMatchJson, type Options } from "./toMatchJson";
 export { toMatchResponse } from "./toMatchResponse";
+export declare const matchResponseAndReturn: (response: {
+    json: () => any | Promise<any>;
+} & ({
+    status: number;
+} | {
+    statusCode: number;
+}), model: any) => Promise<any>;

package/lib/index.js

@@ -1,7 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toMatchResponse = exports.buildToMatchJson = void 0;
+exports.matchResponseAndReturn = exports.toMatchResponse = exports.buildToMatchJson = void 0;
 var toMatchJson_1 = require("./toMatchJson");
 Object.defineProperty(exports, "buildToMatchJson", { enumerable: true, get: function () { return toMatchJson_1.buildToMatchJson; } });
 var toMatchResponse_1 = require("./toMatchResponse");
 Object.defineProperty(exports, "toMatchResponse", { enumerable: true, get: function () { return toMatchResponse_1.toMatchResponse; } });
+const matchResponseAndReturn = async (response, model) => {
+    const jsonValue = await response.json();
+    expect({ ...response, json() {
+            return jsonValue;
+        } })
+        .toMatchResponse(model);
+    return jsonValue;
+};
+exports.matchResponseAndReturn = matchResponseAndReturn;

package/lib/toMatchResponse.d.ts

@@ -1,9 +1,5 @@
-export declare const toMatchResponse: (received: any, statusCode: any, model: any) => Promise<void | {
-    actual: any;
-    message: () => string;
-    name: string;
-    pass: boolean;
-}>;
+import type { MatcherFunction } from "expect";
+export declare const toMatchResponse: MatcherFunction<[number, any]>;
 declare module "expect" {
     interface AsymmetricMatchers {
         toMatchResponse(statusCode: number, model: any): void;

package/lib/toMatchResponse.js

@@ -3,23 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toMatchResponse = void 0;
 const globals_1 = require("@jest/globals");
 const toMatchResponse = async function (received, statusCode, model) {
-    if (!(Object.hasOwn(received, 'json') && typeof received.json === 'function'))
+    if (typeof received !== 'object' || !received)
+        throw new Error('toMatchResponse: the received value needs to be of type object');
+    if (!('json' in received && typeof received.json === 'function'))
         throw new Error('toMatchResponse: the received value needs to have a .json method');
-    if (!(Object.hasOwn(received, 'status') || Object.hasOwn(received, 'statusCode')))
+    if (!('status' in received || 'statusCode' in received))
         throw new Error('toMatchResponse: the received value needs to have a status or statusCode property');
-    const status = received.status || received.statusCode;
+    const status = ('status' in received ? received.status : received.statusCode);
     const jsonResponse = await received.json();
     const statusCodePass = this.isNot ? status !== statusCode : status === statusCode;
+    const message = () => (this.utils.matcherHint('toMatchResponse', undefined, undefined, { comment: 'Match response equality', isNot: this.isNot, promise: this.promise }) +
+        '\n\n' +
+        `Expected Status Code: ${this.utils.printExpected(statusCode)}\n` +
+        `Received Status Code: ${this.utils.printReceived(status)}\n` +
+        `Received Body: ${this.utils.printReceived(jsonResponse)}`);
     if (!statusCodePass) {
-        const message = () => (this.utils.matcherHint('toMatchResponse', undefined, undefined, { comment: 'Match response equality', isNot: this.isNot, promise: this.promise }) +
-            '\n\n' +
-            `Expected Status Code: ${this.utils.printExpected(statusCode)}\n` +
-            `Received Status Code: ${this.utils.printReceived(status)}\n` +
-            `Received Body: ${this.utils.printReceived(jsonResponse)}`);
         return { actual: status, message, name: 'toMatchResponse', pass: false };
     }
-    if (this.isNot)
-        return (0, globals_1.expect)(jsonResponse).not.toMatchJson(model);
-    return (0, globals_1.expect)(jsonResponse).toMatchJson(model);
+    if (this.isNot) {
+        (0, globals_1.expect)(jsonResponse).not.toMatchJson(model);
+        return { pass: true, name: 'toMatchResponse', message };
+    }
+    (0, globals_1.expect)(jsonResponse).toMatchJson(model);
+    return { pass: true, name: 'toMatchResponse', message };
 };
 exports.toMatchResponse = toMatchResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@efebia/jest-match-response",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "license": "MIT",
   "devDependencies": {
     "@types/jest": "^29.2.5",