fix(yarn): Fix up the error handling in getRemotePackageDetails()

Previously, calling `parseYarnInfo(process.stderr)` was useless, because
it attempts to only parse a `PackageJson` instance from `stderr` which
always fails, because `npm` does not output such data to `stderr`.

However, in [1] the logging of errors obtained from `stderr` got
(partially) removed. Fix this up by logging any errors found in
`stderr` in case no `PackageJson` instance could be parsed from
`stdout`.

[1] ad9a363

Signed-off-by: Frank Viernau <[email protected]>

Author: fviernau

plugins/package-managers/node/src/main/kotlin/Yarn.kt

@@ -27,7 +27,10 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.decodeToSequence
+import kotlinx.serialization.json.jsonPrimitive
+import org.apache.logging.log4j.kotlin.KotlinLogger
 
 import org.apache.logging.log4j.kotlin.logger
 
@@ -91,10 +94,8 @@ class Yarn(
 
         val process = run(workingDir, "info", "--json", packageName)
 
-        return parseYarnInfo(process.stdout)?.also {
+        return parseYarnInfo(process.stdout, process.stderr, logger())?.also {
             yarnInfoCache.write(packageName, Json.encodeToString(it))
-        } ?: checkNotNull(parseYarnInfo(process.stderr)).also {
-            logger.warn { "Error running '${process.commandLine}' in directory $workingDir: $it" }
         }
     }
 }
@@ -104,17 +105,34 @@ class Yarn(
  * metadata of the package that was queried. However, under certain circumstances, Yarn may return multiple JSON objects
  * separated by newlines; for instance, if the operation is retried due to network problems. This function filters for
  * the object with the data based on the _type_ field. Result is *null* if no matching object is found or the input is
- * not valid JSON.
+ * not valid JSON. In that case any error found in [stderr] is logged with [logger].
  *
  * Note: The mentioned network issue can be reproduced by setting the network timeout to be very short via the command
  * line option '--network-timeout'.
  */
-internal fun parseYarnInfo(stdout: String): PackageJson? =
-    runCatching {
+internal fun Yarn.parseYarnInfo(stdout: String, stderr: String, logger: KotlinLogger? = null): PackageJson? {
+    val packageJson = runCatching {
         stdout.byteInputStream().use { inputStream ->
             Json.decodeToSequence<JsonObject>(inputStream)
                 .firstOrNull { (it["type"] as? JsonPrimitive)?.content == "inspect" }?.let {
                     it["data"]?.let(::parsePackageJson)
                 }
         }
     }.getOrNull()
+
+    if (packageJson == null) {
+        runCatching {
+            val errors = stdout.byteInputStream().use { inputStream ->
+                Json.decodeToSequence<JsonObject>(inputStream).filter {
+                    (it["type"] as? JsonPrimitive)?.content == "error"
+                }
+            }.mapNotNull { it["data"]?.jsonPrimitive?.content }
+
+            errors.forEach { error ->
+                logger?.warn { "Error parsing yarn info: $error." }
+            }
+        }
+    }
+
+    return packageJson
+}