@cedarjs/testing 7.0.0 → 8.0.0-canary.3263

package/dist/api/mockContext.d.ts

@@ -1,5 +1,5 @@
 export interface GlobalContext extends Record<string, unknown> {
 }
-export declare const context: {};
+export declare const context: GlobalContext;
 export declare const setContext: (newContext: GlobalContext) => GlobalContext;
 //# sourceMappingURL=mockContext.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mockContext.d.ts","sourceRoot":"","sources":["../../src/api/mockContext.ts"],"names":[],"mappings":"AAoCA,MAAM,WAAW,aAAc,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAAG;AAEjE,eAAO,MAAM,OAAO,IAAc,CAAA;AAElC,eAAO,MAAM,UAAU,GAAI,YAAY,aAAa,KAAG,aAKtD,CAAA"}
+{"version":3,"file":"mockContext.d.ts","sourceRoot":"","sources":["../../src/api/mockContext.ts"],"names":[],"mappings":"AAiCA,MAAM,WAAW,aAAc,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAAG;AAEjE,eAAO,MAAM,OAAO,eAAc,CAAA;AAElC,eAAO,MAAM,UAAU,GAAI,YAAY,aAAa,KAAG,aAYtD,CAAA"}

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: {

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

@@ -3,6 +3,7 @@ import path from "node:path";
 import { afterAll, beforeEach, it, describe, vi, beforeAll } from "vitest";
 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 HANDLED_ERRORS = [1451, 1811, 23001, 23503];
 const TEARDOWN_CACHE_PATH = path.join(
   cedarPaths.generated.base,
   "scenarioTeardown.json"
@@ -132,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 && HANDLED_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));
@@ -227,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);
@@ -235,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/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/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

@@ -68,5 +68,19 @@ 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":"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"}
+{"version":3,"file":"mockRequests.d.ts","sourceRoot":"","sources":["../../src/web/mockRequests.ts"],"names":[],"mappings":"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"}

package/dist/web/mockRequests.js

@@ -157,11 +157,19 @@ const mockCurrentUser = (user) => {
     };
   });
 };
