@cedarjs/testing 2.8.1-next.116 → 2.8.1

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

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

package/config/jest/api/globalSetup.js

@@ -31,21 +31,33 @@ __export(globalSetup_exports, {
   default: () => globalSetup_default
 });
 module.exports = __toCommonJS(globalSetup_exports);
-var import_node_path = __toESM(require("node:path"), 1);
+var import_internals = __toESM(require("@prisma/internals"), 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_directUrlHelpers = require("@cedarjs/testing/dist/cjs/api/directUrlHelpers.js");
+const { getSchemaWithPath } = import_internals.default;
+const rwjsPaths = (0, import_project_config.getPaths)();
 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.base, ".redwood", "test.db")}`;
+  const defaultDb = (0, import_directUrlHelpers.getDefaultDb)(rwjsPaths.base);
   process.env.DATABASE_URL = process.env.TEST_DATABASE_URL || defaultDb;
-  const command = process.env.TEST_DATABASE_STRATEGY === "reset" ? ["prisma", "migrate", "reset", "--force"] : ["prisma", "db", "push", "--force-reset", "--accept-data-loss"];
+  const schemaPath = await (0, import_project_config.getSchemaPath)(rwjsPaths.api.prismaConfig);
+  const result = await getSchemaWithPath(schemaPath);
+  const prismaSchema = result.schemas.map(([, content]) => content).join("\n");
+  const directUrlEnvVar = (0, import_directUrlHelpers.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 env = {
+    DATABASE_URL: process.env.DATABASE_URL
+  };
+  if (directUrlEnvVar) {
+    env[directUrlEnvVar] = process.env[directUrlEnvVar];
+  }
   import_execa.default.sync("yarn", ["cedar", ...command], {
-    cwd: cedarPaths.api.base,
+    cwd: rwjsPaths.api.base,
     stdio: "inherit",
-    env: process.env
+    env
   });
 }

package/config/jest/api/jest-preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AASlC,QAAA,MAAM,MAAM,EAAE,MA0Db,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AASlC,QAAA,MAAM,MAAM,EAAE,MAyDb,CAAA;AAED,eAAe,MAAM,CAAA"}

package/config/jest/api/jest-preset.js

@@ -45,21 +45,22 @@ const config = {
   runner: import_node_path.default.join(__dirname, "../jest-serial-runner.js"),
   testEnvironment: import_node_path.default.join(__dirname, "./RedwoodApiJestEnv.js"),
   globals: {
-    __CEDARJS__TEST_IMPORTS: {
+    __RWJS__TEST_IMPORTS: {
       apiSrcPath: rwjsPaths.api.src,
       tearDownCachePath: import_node_path.default.join(
         rwjsPaths.generated.base,
         "scenarioTeardown.json"
-      )
+      ),
+      prismaConfigPath: rwjsPaths.api.prismaConfig
     }
   },
-  sandboxInjectedGlobals: ["__CEDARJS__TEST_IMPORTS"],
+  sandboxInjectedGlobals: ["__RWJS__TEST_IMPORTS"],
   displayName: {
     color: "redBright",
     name: "api"
   },
   collectCoverageFrom: [
-    "**/*.{js,jsx,ts,tsx,mts,cts}",
+    "**/*.{js,jsx,ts,tsx}",
     "!**/node_modules/**",
     "!**/dist/**"
   ],
@@ -73,8 +74,6 @@ const config = {
   // Note this setup runs for each test file!
   setupFilesAfterEnv: [import_node_path.default.join(__dirname, "./jest.setup.js")],
   moduleNameMapper: {
-    "^api/(.*)$": import_node_path.default.join(rwjsPaths.base, "api/$1"),
-    "^src/(.*)$": import_node_path.default.join(rwjsPaths.api.src, "$1"),
     // @NOTE: Import @cedarjs/testing in api tests, and it automatically remaps to the api side only
     // This is to prevent web stuff leaking into api, and vice versa
     "^@cedarjs/testing$": import_node_path.default.join(NODE_MODULES_PATH, "@cedarjs/testing/api"),
@@ -82,7 +81,7 @@ const config = {
     "^(\\.{1,2}/.*)\\.js$": "$1"
   },
   transform: {
-    "\\.[cm]?[jt]sx?$": [
+    "\\.[jt]sx?$": [
       "babel-jest",
       // When jest runs tests in parallel, it serializes the config before passing down options to babel
       // that's why these must be serializable. So ideally, we should just pass reference to a

package/config/jest/api/jest.setup.js

@@ -24,7 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_scenario = require("@cedarjs/testing/dist/cjs/api/scenario.js");
-const { apiSrcPath, tearDownCachePath } = global.__CEDARJS__TEST_IMPORTS;
+const { apiSrcPath, tearDownCachePath, prismaConfigPath } = global.__RWJS__TEST_IMPORTS;
 global.defineScenario = import_scenario.defineScenario;
 const mockContextStore = /* @__PURE__ */ new Map();
 const mockContext = new Proxy(
@@ -58,9 +58,10 @@ const isIdenticalArray = (a, b) => {
   return JSON.stringify(a) === JSON.stringify(b);
 };
 const configureTeardown = async () => {
-  const { getDMMF } = require("@prisma/internals");
-  const { getPrismaSchemas } = require("@cedarjs/project-config");
-  const { schemas } = await getPrismaSchemas();
+  const { getDMMF, getSchemaWithPath } = require("@prisma/internals");
+  const { getSchemaPath } = require("@cedarjs/project-config");
+  const schemaPath = await getSchemaPath(prismaConfigPath);
+  const { schemas } = await getSchemaWithPath(schemaPath);
   const schema = await getDMMF({ datamodel: schemas });
   const schemaModels = schema.datamodel.models.map(
     (m) => m.dbName || m.name
@@ -75,11 +76,14 @@ const configureTeardown = async () => {
 };
 let quoteStyle;
 const getQuoteStyle = async () => {
-  const { getConfig: getPrismaConfig } = require("@prisma/internals");
-  const { getPrismaSchemas } = require("@cedarjs/project-config");
-  const result = await getPrismaSchemas();
+  const { getConfig: getPrismaConfig, getSchemaWithPath } = require("@prisma/internals");
+  const { getSchemaPath } = require("@cedarjs/project-config");
+  const schemaPath = await getSchemaPath(prismaConfigPath);
+  const result = await getSchemaWithPath(schemaPath);
   if (!quoteStyle) {
-    const config = await getPrismaConfig({ datamodel: result.schemas });
+    const config = await getPrismaConfig({
+      datamodel: result.schemas
+    });
     switch (config.datasources?.[0]?.provider) {
       case "mysql":
         quoteStyle = "`";

