@cedarjs/cli 3.0.0-canary.13596 → 3.0.0-canary.13598

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

@@ -8,12 +8,12 @@ import {
   isTypeScriptProject,
   getConfigPath
 } from "@cedarjs/cli-helpers";
-import { getPaths, getSchemaPath } from "@cedarjs/project-config";
+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 { getSchemaWithPath, getConfig } = prismaInternals;
+const { getConfig } = prismaInternals;
 const cedarPaths = getPaths();
 const EXTENSION = isTypeScriptProject ? "ts" : "js";
 async function handler({ force }) {
@@ -58,8 +58,7 @@ async function getAddCoherenceFilesTask(force) {
   });
 }
 async function getCoherenceConfigFileContent() {
-  const schemaPath = await getSchemaPath(cedarPaths.api.prismaConfig);
-  const result = await getSchemaWithPath(schemaPath);
+  const result = await getPrismaSchemas();
   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,7 +4,7 @@ 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 { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../../lib/colors.js";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
@@ -15,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 {
@@ -23,11 +23,7 @@ const getFlightcontrolJson = async (database) => {
       content: flightcontrolConfig
     };
   }
-  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(schemaPath);
+  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,9 +1,8 @@
-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, getSchemaPath } from "@cedarjs/project-config";
+import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../../lib/colors.js";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
@@ -14,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 {
@@ -22,11 +21,7 @@ const getRenderYamlContent = async (database) => {
       content: RENDER_YAML("")
     };
   }
-  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(schemaPath);
+  const result = await getPrismaSchemas();
   const config = await getConfig({ datamodel: result.schemas });
   const detectedDatabase = config.datasources[0].activeProvider;
   if (detectedDatabase === 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/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 prismaClientPath = await resolveGeneratedPrismaClient();
+    const prismaClientFile = prismaClientPath && fs.existsSync(prismaClientPath) ? fs.readFileSync(prismaClientPath, "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 () => {

package/dist/lib/test.js

@@ -61,6 +61,16 @@ vi.mock("@cedarjs/project-config", async (importOriginal) => {
     getSchemaPath: () => {
       return path.join(globalThis.__dirname, "fixtures", "schema.prisma");
     },
+    getPrismaSchemas: async () => {
+      const schemaPath = path.join(
+        globalThis.__dirname,
+        "fixtures",
+        "schema.prisma"
+      );
+      return {
+        schemas: [[schemaPath, fs.readFileSync(schemaPath, "utf-8")]]
+      };
+    },
     getDataMigrationsPath: () => {
       return path.join(globalThis.__dirname, "fixtures", "migrations");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.0.0-canary.13596+e3364d309",
+  "version": "3.0.0-canary.13598+4f325b500",
   "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.13596",
-    "@cedarjs/cli-helpers": "3.0.0-canary.13596",
-    "@cedarjs/fastify-web": "3.0.0-canary.13596",
-    "@cedarjs/internal": "3.0.0-canary.13596",
-    "@cedarjs/prerender": "3.0.0-canary.13596",
-    "@cedarjs/project-config": "3.0.0-canary.13596",
-    "@cedarjs/structure": "3.0.0-canary.13596",
-    "@cedarjs/telemetry": "3.0.0-canary.13596",
-    "@cedarjs/utils": "3.0.0-canary.13596",
-    "@cedarjs/web-server": "3.0.0-canary.13596",
+    "@cedarjs/api-server": "3.0.0-canary.13598",
+    "@cedarjs/cli-helpers": "3.0.0-canary.13598",
+    "@cedarjs/fastify-web": "3.0.0-canary.13598",
+    "@cedarjs/internal": "3.0.0-canary.13598",
+    "@cedarjs/prerender": "3.0.0-canary.13598",
+    "@cedarjs/project-config": "3.0.0-canary.13598",
+    "@cedarjs/structure": "3.0.0-canary.13598",
+    "@cedarjs/telemetry": "3.0.0-canary.13598",
+    "@cedarjs/utils": "3.0.0-canary.13598",
+    "@cedarjs/web-server": "3.0.0-canary.13598",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -51,7 +51,7 @@
     "@opentelemetry/resources": "1.30.1",
     "@opentelemetry/sdk-trace-node": "1.30.1",
     "@opentelemetry/semantic-conventions": "1.38.0",
-    "@prisma/internals": "6.19.2",
+    "@prisma/internals": "7.5.0",
     "ansis": "4.2.0",
     "archiver": "7.0.1",
     "boxen": "5.1.2",
@@ -78,7 +78,7 @@
     "pluralize": "8.0.0",
     "portfinder": "1.0.38",
     "prettier": "3.8.1",
-    "prisma": "6.19.2",
+    "prisma": "7.5.0",
     "prompts": "2.4.2",
     "recast": "0.23.11",
     "rimraf": "6.1.3",
@@ -107,5 +107,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e3364d3098475cbd73b315c90f60845f69838bc1"
+  "gitHead": "4f325b500632f005397e26cd80f46f8ab5a98494"
 }