Unify model and prop meta

modules/core/src/main/scala/dev/guardrail/generators/ProtocolGenerator.scala

@@ -203,10 +203,11 @@ object ProtocolGenerator {
           for {
             typeName <- formatTypeName(name).map(formattedName => NonEmptyList.of(hierarchy.name, formattedName))
             propertyRequirement = getPropertyRequirement(prop, requiredFields.contains(name), defaultPropertyRequirement)
-            customType   <- SwaggerUtil.customTypeName(prop)
-            resolvedType <- SwaggerUtil.propMeta[L, F](prop)
-            defValue     <- defaultValue(typeName, prop, propertyRequirement, definitions)
-            fieldName    <- formatFieldName(name)
+            customType <- SwaggerUtil.customTypeName(prop)
+            resolvedType <- SwaggerUtil
+              .propMeta[L, F](prop) // TODO: This should be resolved via an alternate mechanism that maintains references all the way through, instead of re-deriving and assuming that references are valid
+            defValue  <- defaultValue(typeName, prop, propertyRequirement, definitions)
+            fieldName <- formatFieldName(name)
             res <- transformProperty(hierarchy.name, dtoPackage, supportPackage, concreteTypes)(
               name,
               fieldName,

modules/microsite/src/main/scala/DocsHelpers.scala

@@ -55,7 +55,7 @@ object DocsHelpers {
             val o                                                 = q"object ${Term.Name(className)} { ..${definitions} }"
             val Right(q"""class ${name }(...${args }) {
               ..${defns }
-            }""" )                                                = (g.client.head: @unchecked)
+            }""")                                                 = (g.client.head: @unchecked)
             val basePath = defns.collectFirst {
               case v @ q"val basePath: String = $_" => v
             }

modules/sample/src/main/resources/response-headers.yaml

@@ -8,10 +8,11 @@ components:
   schemas:
     Foo:
       type: object
+      required:
+        - name
       properties:
         name:
           type: string
-          required: true
 paths:
   /foo:
     get:

modules/scala-http4s/src/main/scala/dev/guardrail/generators/scala/http4s/Http4sServerGenerator.scala

@@ -905,11 +905,12 @@ class Http4sServerGenerator private (version: Http4sVersion)(implicit Cl: Collec
       for {
         _ <- Target.log.debug("Found that not all parameters could be represented as unescaped terms")
         res <- parameters.traverse[Target, LanguageParameter[ScalaLanguage]] { param =>
-          val newName = Term.Name(s"_${param.paramName.value}")
-          Target.log.debug(s"Escaping param ${param.argName.value}").flatMap { _ =>
-            if (newName.syntax == newName.value) Target.pure(param.withParamName(newName))
+          for {
+            _ <- Target.log.debug(s"Escaping param ${param.argName.value}")
+            newName = Term.Name(s"_${param.paramName.value}")
+            res <- if (newName.syntax == newName.value) Target.pure(param.withParamName(newName))
             else Target.raiseUserError(s"Can't escape parameter with name ${param.argName.value}.")
-          }
+          } yield res
         }
       } yield res
     } else {

modules/scala-http4s/src/test/scala/core/issues/Issue144.scala

@@ -32,7 +32,7 @@ class Issue144 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
        |         description: description
        |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Ensure mapRoute is generated") {
       val (_, _, Servers(Server(_, _, _, genResource :: _) :: Nil, _)) = runSwaggerSpec(swagger)(Context.empty, new Http4s(version))
 
@@ -63,7 +63,6 @@ class Issue144 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
       // Cause structure is slightly different but source code is the same the value converted to string and then parsed
       genResource.toString().parse[Stat].get.structure shouldEqual resource.structure
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/core/issues/Issue165.scala

@@ -40,7 +40,7 @@ class Issue165 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
        |         description: description
        |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Ensure routes are generated") {
       val (_, _, Servers(Server(_, _, genHandler, genResource :: _) :: Nil, Nil)) = runSwaggerSpec(swagger)(Context.empty, new Http4s(version))
 
@@ -88,7 +88,6 @@ class Issue165 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
       // Cause structure is slightly different but source code is the same the value converted to string and then parsed
       genResource.toString().parse[Stat].get.structure shouldEqual resource.structure
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/core/issues/Issue166.scala

@@ -45,7 +45,7 @@ class Issue166 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
                    |        type: string
                    |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Handle generation of models") {
       val opts = new ParseOptions()
       opts.setResolve(true)
@@ -73,7 +73,6 @@ class Issue166 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
 
       cls.structure should equal(definition.structure)
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/core/issues/Issue223.scala

@@ -33,7 +33,7 @@ class Issue223 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
                            |        description: uuid of kernel
                            |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Test uuid format generation") {
       val (
         ProtocolDefinitions(ClassDefinition(_, _, _, c1, _, _) :: Nil, _, _, _, _),
@@ -43,7 +43,6 @@ class Issue223 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
 
       c1.structure shouldBe q"case class Kernel(id: java.util.UUID)".structure
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/core/issues/Issue225.scala

@@ -30,7 +30,7 @@ class Issue225 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
        |         description: description
        |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Ensure mapRoute is generated") {
       val (_, _, Servers(Server(_, _, genHandler, genResource :: _) :: Nil, Nil)) = runSwaggerSpec(swagger)(Context.empty, new Http4s(version))
 
@@ -61,7 +61,6 @@ class Issue225 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
       // Cause structure is slightly different but source code is the same the value converted to string and then parsed
       genResource.toString().parse[Stat].get.structure shouldEqual resource.structure
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/core/issues/Issue255.scala

@@ -41,7 +41,7 @@ class Issue255 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
                            |        x-scala-type: custom.Bytes
                            |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Test password format generation") {
       val (
         ProtocolDefinitions(ClassDefinition(_, _, _, c1, _, _) :: Nil, _, _, _, _),
@@ -59,7 +59,6 @@ class Issue255 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
        """
       c1.structure shouldBe expected.structure
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/core/issues/Issue260.scala

@@ -10,7 +10,7 @@ import org.scalatest.matchers.should.Matchers
 
 class Issue260 extends AnyFunSpec with Matchers with SwaggerSpecRunner {
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     describe(version.toString()) {
       describe("LocalDate path param is generated more than once") {
 
@@ -93,7 +93,6 @@ class Issue260 extends AnyFunSpec with Matchers with SwaggerSpecRunner {
         }
       }
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/core/issues/Issue370.scala

@@ -53,7 +53,7 @@ class Issue370 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
                            |    default: x
                            |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Test nested enum definition") {
       val (
         ProtocolDefinitions(ClassDefinition(_, _, _, c1, s, _) :: _, _, _, _, _),
@@ -115,7 +115,6 @@ class Issue370 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
       c1.structure shouldEqual q"case class Foo(value: Option[Foo.Value] = Option(Foo.Value.A), value2: Baz = Baz.X, nested: Option[Foo.Nested] = None)".structure
       companion.structure shouldEqual cmp.structure
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/core/issues/Issue416.scala

@@ -40,7 +40,7 @@ class Issue416 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
        |        type: string
        |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Ensure mapRoute is generated") {
       val (_, _, Servers(Server(_, _, genHandler, genResource :: _) :: Nil, _)) = runSwaggerSpec(swagger)(Context.empty, new Http4s(version))
 
@@ -70,7 +70,6 @@ class Issue416 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
       // Cause structure is slightly different but source code is the same the value converted to string and then parsed
       genResource.toString().parse[Stat].get.structure shouldEqual resource.structure
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/core/issues/Issue420.scala

@@ -32,7 +32,7 @@ class Issue420 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
                           |      - $ref: "#/definitions/Bar"
                        |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Test ordering") {
       val (
         ProtocolDefinitions(List(bar: ClassDefinition[ScalaLanguage], foo: ClassDefinition[ScalaLanguage]), _, _, _, _),
@@ -43,7 +43,6 @@ class Issue420 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
       cmp(bar.cls, q"case class Bar(id: Option[String] = None)")
       cmp(foo.cls, q"case class Foo(id: Option[String] = None, otherId: Option[String] = None)")
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/core/issues/Issue429.scala

@@ -25,7 +25,7 @@ class Issue429 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
     |          enum: [0, 1]
     |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Test correct escaping of numbers used as identifiers") {
       val (
         ProtocolDefinitions(ClassDefinition(_, _, _, _, staticDefns, _) :: Nil, _, _, _, _),
@@ -55,7 +55,6 @@ class Issue429 extends AnyFunSuite with Matchers with SwaggerSpecRunner {
       statusCodeCompanion.structure shouldBe expected.structure
       Term.Name("10").syntax shouldBe "`10`"
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/tests/core/FullyQualifiedNames.scala

@@ -41,7 +41,7 @@ class FullyQualifiedNames extends AnyFunSuite with Matchers with SwaggerSpecRunn
       |            $ref: '#/definitions/User'
       |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Test that fully qualified names are used") {
       val (
         ProtocolDefinitions(List(clz @ ClassDefinition(_, _, fullType, _, _, _)), _, _, _, _),
@@ -82,7 +82,6 @@ class FullyQualifiedNames extends AnyFunSuite with Matchers with SwaggerSpecRunn
       respObject shouldEqual q"""object GetUserResponse { case class Ok(value: _root_.com.test.User) extends GetUserResponse }"""
 
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)

modules/scala-http4s/src/test/scala/tests/generators/http4s/client/DefaultParametersTest.scala

@@ -123,7 +123,7 @@ class DefaultParametersTest extends AnyFunSuite with Matchers with SwaggerSpecRu
     |      name: Order
     |""".stripMargin
 
-  def testVersion(version: Http4sVersion): Unit = {
+  def testVersion(version: Http4sVersion): Unit =
     test(s"$version - Ensure responses are generated") {
       val (
         _,
@@ -212,7 +212,6 @@ class DefaultParametersTest extends AnyFunSuite with Matchers with SwaggerSpecRu
 
       statements.zip(expected).foreach({ case (a, b) => a.structure should equal(b.structure) })
     }
-  }
 
   testVersion(Http4sVersion.V0_22)
   testVersion(Http4sVersion.V0_23)