+const mockedRouteParamsMeta = {
+  params: {}
+};
+const mockRouteParams = (params) => {
+  mockedRouteParamsMeta.params = params;
+};
 export {
   closeServer,
   mockCurrentUser,
   mockGraphQLMutation,
   mockGraphQLQuery,
+  mockRouteParams,
+  mockedRouteParamsMeta,
   mockedUserMeta,
   registerHandler,
   setupRequestHandlers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/testing",
-  "version": "7.0.0",
+  "version": "8.0.0-canary.3263",
   "description": "Tools, wrappers and configuration for testing a Cedar project.",
   "repository": {
     "type": "git",
@@ -10,92 +10,29 @@
   "license": "MIT",
   "type": "module",
   "exports": {
-    "./config/jest/web": {
-      "default": "./config/jest/web/index.js"
-    },
-    "./config/jest/api": {
-      "default": "./config/jest/api/index.js"
-    },
-    "./config/jest/api/jest-preset": {
-      "default": "./config/jest/api/jest-preset.js"
-    },
-    "./config/jest/web/jest-preset": {
-      "default": "./config/jest/web/jest-preset.js"
-    },
-    "./dist/cjs/api/scenario.js": {
-      "default": "./dist/cjs/api/scenario.js"
-    },
-    "./dist/cjs/api/checkTestDatabase.js": {
-      "default": "./dist/cjs/api/checkTestDatabase.js"
-    },
-    "./dist/cjs/web/findCellMocks": {
-      "default": "./dist/cjs/web/findCellMocks.js"
-    },
-    "./dist/cjs/web/findCellMocks.js": {
-      "default": "./dist/cjs/web/findCellMocks.js"
-    },
-    "./dist/cjs/web/mockRequests": {
-      "default": "./dist/cjs/web/mockRequests.js"
-    },
-    "./dist/cjs/web/mockRequests.js": {
-      "default": "./dist/cjs/web/mockRequests.js"
-    },
-    "./dist/cjs/web/fileMock.js": {
-      "default": "./dist/cjs/web/fileMock.js"
-    },
     "./auth": {
-      "import": {
-        "types": "./dist/web/mockAuth.d.ts",
-        "default": "./dist/web/mockAuth.js"
-      },
-      "require": {
-        "types": "./dist/cjs/web/index.d.ts",
-        "default": "./dist/cjs/web/mockAuth.js"
-      }
+      "types": "./dist/web/mockAuth.d.ts",
+      "default": "./dist/web/mockAuth.js"
     },
     "./api": {
-      "import": {
-        "types": "./dist/api/index.d.ts",
-        "default": "./dist/api/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/api/index.d.ts",
-        "default": "./dist/cjs/api/index.js"
-      }
+      "types": "./dist/api/index.d.ts",
+      "default": "./dist/api/index.js"
     },
     "./api/vitest": {
       "types": "./dist/api/vitest/index.d.ts",
       "default": "./dist/api/vitest/index.js"
     },
     "./cache": {
-      "import": {
-        "types": "./dist/cache/index.d.ts",
-        "default": "./dist/cache/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/cache/index.d.ts",
-        "default": "./dist/cjs/cache/index.js"
-      }
+      "types": "./dist/cache/index.d.ts",
+      "default": "./dist/cache/index.js"
     },
     "./web": {
-      "import": {
-        "types": "./dist/web/index.d.ts",
-        "default": "./dist/web/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/web/index.d.ts",
-        "default": "./dist/cjs/web/index.js"
-      }
+      "types": "./dist/web/index.d.ts",
+      "default": "./dist/web/index.js"
     },
     "./web/MockRouter.js": {
-      "import": {
-        "types": "./dist/web/MockRouter.d.ts",
-        "default": "./dist/web/MockRouter.js"
-      },
-      "require": {
-        "types": "./dist/cjs/web/MockRouter.d.ts",
-        "default": "./dist/cjs/web/MockRouter.js"
-      }
+      "types": "./dist/web/MockRouter.d.ts",
+      "default": "./dist/web/MockRouter.js"
     },
     "./web/vitest": {
       "types": "./dist/web/vitest/index.d.ts",
@@ -103,14 +40,12 @@
     }
   },
   "files": [
-    "config",
     "dist"
   ],
   "scripts": {
     "build": "node ./build.mts && yarn build:types",
     "build:pack": "yarn pack -o cedarjs-testing.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
-    "build:types-cjs": "tsc --build --verbose ./tsconfig.cjs.json",
     "build:watch": "nodemon --watch src --ext 'js,jsx,ts,tsx' --ignore dist --exec 'yarn build'",
     "check:attw": "yarn cedar-fwtools-attw",
     "check:package": "concurrently npm:check:attw yarn:publint",
@@ -119,46 +54,38 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@babel/preset-env": "7.29.7",
-    "@cedarjs/babel-config": "7.0.0",
-    "@cedarjs/context": "7.0.0",
-    "@cedarjs/graphql-server": "7.0.0",
-    "@cedarjs/project-config": "7.0.0",
+    "@cedarjs/context": "8.0.0-canary.3263",
+    "@cedarjs/graphql-server": "8.0.0-canary.3263",
+    "@cedarjs/project-config": "8.0.0-canary.3263",
     "@testing-library/dom": "10.4.2",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.3",
     "@testing-library/user-event": "14.6.7",
     "@types/aws-lambda": "8.10.163",
-    "@types/babel-core": "6.25.10",
     "@types/jest": "29.5.14",
     "@types/node": "24.10.4",
     "ansis": "4.4.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",
+    "jsdom": "27.4.0",
     "msw": "2.15.0",
     "ts-toolbelt": "9.6.0",
     "unplugin-auto-import": "19.3.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "7.0.0",
-    "@cedarjs/framework-tools": "7.0.0",
-    "@cedarjs/router": "7.0.0",
-    "@cedarjs/web": "7.0.0",
+    "@cedarjs/auth": "8.0.0-canary.3263",
+    "@cedarjs/framework-tools": "8.0.0-canary.3263",
+    "@cedarjs/router": "8.0.0-canary.3263",
+    "@cedarjs/web": "8.0.0-canary.3263",
     "concurrently": "9.2.4",
-    "jsdom": "27.4.0",
     "publint": "0.3.24",
     "typescript": "5.9.3",
     "vitest": "4.1.11"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "7.0.0",
-    "@cedarjs/router": "7.0.0",
-    "@cedarjs/web": "7.0.0",
+    "@cedarjs/auth": "8.0.0-canary.3263",
+    "@cedarjs/router": "8.0.0-canary.3263",
+    "@cedarjs/web": "8.0.0-canary.3263",
     "vitest": "4.1.11"
   },
   "peerDependenciesMeta": {

package/config/jest/api/RedwoodApiJestEnv.d.ts

@@ -1,11 +0,0 @@
-import type { EnvironmentContext, JestEnvironmentConfig } from '@jest/environment';
-import { TestEnvironment } from 'jest-environment-node';
-declare class RedwoodApiJestEnvironment extends TestEnvironment {
-    private testPath;
-    constructor(config: JestEnvironmentConfig, context: EnvironmentContext);
-    setup(): Promise<void>;
-    teardown(): Promise<void>;
-    getVmContext(): import("vm").Context | null;
-}
-export default RedwoodApiJestEnvironment;
-//# sourceMappingURL=RedwoodApiJestEnv.d.ts.map

package/config/jest/api/RedwoodApiJestEnv.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RedwoodApiJestEnv.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/RedwoodApiJestEnv.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,cAAM,yBAA0B,SAAQ,eAAe;IACrD,OAAO,CAAC,QAAQ,CAAQ;gBAEZ,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,kBAAkB;IAKhE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B,YAAY;CAUb;AAED,eAAe,yBAAyB,CAAA"}

package/config/jest/api/RedwoodApiJestEnv.js

@@ -1,48 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var RedwoodApiJestEnv_exports = {};
-__export(RedwoodApiJestEnv_exports, {
-  default: () => RedwoodApiJestEnv_default
-});
-module.exports = __toCommonJS(RedwoodApiJestEnv_exports);
-var import_jest_environment_node = require("jest-environment-node");
-class RedwoodApiJestEnvironment extends import_jest_environment_node.TestEnvironment {
-  testPath;
-  constructor(config, context) {
-    super(config, context);
-    this.testPath = context.testPath;
-  }
-  async setup() {
-    await super.setup();
-    this.global.testPath = this.testPath;
-  }
-  async teardown() {
-    await super.teardown();
-  }
-  getVmContext() {
-    return super.getVmContext();
-  }
-  // async handleTestEvent(event, state) {
-  //   if (event.name === 'test_start') {
-  //     // Link to event docs:
-  //     // https://github.com/facebook/jest/blob/master/packages/jest-types/src/Circus.ts
-  //   }
-  // }
-}
-var RedwoodApiJestEnv_default = RedwoodApiJestEnvironment;

package/config/jest/api/apiBabelConfig.d.ts

@@ -1,5 +0,0 @@
-import { getApiSideDefaultBabelConfig } from '@cedarjs/babel-config';
-type ConfigType = Omit<ReturnType<typeof getApiSideDefaultBabelConfig>, 'babelrc'>;
-declare const config: ConfigType;
-export default config;
-//# sourceMappingURL=apiBabelConfig.d.ts.map

package/config/jest/api/apiBabelConfig.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"apiBabelConfig.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/apiBabelConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAG7B,MAAM,uBAAuB,CAAA;AAO9B,KAAK,UAAU,GAAG,IAAI,CACpB,UAAU,CAAC,OAAO,4BAA4B,CAAC,EAC/C,SAAS,CACV,CAAA;AAED,QAAA,MAAM,MAAM,EAAE,UAMb,CAAA;AAED,eAAe,MAAM,CAAA"}

package/config/jest/api/apiBabelConfig.js

@@ -1,34 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var apiBabelConfig_exports = {};
-__export(apiBabelConfig_exports, {
-  default: () => apiBabelConfig_default
-});
-module.exports = __toCommonJS(apiBabelConfig_exports);
-var import_babel_config = require("@cedarjs/babel-config");
-const { babelrc: _b, ...defaultBabelConfig } = (0, import_babel_config.getApiSideDefaultBabelConfig)();
-const config = {
-  ...defaultBabelConfig,
-  plugins: (0, import_babel_config.getApiSideBabelPlugins)(),
-  presets: (0, import_babel_config.getApiSideBabelPresets)({
-    presetEnv: true
-    // jest needs code transpiled
-  })
-};
-var apiBabelConfig_default = config;

package/config/jest/api/globalSetup.d.ts

@@ -1,3 +0,0 @@
-import 'dotenv-defaults/config';
-export default function (): Promise<void>;
-//# sourceMappingURL=globalSetup.d.ts.map

package/config/jest/api/globalSetup.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"globalSetup.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/globalSetup.ts"],"names":[],"mappings":"AAEA,OAAO,wBAAwB,CAAA;AAW/B,0CAqCC"}

