apply scalafmt (#236)

* apply formatting

Co-authored-by: aonyshchuk <[email protected]>

.githooks/pre-commit.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+/usr/local/bin/scalafmt-native

.scalafmt.conf

@@ -0,0 +1,21 @@
+version = "3.3.0"
+runner.dialect = scala213
+maxColumn = 200          # For my wide 30" display.
+project.git = true
+project.excludeFilters = ["target/"]
+align.preset = more
+align.stripMargin = true
+align.arrowEnumeratorGenerator = true
+assumeStandardLibraryStripMargin = true
+includeCurlyBraceInSelectChains = false
+newlines.penalizeSingleSelectMultiArgList = false
+continuationIndent.defnSite = 2
+docstrings.style = SpaceAsterisk
+
+fileOverride {
+  "glob:**/scala-3*/**" {
+    runner.dialect = scala3
+  }
+}
+
+

api/src/main/scala/json/Json.scala

@@ -6,12 +6,12 @@ import json.schema.{Predef, Version}
 
 import scala.language.experimental.macros
 
-
 object Json {
 
   def schema[T]: Schema[T] = macro Macroses.deriveSchema[T]
 
-  def objectSchema[T](decorations: (String, String)*): `object`[T] = macro Macroses.deriveObjectSchema[T]
+  def objectSchema[T](decorations: (String, String)*): `object`[T] =
+    macro Macroses.deriveObjectSchema[T]
 
   def sig[T]: TypeSignature[T] = macro Macroses.deriveSignature[T]
 
@@ -20,5 +20,6 @@ object Json {
     implicit def derived[T]: Predef[T] = macro Macroses.derivePredef[T]
   }
 
-  def stringify[T, V <: Version : AsValueBuilder](schema: Schema[T], version: V): String = schema.stringify(version)
+  def stringify[T, V <: Version: AsValueBuilder](schema: Schema[T], version: V): String =
+    schema.stringify(version)
 }

api/src/test/scala-2.11/com.github.andyglow.jsonschema.model/UserProfile.scala

@@ -10,4 +10,5 @@ case class UserProfile(
   credentials: Credentials = Credentials("anonymous", "-"),
   role: Role = Role.User,
   lastLoginMs: Option[Long], // = None; not supported currently for scala 2.11
-  notes: Option[Notes] = Some(Notes("initial note", Nil)))
+  notes: Option[Notes] = Some(Notes("initial note", Nil))
+)

api/src/test/scala-2.12/com/github/andyglow/jsonschema/NoneForDefaultValueSpec.scala

@@ -5,7 +5,7 @@ import json.Schema._
 import json.Schema.`object`._
 import org.scalatest.matchers.should.Matchers._
 import org.scalatest.funsuite.AnyFunSuite
-import com.github.andyglow.jsonschema.{ model => case0 }
+import com.github.andyglow.jsonschema.{model => case0}
 
 object NoneForDefaultValueCases {
 
@@ -24,15 +24,12 @@ class NoneForDefaultValueSpec extends AnyFunSuite {
   test("scala.None for default value") {
 
     // type id specified in external file
-    Json.schema[case0.Foo] shouldBe `object`(
-      Field("value", `string`, required = false))
+    Json.schema[case0.Foo] shouldBe `object`(Field("value", `string`, required = false))
 
     // type is specified in same file
-    Json.schema[case2.Foo] shouldBe `object`(
-      Field("value", `string`, required = false))
+    Json.schema[case2.Foo] shouldBe `object`(Field("value", `string`, required = false))
 
     // type is specified in same file, companion object
-    Json.schema[case1.Foo] shouldBe `object`(
-      Field("value", `string`, required = false))
+    Json.schema[case1.Foo] shouldBe `object`(Field("value", `string`, required = false))
   }
 }

api/src/test/scala-2.12/com/github/andyglow/jsonschema/SchemaMacro212Spec.scala

@@ -5,16 +5,15 @@ import json.Schema.{`number`, `object`, `oneof`}
 import org.scalatest.matchers.should.Matchers._
 import org.scalatest.wordspec.AnyWordSpec
 
-
 class SchemaMacro212Spec extends AnyWordSpec {
   import SchemaMacro212Spec._
 
   "generate schema for Sealed Trait subclasses defined inside of another object" in {
     import `object`.Field
 
-    Json.schema[NestedFooBar] shouldEqual `oneof`(Set(
-      `object`(Field("foo", `number`[Double])),
-      `object`(Field("bar", `number`[Double]))))
+    Json.schema[NestedFooBar] shouldEqual `oneof`(
+      Set(`object`(Field("foo", `number`[Double])), `object`(Field("bar", `number`[Double])))
+    )
   }
 }
 

api/src/test/scala-2.12/com/github/andyglow/jsonschema/model/UserProfile.scala

@@ -10,4 +10,5 @@ case class UserProfile(
   credentials: Credentials = Credentials("anonymous", "-"),
   role: Role = Role.User,
   lastLoginMs: Option[Long] = None,
-  notes: Option[Notes] = Some(Notes("initial note", Nil)))
+  notes: Option[Notes] = Some(Notes("initial note", Nil))
+)

