finos · DamianReeves · Nov 3, 2023 · Oct 29, 2023 · Oct 29, 2023 · Oct 29, 2023
diff --git a/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonDecodingSupport.scala b/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonDecodingSupport.scala
@@ -614,8 +614,29 @@ trait MorphirJsonDecodingSupport {
           )
       }
 
+  implicit def libDecoder: JsonDecoder[Lib] = {
+    case class LibTemp(dependencies: List[(PackageName, UPackageSpecification)], packageDef: PackageDefinition.Typed)
+    lazy val dec: JsonDecoder[LibTemp] = DeriveJsonDecoder.gen
+    dec.map(l => Lib(l.dependencies.map(d => d._1 -> d._2).toMap, l.packageDef))
+  }
+
+  implicit def distributionBundleJsonDecoder: JsonDecoder[Bundle] =
+    JsonDecoder
+      .tuple2[String, List[(PackageName, Lib)]]
+      .mapOrFail {
+        case ("Bundle", libraries) =>
+          Right(Bundle(libraries.toMap))
+        case (other, libraries) =>
+          Left(
+            s"Expected Bundle, got $other with libraries: $libraries"
+          )
+      }
+
   implicit def distributionDecoder: JsonDecoder[Distribution] =
-    distributionLibraryJsonDecoder.widen[Distribution]
+    zio.json.TagBasedParser[Distribution] {
+      case "Library" => distributionLibraryJsonDecoder.widen[Distribution]
+      case "Bundle"  => distributionBundleJsonDecoder.widen[Distribution]
+    }
 
   implicit val morphirIRVersionDecoder: JsonDecoder[MorphirIRVersion] = JsonDecoder.int.map {
     case 1 => MorphirIRVersion.V1_0

diff --git a/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonDecodingSupportV1.scala b/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonDecodingSupportV1.scala
@@ -618,8 +618,29 @@ trait MorphirJsonDecodingSupportV1 {
           )
       }
 
+  implicit def libDecoder: JsonDecoder[Lib] = {
+    case class LibTemp(dependencies: List[(PackageName, UPackageSpecification)], packageDef: PackageDefinition.Typed)
+    lazy val dec: JsonDecoder[LibTemp] = DeriveJsonDecoder.gen
+    dec.map(l => Lib(l.dependencies.map(d => d._1 -> d._2).toMap, l.packageDef))
+  }
+
+  implicit def distributionBundleJsonDecoder: JsonDecoder[Bundle] =
+    JsonDecoder
+      .tuple2[String, List[(PackageName, Lib)]]
+      .mapOrFail {
+        case ("bundle", libraries) =>
+          Right(Bundle(libraries.toMap))
+        case (other, libraries) =>
+          Left(
+            s"Expected bundle, got $other with libraries: $libraries"
+          )
+      }
+
   implicit def distributionDecoder: JsonDecoder[Distribution] =
-    distributionLibraryJsonDecoder.widen[Distribution]
+    zio.json.TagBasedParser[Distribution] {
+      case "library" => distributionLibraryJsonDecoder.widen[Distribution]
+      case "bundle"  => distributionBundleJsonDecoder.widen[Distribution]
+    }
 
   implicit val morphirIRVersionDecoder: JsonDecoder[MorphirIRVersion] = JsonDecoder.int.map {
     case 1 => MorphirIRVersion.V1_0

diff --git a/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonDecodingSupportV2.scala b/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonDecodingSupportV2.scala
@@ -614,8 +614,29 @@ trait MorphirJsonDecodingSupportV2 {
           )
       }
 
+  implicit def libDecoder: JsonDecoder[Lib] = {
+    case class LibTemp(dependencies: List[(PackageName, UPackageSpecification)], packageDef: PackageDefinition.Typed)
+    lazy val dec: JsonDecoder[LibTemp] = DeriveJsonDecoder.gen
+    dec.map(l => Lib(l.dependencies.map(d => d._1 -> d._2).toMap, l.packageDef))
+  }
+
+  implicit def distributionBundleJsonDecoder: JsonDecoder[Bundle] =
+    JsonDecoder
+      .tuple2[String, List[(PackageName, Lib)]]
+      .mapOrFail {
+        case ("Bundle", libraries) =>
+          Right(Bundle(libraries.toMap))
+        case (other, libraries) =>
+          Left(
+            s"Expected Bundle, got $other with libraries: $libraries"
+          )
+      }
+
   implicit def distributionDecoder: JsonDecoder[Distribution] =
