Merge pull request #13 from catap/modules-support

Introduced support of modules

Author: exoego

build.sbt

@@ -85,5 +85,6 @@ lazy val `test-project`: Project = project.
   enablePlugins(ScalaJSJUnitPlugin).
   settings(
     scalaJSUseMainModuleInitializer := true,
+    scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule)),
     jsEnv := new net.exoego.jsenv.jsdomnodejs.JSDOMNodeJSEnv()
   )

jsdom-nodejs-env/src/main/scala/net/exoego/jsenv/jsdomnodejs/JSDOMNodeJSEnv.scala

@@ -8,11 +8,13 @@
 
 package net.exoego.jsenv.jsdomnodejs
 
+import com.google.common.io.ByteStreams
+
 import scala.util.control.NonFatal
 
 import java.io._
 import java.nio.charset.StandardCharsets
-import java.nio.file.{Files, Path, StandardCopyOption}
+import java.nio.file.{Files, Path, StandardCopyOption, StandardOpenOption}
 import java.net.URI
 
 import com.google.common.jimfs.Jimfs
@@ -52,6 +54,9 @@ class JSDOMNodeJSEnv(config: JSDOMNodeJSEnv.Config) extends JSEnv {
       case Input.Script(script) =>
         script
 
+      case Input.CommonJSModule(module) =>
+        JSDOMNodeJSEnv.wrapAsFunctionCallThis(module)
+
       case _ =>
         throw new UnsupportedInputException(input)
     }.toList
@@ -194,6 +199,30 @@ object JSDOMNodeJSEnv {
     }
   }
 
+  /*
+   * The reason to add this hack is performance degradation.
+   * Details:
+   *  - https://github.com/scala-js/scala-js/issues/4489
+   *  - https://github.com/jsdom/jsdom/issues/3193
+   */
+  private def wrapAsFunctionCallThis(path: Path): Path = {
+    val suffix = tmpSuffixRE.findFirstIn(path.getFileName.toString).orNull
+
+    val f = File.createTempFile("tmp-", suffix)
+    f.deleteOnExit()
+    val w = f.toPath
+    val out = Files.newOutputStream(w, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)
+    val writer = new BufferedWriter(new OutputStreamWriter(out))
+    writer.write("(function(){")
+    writer.newLine()
+    writer.flush()
+    ByteStreams.copy(Files.newInputStream(path), out)
+    writer.write("}).call(this);")
+    writer.newLine()
+    writer.close()
+    w
+  }
+
   private def materialize(path: Path): URI = {
     try {
       path.toFile.toURI

test-project/src/main/scala/testproject/OsArch.scala

@@ -0,0 +1,10 @@
+package testproject
+
+import scala.scalajs.js
+import scala.scalajs.js.annotation.JSImport
+
+@JSImport("os", "arch")
+@js.native
+object OsArch extends js.Object {
+  def apply(): String = js.native
+}

test-project/src/test/scala/testproject/LibTest.scala

@@ -11,4 +11,8 @@ class LibTest {
     Lib.appendDocument("foo")
     assertEquals(1, count - oldCount)
   }
+
+  @Test def osArch_should_works(): Unit = {
+    assertNotNull(OsArch())
+  }
 }