@cedarjs/codemods 3.0.0-canary.13644 → 3.0.0-canary.13646

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

@@ -33,11 +33,11 @@ async function getPrismaV7Context() {
   } else if (fs.existsSync(dbPathJs)) {
     dbFilePath = dbPathJs;
   }
-  return { provider, isSqlite, isPostgres, paths, dbFilePath };
+  return { provider, isSqlite, isPostgres, dbFilePath };
 }
 async function prismaV7() {
+  const paths = getPaths();
   const context = await getPrismaV7Context();
-  const { paths, isSqlite } = context;
   await runUpdateSchemaFile();
   await updatePrismaConfig(paths.api.prismaConfig);
   if (context.dbFilePath) {
@@ -46,14 +46,14 @@ async function prismaV7() {
       targetPaths: [context.dbFilePath],
       parser: "ts",
       options: {
-        isSqlite,
+        isSqlite: context.isSqlite,
         isPostgres: context.isPostgres,
         silent: true
       }
     });
   }
   await rewriteRemainingImports();
-  if (isSqlite || context.isPostgres) {
+  if (context.isSqlite || context.isPostgres) {
     await updateApiPackageJson(path.join(paths.api.base, "package.json"), {
       provider: context.provider
     });

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

@@ -1,5 +1,6 @@
 import path from "node:path";
 import { styleText } from "node:util";
+import { getPaths } from "@cedarjs/project-config";
 import runTransform from "../../../lib/runTransform.js";
 import { getPrismaV7Context } from "./prismaV7.js";
 import rewriteRemainingImports from "./rewriteRemainingImports.js";
@@ -16,8 +17,9 @@ function step(label, output) {
   console.log(`    \u2192 ${output}`);
 }
 const handler = async () => {
+  const paths = getPaths();
   const context = await getPrismaV7Context();
-  const { paths, isSqlite, isPostgres, provider, dbFilePath } = context;
+  const { isSqlite, isPostgres, provider, dbFilePath } = context;
   console.log(styleText("bold", "\u276F Prisma v7 Migration"));
   const { results: schemaResults } = await runUpdateSchemaFile();
   if (schemaResults.length === 0) {
@@ -144,7 +146,7 @@ const handler = async () => {
     `  ${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`
+    `  ${offset + 4}. Run \`yarn cedar lint --fix\` to fix code formatting issues`
   );
   console.log(styleText("bold", "\n  Next steps:"));
   console.log(nextSteps.join("\n"));

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

@@ -11,6 +11,55 @@ function transform(file, api, options = {}) {
   if (alreadyMigrated) {
     return file.source;
   }
+  function insertAdapterImport(importDecl) {
+    const clientImport = root.find(j.ImportDeclaration, {
+      source: { value: NEW_CLIENT_PATH }
+    });
+    if (clientImport.length > 0) {
+      clientImport.insertBefore(importDecl);
+    } else {
+      root.find(j.ImportDeclaration).at(0).insertBefore(importDecl);
+    }
+  }
+  function addAdapterToPrismaClient() {
+    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" && "name" in prop.key && prop.key.name === "adapter"
+      );
+      if (!hasAdapterProp) {
+        firstArg.properties.push(
+          Object.assign(
+            j.objectProperty(
+              j.identifier("adapter"),
+              j.identifier("adapter")
+            ),
+            { shorthand: true }
+          )
+        );
+      }
+    });
+  }
   let didTransform = false;
   root.find(j.ImportDeclaration, { source: { value: OLD_PRISMA_CLIENT } }).forEach((nodePath) => {
     nodePath.node.source = j.stringLiteral(NEW_CLIENT_PATH);
@@ -31,25 +80,25 @@ function transform(file, api, options = {}) {
       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")
+      insertAdapterImport(
+        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
-      );
+    if (!hasAdapter2) {
+      const prismaClientDeclaration = root.find(j.NewExpression, {
+        callee: { type: "Identifier", name: "PrismaClient" }
+      }).closest(j.VariableDeclaration);
       const adapterDecl = j.variableDeclaration("const", [
         j.variableDeclarator(
           j.identifier("adapter"),
@@ -71,43 +120,7 @@ function transform(file, api, options = {}) {
       ]);
       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 }
-          )
-        );
-      }
-    });
+    addAdapterToPrismaClient();
     return root.toSource({ quote: "single" });
   }
   if (!isSqlite) {
@@ -120,29 +133,26 @@ function transform(file, api, options = {}) {
   const hasGetPathsImport = root.find(j.ImportDeclaration, {
     source: { value: "@cedarjs/project-config" }
   }).length > 0;
-  const allImports = root.find(j.ImportDeclaration);
-  const firstImport = allImports.at(0);
   if (!hasPathImport) {
-    const pathImport = j.importDeclaration(
-      [j.importDefaultSpecifier(j.identifier("path"))],
-      j.stringLiteral("node:path")
+    root.find(j.ImportDeclaration).at(0).insertBefore(
+      j.importDeclaration(
+        [j.importDefaultSpecifier(j.identifier("path"))],
+        j.stringLiteral("node:path")
+      )
     );
-    firstImport.insertBefore(pathImport);
   }
-  const clientImport = root.find(j.ImportDeclaration, {
-    source: { value: NEW_CLIENT_PATH }
-  });
   if (!hasAdapterImport) {
-    const adapterImport = j.importDeclaration(
-      [
-        j.importSpecifier(
-          j.identifier("PrismaBetterSqlite3"),
-          j.identifier("PrismaBetterSqlite3")
-        )
-      ],
-      j.stringLiteral("@prisma/adapter-better-sqlite3")
+    insertAdapterImport(
+      j.importDeclaration(
+        [
+          j.importSpecifier(
+            j.identifier("PrismaBetterSqlite3"),
+            j.identifier("PrismaBetterSqlite3")
+          )
+        ],
+        j.stringLiteral("@prisma/adapter-better-sqlite3")
+      )
     );
-    clientImport.insertBefore(adapterImport);
   }
   if (!hasGetPathsImport) {
     const cedarjsImports = root.find(
@@ -153,6 +163,9 @@ function transform(file, api, options = {}) {
       [j.importSpecifier(j.identifier("getPaths"), j.identifier("getPaths"))],
       j.stringLiteral("@cedarjs/project-config")
     );
+    const clientImport = root.find(j.ImportDeclaration, {
+      source: { value: NEW_CLIENT_PATH }
+    });
     if (cedarjsImports.length > 0) {
       cedarjsImports.at(-1).insertAfter(getPathsImport);
     } else {
@@ -210,40 +223,7 @@ const resolveSqliteUrl = (url = 'file:./db/dev.db') => {
       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 }
-        )
-      );
-    }
-  });
+  addAdapterToPrismaClient();
   return root.toSource({ quote: "single" });
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/codemods",
-  "version": "3.0.0-canary.13644+49351b4e5",
+  "version": "3.0.0-canary.13646+d2a971cc8",
   "description": "Codemods to ease upgrading a CedarJS Project",
   "repository": {
     "type": "git",
@@ -29,8 +29,8 @@
     "@babel/parser": "7.29.2",
     "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/cli-helpers": "3.0.0-canary.13644",
-    "@cedarjs/project-config": "3.0.0-canary.13644",
+    "@cedarjs/cli-helpers": "3.0.0-canary.13646",
+    "@cedarjs/project-config": "3.0.0-canary.13646",
     "@svgr/core": "8.1.0",
     "@svgr/plugin-jsx": "8.1.0",
     "@vscode/ripgrep": "1.17.1",
@@ -48,7 +48,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "3.0.0-canary.13644",
+    "@cedarjs/framework-tools": "3.0.0-canary.13646",
     "@types/babel__core": "7.20.5",
     "@types/jscodeshift": "17.3.0",
     "@types/yargs": "17.0.35",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "49351b4e53e64b816a511698739427f445a24e0b"
+  "gitHead": "d2a971cc88b3047f421cb2df6d6bfdee38fab561"
 }