chore(node): Slightly simplify Yarn code to get package details

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
oss-review-toolkit · Sep 13, 2024 · c725523 · c725523
1 parent 521bd69
commit c725523
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/plugins/package-managers/node/src/main/kotlin/Yarn.kt b/plugins/package-managers/node/src/main/kotlin/Yarn.kt
@@ -87,14 +87,12 @@ class Yarn(
 
         val process = run(workingDir, "info", "--json", packageName)
 
-        return Json.parseToJsonElement(process.stdout).jsonObject["data"]?.let {
+        val data = Json.parseToJsonElement(process.stdout).jsonObject["data"]?.also {
             yarnInfoCache.write(packageName, it.toString())
-            parsePackageJson(it)
-        } ?: run {
-            Json.parseToJsonElement(process.stderr).jsonObject["data"].let {
-                logger.warn { "Error running '${process.commandLine}' in directory $workingDir: $it" }
-                parsePackageJson(checkNotNull(it))
-            }
+        } ?: checkNotNull(Json.parseToJsonElement(process.stderr).jsonObject["data"]).also {
+            logger.warn { "Error running '${process.commandLine}' in directory $workingDir: $it" }
         }
+
+        return parsePackageJson(data)
     }
 }