@jaypie/testkit 1.0.24 → 1.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaypie/testkit",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "author": "Finlayson Studio",
   "type": "module",
   "exports": {
@@ -26,6 +26,7 @@
     "test:spec:constants": "vitest run ./src/__tests__/constants.spec.js",
     "test:spec:index": "vitest run ./src/__tests__/index.spec.js",
     "test:spec:jaypie.mock": "vitest run ./src/__tests__/jaypie.mock.spec.js",
+    "test:spec:expressHandler.mock": "vitest run ./src/__tests__/expressHandler-supertest.mock.spec.js",
     "test:spec:jsonApiSchema.module": "vitest run ./src/__tests__/jsonApiSchema.module.spec.js",
     "test:spec:matchers.module": "vitest run ./src/__tests__/matchers.module.spec.js",
     "test:spec:mockLog.module": "vitest run ./src/__tests__/mockLog.module.spec.js",
@@ -46,10 +47,12 @@
   "devDependencies": {
     "eslint": "^8.57.0",
     "eslint-config-jaypie": "^1.0.7",
+    "express": "^4.19.2",
     "hygen": "^6.2.11",
     "jest-extended": "^4.0.2",
     "prettier": "^3.2.5",
     "sort-package-json": "^2.8.0",
+    "supertest": "^7.0.0",
     "vitest": "^1.4.0"
   }
 }

package/src/jaypie.mock.js

@@ -6,6 +6,7 @@ import {
   JAYPIE,
   log,
   UnavailableError,
+  UnhandledError,
 } from "@jaypie/core";
 import { beforeAll, vi } from "vitest";
 
@@ -189,49 +190,77 @@ export const expressHandler = vi.fn((handler, props = {}) => {
   }
   const jaypieFunction = jaypieHandler(handler, props);
   return async (req = {}, res = {}, ...extra) => {
-    // For mocking, let's make sure res json, send, and status are functions
     const status = HTTP.CODE.OK;
-    if (res && typeof res.status === "function") {
-      res.status(200);
+    let response;
+    let responseError;
+    let supertestMode = false;
+    if (
+      res &&
+      typeof res.socket === "object" &&
+      res.constructor.name === "ServerResponse"
+    ) {
+      // Use the response object in supertest mode
+      supertestMode = true;
     }
-    const response = jaypieFunction(req, res, ...extra);
-    if (response) {
-      if (typeof response === "object") {
-        if (typeof response.json === "function") {
-          if (res && typeof res.json === "function") {
-            res.json(response.json());
-          }
+    try {
+      response = await jaypieFunction(req, res, ...extra);
+    } catch (error) {
+      // In the mock context, if status is a function we are in a "supertest"
+      if (supertestMode) {
+        // In theory jaypieFunction has handled all errors
+        const errorStatus = error.status || HTTP.CODE.INTERNAL_SERVER_ERROR;
+        let errorResponse;
+        if (typeof error.json === "function") {
+          errorResponse = error.json();
         } else {
-          if (res && typeof res.status === "function") {
+          // This should never happen
+          errorResponse = new UnhandledError().json();
+        }
+        res.status(errorStatus).json(errorResponse);
+        return;
+      } else {
+        // else, res.status is not a function, throw the error
+        throw error;
+      }
+    }
+    if (responseError) {
+      if (supertestMode) {
+        res.status(responseError.status || HTTP.CODE.INTERNAL_SERVER_ERROR);
+      } else {
+        throw responseError;
+      }
+      // response = response
+    }
+    if (supertestMode) {
+      if (response) {
+        // if (res && typeof res.status === "function") {
+        //   res.status(200);
+        // }
+        if (typeof response === "object") {
+          if (typeof response.json === "function") {
+            res.json(response.json());
+          } else {
             res.status(status).json(response);
           }
-        }
-      } else if (typeof response === "string") {
-        try {
-          if (res && typeof res.status === "function") {
+        } else if (typeof response === "string") {
+          try {
             res.status(status).json(JSON.parse(response));
+          } catch (error) {
+            if (supertestMode) {
+              res.status(status).send(response);
+            }
           }
-        } catch (error) {
-          if (res && typeof res.status === "function") {
-            res.status(status).send(response);
-          }
-        }
-      } else if (response === true) {
-        if (res && typeof res.status === "function") {
+        } else if (response === true) {
           res.status(HTTP.CODE.CREATED).send();
-        }
-      } else {
-        if (res && typeof res.status === "function") {
+        } else {
           res.status(status).send(response);
         }
-      }
-    } else {
-      // No response
-      if (res && typeof res.status === "function") {
+      } else {
         res.status(HTTP.CODE.NO_CONTENT).send();
       }
+    } else {
+      return response;
     }
-    return response;
   };
 });