@kamaalio/codemod-kit 0.0.37 → 0.0.39

package/dist/github/utils.d.ts

@@ -4,7 +4,7 @@ import type { Codemod, CodemodRunnerCodemod } from '../codemods/index.js';
 export declare function makePullRequestsForCodemodResults<Tag = string, C extends Codemod = Codemod>(codemods: Array<CodemodRunnerCodemod<Tag, C>>, codemodResults: Record<string, Array<Result<{
     hasChanges: boolean;
     content: string;
-}, Error>>>, repositories: Array<Repository<Tag>>): Promise<void>;
+}, Error>>>, repositoriesMappedByCodemodName: Record<string, Array<Repository<Tag>>>): Promise<void>;
 export declare function makePullRequestsForCodemodResult<Tag = string, C extends Codemod = Codemod>(codemod: CodemodRunnerCodemod<Tag, C>, codemodResult: Array<Result<{
     hasChanges: boolean;
     content: string;

package/dist/index.cjs

@@ -456,10 +456,12 @@ function dedupeRepositoriesToClone(repositories, cwd) {
     }, initialDedupeResult).result;
     return dedupedRepos;
 }
-async function makePullRequestsForCodemodResults(codemods, codemodResults, repositories) {
+async function makePullRequestsForCodemodResults(codemods, codemodResults, repositoriesMappedByCodemodName) {
     for (const [codemodName, codemodResult] of Object.entries(codemodResults)){
         const codemod = codemods.find((c)=>c.name === codemodName);
-        if (null == codemod) throw new Error('Invariant found codemod should be present');
+        kamaal_namespaceObject.asserts.invariant(null != codemod, 'Codemod should have been present');
+        const repositories = repositoriesMappedByCodemodName[codemodName];
+        kamaal_namespaceObject.asserts.invariant(null != repositories, 'Repositories should have been present');
         await makePullRequestsForCodemodResult(codemod, codemodResult, repositories);
     }
 }
@@ -482,13 +484,14 @@ async function makePullRequestsForCodemodResult(codemod, codemodResult, reposito
 async function makePullRequest(params) {
     return tryCatchAsync(()=>(0, external_execa_namespaceObject.$)({
             cwd: params.workingDirectory
-        })`gh pr create --title ${params.title} --fill`);
+        })`gh pr create --draft --title ${params.title} --fill`);
 }
 async function runCodemodsOnProjects(repositoriesToClone, codemods, options) {
     const clonedRepositories = await cloneRepositories(repositoriesToClone, options.workingDirectory);
     console.log(`\u{1F5A8}\u{FE0F} cloned ${clonedRepositories.length} ${1 === clonedRepositories.length ? 'repository' : 'repositories'}`);
-    const codemodResults = await runCodemodRunner(codemods, clonedRepositories, options.workingDirectory);
-    if (options.pushChanges) await makePullRequestsForCodemodResults(codemods, codemodResults, clonedRepositories);
+    const codemodRepositoriesMappedByCodemodName = await prepareRepositoriesForCodemods(clonedRepositories, codemods, options.workingDirectory);
+    const codemodResults = await runCodemodRunner(codemods, codemodRepositoriesMappedByCodemodName, options.workingDirectory);
+    if (options.pushChanges) await makePullRequestsForCodemodResults(codemods, codemodResults, codemodRepositoriesMappedByCodemodName);
 }
 function utils_codemodTargetFiltering(repositories, failedRepositoryAddressesMappedByCodemodNames) {
     return (filepath, codemod)=>{
@@ -514,9 +517,9 @@ async function codemodPostTransform(transformedContent) {
     return transformedContent;
 }
 async function runCodemodRunner(codemods, repositories, workingDirectory) {
-    const codemodRepositoriesMappedByCodemodName = await prepareRepositoriesForCodemods(repositories, codemods, workingDirectory);
     const results = Object.fromEntries(await Promise.all(codemods.map(async (codemod)=>{
-        const codemodRepositories = codemodRepositoriesMappedByCodemodName[codemod.name];
+        const start = performance.now();
+        const codemodRepositories = repositories[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 = {};
@@ -524,12 +527,14 @@ async function runCodemodRunner(codemods, repositories, workingDirectory) {
             rootPaths: codemodRepositories.map((repository)=>repository.path),
             hooks: {
                 preCodemodRun: async (codemod)=>{
-                    failedRepositoryAddressesMappedByCodemodNames[codemod.name] = await codemodPreCodemodRun(repositories, codemod);
+                    failedRepositoryAddressesMappedByCodemodNames[codemod.name] = await codemodPreCodemodRun(codemodRepositories, codemod);
                 },
                 targetFiltering: utils_codemodTargetFiltering(groupByFlat(codemodRepositories, 'name'), failedRepositoryAddressesMappedByCodemodNames),
                 postTransform: codemodPostTransform
             }
         });
+        const end = performance.now();
+        console.log(`\u{2728} '${codemod.name}' codemod took ${((end - start) / 1000).toFixed(2)} seconds`);
         return [
             codemod.name,
             result
@@ -551,21 +556,9 @@ async function prepareRepositoriesForCodemods(repositories, codemods, workingDir
         if (prepareResult.isErr()) throw prepareResult.error;
         return prepareResult.value;
     }));
-    console.log(`\u{1F4CB} prepared the following repos for codemods!
+    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)=>{
-            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
-        ];
-    })));
+    return Object.fromEntries(await Promise.all(codemods.map(copyRepo(workingDirectory, updatedRepositories))));
 }
 async function runCodemods(codemods, transformationPath, options) {
     const results = {};
@@ -741,6 +734,21 @@ function findAndReplace(content, rule, transformer) {
     const edits = findAndReplaceEdits(content, rule, transformer);
     return root.commitEdits(edits);
 }
+function copyRepo(workingDirectory, repositories) {
+    return 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(repositories.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
+        ];
+    };
+}
 async function commitEditModifications(edits, modifications) {
     if (0 === edits.length) return modifications;
     const root = modifications.ast.root();

package/dist/index.js

@@ -407,10 +407,12 @@ function dedupeRepositoriesToClone(repositories, cwd) {
     }, initialDedupeResult).result;
     return dedupedRepos;
 }
-async function makePullRequestsForCodemodResults(codemods, codemodResults, repositories) {
+async function makePullRequestsForCodemodResults(codemods, codemodResults, repositoriesMappedByCodemodName) {
     for (const [codemodName, codemodResult] of Object.entries(codemodResults)){
         const codemod = codemods.find((c)=>c.name === codemodName);
-        if (null == codemod) throw new Error('Invariant found codemod should be present');
+        asserts.invariant(null != codemod, 'Codemod should have been present');
+        const repositories = repositoriesMappedByCodemodName[codemodName];
+        asserts.invariant(null != repositories, 'Repositories should have been present');
         await makePullRequestsForCodemodResult(codemod, codemodResult, repositories);
     }
 }
@@ -433,13 +435,14 @@ async function makePullRequestsForCodemodResult(codemod, codemodResult, reposito
 async function makePullRequest(params) {
     return tryCatchAsync(()=>$({
             cwd: params.workingDirectory
-        })`gh pr create --title ${params.title} --fill`);
+        })`gh pr create --draft --title ${params.title} --fill`);
 }
 async function runCodemodsOnProjects(repositoriesToClone, codemods, options) {
     const clonedRepositories = await cloneRepositories(repositoriesToClone, options.workingDirectory);
     console.log(`\u{1F5A8}\u{FE0F} cloned ${clonedRepositories.length} ${1 === clonedRepositories.length ? 'repository' : 'repositories'}`);
-    const codemodResults = await runCodemodRunner(codemods, clonedRepositories, options.workingDirectory);
-    if (options.pushChanges) await makePullRequestsForCodemodResults(codemods, codemodResults, clonedRepositories);
+    const codemodRepositoriesMappedByCodemodName = await prepareRepositoriesForCodemods(clonedRepositories, codemods, options.workingDirectory);
+    const codemodResults = await runCodemodRunner(codemods, codemodRepositoriesMappedByCodemodName, options.workingDirectory);
+    if (options.pushChanges) await makePullRequestsForCodemodResults(codemods, codemodResults, codemodRepositoriesMappedByCodemodName);
 }
 function utils_codemodTargetFiltering(repositories, failedRepositoryAddressesMappedByCodemodNames) {
     return (filepath, codemod)=>{
@@ -465,9 +468,9 @@ async function codemodPostTransform(transformedContent) {
     return transformedContent;
 }
 async function runCodemodRunner(codemods, repositories, workingDirectory) {
-    const codemodRepositoriesMappedByCodemodName = await prepareRepositoriesForCodemods(repositories, codemods, workingDirectory);
     const results = Object.fromEntries(await Promise.all(codemods.map(async (codemod)=>{
-        const codemodRepositories = codemodRepositoriesMappedByCodemodName[codemod.name];
+        const start = performance.now();
+        const codemodRepositories = repositories[codemod.name];
         asserts.invariant(null != codemodRepositories, 'Codemod repositories should be present');
         const codemodWorkingDirectory = node_path.resolve(workingDirectory, codemod.name.replace(/\//g, '-'));
         const failedRepositoryAddressesMappedByCodemodNames = {};
@@ -475,12 +478,14 @@ async function runCodemodRunner(codemods, repositories, workingDirectory) {
             rootPaths: codemodRepositories.map((repository)=>repository.path),
             hooks: {
                 preCodemodRun: async (codemod)=>{
-                    failedRepositoryAddressesMappedByCodemodNames[codemod.name] = await codemodPreCodemodRun(repositories, codemod);
+                    failedRepositoryAddressesMappedByCodemodNames[codemod.name] = await codemodPreCodemodRun(codemodRepositories, codemod);
                 },
                 targetFiltering: utils_codemodTargetFiltering(groupByFlat(codemodRepositories, 'name'), failedRepositoryAddressesMappedByCodemodNames),
                 postTransform: codemodPostTransform
             }
         });
+        const end = performance.now();
+        console.log(`\u{2728} '${codemod.name}' codemod took ${((end - start) / 1000).toFixed(2)} seconds`);
         return [
             codemod.name,
             result
@@ -502,21 +507,9 @@ async function prepareRepositoriesForCodemods(repositories, codemods, workingDir
         if (prepareResult.isErr()) throw prepareResult.error;
         return prepareResult.value;
     }));
-    console.log(`\u{1F4CB} prepared the following repos for codemods!
+    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)=>{
-            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
-        ];
-    })));
+    return Object.fromEntries(await Promise.all(codemods.map(copyRepo(workingDirectory, updatedRepositories))));
 }
 async function runCodemods(codemods, transformationPath, options) {
     const results = {};
@@ -692,6 +685,21 @@ function findAndReplace(content, rule, transformer) {
     const edits = findAndReplaceEdits(content, rule, transformer);
     return root.commitEdits(edits);
 }
+function copyRepo(workingDirectory, repositories) {
+    return async (codemod)=>{
+        const codemodWorkingDirectory = node_path.resolve(workingDirectory, codemod.name.replace(/\//g, '-'));
+        await $`mkdir -p ${codemodWorkingDirectory}`;
+        const codeRepositories = await Promise.all(repositories.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
+        ];
+    };
+}
 async function commitEditModifications(edits, modifications) {
     if (0 === edits.length) return modifications;
     const root = modifications.ast.root();

package/package.json

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