Ignore JsValue to map

Author: rodrigotn

README.md

@@ -1,7 +1,7 @@
 # Play json Mapping
 Enhance the ability to create writes and reads from complex case classes graph. 
 
-[ ![Download](https://api.bintray.com/packages/null-vector/releases/play-json-mapping/images/download.svg?version=1.1.1) ](https://bintray.com/null-vector/releases/play-json-mapping/1.1.1/link)
+[ ![Download](https://api.bintray.com/packages/null-vector/releases/play-json-mapping/images/download.svg?version=1.1.2) ](https://bintray.com/null-vector/releases/play-json-mapping/1.1.2/link)
 
 ## Installation
 Add into your `build.sbt` the following lines:

build.sbt

@@ -5,7 +5,7 @@ lazy val supportedScalaVersions = List(scala212, scala213)
 lazy val commonSettings = Seq(
   name := "play-json-mapping",
   organization := "null-vector",
-  version := "1.1.1",
+  version := "1.1.2",
   scalaVersion := scala213,
   crossScalaVersions := supportedScalaVersions,
   scalacOptions := Seq(

core/src/test/scala/org/nullvector/api/json/JsonMapperSpec.scala

@@ -10,6 +10,7 @@ import org.nullvector.api.json.domian.{DaysOpen, Location, Monday, Money, Operat
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers._
 import play.api.libs.json.{Format, JsString, Json, JsonConfiguration, Reads, Writes}
+import play.api.libs.json.{Format, JsNumber, JsString, JsValue, Json, JsonConfiguration, Reads, Writes}
 
 class JsonMapperSpec extends AnyFlatSpec {
 
@@ -106,5 +107,20 @@ class JsonMapperSpec extends AnyFlatSpec {
       .asJson.toString() shouldBe """{"productId":23,"name":"Train"}"""
   }
 
+  it should "creat a mapping of Map() with JsValue type" in {
+    import JsonMapper._
+    implicit val m = mappingOf[ValueMap]
+
+    ValueMap(Map("key" -> JsNumber(23)), JsString("a text"))
+      .asJson.toString() shouldBe """ {"values":{"key":23},"default":"a text"} """.trim
+  }
+
+  it should "map List of json values" in {
+    implicit val jl = JsonMapper.readsOf[JsonList]
+  }
+
+  case class ValueMap(values: Map[String, JsValue], default: JsString)
+
+  case class JsonList(list: List[JsValue])
 }
 

macros/src/main/scala/org/nullvector/api/json/JsonMapperMacroFactory.scala

@@ -1,7 +1,7 @@
 package org.nullvector.api.json
 
 import org.nullvector.api.json.tree.{Tree => NTree}
-import play.api.libs.json.{Format, JsonConfiguration, Reads, Writes}
+import play.api.libs.json.{Format, JsValue, JsonConfiguration, Reads, Writes}
 
 import scala.reflect.macros.blackbox
 
@@ -69,6 +69,7 @@ private object JsonMapperMacroFactory {
     import context.universe._
     val enumType = context.typeOf[Enumeration]
     val anyValType = context.typeOf[AnyVal]
+    val jsValueType = context.typeOf[JsValue]
 
     def extractAll(testType: context.universe.Type): NTree[context.universe.Type] = {
       def isSupportedTrait(aTypeClass: ClassSymbol) = aTypeClass.isTrait && aTypeClass.isSealed && !aTypeClass.fullName.startsWith("scala")
@@ -77,6 +78,7 @@ private object JsonMapperMacroFactory {
 
       def extractCaseClassesFromTypeArgs(classType: Type): List[Type] = {
         classType.typeArgs.collect {
+          case aType if aType <:< jsValueType => Nil
           case argType if isCaseOrTrait(argType) => List(classType, argType)
           case t => extractCaseClassesFromTypeArgs(t)
         }.flatten
@@ -93,6 +95,7 @@ private object JsonMapperMacroFactory {
               returnType
             }
             .collect {
+              case aType if aType <:< jsValueType => Nil
               case aType if aType <:< anyValType => List(NTree(aType))
               case aType if aType.typeSymbol.owner.isType && aType.typeSymbol.owner.asType.toType =:= enumType => List(NTree(aType))
               case aType if isCaseOrTrait(aType) => List(extractAll(aType))