@kamaalio/codemod-kit 0.0.35 → 0.0.37

package/dist/index.cjs

@@ -518,8 +518,9 @@ async function runCodemodRunner(codemods, repositories, workingDirectory) {
     const results = Object.fromEntries(await Promise.all(codemods.map(async (codemod)=>{
         const codemodRepositories = codemodRepositoriesMappedByCodemodName[codemod.name];
         kamaal_namespaceObject.asserts.invariant(null != codemodRepositories, 'Codemod repositories should be present');
+        const codemodWorkingDirectory = external_node_path_default().resolve(workingDirectory, codemod.name.replace(/\//g, '-'));
         const failedRepositoryAddressesMappedByCodemodNames = {};
-        const result = await runCodemod(codemod, workingDirectory, {
+        const result = await runCodemod(codemod, codemodWorkingDirectory, {
             rootPaths: codemodRepositories.map((repository)=>repository.path),
             hooks: {
                 preCodemodRun: async (codemod)=>{
@@ -537,23 +538,29 @@ async function runCodemodRunner(codemods, repositories, workingDirectory) {
     return results;
 }
 async function prepareRepositoriesForCodemods(repositories, codemods, workingDirectory) {
-    const reposMappedByMainBranchName = Object.fromEntries(await Promise.all(repositories.map(async (repo)=>{
+    const reposMappedByMainBranch = await Promise.all(repositories.map(async (repo)=>{
         const mainBranchResult = await repo.getMainBranch();
         if (mainBranchResult.isErr()) throw mainBranchResult.error;
-        return [
-            mainBranchResult.value.name,
-            repo
-        ];
-    })));
-    const updatedRepositories = await Promise.all(kamaal_namespaceObject.objects.toEntries(reposMappedByMainBranchName).map(async ([mainBranchName, repo])=>{
-        const prepareResult = await repo.prepareForUpdate(mainBranchName);
+        return {
+            mainBranchName: mainBranchResult.value.name,
+            repository: repo
+        };
+    }));
+    const updatedRepositories = await Promise.all(reposMappedByMainBranch.map(async ({ mainBranchName, repository })=>{
+        const prepareResult = await repository.prepareForUpdate(mainBranchName);
         if (prepareResult.isErr()) throw prepareResult.error;
         return prepareResult.value;
     }));
+    console.log(`\u{1F4CB} prepared the following repos for codemods!
+\xb7 ${updatedRepositories.map((repo)=>repo.address).join("\n\xb7 ")}`);
     return Object.fromEntries(await Promise.all(codemods.map(async (codemod)=>{
         const codemodWorkingDirectory = external_node_path_default().resolve(workingDirectory, codemod.name.replace(/\//g, '-'));
         await (0, external_execa_namespaceObject.$)`mkdir -p ${codemodWorkingDirectory}`;
-        const codeRepositories = await Promise.all(updatedRepositories.map((repo)=>repo.copy(external_node_path_default().join(codemodWorkingDirectory, repo.name))));
+        const codeRepositories = await Promise.all(updatedRepositories.map((repo)=>{
+            const newPath = external_node_path_default().join(codemodWorkingDirectory, repo.name);
+            console.log(`\xa9\u{FE0F} copying ${repo.name} -> ${newPath}`);
+            return repo.copy(newPath);
+        }));
         return [
             codemod.name,
             codeRepositories

package/dist/index.js

@@ -4,7 +4,7 @@ import { $ } from "execa";
 import fast_glob from "fast-glob";
 import { ResultAsync, err, ok } from "neverthrow";
 import { Lang, parseAsync } from "@ast-grep/napi";
-import { arrays, asserts, objects } from "@kamaalio/kamaal";
+import { arrays, asserts } from "@kamaalio/kamaal";
 import zod from "zod";
 const JAVASCRIPT_EXTENSIONS = [
     '.js',
@@ -469,8 +469,9 @@ async function runCodemodRunner(codemods, repositories, workingDirectory) {
     const results = Object.fromEntries(await Promise.all(codemods.map(async (codemod)=>{
         const codemodRepositories = codemodRepositoriesMappedByCodemodName[codemod.name];
         asserts.invariant(null != codemodRepositories, 'Codemod repositories should be present');
+        const codemodWorkingDirectory = node_path.resolve(workingDirectory, codemod.name.replace(/\//g, '-'));
         const failedRepositoryAddressesMappedByCodemodNames = {};
-        const result = await runCodemod(codemod, workingDirectory, {
+        const result = await runCodemod(codemod, codemodWorkingDirectory, {
             rootPaths: codemodRepositories.map((repository)=>repository.path),
             hooks: {
                 preCodemodRun: async (codemod)=>{
@@ -488,23 +489,29 @@ async function runCodemodRunner(codemods, repositories, workingDirectory) {
     return results;
 }
 async function prepareRepositoriesForCodemods(repositories, codemods, workingDirectory) {
-    const reposMappedByMainBranchName = Object.fromEntries(await Promise.all(repositories.map(async (repo)=>{
+    const reposMappedByMainBranch = await Promise.all(repositories.map(async (repo)=>{
         const mainBranchResult = await repo.getMainBranch();
         if (mainBranchResult.isErr()) throw mainBranchResult.error;
-        return [
-            mainBranchResult.value.name,
-            repo
-        ];
-    })));
-    const updatedRepositories = await Promise.all(objects.toEntries(reposMappedByMainBranchName).map(async ([mainBranchName, repo])=>{
-        const prepareResult = await repo.prepareForUpdate(mainBranchName);
+        return {
+            mainBranchName: mainBranchResult.value.name,
+            repository: repo
+        };
+    }));
+    const updatedRepositories = await Promise.all(reposMappedByMainBranch.map(async ({ mainBranchName, repository })=>{
+        const prepareResult = await repository.prepareForUpdate(mainBranchName);
         if (prepareResult.isErr()) throw prepareResult.error;
         return prepareResult.value;
     }));
+    console.log(`\u{1F4CB} prepared the following repos for codemods!
+\xb7 ${updatedRepositories.map((repo)=>repo.address).join("\n\xb7 ")}`);
     return Object.fromEntries(await Promise.all(codemods.map(async (codemod)=>{
         const codemodWorkingDirectory = node_path.resolve(workingDirectory, codemod.name.replace(/\//g, '-'));
         await $`mkdir -p ${codemodWorkingDirectory}`;
-        const codeRepositories = await Promise.all(updatedRepositories.map((repo)=>repo.copy(node_path.join(codemodWorkingDirectory, repo.name))));
+        const codeRepositories = await Promise.all(updatedRepositories.map((repo)=>{
+            const newPath = node_path.join(codemodWorkingDirectory, repo.name);
+            console.log(`\xa9\u{FE0F} copying ${repo.name} -> ${newPath}`);
+            return repo.copy(newPath);
+        }));
         return [
             codemod.name,
             codeRepositories

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamaalio/codemod-kit",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "type": "module",
   "author": "Kamaal Farah",
   "license": "MIT",