api/src/test/scala-2.13/com/github/andyglow/jsonschema/NoneForDefaultValueSpec.scala

@@ -5,7 +5,7 @@ import json.Schema._
 import json.Schema.`object`._
 import org.scalatest.matchers.should.Matchers._
 import org.scalatest.funsuite.AnyFunSuite
-import com.github.andyglow.jsonschema.{ model => case0 }
+import com.github.andyglow.jsonschema.{model => case0}
 
 object NoneForDefaultValueCases {
 
@@ -24,15 +24,12 @@ class NoneForDefaultValueSpec extends AnyFunSuite {
   test("scala.None for default value") {
 
     // type id specified in external file
-    Json.schema[case0.Foo] shouldBe `object`(
-      Field("value", `string`, required = false))
+    Json.schema[case0.Foo] shouldBe `object`(Field("value", `string`, required = false))
 
     // type is specified in same file
-    Json.schema[case2.Foo] shouldBe `object`(
-      Field("value", `string`, required = false))
+    Json.schema[case2.Foo] shouldBe `object`(Field("value", `string`, required = false))
 
     // type is specified in same file, companion object
-    Json.schema[case1.Foo] shouldBe `object`(
-      Field("value", `string`, required = false))
+    Json.schema[case1.Foo] shouldBe `object`(Field("value", `string`, required = false))
   }
 }

api/src/test/scala-2.13/com/github/andyglow/jsonschema/SchemaMacro213Spec.scala

@@ -11,9 +11,7 @@ class SchemaMacro213Spec extends AnyWordSpec {
   "generate schema for Sealed Trait subclasses defined inside of another object" in {
     import `object`.Field
 
-    Json.schema[NestedFooBar] shouldEqual `oneof`(Set(
-      `object`(Field("foo", `number`[Double])),
-      `object`(Field("bar", `number`[Double]))))
+    Json.schema[NestedFooBar] shouldEqual `oneof`(Set(`object`(Field("foo", `number`[Double])), `object`(Field("bar", `number`[Double]))))
   }
 }
 

api/src/test/scala-2.13/com/github/andyglow/jsonschema/model/UserProfile.scala

@@ -10,4 +10,5 @@ case class UserProfile(
   credentials: Credentials = Credentials("anonymous", "-"),
   role: Role = Role.User,
   lastLoginMs: Option[Long] = None,
-  notes: Option[Notes] = Some(Notes("initial note", Nil)))
+  notes: Option[Notes] = Some(Notes("initial note", Nil))
+)

api/src/test/scala/com/example/unrelated/CommentsMain.scala

@@ -11,9 +11,7 @@ object CommentsMain {
   }
 
   def main(args: Array[String]): Unit = {
-    val s0 = json.Json.objectSchema[models.Foo](
-      "c" -> "C, C, ccc",
-      "b" -> "bcd")
+    val s0 = json.Json.objectSchema[models.Foo]("c" -> "C, C, ccc", "b" -> "bcd")
 
     printSchema(s0)
 

api/src/test/scala/com/example/unrelated/SchemaMacroNamesSpec.scala

@@ -3,8 +3,7 @@ package com.example.unrelated
 import org.scalatest.matchers.should.Matchers._
 import org.scalatest.wordspec.AnyWordSpec
 
-/** This spec checks that the macro works even when names from
-  * `com.github.andyglow.jsonschema` are not in scope.
+/** This spec checks that the macro works even when names from `com.github.andyglow.jsonschema` are not in scope.
   */
 class SchemaMacroNamesSpec extends AnyWordSpec {
 

api/src/test/scala/com/example/unrelated/models.scala

@@ -6,20 +6,24 @@ object models {
 
   /** My perfect class
     *
-    * @param a A Param
-    * @param b B Param
+    * @param a
+    *   A Param
+    * @param b
+    *   B Param
     */
   case class Foo(
     a: String,
     b: Int,
     c: Boolean,
-    @description("some description") d: Map[String, String])
+    @description("some description") d: Map[String, String]
+  )
 
   @title("A Bar Title")
   @description("this is Bar. description")
   case class Bar(
     @description("aaa") a: String,
     @description("bbb") b: Int,
     @description("ccc") c: Boolean,
-    @description("ddd") d: Map[String, String])
+    @description("ddd") d: Map[String, String]
+  )
 }