@cedarjs/codemods 2.7.0-rc.107 → 2.7.0-rc.118

package/README.md

@@ -235,8 +235,8 @@ yarn build
 The CLI is meant to be run on a Cedar project (i.e. it expects you to be cd'd into a Cedar project), but you can provide it as an environment variable too!
 
 ```shell
-CEDAR_CWD=/path/to/rw-project node "./packages/codemods/dist/codemods.js" {your-codemod-name}
-# ☝️ this is the path to your rw project (not the framework!)
+CEDAR_CWD=/path/to/cedar-project node ./packages/codemods/dist/codemods.js {your-codemod-name}
+# ☝️ this is the path to your Cedar project (not the framework!)
 ```
 
 > **💡 Tip**

package/dist/codemods/v2.7.x/prismaV7Prep/prismaV7Prep.js

@@ -36,69 +36,48 @@ __export(prismaV7Prep_exports, {
 module.exports = __toCommonJS(prismaV7Prep_exports);
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = __toESM(require("node:path"));
-var import_jscodeshift = __toESM(require("jscodeshift"));
 var import_project_config = require("@cedarjs/project-config");
-var import_prettify = __toESM(require("../../../lib/prettify"));
-function getParserForFile(filePath) {
-  if (filePath.endsWith(".tsx") || filePath.endsWith(".jsx")) {
-    return import_jscodeshift.default.withParser("tsx");
+const CODE_FILE_GLOB = "**/*.{ts,tsx,cts,mts,js,jsx,cjs,mjs}";
+const PRISMA_CLIENT_REEXPORT = "export * from '@prisma/client'";
+function insertDbReexport(source) {
+  if (source.includes(PRISMA_CLIENT_REEXPORT)) {
+    return source;
   }
-  return import_jscodeshift.default.withParser("ts");
-}
-function getPrettierParserForFile(filePath) {
-  if (filePath.endsWith(".ts") || filePath.endsWith(".tsx") || filePath.endsWith(".cts") || filePath.endsWith(".mts")) {
-    return "typescript";
+  const lines = source.split("\n");
+  const prismaImportIndex = lines.findIndex(
+    (line) => /from\s+['"]@prisma\/client['"]/.test(line)
+  );
+  if (prismaImportIndex < 0) {
+    throw new Error("Unexpected src/lib/db content");
   }
-  return "babel";
+  lines.splice(prismaImportIndex + 1, 0, "", PRISMA_CLIENT_REEXPORT);
+  return lines.join("\n");
 }
-function transformDbFile(file) {
-  const parser = getParserForFile(file.path);
-  const root = parser(file.source);
-  const existingExport = root.find(parser.ExportAllDeclaration, {
-    source: { value: "@prisma/client" }
-  });
-  if (existingExport.length > 0) {
-    return file.source;
-  }
-  const prismaClientImport = root.find(parser.ImportDeclaration, {
-    source: { value: "@prisma/client" }
-  });
-  if (prismaClientImport.length === 0) {
-    return file.source;
+async function collectCodeFiles(dir) {
+  try {
+    return await Array.fromAsync(import_node_fs.default.promises.glob(CODE_FILE_GLOB, { cwd: dir }));
+  } catch (error) {
+    if (typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT") {
+      return [];
+    }
+    throw error;
   }
-  const importNode = prismaClientImport.get();
-  const exportStatement = parser.exportAllDeclaration(
-    parser.literal("@prisma/client"),
-    null
-  );
-  importNode.insertAfter(exportStatement);
-  return root.toSource();
-}
-function transformOtherFile(file) {
-  const parser = getParserForFile(file.path);
-  const root = parser(file.source);
-  const isInRootScripts = file.path.startsWith((0, import_project_config.getPaths)().scripts + import_node_path.default.sep);
-  const importPath = isInRootScripts ? "api/src/lib/db" : "src/lib/db";
-  root.find(parser.ImportDeclaration, {
-    source: { value: "@prisma/client" }
-  }).forEach((importDecl) => {
-    importDecl.get("source").replace(parser.literal(importPath));
-  });
-  return root.toSource();
 }
 async function getPrismaV7PrepContext() {
   const paths = (0, import_project_config.getPaths)();
   const prismaConfigPath = paths.api.prismaConfig;
   const dataMigrationsPath = await (0, import_project_config.getDataMigrationsPath)(prismaConfigPath);
-  const dbPath = import_node_path.default.join(paths.api.lib, "db.ts");
+  const dbPathTs = import_node_path.default.join(paths.api.lib, "db.ts");
   const dbPathJs = import_node_path.default.join(paths.api.lib, "db.js");
-  let dbFilePath = dbPath;
-  if (!import_node_fs.default.existsSync(dbPath)) {
+  let dbFilePath = null;
+  if (import_node_fs.default.existsSync(dbPathTs)) {
+    dbFilePath = dbPathTs;
+  } else if (import_node_fs.default.existsSync(dbPathJs)) {
     dbFilePath = dbPathJs;
   }
   return {
     dataMigrationsPath,
-    dbFilePath: import_node_fs.default.existsSync(dbFilePath) ? dbFilePath : null,
+    dbFilePath,
     paths
   };
 }
@@ -106,42 +85,33 @@ async function updateDbFile(dbFilePath) {
   if (!dbFilePath) {
     return "skipped";
   }
-  const source = import_node_fs.default.readFileSync(dbFilePath, "utf-8");
-  const transformed = transformDbFile({ source, path: dbFilePath });
-  import_node_fs.default.writeFileSync(
-    dbFilePath,
-    await (0, import_prettify.default)(transformed, {
-      parser: getPrettierParserForFile(dbFilePath)
-    })
-  );
+  const source = await import_node_fs.default.promises.readFile(dbFilePath, "utf-8");
+  const transformed = insertDbReexport(source);
+  if (transformed === source) {
+    return "unmodified";
+  }
+  await import_node_fs.default.promises.writeFile(dbFilePath, transformed);
   return "updated";
 }
 async function rewritePrismaImportsInDirectory(dir, dbFilePath) {
-  if (!import_node_fs.default.existsSync(dir)) {
-    return {
-      filesSeen: 0,
-      filesUpdated: 0
-    };
+  const scriptsDir = (0, import_project_config.ensurePosixPath)((0, import_project_config.getPaths)().scripts);
+  const normalizedDbFilePath = dbFilePath ? (0, import_project_config.ensurePosixPath)(dbFilePath) : null;
+  const fileMatches = await collectCodeFiles(dir);
+  const files = fileMatches.map((relativePath) => import_node_path.default.join(dir, relativePath)).filter((filePath) => (0, import_project_config.ensurePosixPath)(filePath) !== normalizedDbFilePath);
+  if (files.length === 0) {
+    return "skipped";
   }
-  const files = import_node_fs.default.readdirSync(dir, { recursive: true, encoding: "utf8" }).filter(
-    (file) => file.endsWith(".ts") || file.endsWith(".cts") || file.endsWith(".mts") || file.endsWith(".tsx") || file.endsWith(".js") || file.endsWith(".cjs") || file.endsWith(".mjs") || file.endsWith(".jsx")
-  ).map((file) => import_node_path.default.join(dir, file)).filter((file) => import_node_fs.default.statSync(file).isFile()).filter((file) => file !== dbFilePath);
-  let filesUpdated = 0;
-  for (const file of files) {
-    const source = import_node_fs.default.readFileSync(file, "utf-8");
-    const transformed = transformOtherFile({ source, path: file });
-    const prettified = await (0, import_prettify.default)(transformed, {
-      parser: getPrettierParserForFile(file)
-    });
-    if (prettified !== source) {
-      filesUpdated += 1;
-      import_node_fs.default.writeFileSync(file, prettified);
+  for (const filePath of files) {
+    const source = await import_node_fs.default.promises.readFile(filePath, "utf-8");
+    const isScriptFile = (0, import_project_config.ensurePosixPath)(filePath).startsWith(scriptsDir);
+    const importPath = isScriptFile ? "api/src/lib/db" : "src/lib/db";
+    const importPattern = /(['"])@prisma\/client\1/g;
+    const transformed = source.replace(importPattern, `$1${importPath}$1`);
+    if (transformed !== source) {
+      await import_node_fs.default.promises.writeFile(filePath, transformed);
     }
   }
-  return {
-    filesSeen: files.length,
-    filesUpdated
-  };
+  return "updated";
 }
 async function prismaV7Prep() {
   const context = await getPrismaV7PrepContext();

package/dist/codemods/v2.7.x/prismaV7Prep/prismaV7Prep.yargs.js

@@ -37,62 +37,49 @@ var import_tasuku = __toESM(require("tasuku"));
 var import_prismaV7Prep = require("./prismaV7Prep");
 const command = "prisma-v7-prep";
 const description = "(v2.7.x) Prepares for Prisma v7 by funneling imports through src/lib/db";
-const handler = () => {
-  (0, import_tasuku.default)("Prisma v7 Prep", async ({ setError }) => {
-    try {
-      const context = await (0, import_prismaV7Prep.getPrismaV7PrepContext)();
-      await (0, import_tasuku.default)(
-        "Resolve project paths",
-        async ({ setOutput }) => {
-          setOutput(
-            `api/src: ${context.paths.api.src} | dataMigrations: ${context.dataMigrationsPath} | scripts: ` + context.paths.scripts
-          );
-        }
+const handler = async () => {
+  const context = await (0, import_prismaV7Prep.getPrismaV7PrepContext)();
+  await import_tasuku.default.group((task2) => [
+    task2("Add api/src/lib/db re-export", async ({ setOutput }) => {
+      const result = await (0, import_prismaV7Prep.updateDbFile)(context.dbFilePath);
+      if (result === "skipped") {
+        setOutput("Skipped (no api/src/lib/db.ts or api/src/lib/db.js found)");
+        return;
+      } else if (result === "unmodified") {
+        setOutput("Skipped (no changes needed)");
+        return;
+      }
+      setOutput(`Updated ${context.dbFilePath}`);
+    }),
+    task2(
+      "Rewrite imports in api/src",
+      () => (0, import_prismaV7Prep.rewritePrismaImportsInDirectory)(
+        context.paths.api.src,
+        context.dbFilePath
+      )
+    ),
+    task2("Rewrite imports in api/db/dataMigrations", async ({ setOutput }) => {
+      const result = await (0, import_prismaV7Prep.rewritePrismaImportsInDirectory)(
+        context.dataMigrationsPath,
+        context.dbFilePath
       );
-      await (0, import_tasuku.default)("Update api/src/lib/db re-export", async ({ setOutput }) => {
-        const result = await (0, import_prismaV7Prep.updateDbFile)(context.dbFilePath);
-        if (result === "skipped") {
-          setOutput("Skipped (no api/src/lib/db.ts or api/src/lib/db.js found)");
-          return;
-        }
-        setOutput(`Updated ${context.dbFilePath}`);
-      });
-      await (0, import_tasuku.default)("Rewrite imports in api/src", async ({ setOutput }) => {
-        const result = await (0, import_prismaV7Prep.rewritePrismaImportsInDirectory)(
-          context.paths.api.src,
-          context.dbFilePath
-        );
-        setOutput(`Updated ${result.filesUpdated}/${result.filesSeen} files`);
-      });
-      await (0, import_tasuku.default)(
-        "Rewrite imports in api/db/dataMigrations",
-        async ({ setOutput }) => {
-          const result = await (0, import_prismaV7Prep.rewritePrismaImportsInDirectory)(
-            context.dataMigrationsPath,
-            context.dbFilePath
-          );
-          if (result.filesSeen === 0) {
-            setOutput("Skipped (directory missing or empty)");
-            return;
-          }
-          setOutput(`Updated ${result.filesUpdated}/${result.filesSeen} files`);
-        }
+      if (result === "skipped") {
+        setOutput("Skipped (directory missing or empty)");
+      }
+    }),
+    task2("Rewrite imports in scripts", async ({ setOutput }) => {
+      const result = await (0, import_prismaV7Prep.rewritePrismaImportsInDirectory)(
+        context.paths.scripts,
+        context.dbFilePath
       );
-      await (0, import_tasuku.default)("Rewrite imports in scripts", async ({ setOutput }) => {
-        const result = await (0, import_prismaV7Prep.rewritePrismaImportsInDirectory)(
-          context.paths.scripts,
-          context.dbFilePath
-        );
-        if (result.filesSeen === 0) {
-          setOutput("Skipped (directory missing or empty)");
-          return;
-        }
-        setOutput(`Updated ${result.filesUpdated}/${result.filesSeen} files`);
-      });
-    } catch (e) {
-      setError("Failed to codemod your project \n" + e?.message);
-    }
-  });
+      if (result === "skipped") {
+        setOutput("Skipped (directory missing or empty)");
+      }
+    })
+  ]);
+  console.log(
+    "Some imports might be in the wrong order. If that's the case, you can run `yarn cedar lint --fix` to reorder them."
+  );
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/lib/prettify.js

@@ -31,12 +31,17 @@ __export(prettify_exports, {
   default: () => prettify_default
 });
 module.exports = __toCommonJS(prettify_exports);
-var import_path = __toESM(require("path"));
+var import_node_fs = __toESM(require("node:fs"));
+var import_node_path = __toESM(require("node:path"));
 var import_prettier = require("prettier");
 var import_project_config = require("@cedarjs/project-config");
 const getPrettierConfig = async () => {
+  const basePath = (0, import_project_config.getPaths)().base;
+  const prettierConfigCjsPath = import_node_path.default.join(basePath, "prettier.config.cjs");
+  const prettierConfigMjsPath = import_node_path.default.join(basePath, "prettier.config.mjs");
+  const prettierConfigPath = import_node_fs.default.existsSync(prettierConfigCjsPath) ? prettierConfigCjsPath : prettierConfigMjsPath;
   try {
-    const { default: prettierConfig } = await import(`file://${import_path.default.join((0, import_project_config.getPaths)().base, "prettier.config.cjs")}`);
+    const { default: prettierConfig } = await import(`file://${prettierConfigPath}`);
     return prettierConfig;
   } catch {
     return void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/codemods",
-  "version": "2.7.0-rc.107",
+  "version": "2.7.0-rc.118",
   "description": "Codemods to ease upgrading a CedarJS Project",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/runtime-corejs3": "7.29.0",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/project-config": "2.7.0-rc.107",
+    "@cedarjs/project-config": "2.7.0-rc.118",
     "@svgr/core": "8.1.0",
     "@svgr/plugin-jsx": "8.1.0",
     "@vscode/ripgrep": "1.17.0",
@@ -49,16 +49,18 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "2.7.0-rc.107",
+    "@cedarjs/framework-tools": "2.7.0-rc.118",
     "@types/babel__core": "7.20.5",
     "@types/jscodeshift": "0.12.0",
     "@types/yargs": "17.0.35",
+    "memfs": "4.56.10",
     "publint": "0.3.17",
+    "ts-dedent": "2.2.0",
     "tsx": "4.21.0",
     "vitest": "3.2.4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e4c28ed97a1f4859162b32aaede569ab4412e06b"
+  "gitHead": "79d6f4fc16419ba0d8001b257f54813189c3b0c3"
 }