@cedarjs/codemods 3.0.0-canary.13619 → 3.0.0-canary.13624

package/dist/codemods/v3.x/prismaV7/prismaV7.js

@@ -24,6 +24,7 @@ async function getPrismaV7Context() {
   const schemaPath = await getSchemaPath(paths.api.prismaConfig);
   const provider = detectProvider(schemaPath);
   const isSqlite = provider === "sqlite";
+  const isPostgres = provider === "postgresql" || provider === "postgres";
   const dbPathTs = path.join(paths.api.lib, "db.ts");
   const dbPathJs = path.join(paths.api.lib, "db.js");
   let dbFilePath = null;
@@ -32,7 +33,7 @@ async function getPrismaV7Context() {
   } else if (fs.existsSync(dbPathJs)) {
     dbFilePath = dbPathJs;
   }
-  return { isSqlite, paths, dbFilePath };
+  return { provider, isSqlite, isPostgres, paths, dbFilePath };
 }
 async function prismaV7() {
   const context = await getPrismaV7Context();
@@ -45,13 +46,17 @@ async function prismaV7() {
       targetPaths: [context.dbFilePath],
       parser: "ts",
       options: {
-        isSqlite
+        isSqlite,
+        isPostgres: context.isPostgres,
+        silent: true
       }
     });
   }
   await rewriteRemainingImports();
