@cedarjs/testing 5.0.6 → 5.0.7-next.219

package/dist/config/jest/web/jest-preset.js

@@ -1,12 +1,65 @@
+import fs from "node:fs";
 import path from "node:path";
 import { getPaths } from "@cedarjs/project-config";
 const cedarPaths = getPaths();
-const NODE_MODULES_PATH = path.join(cedarPaths.base, "node_modules");
+const RESOLVE_FROM = [cedarPaths.web.base, cedarPaths.base];
+function resolvePackageDir(packageName, resolveFrom = RESOLVE_FROM) {
+  try {
+    return path.dirname(
+      require.resolve(`${packageName}/package.json`, { paths: resolveFrom })
+    );
+  } catch {
+  }
+  try {
+    let dir = path.dirname(require.resolve(packageName, { paths: resolveFrom }));
+    for (; ; ) {
+      const manifestPath = path.join(dir, "package.json");
+      if (fs.existsSync(manifestPath)) {
+        const manifest = JSON.parse(
+          fs.readFileSync(manifestPath, "utf-8")
+        );
+        if (manifest && typeof manifest === "object" && "name" in manifest && manifest.name === packageName) {
+          return dir;
+        }
+      }
+      const parent = path.dirname(dir);
+      if (parent === dir) {
+        return void 0;
+      }
+      dir = parent;
+    }
+  } catch {
+    return void 0;
+  }
+}
+function packagePath(packageName, relativePath = "", resolveFrom = RESOLVE_FROM) {
+  const packageDir = resolvePackageDir(packageName, resolveFrom);
+  return packageDir && path.join(packageDir, relativePath);
+}
+function resolveSubpath(specifier, resolveFrom = RESOLVE_FROM) {
+  try {
+    return require.resolve(specifier, { paths: resolveFrom });
+  } catch {
+    return void 0;
+  }
+}
+const cedarWebDir = resolvePackageDir("@cedarjs/web");
+const cedarWebResolveFrom = cedarWebDir ? [cedarWebDir, ...RESOLVE_FROM] : RESOLVE_FROM;
+function definedEntries(mappings) {
+  return Object.fromEntries(
+    Object.entries(mappings).filter(
+      (entry) => entry[1] !== void 0
+    )
+  );
+}
 const config = {
   // To make sure other config option which depends on rootDir always
   // use correct path, for example, coverageDirectory
   rootDir: cedarPaths.base,
   roots: [path.join(cedarPaths.web.src)],
+  // Opting out of jsdom's browser-style export condition resolution (needed to
+  // resolve `msw/node`) is handled by the environment itself, via
+  // jest-fixed-jsdom
   testEnvironment: path.join(__dirname, "./RedwoodWebJestEnv.js"),
   displayName: {
     color: "blueBright",
@@ -36,41 +89,78 @@ const config = {
   ],
   setupFilesAfterEnv: [path.resolve(__dirname, "./jest.setup.js")],
   moduleNameMapper: {
-    /**
-     * Make sure modules that require different versions of these
-     * dependencies end up using the same one.
-     */
-    "^react$": path.join(NODE_MODULES_PATH, "react"),
-    "^react-dom$": path.join(NODE_MODULES_PATH, "react-dom"),
-    "^@apollo/client/react$": path.join(
-      NODE_MODULES_PATH,
-      "@apollo/client/react"
-    ),
-    // We replace imports to "@cedarjs/router" with our own "mock" implementation.
-    "^@cedarjs/router$": path.join(
-      NODE_MODULES_PATH,
-      "@cedarjs/testing/dist/cjs/web/MockRouter.js"
-    ),
-    "^@cedarjs/web$": path.join(NODE_MODULES_PATH, "@cedarjs/web/dist/cjs"),
-    // This allows us to mock `createAuthentication` which is used by auth
-    // clients, which in turn lets us mock `useAuth` in tests
-    "^@cedarjs/auth$": path.join(
-      NODE_MODULES_PATH,
-      "@cedarjs/testing/dist/cjs/web/mockAuth.js"
-    ),
-    // @NOTE: Import @cedarjs/testing in web tests, and it automatically remaps to the web side only
-    // This is to prevent web stuff leaking into api, and vice versa
-    "^@cedarjs/testing$": path.join(NODE_MODULES_PATH, "@cedarjs/testing/web"),
+    ...definedEntries({
+      /**
+       * Make sure modules that require different versions of these
+       * dependencies end up using the same one.
+       */
+      "^react$": resolveSubpath("react"),
+      "^react-dom$": resolveSubpath("react-dom"),
+      // Point straight at Apollo Client's CJS build. Resolving the subpath
+      // would go through its `exports` map and land on the ESM build (Node 22+
+      // picks the `module-sync` condition), which Jest can't parse.
+      // Resolved starting from `@cedarjs/web` because that's what depends on
+      // Apollo — a project doesn't declare it itself, so under pnpm it isn't
+      // reachable from the web side at all, and searching from there finds
+      // either nothing or some unrelated copy pulled in by another dependency
+      "^@apollo/client/react$": packagePath(
+        "@apollo/client",
+        "__cjs/react/index.cjs",
+        cedarWebResolveFrom
+      ),
+      // We replace imports to "@cedarjs/router" with our own "mock" implementation.
+      "^@cedarjs/router$": resolveSubpath("@cedarjs/testing/web/MockRouter.js"),
+      "^@cedarjs/web$": resolveSubpath("@cedarjs/web"),
+      // This allows us to mock `createAuthentication` which is used by auth
+      // clients, which in turn lets us mock `useAuth` in tests
+      "^@cedarjs/auth$": resolveSubpath("@cedarjs/testing/auth"),
+      // @NOTE: Import @cedarjs/testing in web tests, and it automatically remaps to the web side only
+      // This is to prevent web stuff leaking into api, and vice versa
+      "^@cedarjs/testing$": resolveSubpath("@cedarjs/testing/web"),
+      /**
+       * Mock out files that aren't particularly useful in tests. See fileMock.js for more info.
+       */
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|css)$": resolveSubpath("@cedarjs/testing/dist/cjs/web/fileMock.js")
+    }),
     "~__CEDAR__USER_ROUTES_FOR_MOCK": cedarPaths.web.routes,
     "~__CEDAR__USER_AUTH_FOR_MOCK": path.join(cedarPaths.web.src, "auth"),
-    /**
-     * Mock out files that aren't particularly useful in tests. See fileMock.js for more info.
-     */
-    "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|css)$": "@cedarjs/testing/dist/cjs/web/fileMock.js",
     // Support for importing files with extensions (like you'd do in ESM projects)
     "^(\\.{1,2}/.*)\\.js$": "$1"
   },
   transform: {
+    // MSW's CommonJS build `require`s ESM-only packages (`rettime`,
+    // `@open-draft/deferred-promise` and `until-async`, which ships ESM in
+    // plain `.js` files). Node supports require(esm), but Jest's runtime
+    // doesn't, so compile any `.mjs` file that gets pulled in from
+    // node_modules (plus until-async) to CommonJS. This needs its own
+    // transform entry (with the config inlined) because the web babel config
+    // ignores node_modules
+    //
+    // The `@cedarjs/auth-*-web` packages are ESM-only too, and (like
+    // until-async) ship plain `.js` files rather than `.mjs` since their
+    // package.json already declares `"type": "module"`. A generated
+    // project's `web/src/auth.ts` imports one of these, so they need the
+    // same carve-out. `@cedarjs/forms` is ESM-only for the same reason, and
+    // gets pulled into virtually every generated project's web-side tests
+    // via `web/src/pages/**` scaffolds and dbAuth login/signup forms.
+    // `@cedarjs/web`, `@cedarjs/auth`, and `@cedarjs/router` are ESM-only
+    // too. `web` and `router` are imported directly by virtually every
+    // generated project's web-side test (`Routes.tsx`, page/component
+    // scaffolds), and `auth` gets pulled in transitively through `web`.
+    // Jest's own module loader re-applies this carve-out to every file it
+    // loads, including ones reached transitively through an
+    // already-transformed require() call, so all of them need to be listed
+    // even though only `web`/`router` are usually imported directly.
+    "[/\\\\]node_modules[/\\\\](?:.+\\.mjs|(?:until-async|@cedarjs[/\\\\](?:auth-[a-z-]+-web|forms|web|auth|router))[/\\\\].+\\.js)$": [
+      "babel-jest",
+      {
+        babelrc: false,
+        configFile: false,
+        presets: [
+          [require.resolve("@babel/preset-env"), { targets: { node: "20" } }]
+        ]
+      }
+    ],
     "\\.[jt]sx?$": [
       "babel-jest",
       // When jest runs tests in parallel, it serializes the config before passing down options to babel
@@ -80,6 +170,21 @@ const config = {
       }
     ]
   },
+  // Jest's default is to not transform anything in node_modules, but `.mjs`
+  // files (and until-async, @cedarjs/auth-*-web, @cedarjs/forms,
+  // @cedarjs/web, @cedarjs/auth, and @cedarjs/router) have to be compiled to
+  // CommonJS (see the transform above).
+  // The `.pnpm` lookahead is what makes this work with pnpm: its virtual store
+  // puts packages at `node_modules/.pnpm/<pkg>@<version>/node_modules/<pkg>`,
+  // so without it the pattern matches (and thereby ignores) at the *first*
+  // `node_modules` segment, where the following path starts with `.pnpm/`
+  // instead of `until-async/` and the exception never gets a chance to apply.
+  // Skipping that segment forces the match onto the inner `node_modules`,
+  // which looks the same as a hoisted npm/yarn layout
+  transformIgnorePatterns: [
+    "[/\\\\]node_modules[/\\\\](?!\\.pnpm[/\\\\])(?!.*\\.mjs$)(?!until-async[/\\\\])(?!@cedarjs[/\\\\]auth-[a-z-]+-web[/\\\\])(?!@cedarjs[/\\\\]forms[/\\\\])(?!@cedarjs[/\\\\]web[/\\\\])(?!@cedarjs[/\\\\]auth[/\\\\])(?!@cedarjs[/\\\\]router[/\\\\])",
+    "\\.pnp\\.[^\\\\/]+$"
+  ],
   resolver: path.resolve(__dirname, "./resolver.js"),
   testPathIgnorePatterns: [".(stories|mock).[jt]sx?$"]
 };

