@cedarjs/cli 2.8.1-next.109 → 2.8.1-rc.3

package/dist/commands/build/buildHandler.js

@@ -29,9 +29,7 @@ function checkWorkspacePackageEntryPoints(cedarPaths) {
     if (!fs.existsSync(pkgJsonPath)) {
       continue;
     }
-    const pkgJson = JSON.parse(
-      fs.readFileSync(pkgJsonPath, "utf8")
-    );
+    const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
     const pkgName = pkgJson.name || entry.name;
     const pkgDir = path.join(packagesDir, entry.name);
     const entryFiles = /* @__PURE__ */ new Set();
@@ -80,13 +78,12 @@ const handler = async ({
   const cedarConfig = getConfig();
   const useFragments = cedarConfig.graphql?.fragments;
   const useTrustedDocuments = cedarConfig.graphql?.trustedDocuments;
+  const usePackagesWorkspace = cedarConfig.experimental?.packagesWorkspace?.enabled;
   const prismaSchemaExists = fs.existsSync(cedarPaths.api.prismaConfig);
   const prerenderRoutes = prerender && workspace.includes("web") ? detectPrerenderRoutes() : [];
   const shouldGeneratePrismaClient = prisma && prismaSchemaExists && (workspace.includes("api") || prerenderRoutes.length > 0);
   const packageJsonPath = path.join(cedarPaths.base, "package.json");
-  const packageJson = JSON.parse(
-    fs.readFileSync(packageJsonPath, "utf8")
-  );
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
   const packageJsonWorkspaces = packageJson.workspaces;
   const nonApiWebWorkspaces = Array.isArray(packageJsonWorkspaces) && packageJsonWorkspaces.length > 2 ? workspace.filter((w) => w !== "api" && w !== "web") : [];
   const gqlFeaturesTaskTitle = `Generating types needed for ${[
@@ -104,11 +101,11 @@ const handler = async ({
         });
       }
     },
-    nonApiWebWorkspaces.length > 0 && {
+    nonApiWebWorkspaces.length > 0 && usePackagesWorkspace && {
       title: "Building Packages...",
       task: (_ctx, task) => buildPackagesTask(task, nonApiWebWorkspaces)
     },
-    (workspace.includes("web") || workspace.includes("api")) && {
+    (workspace.includes("web") || workspace.includes("api")) && usePackagesWorkspace && {
       title: "Checking workspace packages...",
       task: () => {
         const problems = checkWorkspacePackageEntryPoints(cedarPaths);
@@ -180,7 +177,7 @@ Run ` + c.info("yarn cedar build") + " (without specifying a workspace) to build
         }
       }
     }
