@cedarjs/cli 1.0.0-canary.12780 → 1.0.0-canary.12783

package/dist/commands/buildHandler.js

@@ -29,14 +29,14 @@ const handler = async ({
   const rwjsConfig = getConfig();
   const useFragments = rwjsConfig.graphql?.fragments;
   const useTrustedDocuments = rwjsConfig.graphql?.trustedDocuments;
-  const prismaSchemaExists = fs.existsSync(rwjsPaths.api.dbSchema);
+  const prismaSchemaExists = fs.existsSync(rwjsPaths.api.prismaConfig);
   const prerenderRoutes = prerender && side.includes("web") ? detectPrerenderRoutes() : [];
   const shouldGeneratePrismaClient = prisma && prismaSchemaExists && (side.includes("api") || prerenderRoutes.length > 0);
   const tasks = [
     shouldGeneratePrismaClient && {
       title: "Generating Prisma Client...",
-      task: () => {
-        const { cmd, args } = generatePrismaCommand(rwjsPaths.api.dbSchema);
+      task: async () => {
+        const { cmd, args } = await generatePrismaCommand();
         return execa(cmd, args, {
           stdio: verbose ? "inherit" : "pipe",
           shell: true,

package/dist/commands/deploy/flightcontrolHandler.js

@@ -16,9 +16,9 @@ const handler = async ({
     dataMigrate,
     serve
   });
-  const rwjsPaths = getPaths();
+  const cedarPaths = getPaths();
   const execaConfig = {
-    cwd: rwjsPaths.base,
+    cwd: cedarPaths.base,
     shell: true,
     stdio: "inherit"
   };
@@ -32,20 +32,20 @@ const handler = async ({
   async function runApiCommands() {
     if (!serve) {
       console.log("Building api...");
-      await runExecaCommand("yarn rw build api --verbose");
+      await runExecaCommand("yarn cedar build api --verbose");
       if (prisma) {
         console.log("Running database migrations...");
         await runExecaCommand(
-          `node_modules/.bin/prisma migrate deploy --schema "${rwjsPaths.api.dbSchema}"`
+          `node_modules/.bin/prisma migrate deploy --config "${cedarPaths.api.prismaConfig}"`
         );
       }
       if (dataMigrate) {
         console.log("Running data migrations...");
-        await runExecaCommand("yarn rw dataMigrate up");
+        await runExecaCommand("yarn cedar dataMigrate up");
       }
       return;
     }
-    const serverFilePath = path.join(rwjsPaths.api.dist, "server.js");
+    const serverFilePath = path.join(cedarPaths.api.dist, "server.js");
     const hasServerFile = fs.pathExistsSync(serverFilePath);
     if (hasServerFile) {
       execa(`yarn node ${serverFilePath}`, execaConfig);
@@ -56,7 +56,7 @@ const handler = async ({
   }
   async function runWebCommands() {
     console.log("Building web...");
-    await runExecaCommand("yarn rw build web --verbose");
+    await runExecaCommand("yarn cedar build web --verbose");
   }
   if (side === "api") {
     await runApiCommands();

package/dist/commands/deploy/renderHandler.js

@@ -10,9 +10,9 @@ const handler = async ({ side, prisma, dataMigrate }) => {
     prisma,
     dataMigrate
   });
-  const rwjsPaths = getPaths();
+  const cedarPaths = getPaths();
   const execaConfig = {
-    cwd: rwjsPaths.base,
+    cwd: cedarPaths.base,
     shell: true,
     stdio: "inherit"
   };
@@ -20,14 +20,14 @@ const handler = async ({ side, prisma, dataMigrate }) => {
     if (prisma) {
       console.log("Running database migrations...");
       execa.commandSync(
-        `node_modules/.bin/prisma migrate deploy --schema "${rwjsPaths.api.dbSchema}"`,
+        `node_modules/.bin/prisma migrate deploy --config "${cedarPaths.api.prismaConfig}"`,
         execaConfig
       );
     }
     if (dataMigrate) {
       console.log("Running data migrations...");
       const packageJson = fs.readJsonSync(
-        path.join(rwjsPaths.base, "package.json")
+        path.join(cedarPaths.base, "package.json")
       );
       const hasDataMigratePackage = !!packageJson.devDependencies["@cedarjs/cli-data-migrate"];
       if (!hasDataMigratePackage) {
@@ -43,10 +43,10 @@ const handler = async ({ side, prisma, dataMigrate }) => {
           ].join("\n")
         );
       } else {
-        execa.commandSync("yarn rw dataMigrate up", execaConfig);
+        execa.commandSync("yarn cedar dataMigrate up", execaConfig);
       }
     }
-    const serverFilePath = path.join(rwjsPaths.api.dist, "server.js");
+    const serverFilePath = path.join(cedarPaths.api.dist, "server.js");
     const hasServerFile = fs.pathExistsSync(serverFilePath);
     if (hasServerFile) {
       execa(`yarn node ${serverFilePath}`, execaConfig);
@@ -57,7 +57,7 @@ const handler = async ({ side, prisma, dataMigrate }) => {
   }
   async function runWebCommands() {
     execa.commandSync("yarn install", execaConfig);
-    execa.commandSync("yarn rw build web --verbose", execaConfig);
+    execa.commandSync("yarn cedar build web --verbose", execaConfig);
   }
   if (side === "api") {
     runApiCommands();

package/dist/commands/devHandler.js

@@ -81,8 +81,7 @@ const handler = async ({
     try {
       await generatePrismaClient({
         verbose: false,
-        force: false,
-        schema: rwjsPaths.api.dbSchema
+        force: false
       });
     } catch (e) {
       errorTelemetry(

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -4,7 +4,11 @@ import execa from "execa";
 import fs from "fs-extra";
 import { Listr } from "listr2";
 import { addApiPackages } from "@cedarjs/cli-helpers";
-import { getConfigPath, resolveFile } from "@cedarjs/project-config";
+import {
+  getConfigPath,
+  resolveFile,
+  getSchemaPath
+} from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../lib/index.js";
@@ -126,8 +130,8 @@ const handler = async ({ force, verbose }) => {
   const prismaTasks = [
     {
       title: "Setup Prisma OpenTelemetry...",
-      task: (_ctx, task) => {
-        const schemaPath = path.join(getPaths().api.db, "schema.prisma");
+      task: async (_ctx, task) => {
+        const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
         const schemaContent = fs.readFileSync(schemaPath, {
           encoding: "utf-8",
           flag: "r"

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

@@ -4,6 +4,7 @@ import fs from "fs-extra";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { getDataMigrationsPath } from "@cedarjs/project-config";
 import c from "../../../lib/colors.js";
 import { getPaths, writeFilesTask } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
@@ -29,13 +30,16 @@ const TEMPLATE_PATHS = {
     "dataMigration.ts.template"
   )
 };
-const files = ({ name, typescript }) => {
+const files = async ({ name, typescript }) => {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const timestamp = now.split(".")[0].replace(/\D/g, "");
   const basename = `${timestamp}-${paramCase(name)}`;
   const extension = typescript ? "ts" : "js";
   const outputFilename = basename + "." + extension;
-  const outputPath = path.join(getPaths().api.dataMigrations, outputFilename);
+  const dataMigrationsPath = await getDataMigrationsPath(
+    getPaths().api.prismaConfig
+  );
+  const outputPath = path.join(dataMigrationsPath, outputFilename);
   return {
     [outputPath]: fs.readFileSync(TEMPLATE_PATHS[extension]).toString()
   };
@@ -72,8 +76,8 @@ const handler = async (args) => {
     [
       {
         title: "Generating data migration file...",
-        task: () => {
-          return writeFilesTask(files(args));
+        task: async () => {
+          return writeFilesTask(await files(args));
         }
       },
       {

package/dist/commands/prismaHandler.js

@@ -18,22 +18,14 @@ const handler = async ({ _, $0, commands = [], ...options }) => {
   }
   const hasHelpOption = options.help || options.h;
   if (!hasHelpOption) {
-    if (["generate", "introspect", "db", "migrate", "studio", "format"].includes(
-      commands[0]
-    )) {
-      const schemaDir = path.dirname(rwjsPaths.api.dbSchema);
-      if (!fs.existsSync(rwjsPaths.api.dbSchema) && !fs.existsSync(schemaDir)) {
-        console.error();
-        console.error(c.error("No Prisma Schema found."));
-        console.error(`Redwood searched here '${rwjsPaths.api.dbSchema}'`);
-        console.error();
-        process.exit(1);
-      }
-      options.schema = `${rwjsPaths.api.dbSchema}`;
-      if (["seed", "diff"].includes(commands[1])) {
-        delete options.schema;
-      }
+    if (!fs.existsSync(rwjsPaths.api.prismaConfig)) {
+      console.error();
+      console.error(c.error("No Prisma config file found."));
+      console.error(`Cedar searched here '${rwjsPaths.api.prismaConfig}'`);
+      console.error();
+      process.exit(1);
     }
+    options.config = `${rwjsPaths.api.prismaConfig}`;
   }
   const args = commands;
   for (const [name, value] of Object.entries(options)) {
@@ -65,10 +57,10 @@ const handler = async ({ _, $0, commands = [], ...options }) => {
 };
 const printWrapInfo = () => {
   const message = [
-    c.bold("Redwood CLI wraps Prisma CLI"),
+    c.bold("Cedar CLI wraps Prisma CLI"),
     "",
-    "Use `yarn rw prisma` to automatically pass `--schema` and `--preview-feature` options.",
-    "Use `yarn prisma` to skip Redwood CLI automatic options.",
+    "Use `yarn cedar prisma` to automatically pass `--config` and `--preview-feature` options.",
+    "Use `yarn prisma` to skip Cedar's automatic CLI options.",
     "",
     "Find more information in our docs:",
     c.underline("https://cedarjs.com/docs/cli-commands#prisma")

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

@@ -2,6 +2,7 @@ import path from "path";
 import fs from "fs-extra";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { getSchemaPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../../lib/colors.js";
 import {
@@ -56,15 +57,16 @@ const files = [
     content: SERVERLESS_WEB_YML
   }
 ];
-const prismaBinaryTargetAdditions = () => {
-  const content = fs.readFileSync(getPaths().api.dbSchema).toString();
+const prismaBinaryTargetAdditions = async () => {
+  const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
+  const content = fs.readFileSync(schemaPath).toString();
   if (!content.includes("rhel-openssl-1.0.x")) {
     const result = content.replace(
       /binaryTargets =.*\n/,
       `binaryTargets = ["native", "rhel-openssl-1.0.x"]
 `
     );
-    fs.writeFileSync(getPaths().api.dbSchema, result);
+    fs.writeFileSync(schemaPath, result);
   }
 };
 const updateRedwoodTomlTask = () => {
@@ -119,7 +121,7 @@ const handler = async ({ force }) => {
       }),
       {
         title: "Adding necessary Prisma binaries...",
-        task: () => prismaBinaryTargetAdditions()
+        task: async () => await prismaBinaryTargetAdditions()
       },
       printSetupNotes(notes)
     ],

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

@@ -3,6 +3,7 @@ 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 c from "../../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
@@ -25,14 +26,16 @@ model BackgroundJob {
 }
 `;
 const getModelNames = async () => {
-  const { schemas } = await getSchemaWithPath(getPaths().api.dbSchema);
+  const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
+  const { schemas } = await getSchemaWithPath(schemaPath);
   const schema = await getDMMF({ datamodel: schemas });
   return schema.datamodel.models.map((model) => model.name);
 };
-const addDatabaseModel = () => {
-  const schema = fs.readFileSync(getPaths().api.dbSchema, "utf-8");
+const addDatabaseModel = async () => {
+  const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
+  const schema = fs.readFileSync(schemaPath, "utf-8");
   const schemaWithUser = schema + MODEL_SCHEMA;
-  fs.writeFileSync(getPaths().api.dbSchema, schemaWithUser);
+  fs.writeFileSync(schemaPath, schemaWithUser);
 };
 const tasks = async ({ force }) => {
   const modelExists = (await getModelNames()).includes("BackgroundJob");
@@ -44,8 +47,8 @@ const tasks = async ({ force }) => {
     [
       {
         title: "Creating job database model...",
-        task: () => {
-          addDatabaseModel();
+        task: async () => {
+          await addDatabaseModel();
         },
         skip: () => {
           if (modelExists) {

package/dist/commands/type-checkHandler.js

@@ -38,8 +38,7 @@ const handler = async ({ sides, verbose, prisma, generate }) => {
   };
   if (generate && prisma) {
     await generatePrismaClient({
-      verbose,
-      schema: getPaths().api.dbSchema
+      verbose
     });
   }
   if (generate) {

package/dist/commands/upgrade.js

@@ -417,8 +417,7 @@ async function refreshPrismaClient(task, { verbose }) {
   try {
     await generatePrismaClient({
       verbose,
-      force: false,
-      schema: getPaths().api.dbSchema
+      force: false
     });
   } catch (e) {
     task.skip("Refreshing the Prisma client caused an Error.");

package/dist/lib/generatePrismaClient.js

@@ -2,35 +2,19 @@ import { createRequire } from "node:module";
 import path from "node:path";
 import fs from "fs-extra";
 import { runCommandTask, getPaths } from "../lib/index.js";
-const skipTask = (schema = getPaths().api.dbSchema) => {
-  if (!fs.existsSync(schema)) {
-    console.log(
-      `Skipping database and Prisma client generation, no \`schema.prisma\` file found: \`${schema}\``
-    );
-    return true;
-  }
-  return false;
-};
-const generatePrismaCommand = (schema) => {
-  if (skipTask(schema)) {
-    return {};
-  }
+const generatePrismaCommand = async () => {
   const createdRequire = createRequire(import.meta.url);
   const prismaIndexPath = createdRequire.resolve("prisma/build/index.js");
   return {
     cmd: `node "${prismaIndexPath}"`,
-    args: ["generate", schema && `--schema="${schema}"`]
+    args: ["generate", `--config="${getPaths().api.prismaConfig}"`]
   };
 };
 const generatePrismaClient = async ({
   verbose = true,
   force = true,
-  silent = false,
-  schema = getPaths().api.dbSchema
+  silent = false
 }) => {
-  if (skipTask(schema)) {
-    return;
-  }
   if (!force) {
     const prismaClientPath = path.join(
       getPaths().base,
@@ -45,7 +29,7 @@ const generatePrismaClient = async ({
     [
       {
         title: "Generating the Prisma client...",
-        ...generatePrismaCommand(schema)
+        ...await generatePrismaCommand()
       }
     ],
     {

package/dist/lib/schemaHelpers.js

@@ -1,4 +1,5 @@
 import prismaInternals from "@prisma/internals";
+import { getSchemaPath } from "@cedarjs/project-config";
 import { ensureUniquePlural } from "./pluralHelpers.js";
 import { singularize, isPlural } from "./rwPluralize.js";
 import { getPaths } from "./index.js";
@@ -62,8 +63,10 @@ const getEnum = async (name) => {
   }
   return model;
 };
-const getDataModel = async (path = getPaths().api.dbSchema) => {
-  const result = await getSchemaWithPath(path);
+const getDataModel = async () => {
+  const prismaConfigPath = getPaths().api.prismaConfig;
+  const schemaPath = await getSchemaPath(prismaConfigPath);
+  const result = await getSchemaWithPath(schemaPath);
   return result.schemas;
 };
 const getSchemaDefinitions = async () => {

package/dist/lib/test.js

@@ -10,7 +10,6 @@ vi.mock("@cedarjs/internal/dist/generate/generate", () => {
   };
 });
 vi.mock("@cedarjs/project-config", async (importOriginal) => {
-  const path2 = await import("path");
   const originalProjectConfig = await importOriginal();
   return {
     ...originalProjectConfig,
@@ -19,44 +18,48 @@ vi.mock("@cedarjs/project-config", async (importOriginal) => {
       return {
         base: BASE_PATH,
         api: {
-          dataMigrations: path2.join(BASE_PATH, "./api/prisma/dataMigrations"),
-          db: path2.join(globalThis.__dirname, "fixtures"),
-          // this folder
-          dbSchema: path2.join(
+          prismaConfig: path.join(
+            // Current test folder
             globalThis.__dirname,
             "fixtures",
-            "schema.prisma"
+            "prisma.config.cjs"
           ),
-          // this folder
-          generators: path2.join(BASE_PATH, "./api/generators"),
-          src: path2.join(BASE_PATH, "./api/src"),
-          jobs: path2.join(BASE_PATH, "./api/src/jobs"),
-          services: path2.join(BASE_PATH, "./api/src/services"),
-          directives: path2.join(BASE_PATH, "./api/src/directives"),
-          graphql: path2.join(BASE_PATH, "./api/src/graphql"),
-          functions: path2.join(BASE_PATH, "./api/src/functions")
+          dataMigrations: path.join(BASE_PATH, "./api/dataMigrations"),
+          generators: path.join(BASE_PATH, "./api/generators"),
+          src: path.join(BASE_PATH, "./api/src"),
+          jobs: path.join(BASE_PATH, "./api/src/jobs"),
+          services: path.join(BASE_PATH, "./api/src/services"),
+          directives: path.join(BASE_PATH, "./api/src/directives"),
+          graphql: path.join(BASE_PATH, "./api/src/graphql"),
+          functions: path.join(BASE_PATH, "./api/src/functions")
         },
         web: {
-          base: path2.join(BASE_PATH, "./web"),
-          config: path2.join(BASE_PATH, "./web/config"),
-          src: path2.join(BASE_PATH, "./web/src"),
-          generators: path2.join(BASE_PATH, "./web/generators"),
-          routes: path2.join(BASE_PATH, "web/src/Routes.js"),
-          components: path2.join(BASE_PATH, "/web/src/components"),
-          layouts: path2.join(BASE_PATH, "/web/src/layouts"),
-          pages: path2.join(BASE_PATH, "/web/src/pages"),
-          app: path2.join(BASE_PATH, "/web/src/App.js")
+          base: path.join(BASE_PATH, "./web"),
+          config: path.join(BASE_PATH, "./web/config"),
+          src: path.join(BASE_PATH, "./web/src"),
+          generators: path.join(BASE_PATH, "./web/generators"),
+          routes: path.join(BASE_PATH, "web/src/Routes.js"),
+          components: path.join(BASE_PATH, "/web/src/components"),
+          layouts: path.join(BASE_PATH, "/web/src/layouts"),
+          pages: path.join(BASE_PATH, "/web/src/pages"),
+          app: path.join(BASE_PATH, "/web/src/App.js")
         },
-        scripts: path2.join(BASE_PATH, "scripts"),
+        scripts: path.join(BASE_PATH, "scripts"),
         generated: {
-          base: path2.join(BASE_PATH, ".redwood"),
-          schema: path2.join(BASE_PATH, ".redwood/schema.graphql"),
+          base: path.join(BASE_PATH, ".redwood"),
+          schema: path.join(BASE_PATH, ".redwood/schema.graphql"),
           types: {
-            includes: path2.join(BASE_PATH, ".redwood/types/includes"),
-            mirror: path2.join(BASE_PATH, ".redwood/types/mirror")
+            includes: path.join(BASE_PATH, ".redwood/types/includes"),
+            mirror: path.join(BASE_PATH, ".redwood/types/mirror")
           }
         }
       };
+    },
+    getSchemaPath: () => {
+      return path.join(globalThis.__dirname, "fixtures", "schema.prisma");
+    },
+    getDataMigrationsPath: () => {
+      return path.join(globalThis.__dirname, "fixtures", "migrations");
     }
   };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.12780+7f8401db4",
+  "version": "1.0.0-canary.12783+89ecc8a8c",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -31,15 +31,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.27.1",
     "@babel/runtime-corejs3": "7.27.6",
-    "@cedarjs/api-server": "1.0.0-canary.12780",
-    "@cedarjs/cli-helpers": "1.0.0-canary.12780",
-    "@cedarjs/fastify-web": "1.0.0-canary.12780",
-    "@cedarjs/internal": "1.0.0-canary.12780",
-    "@cedarjs/prerender": "1.0.0-canary.12780",
-    "@cedarjs/project-config": "1.0.0-canary.12780",
-    "@cedarjs/structure": "1.0.0-canary.12780",
-    "@cedarjs/telemetry": "1.0.0-canary.12780",
-    "@cedarjs/web-server": "1.0.0-canary.12780",
+    "@cedarjs/api-server": "1.0.0-canary.12783",
+    "@cedarjs/cli-helpers": "1.0.0-canary.12783",
+    "@cedarjs/fastify-web": "1.0.0-canary.12783",
+    "@cedarjs/internal": "1.0.0-canary.12783",
+    "@cedarjs/prerender": "1.0.0-canary.12783",
+    "@cedarjs/project-config": "1.0.0-canary.12783",
+    "@cedarjs/structure": "1.0.0-canary.12783",
+    "@cedarjs/telemetry": "1.0.0-canary.12783",
+    "@cedarjs/web-server": "1.0.0-canary.12783",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -101,5 +101,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7f8401db41974dafa310f9b8dcbb355bb36fd24c"
+  "gitHead": "89ecc8a8cce4e50f1302f903c7d5ca9e3a3583f1"
 }