@cedarjs/cli 5.0.0-canary.2331 → 5.0.0-canary.2333

package/dist/commands/dev/devHandler.js

@@ -104,12 +104,17 @@ const handler = async ({
     }
   }
   if (workspace.includes("api")) {
-    try {
-      await generatePrismaClient({ verbose: false, force: false });
-    } catch (e) {
-      const message = getErrorMessage(e);
-      errorTelemetry(process.argv, `Error generating prisma client: ${message}`);
-      console.error(c.error(message));
+    if (generate) {
+      try {
+        await generatePrismaClient({ verbose: false });
+      } catch (e) {
+        const message = getErrorMessage(e);
+        errorTelemetry(
+          process.argv,
+          `Error generating prisma client: ${message}`
+        );
+        console.error(c.error(message));
+      }
     }
     if (!ud && !serverFile) {
       try {

package/dist/commands/execHandler.js

@@ -65,7 +65,6 @@ No script called \`${name}\` in the ./scripts folder.
       title: "Generating Prisma client",
       enabled: () => !!prisma,
       task: () => generatePrismaClient({
-        force: false,
         verbose: !args.silent,
         silent: !!args.silent
       })

package/dist/commands/upgrade/upgradeHandler.js

@@ -440,7 +440,7 @@ async function downloadYarnPatches(ctx, { dryRun, verbose }) {
 }
 async function refreshPrismaClient(task, { verbose }) {
   try {
-    await generatePrismaClient({ verbose, force: false });
+    await generatePrismaClient({ verbose, force: true });
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     task.skip("Refreshing the Prisma client caused an Error.");

package/dist/lib/generatePrismaClient.js

@@ -1,8 +1,11 @@
+import { createHash } from "node:crypto";
 import fs from "node:fs";
 import { createRequire } from "node:module";
-import { resolveGeneratedPrismaClient } from "@cedarjs/project-config";
+import path from "node:path";
+import { getConfig, getPrismaSchemas } from "@cedarjs/project-config";
 import { runCommandTask, getPaths } from "./index.js";
 const generatePrismaCommand = async () => {
+  const config = getConfig();
   const createdRequire = createRequire(import.meta.url);
   const prismaIndexPath = createdRequire.resolve("prisma/build/index.js");
   return {
@@ -10,19 +13,52 @@ const generatePrismaCommand = async () => {
     args: [
       prismaIndexPath,
       "generate",
-      `--config=${getPaths().api.prismaConfig}`
+      `--config=${getPaths().api.prismaConfig}`,
+      ...config.api.prismaGenerateArgs
     ]
   };
 };
-const generatePrismaClient = async ({
+async function computePrismaSchemaHash() {
+  try {
+    const hash = createHash("sha256");
+    const configPath = getPaths().api.prismaConfig;
+    if (fs.existsSync(configPath)) {
+      hash.update(fs.readFileSync(configPath));
+    }
+    const { schemas } = await getPrismaSchemas();
+    for (const schema of schemas) {
+      hash.update(schema[1]);
+    }
+    return hash.digest("hex");
+  } catch {
+    return null;
+  }
+}
+function getHashFilePath() {
+  const generatedBase = getPaths().generated.base;
+  return path.join(generatedBase, "prisma-schema-hash");
+}
+function getStoredSchemaHash() {
+  const hashFile = getHashFilePath();
+  if (fs.existsSync(hashFile)) {
+    return fs.readFileSync(hashFile, "utf-8").trim();
+  }
+  return null;
+}
+function storeSchemaHash(hash) {
+  const hashFile = getHashFilePath();
+  fs.mkdirSync(path.dirname(hashFile), { recursive: true });
+  fs.writeFileSync(hashFile, hash);
+}
+async function generatePrismaClient({
   verbose = true,
-  force = true,
+  force = false,
   silent = false
-} = {}) => {
+} = {}) {
+  const hash = await computePrismaSchemaHash();
   if (!force) {
-    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.")) {
+    const storedHash = hash ? getStoredSchemaHash() : null;
+    if (hash !== null && hash === storedHash) {
       return;
     }
   }
@@ -38,7 +74,10 @@ const generatePrismaClient = async ({
       silent
     }
   );
-};
+  if (hash !== null) {
+    storeSchemaHash(hash);
+  }
+}
 export {
   generatePrismaClient,
   generatePrismaCommand

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2331",
+  "version": "5.0.0-canary.2333",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.3",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "5.0.0-canary.2331",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2331",
-    "@cedarjs/fastify-web": "5.0.0-canary.2331",
-    "@cedarjs/internal": "5.0.0-canary.2331",
-    "@cedarjs/prerender": "5.0.0-canary.2331",
-    "@cedarjs/project-config": "5.0.0-canary.2331",
-    "@cedarjs/structure": "5.0.0-canary.2331",
-    "@cedarjs/telemetry": "5.0.0-canary.2331",
-    "@cedarjs/utils": "5.0.0-canary.2331",
-    "@cedarjs/vite": "5.0.0-canary.2331",
-    "@cedarjs/web-server": "5.0.0-canary.2331",
+    "@cedarjs/api-server": "5.0.0-canary.2333",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2333",
+    "@cedarjs/fastify-web": "5.0.0-canary.2333",
+    "@cedarjs/internal": "5.0.0-canary.2333",
+    "@cedarjs/prerender": "5.0.0-canary.2333",
+    "@cedarjs/project-config": "5.0.0-canary.2333",
+    "@cedarjs/structure": "5.0.0-canary.2333",
+    "@cedarjs/telemetry": "5.0.0-canary.2333",
+    "@cedarjs/utils": "5.0.0-canary.2333",
+    "@cedarjs/vite": "5.0.0-canary.2333",
+    "@cedarjs/web-server": "5.0.0-canary.2333",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",