@cedarjs/testing 9.0.0-canary.1784 → 9.0.0-canary.3124

package/dist/api/checkTestDatabase.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Redacts credentials from a database connection string so it's safe to
+ * print. Handles both URI-style authority credentials, e.g.
+ * `postgres://user:pass@host/db` -> `postgres://user:***@host/db`, and
+ * semicolon-delimited key/value credentials used by SQL Server connection
+ * strings, e.g. `Server=host;Password=secret;` -> `Server=host;Password=***;`.
+ */
+export declare function redactDatabaseUrl(url: string): string;
+/**
+ * Checks that the `DATABASE_URL` about to be used for tests matches the
+ * datasource provider configured in `schema.prisma`, and throws an
+ * actionable error if they don't match.
+ *
+ * Without this check, running `prisma db push`/`migrate reset` against a
+ * mismatched provider/URL combination (e.g. a leftover sqlite fallback URL
+ * with a `postgresql` schema) can hang indefinitely with no output, instead
+ * of failing fast. See https://github.com/cedarjs/cedar/issues/2284.
+ *
+ * If the provider can't be determined (e.g. `schema.prisma` doesn't exist
+ * yet), this is a no-op — Prisma itself will surface the problem.
+ */
+export declare function checkTestDatabaseUrlMatchesProvider(databaseUrl: string, usedFallback: boolean): Promise<void>;
+//# sourceMappingURL=checkTestDatabase.d.ts.map

package/dist/api/checkTestDatabase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkTestDatabase.d.ts","sourceRoot":"","sources":["../../src/api/checkTestDatabase.ts"],"names":[],"mappings":"AAkBA;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIrD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,mCAAmC,CACvD,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,OAAO,iBAmCtB"}

package/dist/api/checkTestDatabase.js