package/dist/api/directUrlHelpers.d.ts

@@ -0,0 +1,3 @@
+export declare function getDefaultDb(projectBaseDir: string): string;
+export declare function checkAndReplaceDirectUrl(prismaSchema: string, defaultDb: string): string | undefined;
+//# sourceMappingURL=directUrlHelpers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"directUrlHelpers.d.ts","sourceRoot":"","sources":["../../src/api/directUrlHelpers.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,cAAc,EAAE,MAAM,UAElD;AAED,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,sBA+BlB"}

package/dist/api/directUrlHelpers.js

@@ -0,0 +1,25 @@
+import path from "path";
+function getDefaultDb(projectBaseDir) {
+  return `file:${path.join(projectBaseDir, ".redwood", "test.db")}`;
+}
+function checkAndReplaceDirectUrl(prismaSchema, defaultDb) {
+  const directUrl = prismaSchema.match(PRISMA_DIRECT_URL_REGEXP);
+  if (!directUrl) {
+    return;
+  }
+  const directUrlEnvMatch = directUrl[0].match(BETWEEN_PARENTHESES_REGEXP);
+  if (!directUrlEnvMatch) {
+    throw new Error(
+      "Error parsing `directUrl` from schema.prisma. Proceeding with this env var could be dangerous. Please check your schema.prisma file; if everything looks ok, file an issue."
+    );
+  }
+  const directUrlEnv = directUrlEnvMatch[2];
+  process.env[directUrlEnv] = process.env.TEST_DIRECT_URL || process.env.TEST_DATABASE_URL || defaultDb;
+  return directUrlEnv;
+}
+const PRISMA_DIRECT_URL_REGEXP = /directUrl(\s*)=(\s*)env\(('|")(.*)('|")\)/g;
+const BETWEEN_PARENTHESES_REGEXP = /\(('|")([^)]+)('|")\)/;
+export {
+  checkAndReplaceDirectUrl,
+  getDefaultDb
+};

package/dist/api/index.d.ts

@@ -1,4 +1,5 @@
 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"}
+{"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"}

package/dist/api/index.js

@@ -1,3 +1,4 @@
 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":"AAEA,OAAO,2BAA2B,CAAA;AAElC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAItD,QAAA,MAAM,yBAAyB,EAAE,WAgChC,CAAA;AAED,eAAe,yBAAyB,CAAA"}
+{"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"}

package/dist/api/vitest/CedarApiVitestEnv.js

@@ -1,7 +1,9 @@
-import path from "node:path";
+import prismaInternals from "@prisma/internals";
 import "dotenv-defaults/config.js";
 import execa from "execa";
-import { getPaths } from "@cedarjs/project-config";
+import { getPaths, getSchemaPath } from "@cedarjs/project-config";
+import { getDefaultDb, checkAndReplaceDirectUrl } from "../directUrlHelpers.js";
+const { getSchemaWithPath } = prismaInternals;
 const CedarApiVitestEnvironment = {
   name: "cedar-api",
   transformMode: "ssr",
@@ -13,13 +15,21 @@ const CedarApiVitestEnvironment = {
       };
     }
     const cedarPaths = getPaths();
-    const defaultDb = `file:${path.join(cedarPaths.base, ".redwood", "test.db")}`;
+    const defaultDb = getDefaultDb(cedarPaths.base);
     process.env.DATABASE_URL = process.env.TEST_DATABASE_URL || defaultDb;
-    const command = process.env.TEST_DATABASE_STRATEGY === "reset" ? ["prisma", "migrate", "reset", "--force"] : ["prisma", "db", "push", "--force-reset", "--accept-data-loss"];
+    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], {
       cwd: cedarPaths.api.base,
       stdio: "inherit",
-      env: process.env
+      env: {
+        DATABASE_URL: process.env.DATABASE_URL,
+        ...directUrlDefinition
+      }
     });
     return {
       teardown() {

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

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { afterAll, beforeEach, it, describe, vi, beforeAll } from "vitest";
-import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
+import { getPaths, getSchemaPath } from "@cedarjs/project-config";
 import { defineScenario } from "@cedarjs/testing/api";
 const mockContextStore = vi.hoisted(() => /* @__PURE__ */ new Map());
 const mockContext = vi.hoisted(
@@ -106,8 +106,9 @@ async function configureTeardown() {
   if (!wasDbImported()) {
     return;
   }
-  const { getDMMF } = await import("@prisma/internals");
-  const result = await getPrismaSchemas();
+  const { getDMMF, getSchemaWithPath } = await import("@prisma/internals");
+  const schemaPath = await getSchemaPath(cedarPaths.api.prismaConfig);
+  const result = await getSchemaWithPath(schemaPath);
   const schema = await getDMMF({ datamodel: result.schemas });
   const schemaModels = schema.datamodel.models.map((m) => {
     return m.dbName || m.name;
@@ -209,8 +210,9 @@ const wasDbImported = () => {
 };
 let quoteStyle;
 async function getQuoteStyle() {
-  const { getConfig: getPrismaConfig } = await import("@prisma/internals");
-  const result = await getPrismaSchemas();
+  const { getConfig: getPrismaConfig, getSchemaWithPath } = await import("@prisma/internals");
+  const schemaPath = await getSchemaPath(cedarPaths.api.prismaConfig);
+  const result = await getSchemaWithPath(schemaPath);
   if (!quoteStyle) {
     const config = await getPrismaConfig({
       datamodel: result.schemas

package/dist/cjs/api/directUrlHelpers.d.ts

@@ -0,0 +1,3 @@
+export declare function getDefaultDb(projectBaseDir: string): string;
+export declare function checkAndReplaceDirectUrl(prismaSchema: string, defaultDb: string): string | undefined;
+//# sourceMappingURL=directUrlHelpers.d.ts.map

package/dist/cjs/api/directUrlHelpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"directUrlHelpers.d.ts","sourceRoot":"","sources":["../../../src/api/directUrlHelpers.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,cAAc,EAAE,MAAM,UAElD;AAED,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,sBA+BlB"}

package/dist/cjs/api/directUrlHelpers.js

@@ -0,0 +1,60 @@
+"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 directUrlHelpers_exports = {};
+__export(directUrlHelpers_exports, {
+  checkAndReplaceDirectUrl: () => checkAndReplaceDirectUrl,
+  getDefaultDb: () => getDefaultDb
+});
+module.exports = __toCommonJS(directUrlHelpers_exports);
+var import_path = __toESM(require("path"), 1);
+function getDefaultDb(projectBaseDir) {
+  return `file:${import_path.default.join(projectBaseDir, ".redwood", "test.db")}`;
+}
+function checkAndReplaceDirectUrl(prismaSchema, defaultDb) {
+  const directUrl = prismaSchema.match(PRISMA_DIRECT_URL_REGEXP);
+  if (!directUrl) {
+    return;
+  }
+  const directUrlEnvMatch = directUrl[0].match(BETWEEN_PARENTHESES_REGEXP);
+  if (!directUrlEnvMatch) {
+    throw new Error(
+      "Error parsing `directUrl` from schema.prisma. Proceeding with this env var could be dangerous. Please check your schema.prisma file; if everything looks ok, file an issue."
+    );
+  }
+  const directUrlEnv = directUrlEnvMatch[2];
+  process.env[directUrlEnv] = process.env.TEST_DIRECT_URL || process.env.TEST_DATABASE_URL || defaultDb;
+  return directUrlEnv;
+}
+const PRISMA_DIRECT_URL_REGEXP = /directUrl(\s*)=(\s*)env\(('|")(.*)('|")\)/g;
+const BETWEEN_PARENTHESES_REGEXP = /\(('|")([^)]+)('|")\)/;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  checkAndReplaceDirectUrl,
+  getDefaultDb
+});

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

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

package/dist/cjs/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"}
+{"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"}

package/dist/cjs/api/index.js

@@ -18,9 +18,11 @@ module.exports = __toCommonJS(api_exports);
 __reExport(api_exports, require("./apiFunction.js"), module.exports);
 __reExport(api_exports, require("./scenario.js"), module.exports);
 __reExport(api_exports, require("./directive.js"), module.exports);
+__reExport(api_exports, require("./directUrlHelpers.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./apiFunction.js"),
   ...require("./scenario.js"),
-  ...require("./directive.js")
+  ...require("./directive.js"),
+  ...require("./directUrlHelpers.js")
 });

package/dist/cjs/api/vitest/CedarApiVitestEnv.js

@@ -31,10 +31,12 @@ __export(CedarApiVitestEnv_exports, {
   default: () => CedarApiVitestEnv_default
 });
 module.exports = __toCommonJS(CedarApiVitestEnv_exports);
-var import_node_path = __toESM(require("node:path"), 1);
+var import_internals = __toESM(require("@prisma/internals"), 1);
 var import_config = require("dotenv-defaults/config.js");
 var import_execa = __toESM(require("execa"), 1);
 var import_project_config = require("@cedarjs/project-config");
+var import_directUrlHelpers = require("../directUrlHelpers.js");
+const { getSchemaWithPath } = import_internals.default;
 const CedarApiVitestEnvironment = {
   name: "cedar-api",
   transformMode: "ssr",
@@ -46,13 +48,21 @@ const CedarApiVitestEnvironment = {
       };
     }
     const cedarPaths = (0, import_project_config.getPaths)();
-    const defaultDb = `file:${import_node_path.default.join(cedarPaths.base, ".redwood", "test.db")}`;
+    const defaultDb = (0, import_directUrlHelpers.getDefaultDb)(cedarPaths.base);
     process.env.DATABASE_URL = process.env.TEST_DATABASE_URL || defaultDb;
-    const command = process.env.TEST_DATABASE_STRATEGY === "reset" ? ["prisma", "migrate", "reset", "--force"] : ["prisma", "db", "push", "--force-reset", "--accept-data-loss"];
+    const schemaPath = await (0, import_project_config.getSchemaPath)(cedarPaths.api.prismaConfig);
+    const result = await getSchemaWithPath(schemaPath);
+    const prismaSchema = result.schemas.map(([, content]) => content).join("\n");
+    const directUrlEnvVar = (0, import_directUrlHelpers.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] } : {};
     import_execa.default.sync("yarn", ["cedar", ...command], {
       cwd: cedarPaths.api.base,
       stdio: "inherit",
-      env: process.env
+      env: {
+        DATABASE_URL: process.env.DATABASE_URL,
+        ...directUrlDefinition
+      }
     });
     return {
       teardown() {

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

@@ -129,8 +129,9 @@ async function configureTeardown() {
   if (!wasDbImported()) {
     return;
   }
-  const { getDMMF } = await import("@prisma/internals");
-  const result = await (0, import_project_config.getPrismaSchemas)();
+  const { getDMMF, getSchemaWithPath } = await import("@prisma/internals");
+  const schemaPath = await (0, import_project_config.getSchemaPath)(cedarPaths.api.prismaConfig);
+  const result = await getSchemaWithPath(schemaPath);
   const schema = await getDMMF({ datamodel: result.schemas });
   const schemaModels = schema.datamodel.models.map((m) => {
     return m.dbName || m.name;
@@ -232,8 +233,9 @@ const wasDbImported = () => {
 };
 let quoteStyle;
 async function getQuoteStyle() {
-  const { getConfig: getPrismaConfig } = await import("@prisma/internals");
-  const result = await (0, import_project_config.getPrismaSchemas)();
+  const { getConfig: getPrismaConfig, getSchemaWithPath } = await import("@prisma/internals");
+  const schemaPath = await (0, import_project_config.getSchemaPath)(cedarPaths.api.prismaConfig);
+  const result = await getSchemaWithPath(schemaPath);
   if (!quoteStyle) {
     const config = await getPrismaConfig({
       datamodel: result.schemas

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

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

package/dist/cjs/config/jest/api/globalSetup.js

@@ -31,21 +31,33 @@ __export(globalSetup_exports, {
   default: () => globalSetup_default
 });
 module.exports = __toCommonJS(globalSetup_exports);
-var import_node_path = __toESM(require("node:path"), 1);
+var import_internals = __toESM(require("@prisma/internals"), 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_directUrlHelpers = require("../../../api/directUrlHelpers.js");
+const { getSchemaWithPath } = import_internals.default;
+const rwjsPaths = (0, import_project_config.getPaths)();
 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.base, ".redwood", "test.db")}`;
+  const defaultDb = (0, import_directUrlHelpers.getDefaultDb)(rwjsPaths.base);
   process.env.DATABASE_URL = process.env.TEST_DATABASE_URL || defaultDb;
-  const command = process.env.TEST_DATABASE_STRATEGY === "reset" ? ["prisma", "migrate", "reset", "--force"] : ["prisma", "db", "push", "--force-reset", "--accept-data-loss"];
+  const schemaPath = await (0, import_project_config.getSchemaPath)(rwjsPaths.api.prismaConfig);
+  const result = await getSchemaWithPath(schemaPath);
+  const prismaSchema = result.schemas.map(([, content]) => content).join("\n");
+  const directUrlEnvVar = (0, import_directUrlHelpers.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 env = {
+    DATABASE_URL: process.env.DATABASE_URL
+  };
+  if (directUrlEnvVar) {
+    env[directUrlEnvVar] = process.env[directUrlEnvVar];
+  }
   import_execa.default.sync("yarn", ["cedar", ...command], {
-    cwd: cedarPaths.api.base,
+    cwd: rwjsPaths.api.base,
     stdio: "inherit",
-    env: process.env
+    env
   });
 }

package/dist/cjs/config/jest/api/jest-preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AASlC,QAAA,MAAM,MAAM,EAAE,MA0Db,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../../src/config/jest/api/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AASlC,QAAA,MAAM,MAAM,EAAE,MAyDb,CAAA;AAED,eAAe,MAAM,CAAA"}

package/dist/cjs/config/jest/api/jest-preset.js

@@ -45,21 +45,22 @@ const config = {
   runner: import_node_path.default.join(__dirname, "../jest-serial-runner.js"),
   testEnvironment: import_node_path.default.join(__dirname, "./RedwoodApiJestEnv.js"),
   globals: {
-    __CEDARJS__TEST_IMPORTS: {
+    __RWJS__TEST_IMPORTS: {
       apiSrcPath: rwjsPaths.api.src,
       tearDownCachePath: import_node_path.default.join(
         rwjsPaths.generated.base,
         "scenarioTeardown.json"
-      )
+      ),
+      prismaConfigPath: rwjsPaths.api.prismaConfig
     }
   },
-  sandboxInjectedGlobals: ["__CEDARJS__TEST_IMPORTS"],
+  sandboxInjectedGlobals: ["__RWJS__TEST_IMPORTS"],
   displayName: {
     color: "redBright",
     name: "api"
   },
   collectCoverageFrom: [
-    "**/*.{js,jsx,ts,tsx,mts,cts}",
+    "**/*.{js,jsx,ts,tsx}",
     "!**/node_modules/**",
     "!**/dist/**"
   ],
@@ -73,8 +74,6 @@ const config = {
   // Note this setup runs for each test file!
   setupFilesAfterEnv: [import_node_path.default.join(__dirname, "./jest.setup.js")],
   moduleNameMapper: {
-    "^api/(.*)$": import_node_path.default.join(rwjsPaths.base, "api/$1"),
-    "^src/(.*)$": import_node_path.default.join(rwjsPaths.api.src, "$1"),
     // @NOTE: Import @cedarjs/testing in api tests, and it automatically remaps to the api side only
     // This is to prevent web stuff leaking into api, and vice versa
     "^@cedarjs/testing$": import_node_path.default.join(NODE_MODULES_PATH, "@cedarjs/testing/api"),
@@ -82,7 +81,7 @@ const config = {
     "^(\\.{1,2}/.*)\\.js$": "$1"
   },
   transform: {
-    "\\.[cm]?[jt]sx?$": [
+    "\\.[jt]sx?$": [
       "babel-jest",
       // When jest runs tests in parallel, it serializes the config before passing down options to babel
       // that's why these must be serializable. So ideally, we should just pass reference to a

package/dist/cjs/config/jest/api/jest.setup.js

@@ -24,7 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_scenario = require("../../../api/scenario.js");
-const { apiSrcPath, tearDownCachePath } = global.__CEDARJS__TEST_IMPORTS;
+const { apiSrcPath, tearDownCachePath, prismaConfigPath } = global.__RWJS__TEST_IMPORTS;
 global.defineScenario = import_scenario.defineScenario;
 const mockContextStore = /* @__PURE__ */ new Map();
 const mockContext = new Proxy(
@@ -58,9 +58,10 @@ const isIdenticalArray = (a, b) => {
   return JSON.stringify(a) === JSON.stringify(b);
 };
 const configureTeardown = async () => {
-  const { getDMMF } = await import("@prisma/internals");
-  const { getPrismaSchemas } = await import("@cedarjs/project-config");
-  const { schemas } = await getPrismaSchemas();
+  const { getDMMF, getSchemaWithPath } = await import("@prisma/internals");
+  const { getSchemaPath } = await import("@cedarjs/project-config");
+  const schemaPath = await getSchemaPath(prismaConfigPath);
+  const { schemas } = await getSchemaWithPath(schemaPath);
   const schema = await getDMMF({ datamodel: schemas });
   const schemaModels = schema.datamodel.models.map(
     (m) => m.dbName || m.name
@@ -75,11 +76,14 @@ const configureTeardown = async () => {
 };
 let quoteStyle;
 const getQuoteStyle = async () => {
-  const { getConfig: getPrismaConfig } = await import("@prisma/internals");
-  const { getPrismaSchemas } = await import("@cedarjs/project-config");
-  const result = await getPrismaSchemas();
+  const { getConfig: getPrismaConfig, getSchemaWithPath } = await import("@prisma/internals");
+  const { getSchemaPath } = await import("@cedarjs/project-config");
+  const schemaPath = await getSchemaPath(prismaConfigPath);
+  const result = await getSchemaWithPath(schemaPath);
   if (!quoteStyle) {
-    const config = await getPrismaConfig({ datamodel: result.schemas });
+    const config = await getPrismaConfig({
+      datamodel: result.schemas
+    });
     switch (config.datasources?.[0]?.provider) {
       case "mysql":
         quoteStyle = "`";

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

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

package/dist/config/jest/api/globalSetup.js

@@ -1,19 +1,34 @@
-import path from "node:path";
+import prismaInternals from "@prisma/internals";
 import "dotenv-defaults/config";
 import execa from "execa";
-import { getPaths } from "@cedarjs/project-config";
+import { getPaths, getSchemaPath } from "@cedarjs/project-config";
+import {
+  getDefaultDb,
+  checkAndReplaceDirectUrl
+} from "../../../api/directUrlHelpers.js";
+const { getSchemaWithPath } = prismaInternals;
+const rwjsPaths = getPaths();
 async function globalSetup_default() {
   if (process.env.SKIP_DB_PUSH === "1") {
     return;
   }
-  const cedarPaths = getPaths();
-  const defaultDb = `file:${path.join(cedarPaths.base, ".redwood", "test.db")}`;
+  const defaultDb = getDefaultDb(rwjsPaths.base);
   process.env.DATABASE_URL = process.env.TEST_DATABASE_URL || defaultDb;
-  const command = process.env.TEST_DATABASE_STRATEGY === "reset" ? ["prisma", "migrate", "reset", "--force"] : ["prisma", "db", "push", "--force-reset", "--accept-data-loss"];
+  const schemaPath = await getSchemaPath(rwjsPaths.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 env = {
+    DATABASE_URL: process.env.DATABASE_URL
+  };
+  if (directUrlEnvVar) {
+    env[directUrlEnvVar] = process.env[directUrlEnvVar];
+  }
   execa.sync("yarn", ["cedar", ...command], {
-    cwd: cedarPaths.api.base,
+    cwd: rwjsPaths.api.base,
     stdio: "inherit",
-    env: process.env
+    env
   });
 }
 export {

package/dist/config/jest/api/jest-preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../src/config/jest/api/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AASlC,QAAA,MAAM,MAAM,EAAE,MA0Db,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"jest-preset.d.ts","sourceRoot":"","sources":["../../../../src/config/jest/api/jest-preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AASlC,QAAA,MAAM,MAAM,EAAE,MAyDb,CAAA;AAED,eAAe,MAAM,CAAA"}

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

@@ -12,21 +12,22 @@ const config = {
   runner: path.join(__dirname, "../jest-serial-runner.js"),
   testEnvironment: path.join(__dirname, "./RedwoodApiJestEnv.js"),
   globals: {
-    __CEDARJS__TEST_IMPORTS: {
+    __RWJS__TEST_IMPORTS: {
       apiSrcPath: rwjsPaths.api.src,
       tearDownCachePath: path.join(
         rwjsPaths.generated.base,
         "scenarioTeardown.json"
-      )
+      ),
+      prismaConfigPath: rwjsPaths.api.prismaConfig
     }
   },
-  sandboxInjectedGlobals: ["__CEDARJS__TEST_IMPORTS"],
+  sandboxInjectedGlobals: ["__RWJS__TEST_IMPORTS"],
   displayName: {
     color: "redBright",
     name: "api"
   },
   collectCoverageFrom: [
-    "**/*.{js,jsx,ts,tsx,mts,cts}",
+    "**/*.{js,jsx,ts,tsx}",
     "!**/node_modules/**",
     "!**/dist/**"
   ],
@@ -40,8 +41,6 @@ const config = {
   // Note this setup runs for each test file!
   setupFilesAfterEnv: [path.join(__dirname, "./jest.setup.js")],
   moduleNameMapper: {
-    "^api/(.*)$": path.join(rwjsPaths.base, "api/$1"),
-    "^src/(.*)$": path.join(rwjsPaths.api.src, "$1"),
     // @NOTE: Import @cedarjs/testing in api tests, and it automatically remaps to the api side only
     // This is to prevent web stuff leaking into api, and vice versa
     "^@cedarjs/testing$": path.join(NODE_MODULES_PATH, "@cedarjs/testing/api"),
@@ -49,7 +48,7 @@ const config = {
     "^(\\.{1,2}/.*)\\.js$": "$1"
   },
   transform: {
-    "\\.[cm]?[jt]sx?$": [
+    "\\.[jt]sx?$": [
       "babel-jest",
       // When jest runs tests in parallel, it serializes the config before passing down options to babel
       // that's why these must be serializable. So ideally, we should just pass reference to a

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

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { defineScenario } from "../../../api/scenario.js";
-const { apiSrcPath, tearDownCachePath } = global.__CEDARJS__TEST_IMPORTS;
+const { apiSrcPath, tearDownCachePath, prismaConfigPath } = global.__RWJS__TEST_IMPORTS;
 global.defineScenario = defineScenario;
 const mockContextStore = /* @__PURE__ */ new Map();
 const mockContext = new Proxy(
@@ -35,9 +35,10 @@ const isIdenticalArray = (a, b) => {
   return JSON.stringify(a) === JSON.stringify(b);
 };
 const configureTeardown = async () => {
-  const { getDMMF } = await import("@prisma/internals");
-  const { getPrismaSchemas } = await import("@cedarjs/project-config");
-  const { schemas } = await getPrismaSchemas();
+  const { getDMMF, getSchemaWithPath } = await import("@prisma/internals");
+  const { getSchemaPath } = await import("@cedarjs/project-config");
+  const schemaPath = await getSchemaPath(prismaConfigPath);
+  const { schemas } = await getSchemaWithPath(schemaPath);
   const schema = await getDMMF({ datamodel: schemas });
   const schemaModels = schema.datamodel.models.map(
     (m) => m.dbName || m.name
@@ -52,11 +53,14 @@ const configureTeardown = async () => {
 };
 let quoteStyle;
 const getQuoteStyle = async () => {
-  const { getConfig: getPrismaConfig } = await import("@prisma/internals");
-  const { getPrismaSchemas } = await import("@cedarjs/project-config");
-  const result = await getPrismaSchemas();
+  const { getConfig: getPrismaConfig, getSchemaWithPath } = await import("@prisma/internals");
+  const { getSchemaPath } = await import("@cedarjs/project-config");
+  const schemaPath = await getSchemaPath(prismaConfigPath);
+  const result = await getSchemaWithPath(schemaPath);
   if (!quoteStyle) {
-    const config = await getPrismaConfig({ datamodel: result.schemas });
+    const config = await getPrismaConfig({
+      datamodel: result.schemas
+    });
     switch (config.datasources?.[0]?.provider) {
       case "mysql":
         quoteStyle = "`";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/testing",
-  "version": "2.8.1-next.116+784d2c048",
+  "version": "2.8.1",
   "description": "Tools, wrappers and configuration for testing a Cedar project.",
   "repository": {
     "type": "git",
@@ -119,13 +119,13 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/auth": "2.8.1-next.116+784d2c048",
-    "@cedarjs/babel-config": "2.8.1-next.116+784d2c048",
-    "@cedarjs/context": "2.8.1-next.116+784d2c048",
-    "@cedarjs/graphql-server": "2.8.1-next.116+784d2c048",
-    "@cedarjs/project-config": "2.8.1-next.116+784d2c048",
-    "@cedarjs/router": "2.8.1-next.116+784d2c048",
-    "@cedarjs/web": "2.8.1-next.116+784d2c048",
+    "@cedarjs/auth": "2.8.1",
+    "@cedarjs/babel-config": "2.8.1",
+    "@cedarjs/context": "2.8.1",
+    "@cedarjs/graphql-server": "2.8.1",
+    "@cedarjs/project-config": "2.8.1",
+    "@cedarjs/router": "2.8.1",
+    "@cedarjs/web": "2.8.1",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "14.3.1",
     "@testing-library/user-event": "14.6.1",
@@ -145,9 +145,9 @@
     "whatwg-fetch": "3.6.20"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "2.8.1-next.116",
+    "@cedarjs/framework-tools": "0.0.0",
     "concurrently": "9.2.1",
-    "jsdom": "27.4.0",
+    "jsdom": "24.1.3",
     "publint": "0.3.18",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
@@ -164,7 +164,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "784d2c0484936b2d853e5b316d167602bd80d996",
+  "gitHead": "b1a808f72ff10c72375d0ff2c0be03631a1b79a2",
   "nx": {
     "targets": {
       "build": {