-  ].filter((t) => Boolean(t));
+  ].filter(Boolean);
   const triggerPrerender = async () => {
     console.log("Starting prerendering...");
     if (prerenderRoutes.length === 0) {

package/dist/commands/build.js

@@ -9,8 +9,7 @@ const builder = (yargs) => {
   yargs.positional("workspace", {
     default: ["api", "web", "packages/*"],
     description: "What workspace(s) to build. Valid values are: web, api, packages/*, <package-name>",
-    type: "string",
-    array: true
+    type: "array"
   }).option("verbose", {
     alias: "v",
     default: false,

package/dist/commands/check.js

@@ -1,12 +1,14 @@
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import c from "../lib/colors.js";
+import { getPaths } from "../lib/index.js";
 const command = "check";
 const aliases = ["diagnostics"];
 const description = "Get structural diagnostics for a Redwood project (experimental)";
 const handler = async () => {
   recordTelemetryAttributes({ command: "check" });
-  const { printDiagnostics, DiagnosticSeverity } = await import("@cedarjs/structure");
-  printDiagnostics({
+  const { printDiagnostics, DiagnosticSeverity } = (await import("@cedarjs/structure")).default;
+  console.log("DiagnosticServerity", DiagnosticSeverity);
+  printDiagnostics(getPaths().base, {
     getSeverityLabel: (severity) => {
       if (severity === DiagnosticSeverity.Error) {
         return c.error("error");

package/dist/commands/console.js

@@ -1,9 +1,9 @@
 const command = "console";
 const aliases = ["c"];
 const description = "Launch an interactive Redwood shell (experimental)";
-const handler = async () => {
+const handler = async (options) => {
   const { handler: handler2 } = await import("./consoleHandler.js");
-  return handler2();
+  return handler2(options);
 };
 export {
   aliases,

package/dist/commands/consoleHandler.js

@@ -6,9 +6,6 @@ import { registerApiSideBabelHook } from "@cedarjs/babel-config";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getPaths } from "../lib/index.js";
 const paths = getPaths();
-function isREPLServerWithHistory(replServer) {
-  return "history" in replServer && "lines" in replServer;
-}
 const loadPrismaClient = (replContext) => {
   const createdRequire = createRequire(import.meta.url);
   const { db } = createdRequire(path.join(paths.api.lib, "db"));
@@ -17,19 +14,16 @@ const loadPrismaClient = (replContext) => {
 };
 const consoleHistoryFile = path.join(paths.generated.base, "console_history");
 const persistConsoleHistory = (r) => {
-  const lines = isREPLServerWithHistory(r) ? r.lines : [];
   fs.appendFileSync(
     consoleHistoryFile,
-    lines.filter((line) => line.trim()).join("\n") + "\n",
+    r.lines.filter((line) => line.trim()).join("\n") + "\n",
     "utf8"
   );
 };
 const loadConsoleHistory = async (r) => {
   try {
     const history = await fs.promises.readFile(consoleHistoryFile, "utf8");
-    if (isREPLServerWithHistory(r)) {
-      history.split("\n").reverse().map((line) => r.history.push(line));
-    }
+    history.split("\n").reverse().map((line) => r.history.push(line));
   } catch {
   }
 };
@@ -59,8 +53,8 @@ const handler = (_options) => {
       } else {
         try {
           callback(null, await Promise.resolve(result));
-        } catch (err2) {
-          callback(err2 instanceof Error ? err2 : new Error(String(err2)), null);
+        } catch (error) {
+          callback(error, null);
         }
       }
     });

package/dist/commands/dev/devHandler.js

@@ -83,7 +83,10 @@ const handler = async ({
   }
   if (workspace.includes("api")) {
     try {
-      await generatePrismaClient({ verbose: false, force: false });
+      await generatePrismaClient({
+        verbose: false,
+        force: false
+      });
     } catch (e) {
       const message = getErrorMessage(e);
       errorTelemetry(process.argv, `Error generating prisma client: ${message}`);

package/dist/commands/execHandler.js

@@ -36,21 +36,14 @@ const printAvailableScriptsToConsole = () => {
 const handler = async (args) => {
   recordTelemetryAttributes({
     command: "exec",
-    prisma: !!args.prisma,
-    list: !!args.list
+    prisma: args.prisma,
+    list: args.list
   });
   const { name, prisma, list, ...scriptArgs } = args;
   if (list || !name) {
     printAvailableScriptsToConsole();
     return;
   }
-  if (Array.isArray(scriptArgs._)) {
-    scriptArgs._ = scriptArgs._.slice(1);
-  }
-  delete scriptArgs.$0;
-  delete scriptArgs.l;
-  delete scriptArgs.s;
-  delete scriptArgs.silent;
   const scriptPath = resolveScriptPath(name);
   if (!scriptPath) {
     console.error(
@@ -64,11 +57,11 @@ No script called \`${name}\` in the ./scripts folder.
   const scriptTasks = [
     {
       title: "Generating Prisma client",
-      enabled: () => !!prisma,
+      enabled: () => Boolean(prisma),
       task: () => generatePrismaClient({
         force: false,
         verbose: !args.silent,
-        silent: !!args.silent
+        silent: args.silent
       })
     },
     {

package/dist/commands/generate/dataMigration/dataMigration.js

@@ -3,6 +3,7 @@ import { paramCase } from "change-case";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { dbReexportsPrismaClient } from "@cedarjs/internal/dist/project";
 import { getDataMigrationsPath } from "@cedarjs/project-config";
 import c from "../../../lib/colors.js";
 import {
@@ -43,7 +44,7 @@ const files = async ({ name, typescript }) => {
     getPaths().api.prismaConfig
   );
   const outputPath = path.join(dataMigrationsPath, outputFilename);
-  const prismaImportSource = "src/lib/db";
+  const prismaImportSource = dbReexportsPrismaClient() ? "src/lib/db" : "@prisma/client";
   return {
     [outputPath]: await generateTemplate(TEMPLATE_PATHS[extension], {
       name,

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

@@ -2,7 +2,7 @@ import path from "path";
 import camelcase from "camelcase";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
-import pluralize from "pluralize";
+import pluralize, { singular } from "pluralize";
 import prompts from "prompts";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { projectIsEsm } from "@cedarjs/project-config";
@@ -17,7 +17,7 @@ import {
 import { isTypeScriptProject } from "../../../lib/project.js";
 import { isRealtimeSetup, isServerFileSetup } from "../../experimental/util.js";
 const templateVariables = (name) => {
-  name = pluralize.singular(name.toLowerCase());
+  name = singular(name.toLowerCase());
   return {
     name,
     collectionName: pluralize(name),
@@ -38,7 +38,7 @@ const templateVariables = (name) => {
 async function handler({ name, type, force, verbose, silent }) {
   const redwoodPaths = getPaths();
   const ts = isTypeScriptProject();
-  name = pluralize.singular(name.toLowerCase());
+  name = singular(name.toLowerCase());
   let functionType = type;
   if (!functionType) {
     const response = await prompts({

package/dist/commands/generate/service/serviceHandler.js

@@ -1,5 +1,6 @@
 import path from "node:path";
 import camelcase from "camelcase";
+import { dbReexportsPrismaClient } from "@cedarjs/internal/dist/project";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import { transformTSToJS } from "../../../lib/index.js";
 import { getSchema, verifyModelName } from "../../../lib/schemaHelpers.js";
@@ -222,7 +223,7 @@ const files = async ({
   const componentName = camelcase(pluralize(name));
   const model = name;
   const idName = await getIdName(model);
-  const prismaImportSource = "src/lib/db";
+  const prismaImportSource = dbReexportsPrismaClient() ? "src/lib/db" : "@prisma/client";
   const modelRelations = relations || relationsForModel(await getSchema(model));
   const serviceFile = await templateForFile({
     name,

package/dist/commands/generate.js

@@ -22,19 +22,12 @@ import * as generateService from "./generate/service/service.js";
 const command = "generate <type>";
 const aliases = ["g"];
 const description = "Generate boilerplate code and type definitions";
-const getExitCode = (error) => {
-  if (typeof error !== "object" || error === null) {
-    return void 0;
-  }
-  const exitCode = Reflect.get(error, "exitCode");
-  return typeof exitCode === "number" ? exitCode : void 0;
-};
 const builder = (yargs) => yargs.command("types", "Generate supplementary code", {}, () => {
   recordTelemetryAttributes({ command: "generate types" });
   try {
     execa.sync("yarn", ["rw-gen"], { stdio: "inherit" });
   } catch (error) {
-    process.exitCode = getExitCode(error) ?? 1;
+    process.exitCode = error.exitCode ?? 1;
   }
 }).command(generateCell).command(generateComponent).command(generateDataMigration).command(generateDbAuth).command(generateDirective).command(generateFunction).command(generateJob).command(generateLayout).command(generateModel).command(generateOgImage).command(generatePackage).command(generatePage).command(generateRealtime).command(generateScaffold).command(generateScript).command(generateSdl).command(generateSecret).command(generateService).demandCommand().epilogue(
   `Also see the ${terminalLink(

package/dist/commands/jobsHandler.js

@@ -6,12 +6,10 @@ const handler = async ({
   commands: _commands,
   ...options
 }) => {
-  const positionalArgs = Array.isArray(_) ? [..._] : [];
-  const commandArg = positionalArgs.pop();
-  const args = [commandArg == null ? "" : String(commandArg)];
+  const args = [_.pop()];
   for (const [name, value] of Object.entries(options)) {
     args.push(name.length > 1 ? `--${name}` : `-${name}`);
-    args.push(String(value));
+    args.push(value);
   }
   let command = `yarn rw-jobs ${args.join(" ")}`;
   const originalLogLevel = process.env.LOG_LEVEL;

package/dist/commands/lint.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import execa from "execa";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { getPaths, getConfig } from "@cedarjs/project-config";
+import { getPaths, getConfig } from "../lib/index.js";
 function detectLegacyEslintConfig() {
   const projectRoot = getPaths().base;
   const legacyConfigFiles = [
@@ -88,7 +88,7 @@ const handler = async ({
   recordTelemetryAttributes({ command: "lint", fix, format });
   const config = getConfig();
   const legacyConfigFiles = detectLegacyEslintConfig();
-  if (legacyConfigFiles.length > 0 && config instanceof Object && "eslintLegacyConfigWarning" in config && config.eslintLegacyConfigWarning) {
+  if (legacyConfigFiles.length > 0 && config.eslintLegacyConfigWarning) {
     showLegacyEslintDeprecationWarning(legacyConfigFiles);
   }
   try {

package/dist/commands/prerenderHandler.js

@@ -1,5 +1,5 @@
 import fs from "node:fs";
-import path from "node:path";
+import path from "path";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getConfig, getPaths, projectIsEsm } from "@cedarjs/project-config";
@@ -9,33 +9,12 @@ import { runScriptFunction } from "../lib/exec.js";
 import { configureBabel } from "../lib/execBabel.js";
 class PathParamError extends Error {
 }
-const hasPath = (route) => {
-  return typeof route.path === "string" && route.path.length > 0;
-};
-const normalizeRoute = (route) => {
-  const normalizedPath = route.path;
-  const normalizedName = typeof route.name === "string" ? route.name : normalizedPath;
-  const normalizedRoutePath = typeof route.routePath === "string" ? route.routePath : normalizedPath;
-  const normalizedFilePath = typeof route.filePath === "string" ? route.filePath : "";
-  return {
-    ...route,
-    name: normalizedName,
-    path: normalizedPath,
-    routePath: normalizedRoutePath,
-    filePath: normalizedFilePath
-  };
-};
-const getErrorMessage = (error) => {
-  return error instanceof Error ? error.message : String(error);
-};
-const getErrorStack = (error) => {
-  return error instanceof Error ? error.stack ?? error.message : String(error);
-};
 const mapRouterPathToHtml = (routerPath) => {
   if (routerPath === "/") {
     return "web/dist/index.html";
+  } else {
+    return `web/dist${routerPath}.html`;
   }
-  return `web/dist${routerPath}.html`;
 };
 function getRouteHooksFilePath(routeFilePath) {
   const routeHooksFilePathTs = routeFilePath.replace(
@@ -70,32 +49,28 @@ async function expandRouteParameters(route) {
         filePath: route.filePath
       }
     });
-    if (Array.isArray(routeParameters)) {
+    if (routeParameters) {
       return routeParameters.map((pathParamValues) => {
         let newPath = route.path;
-        if (typeof pathParamValues === "object" && pathParamValues !== null && !Array.isArray(pathParamValues)) {
-          Object.entries(pathParamValues).forEach(
-            ([paramName, paramValue]) => {
-              newPath = newPath.replace(
-                new RegExp(`{${paramName}:?[^}]*}`),
-                String(paramValue)
-              );
-            }
+        Object.entries(pathParamValues).forEach(([paramName, paramValue]) => {
+          newPath = newPath.replace(
+            new RegExp(`{${paramName}:?[^}]*}`),
+            paramValue
           );
-        }
+        });
         return { ...route, path: newPath };
       });
     }
-  } catch (error) {
-    console.error(c.error(getErrorStack(error)));
+  } catch (e) {
+    console.error(c.error(e.stack));
     return [route];
   }
   return [route];
 }
 const getTasks = async (dryrun, routerPathFilter = null) => {
   const detector = projectIsEsm() ? await import("@cedarjs/prerender/detection") : await import("@cedarjs/prerender/cjs/detection");
-  const detectedRoutes = detector.detectPrerenderRoutes();
-  const prerenderRoutes = detectedRoutes.filter(hasPath).map(normalizeRoute);
+  const prerenderRoutes = detector.detectPrerenderRoutes().filter((route) => route.path);
+  const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
   if (prerenderRoutes.length === 0) {
     console.log("\nSkipping prerender...");
     console.log(
@@ -105,7 +80,6 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
     );
     return [];
   }
-  const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
   if (!fs.existsSync(indexHtmlPath)) {
     console.error(
       "You must run `yarn cedar build web` before trying to prerender."
@@ -151,7 +125,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
         }
       ];
     }
-    return routesToPrerender.flatMap((routeToPrerender) => {
+    return routesToPrerender.map((routeToPrerender) => {
       if (routerPathFilter && routeToPrerender.path !== routerPathFilter) {
         return [];
       }
@@ -186,6 +160,12 @@ const diagnosticCheck = () => {
         path.join(getPaths().web.base, "node_modules/react-dom")
       )
     },
+    {
+      message: "Duplicate core-js version found in web/node_modules",
+      failure: fs.existsSync(
+        path.join(getPaths().web.base, "node_modules/core-js")
+      )
+    },
     {
       message: "Duplicate @cedarjs/web version found in web/node_modules",
       failure: fs.existsSync(
@@ -194,7 +174,7 @@ const diagnosticCheck = () => {
     }
   ];
   console.log("Running diagnostic checks");
-  if (checks.some((check) => check.failure)) {
+  if (checks.some((checks2) => checks2.failure)) {
     console.error(c.error("node_modules are being duplicated in `./web` \n"));
     console.log("\u26A0\uFE0F  Issues found: ");
     console.log("-".repeat(50));
@@ -216,11 +196,8 @@ const diagnosticCheck = () => {
     console.log("\u2714 Diagnostics checks passed \n");
   }
 };
-const hasUnexpandedPathParams = (routePath) => {
-  return /\{.*}/.test(routePath);
-};
 const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun, outputHtmlPath) => {
-  if (hasUnexpandedPathParams(routeToPrerender.path)) {
+  if (/\{.*}/.test(routeToPrerender.path)) {
     throw new PathParamError(
       `Could not retrieve route parameters for ${routeToPrerender.path}`
     );
@@ -230,31 +207,25 @@ const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun,
       queryCache,
       renderPath: routeToPrerender.path
     });
-    if (!dryrun && typeof prerenderedHtml === "string") {
+    if (!dryrun) {
       prerenderer.writePrerenderedHtmlFile(outputHtmlPath, prerenderedHtml);
     }
-  } catch (error) {
+  } catch (e) {
     console.log();
     console.log(
       c.warning("You can use `yarn cedar prerender --dry-run` to debug")
     );
     console.log();
-    const sep = c.info("-".repeat(10));
-    console.log(`${sep} Error rendering path "${routeToPrerender.path}" ${sep}`);
-    errorTelemetry(
-      process.argv,
-      `Error prerendering: ${getErrorMessage(error)}`
+    console.log(
+      `${c.info("-".repeat(10))} Error rendering path "${routeToPrerender.path}" ${c.info("-".repeat(10))}`
     );
-    console.error(c.error(getErrorStack(error)));
+    errorTelemetry(process.argv, `Error prerendering: ${e.message}`);
+    console.error(c.error(e.stack));
     console.log();
     throw new Error(`Failed to render "${routeToPrerender.filePath}"`);
   }
 };
-const handler = async ({
-  path: routerPath,
-  dryRun = false,
-  verbose = false
-}) => {
+const handler = async ({ path: routerPath, dryRun, verbose }) => {
   if (getConfig().experimental?.streamingSsr?.enabled) {
     console.log(
       c.warning(
@@ -268,7 +239,7 @@ const handler = async ({
     dryRun,
     verbose
   });
-  const listrTasks = await getTasks(dryRun, routerPath ?? null);
+  const listrTasks = await getTasks(dryRun, routerPath);
   const tasks = new Listr(listrTasks, {
     renderer: verbose ? "verbose" : "default",
     rendererOptions: { collapseSubtasks: false },
@@ -279,11 +250,11 @@ const handler = async ({
       console.log(c.info("::: Dry run, not writing changes :::"));
     }
     await tasks.run();
-  } catch (error) {
+  } catch (e) {
     console.log();
-    diagnosticCheck();
+    await diagnosticCheck();
     console.log(c.warning("Tips:"));
-    if (error instanceof PathParamError) {
+    if (e instanceof PathParamError) {
       console.log(
         c.info(
           "- You most likely need to add or update a *.routeHooks.{js,ts} file next to the Page you're trying to prerender"
@@ -292,7 +263,7 @@ const handler = async ({
     } else {
       console.log(
         c.info(
-          "- This could mean that a library you're using does not support SSR."
+          `- This could mean that a library you're using does not support SSR.`
         )
       );
       console.log(
@@ -312,6 +283,5 @@ const handler = async ({
 };
 export {
   getTasks,
-  handler,
-  hasUnexpandedPathParams
+  handler
 };

package/dist/commands/prismaHandler.js

@@ -1,81 +1,58 @@
 import fs from "node:fs";
-import path from "node:path";
+import path from "path";
 import boxen from "boxen";
 import execa from "execa";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../lib/colors.js";
 import { getPaths } from "../lib/index.js";
-const getErrorMessage = (error) => {
-  return error instanceof Error ? error.message : String(error);
-};
-function getExitCode(value) {
-  if (!value || typeof value !== "object" || !("exitCode" in value) || typeof value.exitCode !== "number") {
-    return void 0;
-  }
-  return value.exitCode;
-}
-const handler = async ({
-  _: _positionals,
-  $0: _binName,
-  commands = [],
-  ...options
-}) => {
+const handler = async ({ _, $0, commands = [], ...options }) => {
   recordTelemetryAttributes({
     command: "prisma"
   });
-  const cedarPaths = getPaths();
-  const args = [...Array.isArray(commands) ? commands : []].filter(
-    (value) => typeof value === "string"
-  );
-  const helpIndex = args.indexOf("help");
+  const rwjsPaths = getPaths();
+  const helpIndex = commands.indexOf("help");
   if (helpIndex !== -1) {
     options.help = true;
-    args.splice(helpIndex, 1);
+    commands.splice(helpIndex, 1);
   }
   const hasHelpOption = options.help || options.h;
   if (!hasHelpOption) {
-    if (!fs.existsSync(cedarPaths.api.prismaConfig)) {
+    if (!fs.existsSync(rwjsPaths.api.prismaConfig)) {
       console.error();
       console.error(c.error("No Prisma config file found."));
-      console.error(`Cedar searched here '${cedarPaths.api.prismaConfig}'`);
+      console.error(`Cedar searched here '${rwjsPaths.api.prismaConfig}'`);
       console.error();
       process.exit(1);
     }
-    options.config = `${cedarPaths.api.prismaConfig}`;
+    options.config = `${rwjsPaths.api.prismaConfig}`;
   }
+  const args = commands;
   for (const [name, value] of Object.entries(options)) {
     args.push(name.length > 1 ? `--${name}` : `-${name}`);
     if (typeof value === "string") {
-      if (value.split(" ").length > 1) {
-        args.push(`"${value}"`);
-      } else {
-        args.push(value);
-      }
+      value.split(" ").length > 1 ? args.push(`"${value}"`) : args.push(value);
     } else if (typeof value === "number") {
-      args.push(String(value));
+      args.push(value);
     }
   }
   console.log();
   console.log(c.note("Running Prisma CLI..."));
-  console.log(c.underline(`$ yarn prisma ${args.join(" ")}`));
+  console.log(c.underline("$ yarn prisma " + args.join(" ")));
   console.log();
   try {
-    const prismaBin = path.join(cedarPaths.base, "node_modules/.bin/prisma");
+    const prismaBin = path.join(rwjsPaths.base, "node_modules/.bin/prisma");
     execa.sync(prismaBin, args, {
-      cwd: cedarPaths.base,
+      cwd: rwjsPaths.base,
       stdio: "inherit",
       cleanup: true
     });
-    if (hasHelpOption || args.length === 0) {
+    if (hasHelpOption || commands.length === 0) {
       printWrapInfo();
     }
-  } catch (error) {
-    errorTelemetry(
-      process.argv,
-      `Error generating prisma client: ${getErrorMessage(error)}`
-    );
-    process.exit(getExitCode(error) ?? 1);
+  } catch (e) {
+    errorTelemetry(process.argv, `Error generating prisma client: ${e.message}`);
+    process.exit(e?.exitCode || 1);
   }
 };
 const printWrapInfo = () => {

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

@@ -5,15 +5,15 @@ import { Listr } from "listr2";
 import * as toml from "smol-toml";
 import {
   colors as c,
+  getPaths,
   isTypeScriptProject,
   getConfigPath
 } from "@cedarjs/cli-helpers";
-import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { printSetupNotes } from "../../../../lib/index.js";
 import { serverFileExists } from "../../../../lib/project.js";
 import { addFilesTask } from "../helpers/index.js";
-const { getConfig } = prismaInternals;
+const { getSchemaWithPath, getConfig } = prismaInternals;
 const cedarPaths = getPaths();
 const EXTENSION = isTypeScriptProject ? "ts" : "js";
 async function handler({ force }) {
@@ -58,7 +58,7 @@ async function getAddCoherenceFilesTask(force) {
   });
 }
 async function getCoherenceConfigFileContent() {
-  const result = await getPrismaSchemas();
+  const result = await getSchemaWithPath(cedarPaths.api.dbSchema);
   const prismaConfig = await getConfig({ datamodel: result.schemas });
   let db = prismaConfig.datasources[0].activeProvider;
   if (!SUPPORTED_DATABASES.includes(db)) {