Merge pull request #344 from AVSystem/cross-compiled-mongo

Cross compilation of @mongoid & MongoEntity(Companion) to JS

Author: ghik

.github/workflows/ci.yml

@@ -76,7 +76,7 @@ jobs:
         run: sbt ++${{ matrix.scala }} test
 
       - name: Compress target directories
-        run: tar cf targets.tar commons-macros/target commons-core/js/target commons-benchmark/js/target commons-core/target commons-benchmark/target commons-spring/target commons-analyzer/target commons-mongo/target commons-redis/target commons-hocon/target .js/target target commons-jetty/target .jvm/target project/target
+        run: tar cf targets.tar commons-macros/target commons-core/js/target commons-benchmark/js/target commons-core/target commons-benchmark/target commons-spring/target commons-analyzer/target commons-mongo/target commons-redis/target commons-hocon/target .js/target target commons-jetty/target .jvm/target commons-mongo/js/target project/target
 
       - name: Upload target directories
         uses: actions/upload-artifact@v2

.gitignore

@@ -9,6 +9,7 @@
 target
 out
 .bloop
+.bsp
 
 *.sjsir
 *.class

build.sbt

@@ -226,6 +226,7 @@ lazy val `commons-jvm` = project.in(file(".jvm"))
 lazy val `commons-js` = project.in(file(".js"))
   .aggregate(
     `commons-core-js`,
+    `commons-mongo-js`,
     `commons-benchmark-js`,
   )
   .settings(aggregateProjectSettings)
@@ -288,6 +289,63 @@ lazy val `commons-core-js` = project.in(`commons-core`.base / "js")
     )
   )
 
+lazy val `commons-mongo` = project
+  .dependsOn(`commons-core` % CompileAndTest)
+  .settings(
+    jvmCommonSettings,
+    sourceDirsSettings(_ / "jvm"),
+    libraryDependencies ++= Seq(
+      "com.google.guava" % "guava" % guavaVersion,
+      "io.monix" %% "monix" % monixVersion,
+      "org.mongodb" % "mongodb-driver-core" % mongoVersion,
+      "org.mongodb" % "mongodb-driver-sync" % mongoVersion % Optional,
+      "org.mongodb" % "mongodb-driver-reactivestreams" % mongoVersion % Optional,
+      "org.mongodb.scala" %% "mongo-scala-driver" % mongoVersion % Optional,
+    ),
+  )
+
+// only to allow @mongoId & MongoEntity to be used in JS/JVM cross-compiled code
+lazy val `commons-mongo-js` = project.in(`commons-mongo`.base / "js")
+  .enablePlugins(ScalaJSPlugin)
+  .configure(p => if (forIdeaImport) p.dependsOn(`commons-mongo`) else p)
+  .dependsOn(`commons-core-js`)
+  .settings(
+    jsCommonSettings,
+    sameNameAs(`commons-mongo`),
+    sourceDirsSettings(_.getParentFile),
+  )
+
+lazy val `commons-redis` = project
+  .dependsOn(`commons-core` % CompileAndTest)
+  .settings(
+    jvmCommonSettings,
+    libraryDependencies ++= Seq(
+      "com.google.guava" % "guava" % guavaVersion,
+      "com.typesafe.akka" %% "akka-actor" % akkaVersion,
+      "com.typesafe.akka" %% "akka-stream" % akkaVersion,
+      "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
+    ),
+    parallelExecution in Test := false,
+  )
+
+lazy val `commons-hocon` = project
+  .dependsOn(`commons-core` % CompileAndTest)
+  .settings(
+    jvmCommonSettings,
+    libraryDependencies ++= Seq(
+      "com.typesafe" % "config" % typesafeConfigVersion,
+    ),
+  )
+
+lazy val `commons-spring` = project
+  .dependsOn(`commons-hocon` % CompileAndTest)
+  .settings(
+    jvmCommonSettings,
+    libraryDependencies ++= Seq(
+      "org.springframework" % "spring-context" % springVersion,
+    ),
+  )
+
 lazy val `commons-jetty` = project
   .dependsOn(`commons-core` % CompileAndTest)
   .settings(
@@ -338,51 +396,6 @@ lazy val `commons-benchmark-js` = project.in(`commons-benchmark`.base / "js")
     scalaJSUseMainModuleInitializer := true,
   )
 
-lazy val `commons-mongo` = project
-  .dependsOn(`commons-core` % CompileAndTest)
-  .settings(
-    jvmCommonSettings,
-    libraryDependencies ++= Seq(
-      "com.google.guava" % "guava" % guavaVersion,
-      "io.monix" %% "monix" % monixVersion,
-      "org.mongodb" % "mongodb-driver-core" % mongoVersion,
-      "org.mongodb" % "mongodb-driver-sync" % mongoVersion % Optional,
-      "org.mongodb" % "mongodb-driver-reactivestreams" % mongoVersion % Optional,
-      "org.mongodb.scala" %% "mongo-scala-driver" % mongoVersion % Optional,
-    ),
-  )
-
-lazy val `commons-redis` = project
-  .dependsOn(`commons-core` % CompileAndTest)
-  .settings(
-    jvmCommonSettings,
-    libraryDependencies ++= Seq(
-      "com.google.guava" % "guava" % guavaVersion,
-      "com.typesafe.akka" %% "akka-actor" % akkaVersion,
-      "com.typesafe.akka" %% "akka-stream" % akkaVersion,
-      "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
-    ),
-    parallelExecution in Test := false,
-  )
-
-lazy val `commons-hocon` = project
-  .dependsOn(`commons-core` % CompileAndTest)
-  .settings(
-    jvmCommonSettings,
-    libraryDependencies ++= Seq(
-      "com.typesafe" % "config" % typesafeConfigVersion,
-    ),
-  )
-
-lazy val `commons-spring` = project
-  .dependsOn(`commons-hocon` % CompileAndTest)
-  .settings(
-    jvmCommonSettings,
-    libraryDependencies ++= Seq(
-      "org.springframework" % "spring-context" % springVersion,
-    ),
-  )
-
 lazy val `commons-comprof` = project
   .disablePlugins(GenerativePlugin)
   .dependsOn(`commons-core`)

commons-mongo/js/src/main/scala/com/avsystem/commons/mongo/typed/MongoEntityCompanion.scala

@@ -0,0 +1,13 @@
+package com.avsystem.commons
+package mongo.typed
+
+import com.avsystem.commons.meta.MacroInstances
+import com.avsystem.commons.serialization.{GenObjectCodec, HasGenObjectCodec}
+
+abstract class MongoDataCompanion[T](
+  implicit instances: MacroInstances[Unit, () => GenObjectCodec[T]]
+) extends HasGenObjectCodec[T]
+
+abstract class MongoEntityCompanion[T <: BaseMongoEntity](
+  implicit instances: MacroInstances[Unit, () => GenObjectCodec[T]]
+) extends MongoDataCompanion[T]