package/config/jest/api/globalSetup.js

@@ -1,63 +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 globalSetup_exports = {};
-__export(globalSetup_exports, {
-  default: () => globalSetup_default
-});
-module.exports = __toCommonJS(globalSetup_exports);
-var import_node_path = __toESM(require("node:path"), 1);
-var import_config = require("dotenv-defaults/config");
-var import_execa = __toESM(require("execa"), 1);
-var import_project_config = require("@cedarjs/project-config");
-var import_packageManager = require("@cedarjs/project-config/packageManager");
-var import_checkTestDatabase = require("@cedarjs/testing/dist/cjs/api/checkTestDatabase.js");
-async function globalSetup_default() {
-  if (process.env.SKIP_DB_PUSH === "1") {
-    return;
-  }
-  const cedarPaths = (0, import_project_config.getPaths)();
-  const defaultDb = `file:${import_node_path.default.join(cedarPaths.generated.base, "test.db")}`;
-  const usedFallback = !process.env.TEST_DATABASE_URL;
-  process.env.DATABASE_URL = process.env.TEST_DATABASE_URL || defaultDb;
-  await (0, import_checkTestDatabase.checkTestDatabaseUrlMatchesProvider)(
-    process.env.DATABASE_URL,
-    usedFallback
-  );
-  console.log(
-    `Setting up test database: ${(0, import_checkTestDatabase.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 = (0, import_packageManager.getPackageManager)();
-  const pmExec = pm === "pnpm" ? pm : "npx";
-  import_execa.default.sync(pmExec, ["cedar", ...command], {
-    cwd: cedarPaths.api.base,
-    stdio: "inherit",
-    env: process.env
-  });
-}

package/config/jest/api/index.d.ts

@@ -1,3 +0,0 @@
-import * as jestPreset from './jest-preset.js';
-export = jestPreset;
-//# sourceMappingURL=index.d.ts.map

package/config/jest/api/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAA;AAK9C,SAAS,UAAU,CAAA"}