introduce FormatConfig class

Author: vertical-blank

js/src/main/scala/com/github/vertical_blank/sqlformatter/scala/SqlFormatter.scala

@@ -12,19 +12,16 @@ private[scala] object Facade extends js.Object {
 
 object SqlFormatter extends AbstractSqlFormatter {
   def format(sql: String,
-             dialect: SqlDialect,
-             indent: String): String =
-    Facade.format(sql, js.Dictionary("language" -> dialect.name, "indent" -> indent))
+             config: FormatConfig): String =
+    Facade.format(sql, js.Dictionary("language" -> config.dialect.name, "indent" -> config.indent))
 
   def formatWithNamedParams(sql: String,
              params: Map[String, Any],
-             dialect: SqlDialect,
-             indent: String): String =
-    Facade.format(sql, js.Dictionary("language" -> dialect.name, "indent" -> indent, "params" -> params.toJSDictionary))
+             config: FormatConfig): String =
+    Facade.format(sql, js.Dictionary("language" -> config.dialect.name, "indent" -> config.indent, "params" -> params.toJSDictionary))
 
   def formatWithIndexedParams(sql: String,
              params: Seq[Any],
-             dialect: SqlDialect,
-             indent: String): String =
-    Facade.format(sql, js.Dictionary("language" -> dialect.name, "indent" -> indent, "params" -> params.toJSArray))
+             config: FormatConfig): String =
+    Facade.format(sql, js.Dictionary("language" -> config.dialect.name, "indent" -> config.indent, "params" -> params.toJSArray))
 }

jvm/src/main/scala/com/github/vertical_blank/sqlformatter/scala/SqlFormatter.scala

@@ -5,16 +5,13 @@ import com.github.vertical_blank.sqlformatter.{SqlFormatter => JSqlFormatter}
 
 object SqlFormatter extends AbstractSqlFormatter {
   def format(sql: String,
-             dialect: SqlDialect,
-             indent: String): String = JSqlFormatter.of(dialect.name).format(sql, indent)
+             config: FormatConfig): String = JSqlFormatter.of(config.dialect.name).format(sql, config.indent)
 
   def formatWithNamedParams(sql: String,
              params: Map[String, Any],
-             dialect: SqlDialect,
-             indent: String): String = JSqlFormatter.of(dialect.name).format(sql, indent, params.asJava)
+             config: FormatConfig): String = JSqlFormatter.of(config.dialect.name).format(sql, config.indent, params.asJava)
 
   def formatWithIndexedParams(sql: String,
              params: Seq[Any],
-             dialect: SqlDialect,
-             indent: String): String = JSqlFormatter.of(dialect.name).format(sql, indent, params.asJava)
+             config: FormatConfig): String = JSqlFormatter.of(config.dialect.name).format(sql, config.indent, params.asJava)
 }

shared/src/main/scala/com/github/vertical_blank/sqlformatter/scala/AbstractSqlFormatter.scala

@@ -2,17 +2,13 @@ package com.github.vertical_blank.sqlformatter.scala
 
 trait AbstractSqlFormatter {
 
-  def format(sql: String,
-             dialect: SqlDialect = SqlDialect.StandardSQL,
-             indent: String = "  "): String
+  def format(sql: String, config: FormatConfig = FormatConfig()): String
 
   def formatWithNamedParams(sql: String,
              params: Map[String, Any],
-             dialect: SqlDialect = SqlDialect.StandardSQL,
-             indent: String = "  "): String
+             config: FormatConfig = FormatConfig()): String
 
   def formatWithIndexedParams(sql: String,
              params: Seq[Any],
-             dialect: SqlDialect = SqlDialect.StandardSQL,
-             indent: String = "  "): String
+             config: FormatConfig = FormatConfig()): String
 }

shared/src/main/scala/com/github/vertical_blank/sqlformatter/scala/FormatConfig.scala

@@ -0,0 +1,5 @@
+package com.github.vertical_blank.sqlformatter.scala
+
+case class FormatConfig(
+  dialect: SqlDialect = SqlDialect.StandardSQL,
+  indent: String = "  ")

shared/src/test/scala/com/github/vertical_blank/sqlformatter/scala/BaseTest.scala

@@ -34,7 +34,7 @@ abstract class BaseTest(sqlFormatter: AbstractSqlFormatter) extends FunSuite {
                        |    table""".stripMargin
 
     assert(sqlFormatter
-      .format("SELECT foo, bar, CASE baz WHEN 'one' THEN 1 WHEN 'two' THEN 2 ELSE 3 END FROM table", indent = "    ") == formatted)
+      .format("SELECT foo, bar, CASE baz WHEN 'one' THEN 1 WHEN 'two' THEN 2 ELSE 3 END FROM table", FormatConfig(indent = "    ")) == formatted)
   }
 
   test("withNamedParams") {