Make 'export --json' print to stdout by default

Author: MaciejG604

modules/cli/src/main/scala/scala/cli/commands/export0/Export.scala

@@ -104,17 +104,19 @@ object Export extends ScalaCommand[ExportOptions] {
  override def runCommand(options: ExportOptions, args: RemainingArgs, logger: Logger): Unit = {
  val initialBuildOptions = buildOptionsOrExit(options)
 
- val output = options.output.getOrElse("dest")
- val dest = os.Path(output, os.pwd)
- if (os.exists(dest)) {
+ val output = options.output.getOrElse("dest")
+ val dest = os.Path(output, os.pwd)
+ val shouldExportToJson = options.json.getOrElse(false)
+ val shouldExportJsonToStdout = shouldExportToJson && options.output.isEmpty
+
+ if (!shouldExportJsonToStdout && os.exists(dest)) {
  logger.error(
  s"""Error: $dest already exists.
  |To change the destination output directory pass --output path or remove the destination directory first.""".stripMargin
  )
  sys.exit(1)
  }
 
- val shouldExportToJson = options.json.getOrElse(false)
  val shouldExportToMill = options.mill.getOrElse(false)
  val shouldExportToSbt = options.sbt.getOrElse(false)
  if (shouldExportToMill && shouldExportToSbt) {
@@ -128,8 +130,8 @@ object Export extends ScalaCommand[ExportOptions] {
  val buildToolName = if (shouldExportToMill) "mill" else "sbt"
  logger.message(s"Exporting to a $buildToolName project...")
  }
- else
- logger.message(s"Exporting to JSON...")
+ else if (!shouldExportJsonToStdout)
+ logger.message(s"Exporting to a JSON...")
 
  val inputs = options.shared.inputs(args.all).orExit(logger)
  CurrentParams.workspaceOpt = Some(inputs.workspace)
@@ -176,23 +178,31 @@ object Export extends ScalaCommand[ExportOptions] {
  sys.exit(1)
  }
 
- val sbtVersion = options.sbtVersion.getOrElse("1.6.1")
+ if (shouldExportJsonToStdout) {
+ val project = jsonProjectDescriptor(options.project, logger)
+ .`export`(optionsMain0, optionsTest0, sourcesMain, sourcesTest)
+
+ project.print(System.out)
+ }
+ else {
+ val sbtVersion = options.sbtVersion.getOrElse("1.6.1")
 
- def sbtProjectDescriptor0 =
- sbtProjectDescriptor(options.sbtSetting.map(_.trim).filter(_.nonEmpty), sbtVersion, logger)
+  def sbtProjectDescriptor0 =
+  sbtProjectDescriptor(options.sbtSetting.map(_.trim).filter(_.nonEmpty), sbtVersion, logger)
 
- val projectDescriptor =
- if (shouldExportToMill)
- millProjectDescriptor(options.shared.coursierCache, options.project, logger)
- else if (shouldExportToJson)
- jsonProjectDescriptor(options.project, logger)
- else // shouldExportToSbt isn't checked, as it's treated as default
- sbtProjectDescriptor0
+  val projectDescriptor =
+  if (shouldExportToMill)
+  millProjectDescriptor(options.shared.coursierCache, options.project, logger)
+  else if (shouldExportToJson)
+  jsonProjectDescriptor(options.project, logger)
+  else // shouldExportToSbt isn't checked, as it's treated as default
+  sbtProjectDescriptor0
 
- val project = projectDescriptor.`export`(optionsMain0, optionsTest0, sourcesMain, sourcesTest)
+  val project = projectDescriptor.`export`(optionsMain0, optionsTest0, sourcesMain, sourcesTest)
 
- os.makeDir.all(dest)
- project.writeTo(dest)
- logger.message(s"Exported to: $dest")
+ os.makeDir.all(dest)
+ project.writeTo(dest)
+ logger.message(s"Exported to: $dest")
+ }
  }
 }

modules/cli/src/main/scala/scala/cli/exportCmd/JsonProject.scala

@@ -6,6 +6,7 @@ import coursier.Dependency
 import coursier.util.Artifact
 import dependency.AnyDependency
 
+import java.io.PrintStream
 import java.nio.charset.StandardCharsets
 
 import scala.build.options.ConfigMonoid
@@ -48,6 +49,16 @@ final case class JsonProject(
  )
  }
  }