-  if (isSqlite) {
-    await updateApiPackageJson(path.join(paths.api.base, "package.json"));
+  if (isSqlite || context.isPostgres) {
+    await updateApiPackageJson(path.join(paths.api.base, "package.json"), {
+      provider: context.provider
+    });
   }
   await updateTsConfigs({
     apiTsConfig: path.join(paths.api.base, "tsconfig.json"),

package/dist/codemods/v3.x/prismaV7/prismaV7.yargs.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-import task from "tasuku";
+import { styleText } from "node:util";
 import runTransform from "../../../lib/runTransform.js";
 import { getPrismaV7Context } from "./prismaV7.js";
 import rewriteRemainingImports from "./rewriteRemainingImports.js";
@@ -10,152 +10,144 @@ import { updatePrismaConfig } from "./updatePrismaConfig.js";
 import runUpdateSchemaFile from "./updateSchemaFile.js";
 import { updateTsConfigs } from "./updateTsConfigs.js";
 const command = "prisma-v7";
-const description = "(v3.x) Upgrades your Cedar app to use Prisma v7 \u2014 updates schema.prisma, db.ts, prisma.config.cjs, and related config files";
+const description = "(v3.x) Upgrades your Cedar app to use Prisma v7 \u2013 updates schema.prisma, db.ts, prisma.config.cjs, and related config files";
+function step(label, output) {
+  console.log(`  ${styleText("green", "\u2714")} ${styleText("bold", label)}`);
+  console.log(`    \u2192 ${output}`);
+}
 const handler = async () => {
   const context = await getPrismaV7Context();
-  const { paths, isSqlite, dbFilePath } = context;
-  await task("Prisma v7 Migration", async ({ task: task2 }) => {
-    await task2.group(
-      (task3) => [
-        task3("Update schema.prisma", async ({ setOutput }) => {
-          const { results } = await runUpdateSchemaFile();
-          for (const result of results) {
-            if (result.status === "skipped") {
-              setOutput(`Skipped \u2014 ${result.path} not found`);
-            } else if (result.status === "unmodified") {
-              setOutput("No changes needed (already migrated)");
-            } else {
-              setOutput(`Updated ${result.path}`);
-            }
-            for (const warning of result.warnings) {
-              console.warn(`
+  const { paths, isSqlite, isPostgres, provider, dbFilePath } = context;
+  console.log(styleText("bold", "\u276F Prisma v7 Migration"));
+  const { results: schemaResults } = await runUpdateSchemaFile();
+  if (schemaResults.length === 0) {
+    step("Update schema.prisma", "Skipped. No schema.prisma found");
+  } else {
+    for (const result of schemaResults) {
+      if (result.status === "skipped") {
+        step("Update schema.prisma", `Skipped. ${result.path} not found`);
+      } else if (result.status === "unmodified") {
+        step("Update schema.prisma", "No changes needed (already migrated)");
+      } else {
+        step("Update schema.prisma", `Updated ${result.path}`);
+      }
+      for (const warning of result.warnings) {
+        console.warn(`
 \u26A0\uFE0F  ${warning}`);
-            }
-          }
-          if (results.length === 0) {
-            setOutput("Skipped \u2014 no schema.prisma found");
-          }
-        }),
-        task3("Update prisma.config.cjs", async ({ setOutput }) => {
-          const result = await updatePrismaConfig(paths.api.prismaConfig);
-          if (result === "skipped") {
-            setOutput("Skipped \u2014 prisma.config.cjs not found");
-          } else if (result === "unmodified") {
-            setOutput("No changes needed (already has datasource block)");
-          } else {
-            setOutput(`Updated ${paths.api.prismaConfig}`);
-          }
-        }),
-        task3("Update api/src/lib/db.{ts,js}", async ({ setOutput }) => {
-          if (!dbFilePath) {
-            setOutput(
-              "Skipped \u2014 no api/src/lib/db.ts or api/src/lib/db.js found"
-            );
-            return;
-          }
-          await runTransform({
-            transformPath: path.join(import.meta.dirname, "updateDbFile.js"),
-            targetPaths: [dbFilePath],
-            parser: "ts",
-            options: {
-              isSqlite
-            }
-          });
-          setOutput(`Updated ${dbFilePath}`);
-          if (!isSqlite) {
-            console.log(
-              "\n\u2139\uFE0F  Non-SQLite database detected. The import paths in db.ts have\n   been updated, but no driver adapter was added. If you want to\n   use a Prisma driver adapter (recommended), add one manually.\n   See: https://www.prisma.io/docs/orm/overview/databases/database-drivers"
-            );
-          }
-        })
-      ],
-      { concurrency: 1 }
+      }
+    }
+  }
+  const prismaConfigResult = await updatePrismaConfig(paths.api.prismaConfig);
+  if (prismaConfigResult === "skipped") {
+    step("Update prisma.config.cjs", "Skipped. prisma.config.cjs not found");
+  } else if (prismaConfigResult === "unmodified") {
+    step(
+      "Update prisma.config.cjs",
+      "No changes needed (already has datasource block)"
     );
-    await task2.group(
-      (task3) => [
-        task3(
-          "Rewrite remaining @prisma/client imports",
-          async ({ setOutput }) => {
-            await rewriteRemainingImports();
-            setOutput("Done");
-          }
-        ),
-        task3("Update api/package.json", async ({ setOutput }) => {
-          if (!isSqlite) {
-            setOutput(
-              "Skipped \u2014 non-SQLite project. Add your own driver adapter package."
-            );
-            return;
-          }
-          const pkgPath = path.join(paths.api.base, "package.json");
-          const result = await updateApiPackageJson(pkgPath);
-          if (result === "skipped") {
-            setOutput("Skipped \u2014 api/package.json not found");
-          } else if (result === "unmodified") {
-            setOutput("No changes needed (adapter already installed)");
-          } else {
-            setOutput(`Updated ${pkgPath}`);
-          }
-        }),
-        task3("Update tsconfig.json files", async ({ setOutput }) => {
-          const results = await updateTsConfigs({
-            apiTsConfig: path.join(paths.api.base, "tsconfig.json"),
-            scriptsTsConfig: path.join(paths.base, "scripts", "tsconfig.json"),
-            webTsConfig: path.join(paths.web.base, "tsconfig.json")
-          });
-          const updated = Object.entries(results).filter(([, status]) => status === "updated").map(([name]) => name);
-          if (updated.length === 0) {
-            setOutput("No changes needed");
-          } else {
-            setOutput(`Updated: ${updated.join(", ")}`);
-          }
-        }),
-        task3("Update .gitignore", async ({ setOutput }) => {
-          const gitignorePath = path.join(paths.base, ".gitignore");
-          const result = await updateGitignore(gitignorePath);
-          if (result === "skipped") {
-            setOutput("Skipped \u2014 .gitignore not found");
-          } else if (result === "unmodified") {
-            setOutput("No changes needed");
-          } else {
-            setOutput(`Updated ${gitignorePath}`);
-          }
-        }),
-        task3("Update .env.defaults", async ({ setOutput }) => {
-          const envDefaultsPath = path.join(paths.base, ".env.defaults");
-          const result = await updateEnvDefaults(envDefaultsPath);
-          if (result === "skipped") {
-            setOutput("Skipped \u2014 .env.defaults not found");
-          } else if (result === "unmodified") {
-            setOutput("No changes needed");
-          } else {
-            setOutput(`Updated ${envDefaultsPath}`);
-          }
-          const dotEnvWarning = checkDotEnv(path.join(paths.base, ".env"));
-          if (dotEnvWarning) {
-            console.warn(`
-\u26A0\uFE0F  ${dotEnvWarning}`);
-          }
-        })
-      ],
-      { concurrency: Infinity }
+  } else {
+    step("Update prisma.config.cjs", `Updated ${paths.api.prismaConfig}`);
+  }
+  if (!dbFilePath) {
+    step(
+      "Update api/src/lib/db.{ts,js}",
+      "Skipped. No api/src/lib/db.ts or api/src/lib/db.js found"
     );
-    await task2("Next steps", async ({ setOutput }) => {
-      const steps = [
-        "  1. Run `yarn install` to install new dependencies",
-        "  2. Run `yarn cedar prisma generate` to generate the new Prisma client",
-        "  3. Run `yarn cedar prisma migrate dev` to verify migrations work",
-        "  4. Run `yarn cedar lint --fix` to fix any import ordering issues"
-      ];
-      if (!isSqlite) {
-        steps.push(
-          "  5. Add a Prisma driver adapter for your database to api/src/lib/db.ts",
-          "     See: https://www.prisma.io/docs/orm/overview/databases/database-drivers"
-        );
+  } else {
+    await runTransform({
+      transformPath: path.join(import.meta.dirname, "updateDbFile.js"),
+      targetPaths: [dbFilePath],
+      parser: "ts",
+      options: {
+        isSqlite,
+        isPostgres,
+        silent: true
       }
-      setOutput("\n\n" + steps.join("\n"));
     });
+    step("Update api/src/lib/db.{ts,js}", `Updated ${dbFilePath}`);
+    if (!isSqlite && !isPostgres) {
+      const installationUrl = "https://www.prisma.io/docs/orm/prisma-client/setup-and-configuration/introduction#installation";
+      console.log(
+        `    \u2139\uFE0F  Non-SQLite database detected. The import paths in db.ts have been updated,
+       but no driver adapter was added. You'll need to add one manually.
+       See: ${installationUrl}`
+      );
+    }
+  }
+  await rewriteRemainingImports();
+  step("Rewrite remaining @prisma/client imports", "Done");
+  if (!isSqlite && !isPostgres) {
+    step(
+      "Update api/package.json",
+      "Skipped. Unsupported provider. Add your own driver adapter package."
+    );
+  } else {
+    const pkgPath = path.join(paths.api.base, "package.json");
+    const pkgResult = await updateApiPackageJson(pkgPath, { provider });
+    if (pkgResult === "skipped") {
+      step("Update api/package.json", "Skipped. api/package.json not found");
+    } else if (pkgResult === "unmodified") {
+      step(
+        "Update api/package.json",
+        "No changes needed (adapter already installed)"
+      );
+    } else {
+      step("Update api/package.json", `Updated ${pkgPath}`);
+    }
+  }
+  const tsConfigResults = await updateTsConfigs({
+    apiTsConfig: path.join(paths.api.base, "tsconfig.json"),
+    scriptsTsConfig: path.join(paths.base, "scripts", "tsconfig.json"),
+    webTsConfig: path.join(paths.web.base, "tsconfig.json")
   });
+  const updatedTsConfigs = Object.entries(tsConfigResults).filter(([, status]) => status === "updated").map(([name]) => name);
+  if (updatedTsConfigs.length === 0) {
+    step("Update tsconfig.json files", "No changes needed");
+  } else {
+    step(
+      "Update tsconfig.json files",
+      `Updated: ${updatedTsConfigs.join(", ")}`
+    );
+  }
+  const gitignorePath = path.join(paths.base, ".gitignore");
+  const gitignoreResult = await updateGitignore(gitignorePath);
+  if (gitignoreResult === "skipped") {
+    step("Update .gitignore", "Skipped. .gitignore not found");
+  } else if (gitignoreResult === "unmodified") {
+    step("Update .gitignore", "No changes needed");
+  } else {
+    step("Update .gitignore", `Updated ${gitignorePath}`);
+  }
+  const envDefaultsPath = path.join(paths.base, ".env.defaults");
+  const envDefaultsResult = await updateEnvDefaults(envDefaultsPath);
+  if (envDefaultsResult === "skipped") {
+    step("Update .env.defaults", "Skipped. .env.defaults not found");
+  } else if (envDefaultsResult === "unmodified") {
+    step("Update .env.defaults", "No changes needed");
+  } else {
+    step("Update .env.defaults", `Updated ${envDefaultsPath}`);
+  }
+  const dotEnvWarning = checkDotEnv(path.join(paths.base, ".env"));
+  if (dotEnvWarning) {
+    console.warn(`
+\u26A0\uFE0F  ${dotEnvWarning}`);
+  }
+  const nextSteps = [];
+  if (!isSqlite && !isPostgres) {
+    nextSteps.push(
+      "  1. Add a Prisma driver adapter for your database to api/src/lib/db.ts",
+      "     See:  https://www.prisma.io/docs/orm/core-concepts/supported-databases/database-drivers"
+    );
+  }
+  const offset = !isSqlite && !isPostgres ? 1 : 0;
+  nextSteps.push(
+    `  ${offset + 1}. Run \`yarn install\` to install new dependencies`,
+    `  ${offset + 2}. Run \`yarn cedar prisma generate\` to generate the new Prisma client`,
+    `  ${offset + 3}. Run \`yarn cedar prisma migrate dev\` to verify migrations work`,
+    `  ${offset + 4}. Run \`yarn cedar lint --fix\` to fix import ordering issues etc`
+  );
+  console.log(styleText("bold", "\n  Next steps:"));
+  console.log(nextSteps.join("\n"));
 };
 export {
   command,

package/dist/codemods/v3.x/prismaV7/updateApiPackageJson.js

@@ -3,34 +3,54 @@ const ADAPTER_PACKAGE = "@prisma/adapter-better-sqlite3";
 const SQLITE_PACKAGE = "better-sqlite3";
 const ADAPTER_VERSION = "^7.0.0";
 const SQLITE_VERSION = "^12.0.0";
-function transformApiPackageJson(source, adapterVersion = ADAPTER_VERSION, sqliteVersion = SQLITE_VERSION) {
+const PG_ADAPTER_PACKAGE = "@prisma/adapter-pg";
+const PG_PACKAGE = "pg";
+const PG_ADAPTER_VERSION = "^7.0.0";
+const PG_VERSION = "^8.0.0";
+function transformApiPackageJson(source, {
+  provider = "sqlite",
+  adapterVersion = ADAPTER_VERSION,
+  sqliteVersion = SQLITE_VERSION,
+  pgAdapterVersion = PG_ADAPTER_VERSION,
+  pgVersion = PG_VERSION
+} = {}) {
   const pkg = JSON.parse(source);
-  if (pkg.dependencies?.[ADAPTER_PACKAGE]) {
-    return source;
+  const isPostgres = provider === "postgresql" || provider === "postgres";
+  if (isPostgres) {
+    if (pkg.dependencies?.[PG_ADAPTER_PACKAGE]) {
+      return source;
+    }
+    pkg.dependencies = {
+      ...pkg.dependencies ?? {},
+      [PG_ADAPTER_PACKAGE]: pgAdapterVersion,
+      [PG_PACKAGE]: pgVersion
+    };
+  } else {
+    if (pkg.dependencies?.[ADAPTER_PACKAGE]) {
+      return source;
+    }
+    pkg.dependencies = {
+      ...pkg.dependencies ?? {},
+      [ADAPTER_PACKAGE]: adapterVersion,
+      [SQLITE_PACKAGE]: sqliteVersion
+    };
   }
-  pkg.dependencies = {
-    ...pkg.dependencies ?? {},
-    [ADAPTER_PACKAGE]: adapterVersion,
-    [SQLITE_PACKAGE]: sqliteVersion
-  };
   const indentMatch = source.match(/^(\s+)"/m);
   const indent = indentMatch ? indentMatch[1] : "  ";
   return JSON.stringify(pkg, null, indent.length) + "\n";
 }
-async function updateApiPackageJson(packageJsonPath, adapterVersion = ADAPTER_VERSION, sqliteVersion = SQLITE_VERSION) {
+async function updateApiPackageJson(packageJsonPath, options = {}) {
   if (!fs.existsSync(packageJsonPath)) {
     return "skipped";
   }
   const source = fs.readFileSync(packageJsonPath, "utf-8");
   const pkg = JSON.parse(source);
-  if (pkg.dependencies?.[ADAPTER_PACKAGE]) {
+  const isPostgres = options.provider === "postgresql" || options.provider === "postgres";
+  const sentinelPackage = isPostgres ? PG_ADAPTER_PACKAGE : ADAPTER_PACKAGE;
+  if (pkg.dependencies?.[sentinelPackage]) {
     return "unmodified";
   }
-  const transformed = transformApiPackageJson(
-    source,
-    adapterVersion,
-    sqliteVersion
-  );
+  const transformed = transformApiPackageJson(source, options);
   if (transformed === source) {
     return "unmodified";
   }
@@ -40,6 +60,10 @@ async function updateApiPackageJson(packageJsonPath, adapterVersion = ADAPTER_VE
 export {
   ADAPTER_PACKAGE,
   ADAPTER_VERSION,
+  PG_ADAPTER_PACKAGE,
+  PG_ADAPTER_VERSION,
+  PG_PACKAGE,
+  PG_VERSION,
   SQLITE_PACKAGE,
   SQLITE_VERSION,
   transformApiPackageJson,

package/dist/codemods/v3.x/prismaV7/updateDbFile.js

@@ -3,11 +3,14 @@ const OLD_PRISMA_CLIENT = "@prisma/client";
 function transform(file, api, options = {}) {
   const j = api.jscodeshift;
   const root = j(file.source);
-  const alreadyMigrated = root.find(j.ImportDeclaration, { source: { value: NEW_CLIENT_PATH } }).length > 0;
+  const isSqlite = options["isSqlite"] !== false;
+  const isPostgres = options["isPostgres"] === true;
+  const hasNewClientPath = root.find(j.ImportDeclaration, { source: { value: NEW_CLIENT_PATH } }).length > 0;
+  const hasPgAdapter = root.find(j.ImportDeclaration, { source: { value: "@prisma/adapter-pg" } }).length > 0;
+  const alreadyMigrated = hasNewClientPath && (!isPostgres || hasPgAdapter);
   if (alreadyMigrated) {
     return file.source;
   }
-  const isSqlite = options["isSqlite"] !== false;
   let didTransform = false;
   root.find(j.ImportDeclaration, { source: { value: OLD_PRISMA_CLIENT } }).forEach((nodePath) => {
     nodePath.node.source = j.stringLiteral(NEW_CLIENT_PATH);
@@ -20,9 +23,93 @@ function transform(file, api, options = {}) {
     nodePath.node.source = j.stringLiteral(NEW_CLIENT_PATH);
     didTransform = true;
   });
-  if (!didTransform) {
+  if (!didTransform && !isPostgres) {
     return file.source;
   }
+  if (isPostgres) {
+    const hasAdapterImport2 = root.find(j.ImportDeclaration, {
+      source: { value: "@prisma/adapter-pg" }
+    }).length > 0;
+    if (!hasAdapterImport2) {
+      const clientImport2 = root.find(j.ImportDeclaration, {
+        source: { value: NEW_CLIENT_PATH }
+      });
+      const adapterImport = j.importDeclaration(
+        [j.importSpecifier(j.identifier("PrismaPg"), j.identifier("PrismaPg"))],
+        j.stringLiteral("@prisma/adapter-pg")
+      );
+      clientImport2.insertBefore(adapterImport);
+    }
+    const hasAdapter2 = root.find(j.VariableDeclarator, {
+      id: { type: "Identifier", name: "adapter" }
+    }).length > 0;
+    const prismaClientNewExpr2 = root.find(j.NewExpression, {
+      callee: { type: "Identifier", name: "PrismaClient" }
+    });
+    if (prismaClientNewExpr2.length > 0 && !hasAdapter2) {
+      const prismaClientDeclaration = prismaClientNewExpr2.closest(
+        j.VariableDeclaration
+      );
+      const adapterDecl = j.variableDeclaration("const", [
+        j.variableDeclarator(
+          j.identifier("adapter"),
+          j.newExpression(j.identifier("PrismaPg"), [
+            j.objectExpression([
+              j.objectProperty(
+                j.identifier("connectionString"),
+                j.memberExpression(
+                  j.memberExpression(
+                    j.identifier("process"),
+                    j.identifier("env")
+                  ),
+                  j.identifier("DATABASE_URL")
+                )
+              )
+            ])
+          ])
+        )
+      ]);
+      prismaClientDeclaration.insertBefore(adapterDecl);
+    }
+    root.find(j.NewExpression, {
+      callee: { type: "Identifier", name: "PrismaClient" }
+    }).forEach((nodePath) => {
+      const args = nodePath.node.arguments;
+      if (args.length === 0) {
+        nodePath.node.arguments = [
+          j.objectExpression([
+            Object.assign(
+              j.objectProperty(
+                j.identifier("adapter"),
+                j.identifier("adapter")
+              ),
+              { shorthand: true }
+            )
+          ])
+        ];
+        return;
+      }
+      const firstArg = args[0];
+      if (firstArg.type !== "ObjectExpression") {
+        return;
+      }
+      const hasAdapterProp = firstArg.properties.some(
+        (prop) => prop.type === "ObjectProperty" && prop.key.type === "Identifier" && prop.key.name === "adapter"
+      );
+      if (!hasAdapterProp) {
+        firstArg.properties.push(
+          Object.assign(
+            j.objectProperty(
+              j.identifier("adapter"),
+              j.identifier("adapter")
+            ),
+            { shorthand: true }
+          )
+        );
+      }
+    });
+    return root.toSource({ quote: "single" });
+  }
   if (!isSqlite) {
     return root.toSource({ quote: "single" });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/codemods",
-  "version": "3.0.0-canary.13619+337ce69a7",
+  "version": "3.0.0-canary.13624+5a683e227",
   "description": "Codemods to ease upgrading a CedarJS Project",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
   "dependencies": {
     "@babel/cli": "7.28.6",
     "@babel/core": "^7.26.10",
-    "@babel/parser": "7.29.0",
+    "@babel/parser": "7.29.2",
     "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/project-config": "3.0.0-canary.13619",
+    "@cedarjs/project-config": "3.0.0-canary.13624",
     "@svgr/core": "8.1.0",
     "@svgr/plugin-jsx": "8.1.0",
     "@vscode/ripgrep": "1.17.1",
@@ -47,7 +47,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "3.0.0-canary.13619",
+    "@cedarjs/framework-tools": "3.0.0-canary.13624",
     "@types/babel__core": "7.20.5",
     "@types/jscodeshift": "17.3.0",
     "@types/yargs": "17.0.35",
@@ -60,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "337ce69a72b9562e55922b3bf79ecf83b564d28f"
+  "gitHead": "5a683e2277e88ed83a16a0b7c443c47ea2f4d7b6"
 }