Return the installed version of an NPM recipe bundle

Author: jkschneider

rewrite-core/src/main/java/org/openrewrite/marketplace/RecipeMarketplace.java

@@ -22,12 +22,7 @@
 import org.openrewrite.NlsRewrite;
 import org.openrewrite.config.CategoryDescriptor;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import static java.util.Collections.addAll;
+import java.util.*;
 
 @Incubating(since = "8.66.0")
 public class RecipeMarketplace {
@@ -38,9 +33,9 @@ public class RecipeMarketplace {
 
     private final @Getter List<RecipeBundleResolver> resolvers = new ArrayList<>();
 
-    public RecipeMarketplace setResolvers(RecipeBundleResolver... resolvers) {
+    public RecipeMarketplace setResolvers(Collection<RecipeBundleResolver> resolvers) {
         this.resolvers.clear();
-        addAll(this.resolvers, resolvers);
+        this.resolvers.addAll(resolvers);
         return this;
     }
 

rewrite-core/src/test/java/org/openrewrite/rpc/RewriteRpcTest.java

@@ -34,9 +34,11 @@
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
+import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
+import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.openrewrite.marketplace.RecipeBundle.runtimeClasspath;
@@ -60,7 +62,7 @@ void before() throws IOException {
         PipedInputStream clientIn = new PipedInputStream(serverOut);
 
         marketplace = env.toMarketplace(runtimeClasspath())
-          .setResolvers(new TestRecipeBundleResolver());
+          .setResolvers(singletonList(new TestRecipeBundleResolver()));
 
         client = new RewriteRpc(new JsonRpc(new HeaderDelimitedMessageHandler(clientIn, clientOut)), marketplace)
           .batchSize(1);

rewrite-javascript/rewrite/src/rpc/request/install-recipes.ts

@@ -22,6 +22,7 @@ import {RecipeMarketplace} from "../../marketplace";
 
 export interface InstallRecipesResponse {
     recipesInstalled: number
+    version?: string
 }
 
 /**
@@ -81,6 +82,7 @@ export class InstallRecipes {
                     let resolvedPath;
                     let recipesName = request.recipes;
 
+                    let installedVersion: string | undefined;
                     if (typeof request.recipes === "object") {
                         const recipePackage = request.recipes;
                         const absoluteInstallDir = path.isAbsolute(installDir) ? installDir : path.join(process.cwd(), installDir);
@@ -112,6 +114,13 @@ export class InstallRecipes {
                         await spawnNpmCommand("npm", ["install", packageSpec, "--no-fund"], absoluteInstallDir, logger);
                         resolvedPath = require.resolve(path.join(absoluteInstallDir, "node_modules", recipePackage.packageName));
                         recipesName = request.recipes.packageName;
+
+                        // Read the installed package's version from its package.json
+                        const installedPackageJsonPath = path.join(absoluteInstallDir, "node_modules", recipePackage.packageName, "package.json");
+                        if (fs.existsSync(installedPackageJsonPath)) {
+                            const installedPackageJson = JSON.parse(fs.readFileSync(installedPackageJsonPath, "utf8"));
+                            installedVersion = installedPackageJson.version;
+                        }
                     } else {
                         resolvedPath = request.recipes;
                     }
@@ -139,7 +148,10 @@ export class InstallRecipes {
                         throw new Error(`${recipesName} does not export an 'activate' function`);
                     }
 
-                    return {recipesInstalled: marketplace.allRecipes().length - beforeInstall};
+                    return {
+                        recipesInstalled: marketplace.allRecipes().length - beforeInstall,
+                        version: installedVersion
+                    };
                 }
             )
         );

rewrite-javascript/src/integTest/java/org/openrewrite/javascript/rpc/JavaScriptRewriteRpcTest.java

@@ -163,7 +163,7 @@ void runSearchRecipeWithJavaRecipeActingAsPrecondition(boolean matchesPreconditi
 
     @Test
     void printJava() {
-        assertThat(client().installRecipes(new File("rewrite/dist-fixtures/modify-all-trees.js")))
+        assertThat(client().installRecipes(new File("rewrite/dist-fixtures/modify-all-trees.js")).getRecipesInstalled())
           .isEqualTo(1);
         Recipe modifyAll = client().prepareRecipe("org.openrewrite.java.test.modify-all-trees");
 
@@ -190,7 +190,7 @@ public J preVisit(J tree, ExecutionContext ctx) {
 
     @Test
     void installRecipesFromNpm() {
-        assertThat(client().installRecipes("@openrewrite/recipes-npm")).isEqualTo(1);
+        assertThat(client().installRecipes("@openrewrite/recipes-npm").getRecipesInstalled()).isEqualTo(1);
         assertThat(client().getMarketplace(new RecipeBundle("npm", "@openrewrite/recipes-npm", null, null, null)).getAllRecipes()).satisfiesExactly(
           d -> {
               assertThat(d.getDisplayName()).isEqualTo("Change version in `package.json`");
@@ -434,7 +434,7 @@ void parseProjectWithExclusions(@TempDir Path projectDir) throws IOException {
     private void installRecipes() {
         File exampleRecipes = new File("rewrite/dist-fixtures/example-recipe.js");
         assertThat(exampleRecipes).exists();
-        assertThat(client().installRecipes(exampleRecipes)).isGreaterThan(0);
+        assertThat(client().installRecipes(exampleRecipes).getRecipesInstalled()).isGreaterThan(0);
     }
 
     private JavaScriptRewriteRpc client() {

rewrite-javascript/src/integTest/java/org/openrewrite/javascript/rpc/JavaToJavaScriptRpcTest.java

@@ -47,7 +47,7 @@ static void beforeSuite() {
           .recipe(toRecipe(() -> {
               JavaScriptRewriteRpc client = JavaScriptRewriteRpc.getOrStart();
 
-              assertThat(client.installRecipes(new File("rewrite/dist-fixtures/modify-all-trees.js")))
+              assertThat(client.installRecipes(new File("rewrite/dist-fixtures/modify-all-trees.js")).getRecipesInstalled())
                 .isEqualTo(1);
               Recipe modifyAll = client.prepareRecipe("org.openrewrite.java.test.modify-all-trees");
 

rewrite-javascript/src/main/java/org/openrewrite/javascript/marketplace/NpmRecipeBundleResolver.java

@@ -16,6 +16,7 @@
 package org.openrewrite.javascript.marketplace;
 
 import lombok.RequiredArgsConstructor;
+import org.openrewrite.javascript.rpc.InstallRecipesResponse;
 import org.openrewrite.javascript.rpc.JavaScriptRewriteRpc;
 import org.openrewrite.marketplace.RecipeBundle;
 import org.openrewrite.marketplace.RecipeBundleReader;
@@ -37,10 +38,14 @@ public String getEcosystem() {
     @Override
     public RecipeBundleReader resolve(RecipeBundle bundle) {
         Path pkgPath = Paths.get(bundle.getPackageName());
+        InstallRecipesResponse response;
         if (Files.exists(pkgPath)) {
-            rpc.installRecipes(pkgPath.toFile());
+            response = rpc.installRecipes(pkgPath.toFile());
         } else {
-            rpc.installRecipes(bundle.getPackageName(), bundle.getVersion());
+            response = rpc.installRecipes(bundle.getPackageName(), bundle.getVersion());
+        }
+        if (response.getVersion() != null) {
+            bundle.setVersion(response.getVersion());
         }
         return new NpmRecipeBundleReader(bundle, rpc);
     }

rewrite-javascript/src/main/java/org/openrewrite/javascript/rpc/InstallRecipesResponse.java

@@ -16,8 +16,10 @@
 package org.openrewrite.javascript.rpc;
 
 import lombok.Value;
+import org.jspecify.annotations.Nullable;
 
 @Value
-class InstallRecipesResponse {
+public class InstallRecipesResponse {
     int recipesInstalled;
+    @Nullable String version;
 }

rewrite-javascript/src/main/java/org/openrewrite/javascript/rpc/JavaScriptRewriteRpc.java

@@ -87,25 +87,25 @@ public static void shutdownCurrent() {
         MANAGER.shutdown();
     }
 
-    public int installRecipes(File recipes) {
+    public InstallRecipesResponse installRecipes(File recipes) {
         return send(
                 "InstallRecipes",
                 new InstallRecipesByFile(recipes.getAbsoluteFile().toPath()),
                 InstallRecipesResponse.class
-        ).getRecipesInstalled();
+        );
     }
 
-    public int installRecipes(String packageName) {
+    public InstallRecipesResponse installRecipes(String packageName) {
         return installRecipes(packageName, null);
     }
 
-    public int installRecipes(String packageName, @Nullable String version) {
+    public InstallRecipesResponse installRecipes(String packageName, @Nullable String version) {
         return send(
                 "InstallRecipes",
                 new InstallRecipesByPackage(
                         new InstallRecipesByPackage.Package(packageName, version)),
                 InstallRecipesResponse.class
-        ).getRecipesInstalled();
+        );
     }
 
     /**