@cedarjs/cli 2.8.0 → 2.8.1-next.109

package/dist/commands/setup/deploy/providers/flightcontrolHandler.js

@@ -4,13 +4,10 @@ import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../../lib/colors.js";
-import {
-  getPaths,
-  writeFilesTask,
-  printSetupNotes
-} from "../../../../lib/index.js";
+import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
 import { updateApiURLTask } from "../helpers/index.js";
 import {
   flightcontrolConfig,
@@ -18,7 +15,7 @@ import {
   postgresDatabaseService,
   mysqlDatabaseService
 } from "../templates/flightcontrol.js";
-const { getSchemaWithPath, getConfig } = prismaInternals;
+const { getConfig } = prismaInternals;
 const getFlightcontrolJson = async (database) => {
   if (database === "none") {
     return {
@@ -26,12 +23,7 @@ const getFlightcontrolJson = async (database) => {
       content: flightcontrolConfig
     };
   }
-  if (!fs.existsSync(path.join(getPaths().base, "api/db/schema.prisma"))) {
-    throw new Error("Could not find prisma schema at 'api/db/schema.prisma'");
-  }
-  const result = await getSchemaWithPath(
-    path.join(getPaths().base, "api/db/schema.prisma")
-  );
+  const result = await getPrismaSchemas();
   const config = await getConfig({ datamodel: result.schemas });
   const detectedDatabase = config.datasources[0].activeProvider;
   if (detectedDatabase === database) {

package/dist/commands/setup/deploy/providers/renderHandler.js

@@ -1,15 +1,11 @@
-import fs from "node:fs";
 import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../../lib/colors.js";
-import {
-  getPaths,
-  writeFilesTask,
-  printSetupNotes
-} from "../../../../lib/index.js";
+import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
 import { addFilesTask, updateApiURLTask } from "../helpers/index.js";
 import {
   POSTGRES_YAML,
@@ -17,7 +13,7 @@ import {
   RENDER_YAML,
   SQLITE_YAML
 } from "../templates/render.js";
-const { getSchemaWithPath, getConfig } = prismaInternals;
+const { getConfig } = prismaInternals;
 const getRenderYamlContent = async (database) => {
   if (database === "none") {
     return {
@@ -25,11 +21,8 @@ const getRenderYamlContent = async (database) => {
       content: RENDER_YAML("")
     };
   }
-  if (!fs.existsSync("api/db/schema.prisma")) {
-    throw new Error("Could not find prisma schema at 'api/db/schema.prisma'");
-  }
-  const { schemas } = await getSchemaWithPath("api/db/schema.prisma");
-  const config = await getConfig({ datamodel: schemas });
+  const result = await getPrismaSchemas();
+  const config = await getConfig({ datamodel: result.schemas });
   const detectedDatabase = config.datasources[0].activeProvider;
   if (detectedDatabase === database) {
     switch (database) {

package/dist/commands/setup/jobs/jobsHandler.js

@@ -3,11 +3,11 @@ import * as path from "node:path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { addApiPackages } from "@cedarjs/cli-helpers";
-import { getSchemaPath } from "@cedarjs/project-config";
+import { getSchemaPath, getPrismaSchemas } from "@cedarjs/project-config";
 import c from "../../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
-const { getDMMF, getSchemaWithPath } = prismaInternals;
+const { getDMMF } = prismaInternals;
 const MODEL_SCHEMA = `
 model BackgroundJob {
   id        Int       @id @default(autoincrement())
@@ -26,8 +26,7 @@ model BackgroundJob {
 }
 `;
 const getModelNames = async () => {
-  const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
-  const { schemas } = await getSchemaWithPath(schemaPath);
+  const { schemas } = await getPrismaSchemas();
   const schema = await getDMMF({ datamodel: schemas });
   return schema.datamodel.models.map((model) => model.name);
 };

package/dist/commands/setup/realtime/realtime.js

@@ -4,7 +4,7 @@ const description = "Setup RedwoodJS Realtime";
 function builder(yargs) {
   yargs.option("includeExamples", {
     alias: ["e", "examples"],
-    default: true,
+    default: void 0,
     description: "Include examples of how to implement liveQueries and subscriptions",
     type: "boolean"
   }).option("force", {

package/dist/commands/setup/realtime/realtimeHandler.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "path";
 import execa from "execa";
 import { Listr } from "listr2";
+import prompts from "prompts";
 import { addApiPackages } from "@cedarjs/cli-helpers";
 import { projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
@@ -16,13 +17,31 @@ const { version } = JSON.parse(
     "utf-8"
   )
 );
-async function handler({ force, includeExamples, verbose }) {
+async function handleExamplesPreference(includeExamples) {
+  let incl = includeExamples;
+  if (typeof includeExamples === "undefined") {
+    const response = await prompts({
+      type: "toggle",
+      name: "includeExamples",
+      message: "Do you want to generate examples?",
+      initial: true,
+      active: "Yes",
+      inactive: "No"
+    });
+    incl = response.includeExamples;
+  }
+  return incl;
+}
+async function handler(args) {
   const redwoodPaths = getPaths();
   const ts = isTypeScriptProject();
   const realtimeLibFilePath = path.join(
     redwoodPaths.api.lib,
     `realtime.${isTypeScriptProject() ? "ts" : "js"}`
   );
+  const force = args.force || false;
+  const verbose = args.verbose || false;
+  const includeExamples = await handleExamplesPreference(args.includeExamples);
   const tasks = new Listr(
     [
       addApiPackages(["ioredis@^5", `@cedarjs/realtime@${version}`]),

package/dist/commands/setup/ui/libraries/tailwindcssHandler.js

@@ -76,7 +76,7 @@ const handler = async ({ force, install }) => {
     install
   });
   const rwPaths = getPaths();
-  const projectPackages = ["prettier-plugin-tailwindcss@^0.5.12"];
+  const projectPackages = ["prettier-plugin-tailwindcss@^0.7.0"];
   const webWorkspacePackages = [
     "postcss",
     "postcss-loader",

package/dist/commands/test/datasourceWarning.js

@@ -0,0 +1,42 @@
+import fs from "node:fs";
+import Enquirer from "enquirer";
+import { getPaths } from "@cedarjs/project-config";
+async function warnIfNonStandardDatasourceUrl({ force } = {}) {
+  const cedarPaths = getPaths();
+  if (!fs.existsSync(cedarPaths.api.prismaConfig)) {
+    return;
+  }
+  const prismaConfig = await fs.promises.readFile(
+    cedarPaths.api.prismaConfig,
+    "utf-8"
+  );
+  const prismaConfigLines = prismaConfig.split("\n");
+  for (const line of prismaConfigLines) {
+    const envVarName = (line.match(
+      /^\s*url: process\.env\.(\w+),?(\s*\/\/.*)?$/
+    ) ?? line.match(/^\s*url: env\(['"](\w+)['"]\),?(\s*\/\/.*)?$/) ?? line.match(/[{,] url: process\.env\.(\w+)(?:,| })/) ?? line.match(/[{,] url: env\(['"](\w+)['"]\)(?:,| })/))?.[1];
+    if (envVarName && envVarName !== "DATABASE_URL") {
+      if (force) {
+        return;
+      }
+      console.warn(
+        `Found a non-standard prisma config datasource url env var: "${envVarName}".
+Cedar will not override this env var, potentially running destructive commands against your production database.`
+      );
+      const { proceed } = await Enquirer.prompt({
+        type: "confirm",
+        name: "proceed",
+        message: "Are you sure you want to run tests against this database?",
+        initial: false
+      });
+      if (!proceed) {
+        console.log("Aborting.");
+        process.exit(1);
+      }
+      return;
+    }
+  }
+}
+export {
+  warnIfNonStandardDatasourceUrl
+};

package/dist/commands/{testHandler.js → test/testHandler.js}

@@ -1,12 +1,22 @@
 import fs from "node:fs";
-import path from "path";
+import path from "node:path";
 import execa from "execa";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
-import c from "../lib/colors.js";
-import { getPaths } from "../lib/index.js";
-import * as project from "../lib/project.js";
+import c from "../../lib/colors.js";
+import { getPaths } from "../../lib/index.js";
+import * as project from "../../lib/project.js";
+import { warnIfNonStandardDatasourceUrl } from "./datasourceWarning.js";
+function hasStringMessage(value) {
+  return typeof value === "object" && value !== null && "message" in value && value.message === "string";
+}
+function getExitCode(value) {
+  if (!value || typeof value !== "object" || !("exitCode" in value) || typeof value.exitCode !== "number") {
+    return void 0;
+  }
+  return value.exitCode;
+}
 function isInGitRepository() {
   try {
     execa.commandSync("git rev-parse --is-inside-work-tree");
@@ -24,25 +34,24 @@ function isInMercurialRepository() {
   }
 }
 function isJestConfigFile(sides) {
-  for (let side of sides) {
+  for (const side of sides) {
     try {
-      if (sides.includes(side)) {
-        const jestConfigExists = fs.existsSync(path.join(side, "jest.config.js")) || fs.existsSync(path.join(side, "jest.config.ts"));
-        if (!jestConfigExists) {
-          console.error(
-            c.error(
-              `
+      const jestConfigExists = fs.existsSync(path.join(side, "jest.config.js")) || fs.existsSync(path.join(side, "jest.config.ts"));
+      if (!jestConfigExists) {
+        console.error(
+          c.error(
+            `
 Error: Missing Jest config file ${side}/jest.config.js
 To add this file, run \`npx @cedarjs/codemods update-jest-config\`
 `
-            )
-          );
-          throw new Error(`Error: Jest config file not found in ${side} side`);
-        }
+          )
+        );
+        throw new Error(`Error: Jest config file not found in ${side} side`);
       }
-    } catch (e) {
-      errorTelemetry(process.argv, e.message);
-      process.exit(e?.exitCode || 1);
+    } catch (error) {
+      const message = hasStringMessage(error) ? error.message : `Error: Jest config file not found in ${side} side`;
+      errorTelemetry(process.argv, message);
+      process.exit(getExitCode(error) ?? 1);
     }
   }
 }
@@ -51,6 +60,7 @@ const handler = async ({
   watch = true,
   collectCoverage = false,
   dbPush = true,
+  force = false,
   ...others
 }) => {
   recordTelemetryAttributes({
@@ -64,21 +74,20 @@ const handler = async ({
     if ([
       "collect-coverage",
       "db-push",
+      "force",
       "loadEnvFiles",
       "watch",
       "$0",
       "_"
     ].includes(flagName)) {
       return [];
-    } else {
-      const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
-      const flagValue = others[flagName];
-      if (Array.isArray(flagValue)) {
-        return flagValue.flatMap((val) => [flag, val]);
-      } else {
-        return [flag, flagValue];
-      }
     }
+    const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
+    const flagValue = others[flagName];
+    if (Array.isArray(flagValue)) {
+      return flagValue.flatMap((val) => [flag, val]);
+    }
+    return [flag, flagValue];
   });
   const sides = filterParams.filter(
     (filterString) => project.workspaces().includes(filterString)
@@ -113,11 +122,14 @@ const handler = async ({
     if (sides.includes("api") && !dbPush) {
       process.env.SKIP_DB_PUSH = "1";
     }
+    if (sides.includes("api")) {
+      await warnIfNonStandardDatasourceUrl({ force });
+    }
     const runCommand = async () => {
       await execa("yarn", ["jest", ...jestArgs], {
         cwd: rwjsPaths.base,
         stdio: "inherit",
-        env: { DATABASE_URL }
+        env: { ...process.env, DATABASE_URL }
       });
     };
     if (watch) {
@@ -127,9 +139,10 @@ const handler = async ({
         await runCommand();
       });
     }
-  } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    process.exit(e?.exitCode || 1);
+  } catch (error) {
+    const message = hasStringMessage(error) ? error.message : "Test command failed";
+    errorTelemetry(process.argv, message);
+    process.exit(getExitCode(error) ?? 1);
   }
 };
 export {

package/dist/commands/{testHandlerEsm.js → test/testHandlerEsm.js}

@@ -2,11 +2,22 @@ import execa from "execa";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
-import { getPaths } from "../lib/index.js";
-import * as project from "../lib/project.js";
+import { getPaths } from "../../lib/index.js";
+import * as project from "../../lib/project.js";
+import { warnIfNonStandardDatasourceUrl } from "./datasourceWarning.js";
+function hasStringMessage(value) {
+  return typeof value === "object" && value !== null && "message" in value && value.message === "string";
+}
+function getExitCode(value) {
+  if (!value || typeof value !== "object" || !("exitCode" in value) || typeof value.exitCode !== "number") {
+    return void 0;
+  }
+  return value.exitCode;
+}
 const handler = async ({
   filter: filterParams = [],
   dbPush = true,
+  force = false,
   ...others
 }) => {
   recordTelemetryAttributes({
@@ -16,22 +27,20 @@ const handler = async ({
   let watch = true;
   const rwjsPaths = getPaths();
   const forwardVitestFlags = Object.keys(others).flatMap((flagName) => {
-    if (["db-push", "loadEnvFiles", "$0", "_"].includes(flagName)) {
+    if (["db-push", "force", "loadEnvFiles", "$0", "_"].includes(flagName)) {
       return [];
-    } else {
-      const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
-      const flagValue = others[flagName];
-      if (flagName === "watch") {
-        watch = flagValue === true;
-      } else if (flagName === "run" && flagValue) {
-        watch = false;
-      }
-      if (Array.isArray(flagValue)) {
-        return flagValue.flatMap((val) => [flag, val]);
-      } else {
-        return [flag, flagValue];
-      }
     }
+    const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
+    const flagValue = others[flagName];
+    if (flagName === "watch") {
+      watch = flagValue === true;
+    } else if (flagName === "run" && flagValue) {
+      watch = false;
+    }
+    if (Array.isArray(flagValue)) {
+      return flagValue.flatMap((val) => [flag, val]);
+    }
+    return [flag, flagValue];
   });
   const sides = filterParams.filter(
     (filterString) => project.workspaces().includes(filterString)
@@ -49,10 +58,12 @@ const handler = async ({
   if (process.env.CI) {
     vitestArgs.push("--run");
   }
-  if (!sides.length) {
-    project.workspaces().forEach((side) => sides.push(side));
+  if (!others["config"]) {
+    if (!sides.length) {
+      project.workspaces().forEach((side) => sides.push(side));
+    }
+    sides.forEach((side) => vitestArgs.push("--project", side));
   }
-  sides.forEach((side) => vitestArgs.push("--project", side));
   try {
     const cacheDirDb = `file:${ensurePosixPath(
       rwjsPaths.generated.base
@@ -61,11 +72,14 @@ const handler = async ({
     if (sides.includes("api") && !dbPush) {
       process.env.SKIP_DB_PUSH = "1";
     }
+    if (sides.includes("api")) {
+      await warnIfNonStandardDatasourceUrl({ force });
+    }
     const runCommand = async () => {
       await execa("yarn", ["vitest", ...vitestArgs], {
         cwd: rwjsPaths.base,
         stdio: "inherit",
-        env: { DATABASE_URL }
+        env: { ...process.env, DATABASE_URL }
       });
     };
     if (watch) {
@@ -75,9 +89,10 @@ const handler = async ({
         await runCommand();
       });
     }
-  } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    process.exit(e?.exitCode || 1);
+  } catch (error) {
+    const message = hasStringMessage(error) ? error.message : "Test command failed";
+    errorTelemetry(process.argv, message);
+    process.exit(getExitCode(error) ?? 1);
   }
 };
 export {

package/dist/commands/test.js

@@ -21,6 +21,10 @@ const builder = (yargs) => {
     describe: "Syncs the test database with your Prisma schema without requiring a migration. It creates a test database if it doesn't already exist.",
     type: "boolean",
     default: true
+  }).option("force", {
+    describe: "Run tests without prompting for confirmation, even when a non-standard datasource url env var is detected.",
+    type: "boolean",
+    default: false
   }).epilogue(
     `For all available flags, run jest cli directly ${c.tip(
       "yarn jest --help"
@@ -34,7 +38,7 @@ Also see the ${terminalLink(
   );
 };
 const handler = async (options) => {
-  const { handler: handler2 } = await import("./testHandler.js");
+  const { handler: handler2 } = await import("./test/testHandler.js");
   return handler2(options);
 };
 export {

package/dist/commands/testEsm.js

@@ -18,6 +18,10 @@ const builder = (yargs) => {
     describe: "Syncs the test database with your Prisma schema without requiring a migration. It creates a test database if it doesn't already exist.",
     type: "boolean",
     default: true
+  }).option("force", {
+    describe: "Skip any confirmation prompts and run tests without interruption. Useful in CI or scripted environments.",
+    type: "boolean",
+    default: false
   }).epilogue(
     `For all available flags, run vitest cli directly ${vitestTip}
 
@@ -26,7 +30,7 @@ Also see the ${cliDocsLink}
   );
 };
 const handler = async (options) => {
-  const { handler: handler2 } = await import("./testHandlerEsm.js");
+  const { handler: handler2 } = await import("./test/testHandlerEsm.js");
   return handler2(options);
 };
 export {

package/dist/commands/type-checkHandler.js

@@ -1,25 +1,36 @@
-import path from "path";
+import path from "node:path";
 import concurrently from "concurrently";
 import execa from "execa";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";
 import { getPaths } from "../lib/index.js";
-const handler = async ({ sides, verbose, prisma, generate }) => {
+const isConcurrentlyErrorArray = (value) => {
+  return Array.isArray(value);
+};
+const handler = async ({
+  sides,
+  verbose = false,
+  prisma = true,
+  generate = true
+}) => {
+  const selectedSides = (Array.isArray(sides) ? sides : []).filter(
+    (side) => typeof side === "string"
+  );
   recordTelemetryAttributes({
     command: "type-check",
-    sides: JSON.stringify(sides),
+    sides: JSON.stringify(selectedSides),
     verbose,
     prisma,
     generate
   });
   const typeCheck = async () => {
     let conclusiveExitCode = 0;
-    const tscForAllSides = sides.map((side) => {
+    const tscForAllSides = selectedSides.map((side) => {
       const projectDir = path.join(getPaths().base, side);
       return {
         cwd: projectDir,
-        command: `yarn tsc --noEmit --skipLibCheck`
+        command: "yarn tsc --noEmit --skipLibCheck"
       };
     });
     const { result } = concurrently(tscForAllSides, {
@@ -28,18 +39,16 @@ const handler = async ({ sides, verbose, prisma, generate }) => {
     });
     try {
       await result;
-    } catch (err) {
-      if (err.length) {
-        const exitCodes = err.map((e) => e?.exitCode).filter(Boolean);
+    } catch (error) {
+      if (isConcurrentlyErrorArray(error)) {
+        const exitCodes = error.map((entry) => entry.exitCode).filter((exitCode2) => Boolean(exitCode2));
         conclusiveExitCode = Math.max(...exitCodes);
       }
     }
     return conclusiveExitCode;
   };
   if (generate && prisma) {
-    await generatePrismaClient({
-      verbose
-    });
+    await generatePrismaClient({ verbose });
   }
   if (generate) {
     await new Listr(
@@ -53,7 +62,7 @@ const handler = async ({ sides, verbose, prisma, generate }) => {
         }
       ],
       {
-        renderer: verbose && "verbose",
+        renderer: verbose ? "verbose" : "default",
         rendererOptions: { collapseSubtasks: false }
       }
     ).run();

package/dist/commands/upgrade/upgradeHandler.js

@@ -331,6 +331,11 @@ async function updatePackageVersionsFromTemplate(ctx, { dryRun, verbose }) {
         title: `Updating ${pkgJsonPath}`,
         task: async (_ctx, task) => {
           const res = await fetch(url);
+          if (!res.ok) {
+            throw new Error(
+              `Failed to fetch template package.json from ${url}: ` + res.statusText
+            );
+          }
           const text = await res.text();
           const templatePackageJson = JSON.parse(text);
           const localPackageJsonText = fs.readFileSync(pkgJsonPath, "utf-8");
@@ -380,16 +385,19 @@ async function downloadYarnPatches(ctx, { dryRun, verbose }) {
     throw new Error("Failed to upgrade");
   }
   const githubToken = process.env.GH_TOKEN || process.env.GITHUB_TOKEN || process.env.REDWOOD_GITHUB_TOKEN;
-  const res = await fetch(
-    "https://api.github.com/repos/cedarjs/cedar/git/trees/main?recursive=1",
-    {
-      headers: {
-        ...githubToken && { Authorization: `Bearer ${githubToken}` },
-        ["X-GitHub-Api-Version"]: "2022-11-28",
-        Accept: "application/vnd.github+json"
-      }
+  const url = "https://api.github.com/repos/cedarjs/cedar/git/trees/main?recursive=1";
+  const res = await fetch(url, {
+    headers: {
+      ...githubToken && { Authorization: `Bearer ${githubToken}` },
+      ["X-GitHub-Api-Version"]: "2022-11-28",
+      Accept: "application/vnd.github+json"
     }
-  );
+  });
+  if (!res.ok) {
+    throw new Error(
+      `Failed to fetch list of yarn patches from ${url}: ` + res.statusText
+    );
+  }
   const json = await res.json();
   const patches = json.tree?.filter(
     (patchInfo) => patchInfo.path.startsWith(
@@ -409,6 +417,11 @@ async function downloadYarnPatches(ctx, { dryRun, verbose }) {
         title: `Downloading ${patch.path}`,
         task: async () => {
           const res2 = await fetch(patch.url);
+          if (!res2.ok) {
+            throw new Error(
+              `Failed to fetch patch metadata from ${patch.url}: ` + res2.statusText
+            );
+          }
           const patchMeta = await res2.json();
           const patchPath = path.join(
             getPaths().base,

package/dist/lib/background.js

@@ -47,6 +47,8 @@ function spawnBackgroundProcess(name, cmd, args) {
     const child = spawn(cmd, args, spawnOptions);
     child.unref();
   }
+  fs.closeSync(stdout);
+  fs.closeSync(stderr);
 }
 export {
   spawnBackgroundProcess

package/dist/lib/generatePrismaClient.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import { createRequire } from "node:module";
 import { resolveGeneratedPrismaClient } from "@cedarjs/project-config";
-import { runCommandTask, getPaths } from "../lib/index.js";
+import { runCommandTask, getPaths } from "./index.js";
 const generatePrismaCommand = async () => {
   const createdRequire = createRequire(import.meta.url);
   const prismaIndexPath = createdRequire.resolve("prisma/build/index.js");
@@ -18,10 +18,10 @@ const generatePrismaClient = async ({
   verbose = true,
   force = true,
   silent = false
-}) => {
+} = {}) => {
   if (!force) {
-    const prismaClientPath = resolveGeneratedPrismaClient();
-    const prismaClientFile = fs.existsSync(prismaClientPath) ? fs.readFileSync(prismaClientPath, "utf8") : "";
+    const { clientPath } = await resolveGeneratedPrismaClient();
+    const prismaClientFile = clientPath && fs.existsSync(clientPath) ? fs.readFileSync(clientPath, "utf8") : "";
     if (!prismaClientFile.includes("@prisma/client did not initialize yet.") && prismaClientFile.includes("exports.Prisma.")) {
       return;
     }

package/dist/lib/schemaHelpers.js

@@ -1,9 +1,8 @@
 import prismaInternals from "@prisma/internals";
-import { getSchemaPath } from "@cedarjs/project-config";
+import { getPrismaSchemas } from "@cedarjs/project-config";
 import { singularize, isPlural } from "@cedarjs/utils/cedarPluralize";
 import { ensureUniquePlural } from "./pluralHelpers.js";
-import { getPaths } from "./index.js";
-const { getConfig, getDMMF, getSchemaWithPath } = prismaInternals;
+const { getConfig, getDMMF } = prismaInternals;
 const schemaMemo = {};
 const getExistingModelName = async (name) => {
   if (!name) {
@@ -64,9 +63,7 @@ const getEnum = async (name) => {
   return model;
 };
 const getDataModel = async () => {
-  const prismaConfigPath = getPaths().api.prismaConfig;
-  const schemaPath = await getSchemaPath(prismaConfigPath);
-  const result = await getSchemaWithPath(schemaPath);
+  const result = await getPrismaSchemas();
   return result.schemas;
 };
 const getSchemaDefinitions = async () => {