@@ -0,0 +1,44 @@
+import { getPrismaDatasourceProvider } from "@cedarjs/project-config";
+const PROVIDER_URL_SCHEMES = {
+  sqlite: ["file:"],
+  postgresql: ["postgres:", "postgresql:"],
+  postgres: ["postgres:", "postgresql:"],
+  cockroachdb: ["postgres:", "postgresql:"],
+  mysql: ["mysql:"],
+  sqlserver: ["sqlserver:"],
+  mongodb: ["mongodb:", "mongodb+srv:"]
+};
+function getUrlScheme(url) {
+  const match = url.match(/^([a-z][a-z0-9+.-]*:)/i);
+  return match?.[1]?.toLowerCase();
+}
+function redactDatabaseUrl(url) {
+  return url.replace(/:\/\/([^:/?#]+):([^@/?#]+)@/, "://$1:***@").replace(/((?:^|;)\s*password\s*=)[^;]*/gi, "$1***");
+}
+async function checkTestDatabaseUrlMatchesProvider(databaseUrl, usedFallback) {
+  let provider;
+  try {
+    provider = await getPrismaDatasourceProvider();
+  } catch {
+    return;
+  }
+  const expectedSchemes = PROVIDER_URL_SCHEMES[provider];
+  if (!expectedSchemes) {
+    return;
+  }
+  const actualScheme = getUrlScheme(databaseUrl);
+  if (actualScheme && expectedSchemes.includes(actualScheme)) {
+    return;
+  }
+  const redactedUrl = redactDatabaseUrl(databaseUrl);
+  const reason = usedFallback ? `TEST_DATABASE_URL is not set, so the default sqlite test database was used (${redactedUrl}), but your schema.prisma is configured for "${provider}". Set TEST_DATABASE_URL to a "${provider}" connection string to run tests.` : `TEST_DATABASE_URL (${redactedUrl}) does not match the "${provider}" provider configured in schema.prisma. Update TEST_DATABASE_URL to a "${provider}" connection string.`;
+  throw new Error(
+    `Test database URL does not match your Prisma schema's provider.
+
+${reason}`
+  );
+}
+export {
+  checkTestDatabaseUrlMatchesProvider,
+  redactDatabaseUrl
+};

package/dist/api/index.d.ts

@@ -1,5 +1,4 @@
 export * from './apiFunction.js';
 export * from './scenario.js';
 export * from './directive.js';
-export * from './directUrlHelpers.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/api/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA"}

package/dist/api/index.js

@@ -1,4 +1,3 @@
 export * from "./apiFunction.js";
 export * from "./scenario.js";
 export * from "./directive.js";
-export * from "./directUrlHelpers.js";

package/dist/api/vitest/CedarApiVitestEnv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CedarApiVitestEnv.d.ts","sourceRoot":"","sources":["../../../src/api/vitest/CedarApiVitestEnv.ts"],"names":[],"mappings":"AACA,OAAO,2BAA2B,CAAA;AAElC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAQtD,QAAA,MAAM,yBAAyB,EAAE,WAkDhC,CAAA;AAED,eAAe,yBAAyB,CAAA"}
+{"version":3,"file":"CedarApiVitestEnv.d.ts","sourceRoot":"","sources":["../../../src/api/vitest/CedarApiVitestEnv.ts"],"names":[],"mappings":"AAEA,OAAO,2BAA2B,CAAA;AAElC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAUtD,QAAA,MAAM,yBAAyB,EAAE,WAgDhC,CAAA;AAED,eAAe,yBAAyB,CAAA"}

package/dist/api/vitest/CedarApiVitestEnv.js

@@ -1,12 +1,15 @@
-import prismaInternals from "@prisma/internals";
+import path from "node:path";
 import "dotenv-defaults/config.js";
 import execa from "execa";
-import { getPaths, getSchemaPath } from "@cedarjs/project-config";
-import { getDefaultDb, checkAndReplaceDirectUrl } from "../directUrlHelpers.js";
-const { getSchemaWithPath } = prismaInternals;
+import { getPaths } from "@cedarjs/project-config";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
+import {
+  checkTestDatabaseUrlMatchesProvider,
+  redactDatabaseUrl
+} from "../checkTestDatabase.js";
 const CedarApiVitestEnvironment = {
   name: "cedar-api",
-  transformMode: "ssr",
+  viteEnvironment: "ssr",
   async setup() {
     if (process.env.SKIP_DB_PUSH === "1") {
       return {
@@ -15,21 +18,23 @@ const CedarApiVitestEnvironment = {
       };
     }
     const cedarPaths = getPaths();
-    const defaultDb = getDefaultDb(cedarPaths.base);
+    const defaultDb = `file:${path.join(cedarPaths.generated.base, "test.db")}`;
+    const usedFallback = !process.env.TEST_DATABASE_URL;
     process.env.DATABASE_URL = process.env.TEST_DATABASE_URL || defaultDb;
-    const schemaPath = await getSchemaPath(cedarPaths.api.prismaConfig);
-    const result = await getSchemaWithPath(schemaPath);
-    const prismaSchema = result.schemas.map(([, content]) => content).join("\n");
-    const directUrlEnvVar = checkAndReplaceDirectUrl(prismaSchema, defaultDb);
-    const command = process.env.TEST_DATABASE_STRATEGY === "reset" ? ["prisma", "migrate", "reset", "--force", "--skip-seed"] : ["prisma", "db", "push", "--force-reset", "--accept-data-loss"];
-    const directUrlDefinition = directUrlEnvVar ? { [directUrlEnvVar]: process.env[directUrlEnvVar] } : {};
-    execa.sync("yarn", ["cedar", ...command], {
+    await checkTestDatabaseUrlMatchesProvider(
+      process.env.DATABASE_URL,
+      usedFallback
+    );
+    console.log(
+      `Setting up test database: ${redactDatabaseUrl(process.env.DATABASE_URL)}`
+    );
+    const command = process.env.TEST_DATABASE_STRATEGY === "reset" ? ["prisma", "migrate", "reset", "--force"] : ["prisma", "db", "push", "--force-reset", "--accept-data-loss"];
+    const pm = getPackageManager();
+    const pmExec = pm === "pnpm" ? pm : "npx";
+    execa.sync(pmExec, ["cedar", ...command], {
       cwd: cedarPaths.api.base,
       stdio: "inherit",
-      env: {
-        DATABASE_URL: process.env.DATABASE_URL,
-        ...directUrlDefinition
-      }
+      env: process.env
     });
     return {
       teardown() {

package/dist/api/vitest/teardown.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Whether `e` is a constraint violation that scenario teardown recovers from
+ * by emptying the table later, rather than an error worth raising.
+ */
+export declare function isHandledTeardownError(e: unknown): boolean;
+/**
+ * Empties every table in `order`, deferring a table to the end of the order
+ * when a foreign key says another table has to be emptied first, and
+ * returning the order that worked so the next run can start with it.
+ *
+ * A table that cannot be emptied in any order (a trigger that aborts the
+ * delete, or a foreign key no ordering satisfies) would otherwise be deferred
+ * forever, since deferring appends to the order being walked. Deferring every
+ * table still waiting without emptying one means no order works, so the
+ * driver's error is raised instead.
+ */
+export declare function emptyTablesInWorkingOrder(order: string[], emptyTable: (modelName: string) => Promise<unknown>): Promise<string[]>;
+//# sourceMappingURL=teardown.d.ts.map

package/dist/api/vitest/teardown.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"teardown.d.ts","sourceRoot":"","sources":["../../../src/api/vitest/teardown.ts"],"names":[],"mappings":"AA0BA;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAQ1D;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAClD,OAAO,CAAC,MAAM,EAAE,CAAC,CA+BnB"}

package/dist/api/vitest/teardown.js

@@ -0,0 +1,43 @@
+const RETRYABLE_ERROR_KINDS = [
+  "ForeignKeyConstraintViolation",
+  "RestrictViolation"
+];
+function property(value, key) {
+  return typeof value === "object" && value !== null ? value[key] : void 0;
+}
+function isHandledTeardownError(e) {
+  const cause = property(
+    property(property(e, "meta"), "driverAdapterError"),
+    "cause"
+  );
+  const kind = property(cause, "kind");
+  return typeof kind === "string" && RETRYABLE_ERROR_KINDS.includes(kind);
+}
+async function emptyTablesInWorkingOrder(order, emptyTable) {
+  const remaining = [...order];
+  let pendingCount = remaining.length;
+  let deferralsSinceLastEmptied = 0;
+  for (const modelName of remaining) {
+    if (modelName === null) {
+      continue;
+    }
+    try {
+      await emptyTable(modelName);
+      pendingCount--;
+      deferralsSinceLastEmptied = 0;
+    } catch (e) {
+      console.error("teardown error\n", e);
+      if (!isHandledTeardownError(e) || deferralsSinceLastEmptied >= pendingCount) {
+        throw e;
+      }
+      deferralsSinceLastEmptied++;
+      remaining[remaining.indexOf(modelName)] = null;
+      remaining.push(modelName);
+    }
+  }
+  return remaining.filter((name) => name !== null);
+}
+export {
+  emptyTablesInWorkingOrder,
+  isHandledTeardownError
+};

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

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

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

@@ -7,7 +7,12 @@ function cedarVitestApiConfigPlugin() {
       return {
         define: getEnvVarDefinitions(),
         ssr: {
-          noExternal: ["@cedarjs/testing"]
+          // `@cedarjs/tenancy` reads and writes the request context, which
+          // the api test setup replaces with a mock. The mock only reaches
+          // code Vite processes, so the tenancy runtime has to be bundled
+          // rather than loaded as an external dependency, or a service under
+          // test and its Prisma extension would see different contexts.
+          noExternal: ["@cedarjs/testing", "@cedarjs/tenancy"]
         },
         resolve: {
           alias: {
@@ -16,13 +21,13 @@ function cedarVitestApiConfigPlugin() {
         },
         test: {
           environment: path.join(import.meta.dirname, "CedarApiVitestEnv.js"),
-          // fileParallelism: false,
-          // fileParallelism doesn't work with vitest projects (which is what
-          // we're using in the root vitest.config.ts). As a workaround we set
-          // poolOptions instead, which also shouldn't work, but was suggested
-          // by Vitest team member AriPerkkio (Hiroshi's answer didn't work).
-          // https://github.com/vitest-dev/vitest/discussions/7416
-          poolOptions: { forks: { singleFork: true } },
+          // All api test files share a single test database, so they can't
+          // run in parallel. In Vitest 3 project-level fileParallelism didn't
+          // work (https://github.com/vitest-dev/vitest/discussions/7416) and
+          // we used the now-removed `poolOptions: { forks: { singleFork:
+          // true } }` as a workaround. Vitest 4 removed `poolOptions` and
+          // supports `fileParallelism` in project configs.
+          fileParallelism: false,
           setupFiles: [path.join(import.meta.dirname, "vitest-api.setup.js")]
         }
       };

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

@@ -1 +1 @@
-{"version":3,"file":"vitest-api.setup.d.ts","sourceRoot":"","sources":["../../../src/api/vitest/vitest-api.setup.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AA0C1D,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,eAAe,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,KAAK,IAAI,CAAA;CAC3E;AAUD,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,cAAc,EAAE,cAAc,CAAA;IAElC,IAAI,uBAAuB,EAAE,OAAO,CAAA;CACrC"}
+{"version":3,"file":"vitest-api.setup.d.ts","sourceRoot":"","sources":["../../../src/api/vitest/vitest-api.setup.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AA4C1D,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,eAAe,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,KAAK,IAAI,CAAA;CAC3E;AAUD,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,cAAc,EAAE,cAAc,CAAA;IAElC,IAAI,uBAAuB,EAAE,OAAO,CAAA;CACrC"}

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

@@ -1,8 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
 import { afterAll, beforeEach, it, describe, vi, beforeAll } from "vitest";
-import { getPaths, getSchemaPath } from "@cedarjs/project-config";
+import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { defineScenario } from "@cedarjs/testing/api";
+import { emptyTablesInWorkingOrder } from "./teardown.js";
 const mockContextStore = vi.hoisted(() => /* @__PURE__ */ new Map());
 const mockContext = vi.hoisted(
   () => new Proxy(
@@ -38,7 +39,6 @@ globalThis.mockCurrentUser = (currentUser) => {
 };
 globalThis.defineScenario = defineScenario;
 const cedarPaths = getPaths();
-const FOREIGN_KEY_ERRORS = [1451, 1811, 23503];
 const TEARDOWN_CACHE_PATH = path.join(
   cedarPaths.generated.base,
   "scenarioTeardown.json"
@@ -60,8 +60,8 @@ function buildScenario(itFunc) {
     } else {
       throw new Error("scenario() requires 2 or 3 arguments");
     }
-    return itFunc(testName, async (ctx) => {
-      const testPath = ctx.task.file.filepath;
+    return itFunc(testName, async ({ task }) => {
+      const testPath = task.file.filepath;
       const { scenario } = await loadScenarios(testPath, scenarioName);
       const scenarioData = await seedScenario(scenario);
       try {
@@ -89,8 +89,8 @@ function buildDescribeScenario(describeFunc) {
     }
     return describeFunc(describeBlockName, () => {
       let scenarioData;
-      beforeAll(async (ctx) => {
-        const testPath = ctx.file.filepath;
+      beforeAll(async ({}, suite) => {
+        const testPath = suite.file.filepath;
         const { scenario } = await loadScenarios(testPath, scenarioName);
         scenarioData = await seedScenario(scenario);
       });
@@ -106,9 +106,8 @@ async function configureTeardown() {
   if (!wasDbImported()) {
     return;
   }
-  const { getDMMF, getSchemaWithPath } = await import("@prisma/internals");
-  const schemaPath = await getSchemaPath(cedarPaths.api.prismaConfig);
-  const result = await getSchemaWithPath(schemaPath);
+  const { getDMMF } = await import("@prisma/internals");
+  const result = await getPrismaSchemas();
   const schema = await getDMMF({ datamodel: result.schemas });
   const schemaModels = schema.datamodel.models.map((m) => {
     return m.dbName || m.name;
@@ -133,23 +132,12 @@ async function teardown() {
   }
   const quoteStyle2 = await getQuoteStyle();
   const projectDb = await getProjectDb();
-  for (const modelName of teardownOrder) {
-    try {
-      const query = `DELETE FROM ${quoteStyle2}${modelName}${quoteStyle2}`;
-      await projectDb.$executeRawUnsafe(query);
-    } catch (e) {
-      console.error("teardown error\n", e);
-      const match = isErrorWithMessage(e) && e.message.match(/Code: `(\d+)`/);
-      if (match && FOREIGN_KEY_ERRORS.includes(parseInt(match[1]))) {
-        const index = teardownOrder.indexOf(modelName);
-        teardownOrder[index] = null;
-        teardownOrder.push(modelName);
-      } else {
-        throw e;
-      }
-    }
-  }
-  teardownOrder = teardownOrder.filter((val) => val);
+  teardownOrder = await emptyTablesInWorkingOrder(
+    teardownOrder,
+    (modelName) => projectDb.$executeRawUnsafe(
+      `DELETE FROM ${quoteStyle2}${modelName}${quoteStyle2}`
+    )
+  );
   if (!isIdenticalArray(teardownOrder, originalTeardownOrder)) {
     originalTeardownOrder = deepCopy(teardownOrder);
     fs.writeFileSync(TEARDOWN_CACHE_PATH, JSON.stringify(teardownOrder));
@@ -210,9 +198,8 @@ const wasDbImported = () => {
 };
 let quoteStyle;
 async function getQuoteStyle() {
-  const { getConfig: getPrismaConfig, getSchemaWithPath } = await import("@prisma/internals");
-  const schemaPath = await getSchemaPath(cedarPaths.api.prismaConfig);
-  const result = await getSchemaWithPath(schemaPath);
+  const { getConfig: getPrismaConfig } = await import("@prisma/internals");
+  const result = await getPrismaSchemas();
   if (!quoteStyle) {
     const config = await getPrismaConfig({
       datamodel: result.schemas
@@ -229,7 +216,8 @@ async function getQuoteStyle() {
 }
 async function getProjectDb() {
   const libDb = await import(`${cedarPaths.api.lib}/db`);
-  return libDb.db;
+  const db = libDb.db;
+  return typeof db?.$withoutTenant === "function" ? db.$withoutTenant() : db;
 }
 function isIdenticalArray(a, b) {
   return JSON.stringify(a) === JSON.stringify(b);
@@ -237,9 +225,6 @@ function isIdenticalArray(a, b) {
 function deepCopy(obj) {
   return JSON.parse(JSON.stringify(obj));
 }
-function isErrorWithMessage(e) {
-  return !!e && typeof e === "object" && "message" in e && typeof e.message === "string";
-}
 function isErrorWithCode(e) {
   return !!e && typeof e === "object" && "code" in e && typeof e.code === "string";
 }

package/dist/cache/index.js

@@ -57,7 +57,7 @@ const _isKVPair = (keyOrCachedValue, cachedValue) => {
 const _checkValueForKey = (cacheClient, cacheKey, expectedValue) => {
   try {
     const cachedStringValue = cacheClient.storage[cacheKey]?.value;
-    const expectedValueOrMatcher = expectedValue?.$$typeof === Symbol.for("jest.asymmetricMatcher") ? expectedValue : JSON.parse(JSON.stringify(expectedValue));
+    const expectedValueOrMatcher = expectedValue?.$$typeof === /* @__PURE__ */ Symbol.for("jest.asymmetricMatcher") ? expectedValue : JSON.parse(JSON.stringify(expectedValue));
     expect(
       cachedStringValue ? JSON.parse(cachedStringValue) : void 0
     ).toEqual(expectedValueOrMatcher);

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

@@ -1 +1 @@
-{"version":3,"file":"MockParamsProvider.d.ts","sourceRoot":"","sources":["../../src/web/MockParamsProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,UAAU,KAAK;IACb,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAC3B;AAED,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAS9C,CAAA"}
+{"version":3,"file":"MockParamsProvider.d.ts","sourceRoot":"","sources":["../../src/web/MockParamsProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,UAAU,KAAK;IACb,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAC3B;AAED,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAgB9C,CAAA"}

package/dist/web/MockParamsProvider.js

@@ -1,9 +1,18 @@
 import React from "react";
 import { useLocation, ParamsContext, parseSearch } from "@cedarjs/router";
+import { mockedRouteParamsMeta } from "./mockRequests.js";
 const MockParamsProvider = ({ children }) => {
   const location = useLocation();
   const searchParams = parseSearch(location.search);
-  return /* @__PURE__ */ React.createElement(ParamsContext.Provider, { value: { params: { ...searchParams } } }, children);
+  return /* @__PURE__ */ React.createElement(
+    ParamsContext.Provider,
+    {
+      value: {
+        params: { ...searchParams, ...mockedRouteParamsMeta.params }
+      }
+    },
+    children
+  );
 };
 export {
   MockParamsProvider

package/dist/web/MockProviders.js

@@ -1,25 +1,31 @@
 import React from "react";
 import { LocationProvider } from "@cedarjs/router";
-import { RedwoodProvider } from "@cedarjs/web";
-import { RedwoodApolloProvider } from "@cedarjs/web/apollo";
+import { CedarProvider } from "@cedarjs/web";
+import { CedarApolloProvider } from "@cedarjs/web/apollo/CedarApolloProvider";
 import { UserRoutes as VitestUserRoutes } from "./globRoutesImporter.js";
 import { useAuth } from "./mockAuth.js";
 import { MockParamsProvider } from "./MockParamsProvider.js";
 let UserRoutes;
 try {
-  const userRoutesModule = require("~__REDWOOD__USER_ROUTES_FOR_MOCK");
+  const userRoutesModule = require("~__CEDAR__USER_ROUTES_FOR_MOCK");
   UserRoutes = userRoutesModule.default;
 } catch (error) {
-  if (!isModuleNotFoundError(error, "~__REDWOOD__USER_ROUTES_FOR_MOCK")) {
+  if (!isModuleNotFoundError(error, "~__CEDAR__USER_ROUTES_FOR_MOCK")) {
     console.warn(error);
   }
   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(CedarProvider, { 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/MockRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MockRouter.d.ts","sourceRoot":"","sources":["../../src/web/MockRouter.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAO9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAG9D,cAAc,4BAA4B,CAAA;AAE1C,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,MAAM,CAAA;CAAO,CAAA;AAE/D;;GAEG;AACH,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAcxC,CAAA"}
+{"version":3,"file":"MockRouter.d.ts","sourceRoot":"","sources":["../../src/web/MockRouter.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAM9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAG9D,cAAc,4BAA4B,CAAA;AAE1C,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,MAAM,CAAA;CAAO,CAAA;AAE/D;;GAEG;AACH,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAcxC,CAAA"}

package/dist/web/mockRequests.d.ts

@@ -1,30 +1,86 @@
-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: {
     currentUser: Record<string, unknown> | null;
 };
 export declare const mockCurrentUser: (user: Record<string, unknown> | null) => void;
+export declare const mockedRouteParamsMeta: {
+    params: Record<string, string>;
+};
+/**
+ * Sets the route params `useParams()` (and generated `routes.*()` calls, via
+ * `MockRouter`) see in a rendered-in-isolation test -- a cell test, for
+ * example, has no matched route to read `{orgSlug}` or similar path params
+ * from. Mirrors `mockCurrentUser`'s effect on `useAuth().currentUser`.
+ *
+ * ```ts
+ * mockRouteParams({ orgSlug: 'acme' })
+ * ```
+ */
+export declare const mockRouteParams: (params: Record<string, string>) => void;
 export {};
 //# sourceMappingURL=mockRequests.d.ts.map

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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"}