@cedarjs/cli 3.0.0-canary.13544 → 3.0.0-canary.13546

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, { singular } from "pluralize";
+import pluralize 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 = singular(name.toLowerCase());
+  name = pluralize.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 = singular(name.toLowerCase());
+  name = pluralize.singular(name.toLowerCase());
   let functionType = type;
   if (!functionType) {
     const response = await prompts({

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

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

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, getSchemaPath } 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,
@@ -26,12 +23,11 @@ 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 schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
+  if (!fs.existsSync(schemaPath)) {
+    throw new Error(`Could not find prisma schema at ${schemaPath}`);
   }
-  const result = await getSchemaWithPath(
-    path.join(getPaths().base, "api/db/schema.prisma")
-  );
+  const result = await getSchemaWithPath(schemaPath);
   const config = await getConfig({ datamodel: result.schemas });
   const detectedDatabase = config.datasources[0].activeProvider;
   if (detectedDatabase === database) {

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

@@ -3,13 +3,10 @@ import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { getPaths, getSchemaPath } 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,
@@ -25,11 +22,12 @@ 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 schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
+  if (!fs.existsSync(schemaPath)) {
+    throw new Error(`Could not find prisma schema at ${schemaPath}`);
   }
-  const { schemas } = await getSchemaWithPath("api/db/schema.prisma");
-  const config = await getConfig({ datamodel: schemas });
+  const result = await getSchemaWithPath(schemaPath);
+  const config = await getConfig({ datamodel: result.schemas });
   const detectedDatabase = config.datasources[0].activeProvider;
   if (detectedDatabase === database) {
     switch (database) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.0.0-canary.13544+4071bcae9",
+  "version": "3.0.0-canary.13546+ed4ef855e",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -34,16 +34,16 @@
     "@babel/parser": "7.29.0",
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.29.0",
-    "@cedarjs/api-server": "3.0.0-canary.13544",
-    "@cedarjs/cli-helpers": "3.0.0-canary.13544",
-    "@cedarjs/fastify-web": "3.0.0-canary.13544",
-    "@cedarjs/internal": "3.0.0-canary.13544",
-    "@cedarjs/prerender": "3.0.0-canary.13544",
-    "@cedarjs/project-config": "3.0.0-canary.13544",
-    "@cedarjs/structure": "3.0.0-canary.13544",
-    "@cedarjs/telemetry": "3.0.0-canary.13544",
-    "@cedarjs/utils": "3.0.0-canary.13544",
-    "@cedarjs/web-server": "3.0.0-canary.13544",
+    "@cedarjs/api-server": "3.0.0-canary.13546",
+    "@cedarjs/cli-helpers": "3.0.0-canary.13546",
+    "@cedarjs/fastify-web": "3.0.0-canary.13546",
+    "@cedarjs/internal": "3.0.0-canary.13546",
+    "@cedarjs/prerender": "3.0.0-canary.13546",
+    "@cedarjs/project-config": "3.0.0-canary.13546",
+    "@cedarjs/structure": "3.0.0-canary.13546",
+    "@cedarjs/telemetry": "3.0.0-canary.13546",
+    "@cedarjs/utils": "3.0.0-canary.13546",
+    "@cedarjs/web-server": "3.0.0-canary.13546",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -107,5 +107,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4071bcae9162b5f40536a2899e2fb69612e6e4cd"
+  "gitHead": "ed4ef855ed3fdde4ac0d944fe77de56c3cdbf856"
 }