Add driver subproject

.github/workflows/scala.yml

@@ -21,7 +21,13 @@ jobs:
         node-version: '17.x'
     - name: Install TypeScript
       run: npm ci
+    - name: Install test libraries for es projects
+      working-directory: ./driver/js/src/test/esprojects
+      run: npm ci
+    - name: Install test libraries for cjs projects
+      working-directory: ./driver/js/src/test/cjsprojects
+      run: npm ci
     - name: Run tests
-      run: sbt test
+      run: sbt test -J-XX:+UseG1GC
     - name: Check no changes
       run: git diff-files -p --exit-code

build.sbt

@@ -8,7 +8,7 @@ ThisBuild / organization     := "io.lptk"
 ThisBuild / organizationName := "LPTK"
 
 lazy val root = project.in(file("."))
-  .aggregate(mlscriptJS, mlscriptJVM, ts2mlsTest, compilerJVM)
+  .aggregate(mlscriptJS, mlscriptJVM, driverTest, compilerJVM)
   .settings(
     publish := {},
     publishLocal := {},
@@ -74,12 +74,6 @@ lazy val ts2mls = crossProject(JSPlatform, JVMPlatform).in(file("ts2mls"))
 lazy val ts2mlsJS = ts2mls.js
 lazy val ts2mlsJVM = ts2mls.jvm
 
-lazy val ts2mlsTest = project.in(file("ts2mls"))
-  .settings(
-    scalaVersion := "2.13.8",
-    Test / test := ((ts2mlsJVM / Test / test) dependsOn (ts2mlsJS / Test / test)).value
-  )
-
 lazy val compiler = crossProject(JSPlatform, JVMPlatform).in(file("compiler"))
   .settings(
     name := "mlscript-compiler",
@@ -93,3 +87,25 @@ lazy val compiler = crossProject(JSPlatform, JVMPlatform).in(file("compiler"))
 lazy val compilerJVM = compiler.jvm
 lazy val compilerJS = compiler.js
 
+lazy val driver = crossProject(JSPlatform, JVMPlatform).in(file("driver"))
+  .settings(
+    name := "mlscript-driver",
+    scalaVersion := "2.13.8",
+    scalacOptions ++= Seq(
+      "-deprecation"
+    )
+  )
+  .jvmSettings()
+  .jsSettings(
+    libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.1.0",
+    libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.12" % "test"
+  )
+  .dependsOn(mlscript % "compile->compile;test->test")
+  .dependsOn(ts2mls % "compile->compile;test->test")
+
+lazy val driverJS = driver.js
+lazy val driverTest = project.in(file("driver"))
+  .settings(
+    scalaVersion := "2.13.8",
+    Test / test := ((driverJS / Test / test) dependsOn (ts2mlsJS / Test / test)).value
+  )

compiler/shared/main/scala/mlscript/compiler/ClassLifter.scala

@@ -380,13 +380,13 @@ class ClassLifter(logDebugMsg: Boolean = false) {
       val cls = cache.get(t).get
       val supArgs = Tup(cls.body.params.fold(Nil)(t => t.fields).flatMap(tupleEntityToVar).map(toFldsEle))
       val anoCls = NuTypeDef(Cls, nTpNm, Nil, cls.body.params, None, None,
-                    List(App(Var(t.name), supArgs)), None, None, tu)(None, None)
+                    List(App(Var(t.name), supArgs)), None, None, tu)(None, None, None)
       val nSta = New(Some((nTpNm, prm)), TypingUnit(Nil))
       val ret = liftEntities(List(anoCls, nSta))
       (Blk(ret._1), ret._2)
     case New(None, tu) =>
       val nTpNm = TypeName(genAnoName())
-      val anoCls = NuTypeDef(Cls, nTpNm, Nil, None, None, None, Nil, None, None, tu)(None, None)
+      val anoCls = NuTypeDef(Cls, nTpNm, Nil, None, None, None, Nil, None, None, tu)(None, None, None)
       val nSta = New(Some((nTpNm, Tup(Nil))), TypingUnit(Nil))
       val ret = liftEntities(List(anoCls, nSta))
       (Blk(ret._1), ret._2)
@@ -545,14 +545,14 @@ class ClassLifter(logDebugMsg: Boolean = false) {
     body match {
       case Left(value) =>
         val ret = liftTerm(value)(using ctx.addV(nm).addT(tpVs))
-        (func.copy(rhs = Left(ret._1))(func.declareLoc, func.signature, func.outer), ret._2)
+        (func.copy(rhs = Left(ret._1))(func.declareLoc, func.exportLoc, func.signature, func.outer), ret._2)
       case Right(PolyType(targs, body)) =>
         val nBody = liftType(body)(using ctx.addT(tpVs))
         val nTargs = targs.map {
           case L(tp) => liftTypeName(tp)(using ctx.addT(tpVs)).mapFirst(Left.apply)
           case R(tv) => R(tv) -> emptyCtx
         }.unzip
-        (func.copy(rhs = Right(PolyType(nTargs._1, nBody._1)))(func.declareLoc, func.signature, func.outer),
+        (func.copy(rhs = Right(PolyType(nTargs._1, nBody._1)))(func.declareLoc, func.exportLoc, func.signature, func.outer),
           nTargs._2.fold(nBody._2)(_ ++ _))
       case _ => ??? // TODO
     }
@@ -649,7 +649,7 @@ class ClassLifter(logDebugMsg: Boolean = false) {
     clsList.foreach(x => liftTypeDefNew(x)(using nCache, nOuter))
     retSeq = retSeq.appended(NuTypeDef(
       kind, nName, nTps.map((None, _)), S(Tup(nParams)), None, None, nPars._1,
-      None, None, TypingUnit(nFuncs._1 ++ nTerms._1))(None, None))
+      None, None, TypingUnit(nFuncs._1 ++ nTerms._1))(None, None, None))
   }
 
   def liftTypingUnit(rawUnit: TypingUnit): TypingUnit = {