+
+ def print(printStream: PrintStream): Unit = {
+ val config = WriterConfig.withIndentionStep(1)
+
+ writeToStream(
+ this,
+ printStream,
+ config
+ )
+ }
 }
 
 final case class ScopedJsonProject(

modules/integration/src/test/scala/scala/cli/integration/ExportJsonTestDefinitions.scala

@@ -5,7 +5,10 @@ import com.eed3si9n.expecty.Expecty.expect
 abstract class ExportJsonTestDefinitions(val scalaVersionOpt: Option[String])
  extends ScalaCliSuite with TestScalaVersionArgs {
  private def readJson(path: os.ReadablePath): String =
- os.read(path)
+ readJson(os.read(path))
+
+ private def readJson(json: String): String =
+ json
  .replaceAll("\\s", "")
  .replaceAll(
  "ivy:file:[^\"]*(scalacli|ScalaCli)[^\"]*/local-repo[^\"]*",
@@ -29,12 +32,13 @@ abstract class ExportJsonTestDefinitions(val scalaVersionOpt: Option[String])
  )
 
  inputs.fromRoot { root =>
- os.proc(TestUtil.cli, "--power", "export", "--json", ".", "--jvm", "adopt:11")
- .call(cwd = root)
+ val exportJsonProc =
+ os.proc(TestUtil.cli, "--power", "export", "--json", ".", "--jvm", "adopt:11")
+ .call(cwd = root)
 
- val fileContents = readJson(root / "dest" / "export.json")
+ val jsonContents = readJson(exportJsonProc.out.text())
 
- expect(fileContents ==
+ expect(jsonContents ==
  """{
  |"scalaVersion":"3.2.2",
  |"platform":"JVM",
@@ -84,10 +88,10 @@ abstract class ExportJsonTestDefinitions(val scalaVersionOpt: Option[String])
  )
 
  inputs.fromRoot { root =>
- os.proc(TestUtil.cli, "--power", "export", "--json", ".", "--native")
+ val exportJsonProc = os.proc(TestUtil.cli, "--power", "export", "--json", ".", "--native")
  .call(cwd = root)
 
- val fileContents = readJson(root / "dest" / "export.json")
+ val jsonContents = readJson(exportJsonProc.out.text())
  .replaceAll(
  "\"resourcesDirs\":\\[\"[^\"]*resources\"\\]",
  "\"resourcesDirs\":[\"./resources\"]"
@@ -97,7 +101,7 @@ abstract class ExportJsonTestDefinitions(val scalaVersionOpt: Option[String])
  "\"customJarsDecls\":[\"./TEST.jar\"]"
  )
 
- expect(fileContents ==
+ expect(jsonContents ==
  s"""{
  |"scalaVersion":"3.2.2",
  |"platform":"Native",
@@ -187,10 +191,22 @@ abstract class ExportJsonTestDefinitions(val scalaVersionOpt: Option[String])
  )
 
  inputs.fromRoot { root =>
- os.proc(TestUtil.cli, "--power", "export", "--json", ".", "--js-es-version", "es2015")
+ val exportJsonProc = os.proc(
+ TestUtil.cli,
+ "--power",
+ "export",
+ "--json",
+ "--output",
+ "json_dir",
+ ".",
+ "--js-es-version",
+ "es2015"
+ )
  .call(cwd = root)
 
- val fileContents = readJson(root / "dest" / "export.json")
+ expect(exportJsonProc.out.text().isEmpty)
+
+ val fileContents = readJson(root / "json_dir" / "export.json")
 
  expect(fileContents ==
  s"""{
@@ -231,6 +247,24 @@ abstract class ExportJsonTestDefinitions(val scalaVersionOpt: Option[String])
  |}
  |}
  |""".replaceAll("\\s|\\|", ""))
+
+ val exportToExistingProc = os.proc(
+ TestUtil.cli,
+ "--power",
+ "export",
+ "--json",
+ "--output",
+ "json_dir",
+ ".",
+ "--js-es-version",
+ "es2015"
+ )
+ .call(cwd = root, check = false, mergeErrIntoOut = true)
+
+ expect(exportToExistingProc.exitCode != 0)
+ expect(
+ exportToExistingProc.out.text().contains(s"Error: ${root / "json_dir"} already exists.")
+ )
  }
  }