package/dist/config/jest/web/jest.setup.d.ts

@@ -1,5 +1,4 @@
 import '@testing-library/jest-dom';
-import 'whatwg-fetch';
 import { mockCurrentUser as _mockCurrentUser } from '../../../web/mockRequests.js';
 declare global {
     var __RWJS_TESTROOT_DIR: string;

package/dist/config/jest/web/jest.setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest.setup.d.ts","sourceRoot":"","sources":["../../../../src/config/jest/web/jest.setup.ts"],"names":[],"mappings":"AAEA,OAAO,2BAA2B,CAAA;AAClC,OAAO,cAAc,CAAA;AAGrB,OAAO,EAML,eAAe,IAAI,gBAAgB,EACpC,MAAM,8BAA8B,CAAA;AAErC,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,mBAAmB,EAAE,MAAM,CAAA;IAE/B,IAAI,eAAe,EAAE,OAAO,gBAAgB,CAAA;CAC7C"}
+{"version":3,"file":"jest.setup.d.ts","sourceRoot":"","sources":["../../../../src/config/jest/web/jest.setup.ts"],"names":[],"mappings":"AAEA,OAAO,2BAA2B,CAAA;AAGlC,OAAO,EAML,eAAe,IAAI,gBAAgB,EACpC,MAAM,8BAA8B,CAAA;AAErC,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,mBAAmB,EAAE,MAAM,CAAA;IAE/B,IAAI,eAAe,EAAE,OAAO,gBAAgB,CAAA;CAC7C"}

package/dist/config/jest/web/jest.setup.js

@@ -1,5 +1,4 @@
 import "@testing-library/jest-dom";
-import "whatwg-fetch";
 import { findCellMocks } from "../../../web/findCellMocks.js";
 import {
   startMSW,

package/dist/config/jest/web/resolver.js

@@ -1,6 +1,10 @@
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  try {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  } catch (e) {
+    throw mod = 0, e;
+  }
 };
 var require_resolver = __commonJS({
   "src/config/jest/web/resolver.ts"(exports, module) {

package/dist/web/MockProviders.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { LocationProvider } from "@cedarjs/router";
 import { RedwoodProvider } from "@cedarjs/web";
-import { RedwoodApolloProvider } from "@cedarjs/web/apollo";
+import { CedarApolloProvider } from "@cedarjs/web/apollo/CedarApolloProvider";
 import { UserRoutes as VitestUserRoutes } from "./globRoutesImporter.js";
 import { useAuth } from "./mockAuth.js";
 import { MockParamsProvider } from "./MockParamsProvider.js";
@@ -16,10 +16,16 @@ try {
   UserRoutes = () => /* @__PURE__ */ React.createElement(React.Fragment, null);
 }
 const MockProviders = ({ children }) => {
-  return /* @__PURE__ */ React.createElement(RedwoodProvider, { titleTemplate: "%PageTitle | %AppTitle" }, /* @__PURE__ */ React.createElement(RedwoodApolloProvider, { useAuth }, /* @__PURE__ */ React.createElement(UserRoutes, null), /* @__PURE__ */ React.createElement(VitestUserRoutes, null), /* @__PURE__ */ React.createElement(LocationProvider, null, /* @__PURE__ */ React.createElement(MockParamsProvider, null, children))));
+  return /* @__PURE__ */ React.createElement(RedwoodProvider, { titleTemplate: "%PageTitle | %AppTitle" }, /* @__PURE__ */ React.createElement(CedarApolloProvider, { useAuth }, /* @__PURE__ */ React.createElement(UserRoutes, null), /* @__PURE__ */ React.createElement(VitestUserRoutes, null), /* @__PURE__ */ React.createElement(LocationProvider, null, /* @__PURE__ */ React.createElement(MockParamsProvider, null, children))));
 };
 function isModuleNotFoundError(error, module) {
-  return !!error && typeof error === "object" && "code" in error && error.code === "MODULE_NOT_FOUND" && "moduleName" in error && error.moduleName === module;
+  if (!error || typeof error !== "object" || !("code" in error) || error.code !== "MODULE_NOT_FOUND") {
+    return false;
+  }
+  if ("moduleName" in error) {
+    return error.moduleName === module;
+  }
+  return "message" in error && typeof error.message === "string" && (error.message.includes(`'${module}'`) || error.message.includes(`"${module}"`));
 }
 export {
   MockProviders

package/dist/web/fileMock.d.ts

@@ -1,8 +1,9 @@
 /**
- * configure Jest to gracefully handle asset files such as stylesheets and images.
- * Usually, these files aren't particularly useful in tests so we can safely mock them out.
- * See: https://jestjs.io/docs/en/webpack#handling-static-assets
- * See: https://github.com/cedarjs/cedar/blob/4637f61d5e6aeb907d4a17217ab643cfb4d4ebe4/packages/testing/config/jest/web/jest-preset.js#L77-L78
+ * Lets Jest gracefully handle asset files such as stylesheets and images.
+ * Usually, these files aren't particularly useful in tests so we can safely
+ * mock them out. Asset imports are mapped to this module by the
+ * `moduleNameMapper` config in
+ * `packages/testing/src/config/jest/web/jest-preset.ts`.
  */
 declare const _default: "fileMock";
 export default _default;

package/dist/web/fileMock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileMock.d.ts","sourceRoot":"","sources":["../../src/web/fileMock.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;wBACY,UAAU;AAAzB,wBAAyB"}
+{"version":3,"file":"fileMock.d.ts","sourceRoot":"","sources":["../../src/web/fileMock.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;wBACY,UAAU;AAAzB,wBAAyB"}

package/dist/web/mockRequests.d.ts

@@ -1,25 +1,67 @@
-import type { StartOptions as StartMSWWorkerOptions, SharedOptions as SharedMSWOptions, MockedResponse, DefaultBodyType, RequestHandler, GraphQLContext, GraphQLRequest, ResponseTransformer } from 'msw';
-/**
- * Plugs fetch for the correct target in order to capture requests.
- *
- * Request handlers can be registered lazily (via `mockGraphQL<Query|Mutation>`),
- * the queue will be drained and used.
- */
-type StartOptions<Target> = Target extends 'browsers' ? StartMSWWorkerOptions : SharedMSWOptions;
-export declare const startMSW: <Target extends "node" | "browsers">(target: Target, options?: StartOptions<Target>) => Promise<any>;
+import type { RequestHandler, SharedOptions } from 'msw';
+import type { StartOptions as StartMSWWorkerOptions } from 'msw/browser';
+interface MockServerCommonApi {
+    use(...handlers: any[]): void;
+    resetHandlers(): void;
+}
+type MockWorkerInstance = MockServerCommonApi & {
+    stop(): void;
+};
+type MockServerInstance = MockServerCommonApi & {
+    listen(options?: Partial<SharedOptions>): void;
+    close(): void;
+};
+type StartOptions<Target> = Target extends 'browsers' ? StartMSWWorkerOptions : Partial<SharedOptions>;
+export declare const startMSW: <Target extends "node" | "browsers">(target: Target, options?: StartOptions<Target>) => Promise<MockWorkerInstance | MockServerInstance>;
 export declare const setupRequestHandlers: () => void;
 export declare const closeServer: () => void;
 export declare const registerHandler: (handler: RequestHandler) => void;
+/**
+ * The `ctx` object passed to mock-data functions. It mirrors the API of MSW
+ * v1's GraphQL context so that existing Cedar mocks keep working with MSW v2,
+ * where the `(req, res, ctx)` resolver signature no longer exists.
+ */
+export interface MockGraphQLContext {
+    /** Set the http response status code (and optionally status text) */
+    status(code: number, text?: string): void;
+    /** Delay the response by the given number of milliseconds */
+    delay(durationMs: number): void;
+    /** Return GraphQL errors in the response */
+    errors(errorList: Record<string, unknown>[]): void;
+    /** Set a response header. Accepts a name/value pair or an object */
+    set(name: string | Record<string, string>, value?: string): void;
+    /** Set a response cookie */
+    cookie(name: string, value: string): void;
+    /** Set the `extensions` field of the GraphQL response */
+    extensions(extensions: Record<string, unknown>): void;
+    /** Set an arbitrary field on the GraphQL response body */
+    field(fieldName: string, value: unknown): void;
+    /** Set the `data` field of the response. Overrides the returned mock-data */
+    data(data: Record<string, unknown>): void;
+    /** Perform a request that bypasses any mock handlers */
+    fetch(input: string | URL | Request, init?: RequestInit): Promise<Response>;
+}
+/**
+ * Information about the intercepted GraphQL request, passed to mock-data
+ * functions as `req`
+ */
+export interface MockGraphQLRequest {
+    /** The intercepted Fetch API `Request` */
+    request: Request;
+    /** The GraphQL query document string */
+    query: string;
+    operationName: string;
+    variables: Record<string, any>;
+    cookies: Record<string, string>;
+    url: URL;
+    headers: Headers;
+    method: string;
+}
 export type DataFunction<Query extends Record<string, unknown> = Record<string, unknown>, QueryVariables = Record<string, any>> = (variables: QueryVariables, { req, ctx, }: {
-    req: GraphQLRequest<any>;
-    ctx: GraphQLContext<Record<string, any>>;
-}) => Query | void;
-type ResponseFunction<BodyType extends DefaultBodyType = any> = (...transformers: ResponseTransformer<BodyType>[]) => MockedResponse<BodyType>;
-type ResponseEnhancers = {
-    once: ResponseFunction<any>;
-    networkError: (message: string) => void;
-};
-type ResponseEnhancer = keyof ResponseEnhancers;
+    req: MockGraphQLRequest;
+    ctx: MockGraphQLContext;
+}) => Query | void | Promise<Query | void>;
+type ResponseEnhancer = 'once' | 'networkError';
 export declare const mockGraphQLQuery: <Query extends Record<string, unknown> = Record<string, unknown>, QueryVariables = Record<string, any>>(operation: string, data: DataFunction<Query, QueryVariables> | Query, responseEnhancer?: ResponseEnhancer) => Record<string, any> | DataFunction<Record<string, unknown>, Record<string, any>>;
 export declare const mockGraphQLMutation: <Query extends Record<string, unknown> = Record<string, unknown>, QueryVariables = Record<string, any>>(operation: string, data: DataFunction<Query, QueryVariables> | Query, responseEnhancer?: ResponseEnhancer) => Record<string, any> | DataFunction<Record<string, unknown>, Record<string, any>>;
 export declare const mockedUserMeta: {

package/dist/web/mockRequests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mockRequests.d.ts","sourceRoot":"","sources":["../../src/web/mockRequests.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,IAAI,qBAAqB,EACrC,aAAa,IAAI,gBAAgB,EACjC,cAAc,EACd,eAAe,EACf,cAAc,EACd,cAAc,EACd,cAAc,EACd,mBAAmB,EAGpB,MAAM,KAAK,CAAA;AAQZ;;;;;GAKG;AAEH,KAAK,YAAY,CAAC,MAAM,IAAI,MAAM,SAAS,UAAU,GACjD,qBAAqB,GACrB,gBAAgB,CAAA;AACpB,eAAO,MAAM,QAAQ,GAAU,MAAM,SAAS,MAAM,GAAG,UAAU,EAC/D,QAAQ,MAAM,EACd,UAAU,YAAY,CAAC,MAAM,CAAC,iBAgB/B,CAAA;AAED,eAAO,MAAM,oBAAoB,YAMhC,CAAA;AAED,eAAO,MAAM,WAAW,YAEvB,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,SAAS,cAAc,SAQtD,CAAA;AAED,MAAM,MAAM,YAAY,CACtB,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAClC,CACF,SAAS,EAAE,cAAc,EACzB,EACE,GAAG,EACH,GAAG,GACJ,EAAE;IACD,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAA;IACxB,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;CACzC,KACE,KAAK,GAAG,IAAI,CAAA;AAGjB,KAAK,gBAAgB,CAAC,QAAQ,SAAS,eAAe,GAAG,GAAG,IAAI,CAC9D,GAAG,YAAY,EAAE,mBAAmB,CAAC,QAAQ,CAAC,EAAE,KAC7C,cAAc,CAAC,QAAQ,CAAC,CAAA;AAE7B,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAA;IAC3B,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACxC,CAAA;AACD,KAAK,gBAAgB,GAAG,MAAM,iBAAiB,CAAA;AAuD/C,eAAO,MAAM,gBAAgB,GAC3B,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAEpC,WAAW,MAAM,EACjB,MAAM,YAAY,CAAC,KAAK,EAAE,cAAc,CAAC,GAAG,KAAK,EACjD,mBAAmB,gBAAgB,qFAGpC,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAEpC,WAAW,MAAM,EACjB,MAAM,YAAY,CAAC,KAAK,EAAE,cAAc,CAAC,GAAG,KAAK,EACjD,mBAAmB,gBAAgB,qFAGpC,CAAA;AAED,eAAO,MAAM,cAAc,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAEzE,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,SASnE,CAAA"}
+{"version":3,"file":"mockRequests.d.ts","sourceRoot":"","sources":["../../src/web/mockRequests.ts"],"names":[],"mappings":"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"}

package/dist/web/mockRequests.js

@@ -1,28 +1,43 @@
-import { setupWorker, graphql } from "msw";
+import { bypass, delay, graphql, HttpResponse } 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") {
-    SERVER_INSTANCE = setupWorker();
-    await SERVER_INSTANCE.start(options);
+    const { setupWorker } = await import("msw/browser");
+    const worker = setupWorker();
+    SERVER_INSTANCE = worker;
+    await worker.start(options);
   } else {
-    const { setupServer } = await import("msw/node");
-    SERVER_INSTANCE = setupServer();
-    await SERVER_INSTANCE.listen(options);
+    const { setupServer } = await import(
+      /* @vite-ignore */
+      MSW_NODE_SPECIFIER
+    );
+    const server = setupServer();
+    SERVER_INSTANCE = server;
+    server.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 = () => {
-  SERVER_INSTANCE.close();
+  if (!SERVER_INSTANCE) {
+    return;
+  }
+  if ("close" in SERVER_INSTANCE) {
+    SERVER_INSTANCE.close();
+  } else {
+    SERVER_INSTANCE.stop();
+  }
+  SERVER_INSTANCE = void 0;
 };
 const registerHandler = (handler) => {
   if (!SERVER_INSTANCE) {
@@ -32,39 +47,95 @@ const registerHandler = (handler) => {
   }
 };
 const mockGraphQL = (type, operation, data, responseEnhancer) => {
-  const resolver = (req, res, ctx) => {
-    let d = data;
-    let responseTransforms = [];
+  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();
     if (typeof data === "function") {
-      const captureTransform = (fn) => {
-        return (...args) => {
-          const resTransform = fn(...args);
-          responseTransforms = [...responseTransforms, resTransform];
-          return resTransform;
-        };
+      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 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)
+      const req = {
+        request,
+        query,
+        operationName,
+        variables,
+        cookies,
+        url: new URL(request.url),
+        headers: request.headers,
+        method: request.method
       };
-      d = data(req.variables, {
-        req,
-        ctx: newCtx
-      });
+      d = await data(variables, { req, ctx });
+    } else {
+      d = data;
     }
-    return (responseEnhancer ? res[responseEnhancer] : res)(
-      ctx.data(d),
-      ...responseTransforms
-    );
+    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 });
   };
-  registerHandler(graphql[type](operation, resolver));
+  registerHandler(
+    graphql[type](operation, resolver, {
+      once: responseEnhancer === "once"
+    })
+  );
   return data;
 };
 const mockGraphQLQuery = (operation, data, responseEnhancer) => {

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

@@ -1,4 +1,5 @@
 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,+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,0BAA0B,EAAE,MAAM,0CAA0C,CAAA;AACrF,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,8 +1,10 @@
 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/dist/web/vitest/vite-plugin-cedar-vitest-web-config.d.ts

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,16 @@
+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/vite-plugin-cedarjs-router-import-transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedarjs-router-import-transform.d.ts","sourceRoot":"","sources":["../../../src/web/vitest/vite-plugin-cedarjs-router-import-transform.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAExC;;;GAGG;AACH,wBAAgB,kCAAkC,IAAI,YAAY,CAejE"}
+{"version":3,"file":"vite-plugin-cedarjs-router-import-transform.d.ts","sourceRoot":"","sources":["../../../src/web/vitest/vite-plugin-cedarjs-router-import-transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAExC;;;GAGG;AACH,wBAAgB,kCAAkC,IAAI,YAAY,CAejE"}

package/dist/web/vitest/vite-plugin-create-auth-import-transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-create-auth-import-transform.d.ts","sourceRoot":"","sources":["../../../src/web/vitest/vite-plugin-create-auth-import-transform.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAExC,wBAAgB,+BAA+B,IAAI,YAAY,CAuB9D"}
+{"version":3,"file":"vite-plugin-create-auth-import-transform.d.ts","sourceRoot":"","sources":["../../../src/web/vitest/vite-plugin-create-auth-import-transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAExC,wBAAgB,+BAA+B,IAAI,YAAY,CAuB9D"}

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

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

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

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