Merge branch 'main' into type_parameters_derive

README.md

@@ -30,13 +30,13 @@ _ZIO Schema_ is used by a growing number of ZIO libraries, including _ZIO Flow_,
 In order to use this library, we need to add the following lines in our `build.sbt` file:
 
 ```scala
-libraryDependencies += "dev.zio" %% "zio-schema"          % "0.4.11"
-libraryDependencies += "dev.zio" %% "zio-schema-bson"     % "0.4.11"
-libraryDependencies += "dev.zio" %% "zio-schema-json"     % "0.4.11"
-libraryDependencies += "dev.zio" %% "zio-schema-protobuf" % "0.4.11"
+libraryDependencies += "dev.zio" %% "zio-schema"          % "0.4.12"
+libraryDependencies += "dev.zio" %% "zio-schema-bson"     % "0.4.12"
+libraryDependencies += "dev.zio" %% "zio-schema-json"     % "0.4.12"
+libraryDependencies += "dev.zio" %% "zio-schema-protobuf" % "0.4.12"
 
 // Required for automatic generic derivation of schemas
-libraryDependencies += "dev.zio" %% "zio-schema-derivation" % "0.4.11",
+libraryDependencies += "dev.zio" %% "zio-schema-derivation" % "0.4.12",
 libraryDependencies += "org.scala-lang" % "scala-reflect"  % scalaVersion.value % "provided"
 ```
 

build.sbt

@@ -223,6 +223,7 @@ lazy val zioSchemaAvro = crossProject(JSPlatform, JVMPlatform)
   .in(file("zio-schema-avro"))
   .dependsOn(zioSchema, zioSchemaDerivation, tests % "test->test")
   .settings(stdSettings("zio-schema-avro"))
+  .settings(dottySettings)
   .settings(crossProjectSettings)
   .settings(buildInfoSettings("zio.schema.avro"))
   .settings(

zio-schema-derivation/shared/src/main/scala-3/zio/schema/DeriveSchema.scala

@@ -116,7 +116,7 @@ private case class DeriveSchema()(using val ctx: Quotes) extends ReflectionUtils
   }
 
   def deriveCaseObject[T: Type](stack: Stack, top: Boolean)(using Quotes) = {
-    val selfRefSymbol = Symbol.newVal(Symbol.spliceOwner, s"derivedSchema${stack.size}", TypeRepr.of[Schema[T]], Flags.Lazy, Symbol.spliceOwner)
+    val selfRefSymbol = Symbol.newVal(Symbol.spliceOwner, s"derivedSchema${stack.size}", TypeRepr.of[Schema[T]], Flags.Lazy, Symbol.noSymbol)
     val selfRef = Ref(selfRefSymbol)
 
     val typeInfo = '{TypeId.parse(${Expr(TypeRepr.of[T].show)})}
@@ -150,7 +150,7 @@ private case class DeriveSchema()(using val ctx: Quotes) extends ReflectionUtils
   }
 
   def deriveCaseClass[T: Type](mirror: Mirror, stack: Stack, top: Boolean)(using Quotes) = {
-    val selfRefSymbol = Symbol.newVal(Symbol.spliceOwner, s"derivedSchema${stack.size}", TypeRepr.of[Schema[T]], Flags.Lazy, Symbol.spliceOwner)
+    val selfRefSymbol = Symbol.newVal(Symbol.spliceOwner, s"derivedSchema${stack.size}", TypeRepr.of[Schema[T]], Flags.Lazy, Symbol.noSymbol)
     val selfRef = Ref(selfRefSymbol)
     val newStack = stack.push(selfRef, TypeRepr.of[T])
 
@@ -283,7 +283,7 @@ private case class DeriveSchema()(using val ctx: Quotes) extends ReflectionUtils
       }.toMap
 
   def deriveEnum[T: Type](mirror: Mirror, stack: Stack)(using Quotes) = {
-    val selfRefSymbol = Symbol.newVal(Symbol.spliceOwner, s"derivedSchema${stack.size}", TypeRepr.of[Schema[T]], Flags.Lazy, Symbol.spliceOwner)
+    val selfRefSymbol = Symbol.newVal(Symbol.spliceOwner, s"derivedSchema${stack.size}", TypeRepr.of[Schema[T]], Flags.Lazy, Symbol.noSymbol)
     val selfRef = Ref(selfRefSymbol)
     val newStack = stack.push(selfRef, TypeRepr.of[T])
 

zio-schema-json/shared/src/main/scala/zio/schema/codec/JsonCodec.scala

@@ -273,6 +273,7 @@ object JsonCodec {
         case Schema.Primitive(StandardType.StringType, _) => Option(JsonFieldEncoder.string)
         case Schema.Primitive(StandardType.LongType, _)   => Option(JsonFieldEncoder.long)
         case Schema.Primitive(StandardType.IntType, _)    => Option(JsonFieldEncoder.int)
+        case Schema.Lazy(inner)                           => jsonFieldEncoder(inner())
         case _                                            => None
       }
 
@@ -598,6 +599,7 @@ object JsonCodec {
         case Schema.Primitive(StandardType.StringType, _) => Option(JsonFieldDecoder.string)
         case Schema.Primitive(StandardType.LongType, _)   => Option(JsonFieldDecoder.long)
         case Schema.Primitive(StandardType.IntType, _)    => Option(JsonFieldDecoder.int)
+        case Schema.Lazy(inner)                           => jsonFieldDecoder(inner())
         case _                                            => None
       }
 

zio-schema-json/shared/src/test/scala-2/zio/schema/codec/JsonCodecSpec.scala

@@ -96,6 +96,15 @@ object JsonCodecSpec extends ZIOSpecDefault {
             """{"0":{"first":0,"second":true},"1":{"first":1,"second":false}}"""
           )
         )
+      },
+      test("of simple keys and values where the key's schema is lazy") {
+        assertEncodes(
+          Schema.map[Int, Value](Schema.defer(Schema[Int]), Schema[Value]),
+          Map(0 -> Value(0, true), 1 -> Value(1, false)),
+          charSequenceToByteChunk(
+            """{"0":{"first":0,"second":true},"1":{"first":1,"second":false}}"""
+          )
+        )
       }
     ),
     suite("Set")(
@@ -469,6 +478,15 @@ object JsonCodecSpec extends ZIOSpecDefault {
             """{"0":{"first":0,"second":true},"1":{"first":1,"second":false}}"""
           )
         )
+      },
+      test("of simple keys and values where the key schema is lazy") {
+        assertDecodes(
+          Schema.map[Int, Value](Schema.defer(Schema[Int]), Schema[Value]),
+          Map(0 -> Value(0, true), 1 -> Value(1, false)),
+          charSequenceToByteChunk(
+            """{"0":{"first":0,"second":true},"1":{"first":1,"second":false}}"""
+          )
+        )
       }
     )
   )