@cedarjs/testing 5.0.4-next.167 → 5.0.4

package/dist/web/mockRequests.js

@@ -1,43 +1,28 @@
-import { bypass, delay, graphql, HttpResponse } from "msw";
+import { setupWorker, graphql } from "msw";
 let REQUEST_HANDLER_QUEUE = [];
 let SERVER_INSTANCE;
-const MSW_NODE_SPECIFIER = "msw/node";
 const startMSW = async (target, options) => {
   if (SERVER_INSTANCE) {
     return SERVER_INSTANCE;
   }
   if (target === "browsers") {
-    const { setupWorker } = await import("msw/browser");
-    const worker = setupWorker();
-    SERVER_INSTANCE = worker;
-    await worker.start(options);
+    SERVER_INSTANCE = setupWorker();
+    await SERVER_INSTANCE.start(options);
   } else {
-    const { setupServer } = await import(
-      /* @vite-ignore */
-      MSW_NODE_SPECIFIER
-    );
-    const server = setupServer();
-    SERVER_INSTANCE = server;
-    server.listen(options);
+    const { setupServer } = await import("msw/node");
+    SERVER_INSTANCE = setupServer();
+    await SERVER_INSTANCE.listen(options);
   }
   return SERVER_INSTANCE;
 };
 const setupRequestHandlers = () => {
-  SERVER_INSTANCE?.resetHandlers();
+  SERVER_INSTANCE.resetHandlers();
   for (const handler of REQUEST_HANDLER_QUEUE) {
-    SERVER_INSTANCE?.use(handler);
+    SERVER_INSTANCE.use(handler);
   }
 };
 const closeServer = () => {
-  if (!SERVER_INSTANCE) {
-    return;
-  }
-  if ("close" in SERVER_INSTANCE) {
-    SERVER_INSTANCE.close();
-  } else {
-    SERVER_INSTANCE.stop();
-  }
-  SERVER_INSTANCE = void 0;
+  SERVER_INSTANCE.close();
 };
 const registerHandler = (handler) => {
   if (!SERVER_INSTANCE) {
@@ -47,95 +32,39 @@ const registerHandler = (handler) => {
   }
 };
 const mockGraphQL = (type, operation, data, responseEnhancer) => {
-  const resolver = async ({
-    request,
-    query,
-    operationName,
-    variables,
-    cookies
-  }) => {
-    let d = void 0;
-    let status = 200;
-    let statusText;
-    let delayDurationMs;
-    let errorList;
-    let extensions;
-    let explicitData;
-    const extraFields = {};
-    const headers = new Headers();
+  const resolver = (req, res, ctx) => {
+    let d = data;
+    let responseTransforms = [];
     if (typeof data === "function") {
-      const ctx = {
-        status: (code, text) => {
-          status = code;
-          statusText = text;
-        },
-        delay: (durationMs) => {
-          delayDurationMs = durationMs;
-        },
-        errors: (errors) => {
-          errorList = errors;
-        },
-        set: (name, value) => {
-          if (typeof name === "object") {
-            for (const [headerName, headerValue] of Object.entries(name)) {
-              headers.set(headerName, headerValue);
-            }
-          } else if (typeof value !== "undefined") {
-            headers.set(name, value);
-          }
-        },
-        cookie: (name, value) => {
-          headers.append("Set-Cookie", `${name}=${value}`);
-        },
-        extensions: (ext) => {
-          extensions = ext;
-        },
-        field: (fieldName, value) => {
-          extraFields[fieldName] = value;
-        },
-        data: (dataValue) => {
-          explicitData = dataValue;
-        },
-        fetch: (input, init) => fetch(bypass(input, init))
+      const captureTransform = (fn) => {
+        return (...args) => {
+          const resTransform = fn(...args);
+          responseTransforms = [...responseTransforms, resTransform];
+          return resTransform;
+        };
       };
-      const req = {
-        request,
-        query,
-        operationName,
-        variables,
-        cookies,
-        url: new URL(request.url),
-        headers: request.headers,
-        method: request.method
+      const newCtx = {
+        status: captureTransform(ctx.status),
+        delay: captureTransform(ctx.delay),
+        errors: captureTransform(ctx.errors),
+        set: captureTransform(ctx.set),
+        fetch: captureTransform(ctx.fetch),
+        data: captureTransform(ctx.data),
+        extensions: captureTransform(ctx.extensions),
+        cookie: captureTransform(ctx.cookie),
+        field: captureTransform(ctx.field)
       };
-      d = await data(variables, { req, ctx });
-    } else {
-      d = data;
+      d = data(req.variables, {
+        req,
+        ctx: newCtx
+      });
     }
-    if (responseEnhancer === "networkError") {
-      return HttpResponse.error();
-    }
-    if (typeof delayDurationMs !== "undefined") {
-      await delay(delayDurationMs);
-    }
-    const body = { ...extraFields };
-    const bodyData = explicitData ?? d;
-    if (typeof bodyData !== "undefined") {
-      body.data = bodyData;
-    }
-    if (typeof errorList !== "undefined") {
-      body.errors = errorList;
-    }
-    if (typeof extensions !== "undefined") {
-      body.extensions = extensions;
-    }
-    return HttpResponse.json(body, { status, statusText, headers });
+    return (responseEnhancer ? res[responseEnhancer] : res)(
+      ctx.data(d),
+      ...responseTransforms
+    );
   };
-  registerHandler(
-    graphql[type](operation, resolver, {
-      once: responseEnhancer === "once"
-    })
-  );
+  registerHandler(graphql[type](operation, resolver));
   return data;
 };
 const mockGraphQLQuery = (operation, data, responseEnhancer) => {

package/dist/web/vitest/index.d.ts

@@ -1,5 +1,4 @@
 export { cedarJsRouterImportTransformPlugin } from './vite-plugin-cedarjs-router-import-transform.js';
-export { cedarVitestWebConfigPlugin } from './vite-plugin-cedar-vitest-web-config.js';
 export { createAuthImportTransformPlugin } from './vite-plugin-create-auth-import-transform.js';
 export { autoImportsPlugin } from './vite-plugin-auto-import.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/web/vitest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/web/vitest/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,MAAM,kDAAkD,CAAA;AACrG,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAA;AACrF,OAAO,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAA;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/web/vitest/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kCAAkC,EAAE,MAAM,kDAAkD,CAAA;AACrG,OAAO,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAA;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA"}

package/dist/web/vitest/index.js

@@ -1,10 +1,8 @@
 import { cedarJsRouterImportTransformPlugin } from "./vite-plugin-cedarjs-router-import-transform.js";
-import { cedarVitestWebConfigPlugin } from "./vite-plugin-cedar-vitest-web-config.js";
 import { createAuthImportTransformPlugin } from "./vite-plugin-create-auth-import-transform.js";
 import { autoImportsPlugin } from "./vite-plugin-auto-import.js";
 export {
   autoImportsPlugin,
   cedarJsRouterImportTransformPlugin,
-  cedarVitestWebConfigPlugin,
   createAuthImportTransformPlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/testing",
-  "version": "5.0.4-next.167",
+  "version": "5.0.4",
   "description": "Tools, wrappers and configuration for testing a Cedar project.",
   "repository": {
     "type": "git",
@@ -116,47 +116,45 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@babel/preset-env": "7.29.7",
-    "@cedarjs/babel-config": "5.0.4-next.167",
-    "@cedarjs/context": "5.0.4-next.167",
-    "@cedarjs/graphql-server": "5.0.4-next.167",
-    "@cedarjs/project-config": "5.0.4-next.167",
-    "@testing-library/dom": "10.4.1",
+    "@cedarjs/babel-config": "5.0.4",
+    "@cedarjs/context": "5.0.4",
+    "@cedarjs/graphql-server": "5.0.4",
+    "@cedarjs/project-config": "5.0.4",
     "@testing-library/jest-dom": "6.9.1",
-    "@testing-library/react": "16.3.2",
+    "@testing-library/react": "14.3.1",
     "@testing-library/user-event": "14.6.1",
     "@types/aws-lambda": "8.10.162",
     "@types/babel-core": "6.25.10",
     "@types/jest": "29.5.14",
     "@types/node": "24.10.4",
-    "ansis": "4.3.1",
+    "ansis": "4.2.0",
     "babel-jest": "^29.7.0",
     "fast-glob": "3.3.3",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
-    "jest-fixed-jsdom": "0.0.11",
     "jest-watch-typeahead": "2.2.2",
-    "msw": "2.15.0",
+    "msw": "1.3.5",
     "ts-toolbelt": "9.6.0",
-    "unplugin-auto-import": "19.3.0"
+    "unplugin-auto-import": "19.3.0",
+    "whatwg-fetch": "3.6.20"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "5.0.4-next.167",
-    "@cedarjs/framework-tools": "5.0.4-next.167",
-    "@cedarjs/router": "5.0.4-next.167",
-    "@cedarjs/web": "5.0.4-next.167",
+    "@arethetypeswrong/cli": "0.18.4",
+    "@cedarjs/auth": "5.0.4",
+    "@cedarjs/framework-tools": "5.0.4",
+    "@cedarjs/router": "5.0.4",
+    "@cedarjs/web": "5.0.4",
     "concurrently": "9.2.4",
     "jsdom": "27.4.0",
-    "publint": "0.3.22",
+    "publint": "0.3.21",
     "typescript": "5.9.3",
-    "vitest": "4.1.10"
+    "vitest": "3.2.6"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "5.0.4-next.167",
-    "@cedarjs/router": "5.0.4-next.167",
-    "@cedarjs/web": "5.0.4-next.167",
-    "vitest": "4.1.10"
+    "@cedarjs/auth": "5.0.4",
+    "@cedarjs/router": "5.0.4",
+    "@cedarjs/web": "5.0.4",
+    "vitest": "3.2.6"
   },
   "peerDependenciesMeta": {
     "vitest": {

package/config/jest/web/jest-fixed-jsdom.d.js

@@ -1 +0,0 @@
-"use strict";

package/dist/cjs/config/jest/web/jest-fixed-jsdom.d.js

@@ -1 +0,0 @@
-"use strict";

package/dist/cjs/web/vitest/vite-plugin-cedar-vitest-web-config.js

@@ -1,51 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var vite_plugin_cedar_vitest_web_config_exports = {};
-__export(vite_plugin_cedar_vitest_web_config_exports, {
-  cedarVitestWebConfigPlugin: () => cedarVitestWebConfigPlugin
-});
-module.exports = __toCommonJS(vite_plugin_cedar_vitest_web_config_exports);
-var import_node_path = __toESM(require("node:path"), 1);
-const import_meta = {};
-function cedarVitestWebConfigPlugin() {
-  return {
-    name: "cedar-vitest-web-config",
-    config: () => {
-      return {
-        test: {
-          setupFiles: [import_node_path.default.join(import_meta.dirname, "vitest-web.setup.js")]
-        }
-      };
-    }
-  };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  cedarVitestWebConfigPlugin
-});

package/dist/cjs/web/vitest/vitest-web.setup.js

@@ -1,19 +0,0 @@
-"use strict";
-var import_vitest = require("vitest");
-var import_project_config = require("@cedarjs/project-config");
-var import_findCellMocks = require("../findCellMocks.js");
-var import_mockRequests = require("../mockRequests.js");
-(0, import_vitest.beforeAll)(async () => {
-  const cellMocks = (0, import_findCellMocks.findCellMocks)((0, import_project_config.getPaths)().web.src);
-  for (const m of cellMocks) {
-    await import(m);
-  }
-  await (0, import_mockRequests.startMSW)("node");
-  (0, import_mockRequests.setupRequestHandlers)();
-});
-(0, import_vitest.afterEach)(() => {
-  (0, import_mockRequests.setupRequestHandlers)();
-});
-(0, import_vitest.afterAll)(() => {
-  (0, import_mockRequests.closeServer)();
-});

package/dist/web/vitest/vite-plugin-cedar-vitest-web-config.d.ts

@@ -1,12 +0,0 @@
-import type { Plugin } from 'vite';
-/**
- * Contributes web-side Vitest config, most importantly a setup file that
- * starts MSW so that `mockGraphQLQuery`/`mockGraphQLMutation` handlers (and
- * cell mocks) actually intercept GraphQL requests during tests.
- *
- * Vitest resolves its `test` config from Vite plugins, so returning `test`
- * from the `config` hook here merges with the user's own vitest config (the
- * `setupFiles` arrays are concatenated).
- */
-export declare function cedarVitestWebConfigPlugin(): Plugin;
-//# sourceMappingURL=vite-plugin-cedar-vitest-web-config.d.ts.map

package/dist/web/vitest/vite-plugin-cedar-vitest-web-config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"vite-plugin-cedar-vitest-web-config.d.ts","sourceRoot":"","sources":["../../../src/web/vitest/vite-plugin-cedar-vitest-web-config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,CAWnD"}

package/dist/web/vitest/vite-plugin-cedar-vitest-web-config.js

@@ -1,16 +0,0 @@
-import path from "node:path";
-function cedarVitestWebConfigPlugin() {
-  return {
-    name: "cedar-vitest-web-config",
-    config: () => {
-      return {
-        test: {
-          setupFiles: [path.join(import.meta.dirname, "vitest-web.setup.js")]
-        }
-      };
-    }
-  };
-}
-export {
-  cedarVitestWebConfigPlugin
-};

package/dist/web/vitest/vitest-web.setup.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=vitest-web.setup.d.ts.map

package/dist/web/vitest/vitest-web.setup.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"vitest-web.setup.d.ts","sourceRoot":"","sources":["../../../src/web/vitest/vitest-web.setup.ts"],"names":[],"mappings":""}

package/dist/web/vitest/vitest-web.setup.js

@@ -1,18 +0,0 @@
-import { afterAll, afterEach, beforeAll } from "vitest";
-import { getPaths } from "@cedarjs/project-config";
-import { findCellMocks } from "../findCellMocks.js";
-import { closeServer, setupRequestHandlers, startMSW } from "../mockRequests.js";
-beforeAll(async () => {
-  const cellMocks = findCellMocks(getPaths().web.src);
-  for (const m of cellMocks) {
-    await import(m);
-  }
-  await startMSW("node");
-  setupRequestHandlers();
-});
-afterEach(() => {
-  setupRequestHandlers();
-});
-afterAll(() => {
-  closeServer();
-});