cli: Add --output-format=PARTIQL_PRETTY for non-interactive use (#349)

Author: evanj

cli/src/org/partiql/cli/Cli.kt

@@ -16,10 +16,11 @@ package org.partiql.cli
 
 import com.amazon.ion.*
 import com.amazon.ion.system.*
+import java.io.*
 import org.partiql.cli.OutputFormat.*
 import org.partiql.lang.*
 import org.partiql.lang.eval.*
-import java.io.*
+import org.partiql.lang.util.ConfigurableExprValueFormatter
 
 /**
  * TODO builder, kdoc
@@ -46,6 +47,9 @@ internal class Cli(private val valueFactory: ExprValueFactory,
                 ION_TEXT   -> valueFactory.ion.newTextWriter(output).use { printIon(it, result) }
                 ION_BINARY -> valueFactory.ion.newBinaryWriter(output).use { printIon(it, result) }
                 PARTIQL    -> OutputStreamWriter(output).use { it.write(result.toString()) }
+                PARTIQL_PRETTY -> OutputStreamWriter(output).use {
+                    ConfigurableExprValueFormatter.pretty.formatTo(result, it)
+                }
             }
         }
     }

cli/src/org/partiql/cli/main.kt

@@ -62,7 +62,7 @@ private val formatter = object : BuiltinHelpFormatter(120, 2) {
 }
 
 enum class OutputFormat {
-    ION_TEXT, ION_BINARY, PARTIQL
+    ION_TEXT, ION_BINARY, PARTIQL, PARTIQL_PRETTY
 }
 
 // opt parser options
@@ -108,7 +108,7 @@ private val outputFormatOpt = optParser.acceptsAll(listOf("output-format", "of")
  *      * -q --query: PartiQL query
  *      * -i --input: input file, default STDIN
  *      * -o --output: output file, default STDOUT
- *      * -of --output-format: output format, ION_TEXT, ION_BINARY and PARTIQL (default)
+ *      * -of --output-format: ION_TEXT, ION_BINARY, PARTIQL (default), PARTIQL_PRETTY
  */
 fun main(args: Array<String>) = try {
     optParser.formatHelpWith(formatter)

docs/user/CLI.md

@@ -25,7 +25,7 @@ Option                                Description
 -i, --input <File>                    input file, requires the query option (default: stdin)
 -o, --output <File>                   output file, requires the query option (default: stdout)
 --of, --output-format <OutputFormat:  output format, requires the query option (default: PARTIQL)
-  (ION_TEXT|ION_BINARY|PARTIQL)>
+  (ION_TEXT|ION_BINARY|PARTIQL|PARTIQL_PRETTY)>
 -q, --query <String>                  PartiQL query, triggers non interactive mode
 ```