Improve None for Optional Defaults Handling

.drone.jsonnet

@@ -37,11 +37,11 @@ local SbtCleanTest(ver) = BuildStep(ver) + {
 local Coverage(name, ver) = BuildStep(ver) + {
   name: name,
   commands: [
-     "sbt clean coverage test",
-     "sbt coverageAggregate",
-     "wget -O .codecov https://codecov.io/bash",
-     "chmod +x .codecov",
-     "./.codecov -X gcov -X coveragepy -X xcode -X gcovout"
+    "sbt clean coverage test",
+    "sbt coverageAggregate",
+    "curl -Os https://uploader.codecov.io/latest/alpine/codecov",
+    "chmod +x codecov",
+    "./codecov -t ${CODECOV_TOKEN}",
   ]
 };
 

.drone.yml

@@ -153,9 +153,9 @@
          "commands": [
             "sbt clean coverage test",
             "sbt coverageAggregate",
-            "wget -O .codecov https://codecov.io/bash",
-            "chmod +x .codecov",
-            "./.codecov -X gcov -X coveragepy -X xcode -X gcovout"
+            "curl -Os https://uploader.codecov.io/latest/alpine/codecov",
+            "chmod +x codecov",
+            "./codecov -t ${CODECOV_TOKEN}"
          ],
          "environment": {
             "CODECOV_TOKEN": {

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

@@ -0,0 +1,5 @@
+package com.github.andyglow.jsonschema
+
+case class NoneForDefaultModelsCase4Inner(value: Option[String] = None)
+
+case class NoneForDefaultModelsCase4(value: Option[NoneForDefaultModelsCase4Inner] = None)

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

@@ -18,6 +18,11 @@ object case2 {
   case class Foo(value: Option[String] = None)
 }
 
+object case3 {
+  import case2._
+  case class Bar(value: Option[Foo] = None)
+}
+
 class NoneForDefaultValueSpec extends AnyFunSuite {
   import NoneForDefaultValueCases._
 
@@ -31,5 +36,13 @@ class NoneForDefaultValueSpec extends AnyFunSuite {
 
     // type is specified in same file, companion object
     Json.schema[case1.Foo] shouldBe `object`(Field("value", `string`, required = false))
+
+    // type hierarchy
+    // same source file
+    Json.schema[case3.Bar] shouldBe `object`(Field("value", `object`(Field("value", `string`, required = false)), required = false))
+    // external source file
+    Json.schema[NoneForDefaultModelsCase4] shouldBe `object`(Field("value", `object`(Field("value", `string`, required = false)), required = false))
+    // external module
+    Json.schema[ExternalNoneForDefaultModelsCase5] shouldBe `object`(Field("value", `object`(Field("value", `string`, required = false)), required = false))
   }
 }

build.sbt

@@ -87,8 +87,16 @@ lazy val macros = { project in file("macros") }
     )
   )
 
+lazy val testModels = { project in file("test-models") }.settings(
+  commonSettings,
+  name := "scala-jsonschema-test-models",
+  crossScalaVersions := Nil,
+  publish / skip     := true,
+  publishArtifact    := false,
+  update / aggregate := false)
+
 lazy val api = { project in file("api") }
-  .dependsOn(core, macros)
+  .dependsOn(core, macros, testModels % "test->compile")
   .settings(
     commonSettings,
     name := "scala-jsonschema"

modules/circe-json/src/test/scala-2.12/com.github.andyglow.jsonschema/NoneForDefaultValueCases.scala

@@ -0,0 +1,99 @@
+package com.github.andyglow.jsonschema
+
+import json._
+import org.scalatest.matchers.should.Matchers._
+import org.scalatest.funsuite.AnyFunSuite
+import com.github.andyglow.jsonschema.{model => case0}
+
+object NoneForDefaultCirceCases {
+
+  object case1 {
+    case class Foo(value: Option[String] = None)
+  }
+
+  object case3 {
+
+    case class Bar(name: String, innerLevel2: Option[String] = None)
+
+    case class Foo(name: String, inner: Option[Bar] = None)
+  }
+}
+
+object case2 {
+
+  case class Foo(value: Option[String] = None)
+}
+
+class NoneForDefaultCirceSpec extends AnyFunSuite {
+  import AsCirceSpec.jsValEq
+  import NoneForDefaultCirceCases._
+  import json.schema.Version.Draft04
+  import io.circe.{ Json => Circe }
+  import io.circe.generic.auto._
+  import AsCirce._
+
+  test("scala.None for default value") {
+
+    // type id specified in external file
+    Json.schema[case0.Foo].asCirce(Draft04()) shouldEqual Circe.obj(
+      """$schema""" -> Circe.fromString("http://json-schema.org/draft-04/schema#"),
+      "properties" -> Circe.obj(
+        "value" -> Circe.obj(
+          "type" -> Circe.fromString("string")
+        )
+      ),
+      "type" -> Circe.fromString("object"),
+      "additionalProperties" -> Circe.fromBoolean(false)
+    )
+
+    // type is specified in same file
+    Json.schema[case2.Foo].asCirce(Draft04()) shouldEqual Circe.obj(
+      """$schema""" -> Circe.fromString("http://json-schema.org/draft-04/schema#"),
+      "properties" -> Circe.obj(
+        "value" -> Circe.obj(
+          "type" -> Circe.fromString("string")
+        )
+      ),
+      "type" -> Circe.fromString("object"),
+      "additionalProperties" -> Circe.fromBoolean(false)
+    )
+
+    // type is specified in same file, companion object
+    Json.schema[case1.Foo].asCirce(Draft04()) shouldEqual Circe.obj(
+      """$schema""" -> Circe.fromString("http://json-schema.org/draft-04/schema#"),
+      "properties" -> Circe.obj(
+        "value" -> Circe.obj(
+          "type" -> Circe.fromString("string")
+        )
+      ),
+      "type" -> Circe.fromString("object"),
+      "additionalProperties" -> Circe.fromBoolean(false)
+    )
+
+    // type is specified in same file, companion object
+    Json.schema[case3.Foo].asCirce(Draft04()) shouldEqual Circe.obj(
+      """$schema""" -> Circe.fromString("http://json-schema.org/draft-04/schema#"),
+      "type" -> Circe.fromString("object"),
+      "additionalProperties" -> Circe.fromBoolean(false),
+      "required" -> Circe.arr(Circe.fromString("name")),
+      "properties" -> Circe.obj(
+        "name" -> Circe.obj(
+          "type" -> Circe.fromString("string")
+        ),
+        "inner" -> Circe.obj(
+          "type" -> Circe.fromString("object"),
+          "additionalProperties" -> Circe.fromBoolean(false),
+          "required" -> Circe.arr(Circe.fromString("name")),
+          "properties" -> Circe.obj(
+            "name" -> Circe.obj(
+              "type" -> Circe.fromString("string")
+            ),
+            "innerLevel2" -> Circe.obj(
+              "type" -> Circe.fromString("string")
+            )
+          )
+        )
+      )
+    )
+  }
+}

test-models/src/main/scala/com/github/andyglow/jsonschema/ExternalNoneForDefaultModels.scala

@@ -0,0 +1,6 @@
+package com.github.andyglow.jsonschema
+
+
+case class ExternalNoneForDefaultModelsCase5Inner(value: Option[String] = None)
+
+case class ExternalNoneForDefaultModelsCase5(value: Option[ExternalNoneForDefaultModelsCase5Inner] = None)

version.sbt

@@ -1 +1 @@
-ThisBuild / version := "0.7.9-SNAPSHOT"
+ThisBuild / version := "0.7.8"