-    distributionLibraryJsonDecoder.widen[Distribution]
+    zio.json.TagBasedParser[Distribution] {
+      case "Library" => distributionLibraryJsonDecoder.widen[Distribution]
+      case "Bundle"  => distributionBundleJsonDecoder.widen[Distribution]
+    }
 
   implicit val morphirIRVersionDecoder: JsonDecoder[MorphirIRVersion] = JsonDecoder.int.map {
     case 1 => MorphirIRVersion.V1_0

diff --git a/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonEncodingSupport.scala b/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonEncodingSupport.scala
@@ -526,10 +526,30 @@ trait MorphirJsonEncodingSupport extends JsonEncodingHelpers {
         ("Library", packageName, dependencies.toList, packageDef)
       }
 
+  implicit def libEncoder: JsonEncoder[Lib] =
+    Json.encoder.contramap[Lib] { lib =>
+      Json.Obj(
+        "dependencies" -> toJsonAstOrThrow(
+          lib.dependencies.toList.map { case (dependencies, packageDef) =>
+            Json.Arr(toJsonAstOrThrow(dependencies), toJsonAstOrThrow(packageDef))
+          }
+        ),
+        "packageDef" -> toJsonAstOrThrow(lib.packageDef)
+      )
+    }
+
+  implicit def distributionBundleJsonEncoder: JsonEncoder[Bundle] =
+    JsonEncoder
+      .tuple2[String, List[(PackageName, Lib)]]
+      .contramap { case Bundle(libraries) =>
+        ("Bundle", libraries.toList)
+      }
+
   implicit def distributionEncoder: JsonEncoder[Distribution] =
     new JsonEncoder[Distribution] {
       def unsafeEncode(a: Distribution, indent: Option[Int], out: Write): Unit = a match {
         case library: Library => distributionLibraryJsonEncoder.unsafeEncode(library, indent, out)
+        case bundle: Bundle   => distributionBundleJsonEncoder.unsafeEncode(bundle, indent, out)
       }
     }
 

diff --git a/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonEncodingSupportV1.scala b/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonEncodingSupportV1.scala
@@ -520,10 +520,30 @@ trait MorphirJsonEncodingSupportV1 extends JsonEncodingHelpers {
         ("library", packageName, dependencies.toList, packageDef)
       }
 
+  implicit def libEncoder: JsonEncoder[Lib] =
+    Json.encoder.contramap[Lib] { lib =>
+      Json.Obj(
+        "dependencies" -> toJsonAstOrThrow(
+          lib.dependencies.toList.map { case (dependencies, packageDef) =>
+            Json.Arr(toJsonAstOrThrow(dependencies), toJsonAstOrThrow(packageDef))
+          }
+        ),
+        "packageDef" -> toJsonAstOrThrow(lib.packageDef)
+      )
+    }
+
+  implicit def distributionBundleJsonEncoder: JsonEncoder[Bundle] =
+    JsonEncoder
+      .tuple2[String, List[(PackageName, Lib)]]
+      .contramap { case Bundle(libraries) =>
+        ("bundle", libraries.toList)
+      }
+
   implicit def distributionEncoder: JsonEncoder[Distribution] =
     new JsonEncoder[Distribution] {
       def unsafeEncode(a: Distribution, indent: Option[Int], out: Write): Unit = a match {
         case library: Library => distributionLibraryJsonEncoder.unsafeEncode(library, indent, out)
+        case bundle: Bundle   => distributionBundleJsonEncoder.unsafeEncode(bundle, indent, out)
       }
     }
 

diff --git a/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonEncodingSupportV2.scala b/morphir/interop/zio/json/src/org/finos/morphir/ir/json/MorphirJsonEncodingSupportV2.scala
@@ -526,10 +526,30 @@ trait MorphirJsonEncodingSupportV2 extends JsonEncodingHelpers {
         ("Library", packageName, dependencies.toList, packageDef)
       }
 
+  implicit def libEncoder: JsonEncoder[Lib] =
+    Json.encoder.contramap[Lib] { lib =>
+      Json.Obj(
+        "dependencies" -> toJsonAstOrThrow(
+          lib.dependencies.toList.map { case (dependencies, packageDef) =>
+            Json.Arr(toJsonAstOrThrow(dependencies), toJsonAstOrThrow(packageDef))
+          }
+        ),
+        "packageDef" -> toJsonAstOrThrow(lib.packageDef)
+      )
+    }
+
+  implicit def distributionBundleJsonEncoder: JsonEncoder[Bundle] =
+    JsonEncoder
+      .tuple2[String, List[(PackageName, Lib)]]
+      .contramap { case Bundle(libraries) =>
+        ("Bundle", libraries.toList)
+      }
+
   implicit def distributionEncoder: JsonEncoder[Distribution] =
     new JsonEncoder[Distribution] {
       def unsafeEncode(a: Distribution, indent: Option[Int], out: Write): Unit = a match {
         case library: Library => distributionLibraryJsonEncoder.unsafeEncode(library, indent, out)
+        case bundle: Bundle   => distributionBundleJsonEncoder.unsafeEncode(bundle, indent, out)
       }
     }