From d10b795ade2b5d0151c39c5a36cf94dea555495d Mon Sep 17 00:00:00 2001
From: Mingun <Alexander_Sergey@mail.ru>
Date: Tue, 24 Nov 2020 22:01:36 +0500
Subject: [PATCH] Fix scala.js deprecation warnings

---
 build.sbt                                                 | 8 ++++----
 .../main/scala/io/kaitai/struct/JavaScriptImporter.scala  | 2 ++
 js/src/main/scala/io/kaitai/struct/MainJs.scala           | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index 6f38ec8ea..b5fc46ac7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -197,13 +197,13 @@ lazy val buildNpmJsFileTask = Def.task {
   val compiledFileContents = IO.read(compiledFile, UTF8)
 
   val fileWithExports =
-    s"""(function (root, factory) {
+    s"""(function (root, compiler) {
        |  if (typeof define === 'function' && define.amd) {
-       |    define([], factory);
+       |    define([], function() { return compiler; });
        |  } else if (typeof module === 'object' && module.exports) {
-       |    module.exports = factory();
+       |    module.exports = compiler;
        |  } else {
-       |    root.KaitaiStructCompiler = factory();
+       |    root.KaitaiStructCompiler = compiler;
        |  }
        |}(this, function () {
        |
diff --git a/js/src/main/scala/io/kaitai/struct/JavaScriptImporter.scala b/js/src/main/scala/io/kaitai/struct/JavaScriptImporter.scala
index 969677318..e4b8debcb 100644
--- a/js/src/main/scala/io/kaitai/struct/JavaScriptImporter.scala
+++ b/js/src/main/scala/io/kaitai/struct/JavaScriptImporter.scala
@@ -2,8 +2,10 @@ package io.kaitai.struct
 
 import scala.scalajs.js
 import scala.scalajs.js.Promise
+import scala.scalajs.js.annotation.JSGlobal
 
 @js.native
+@JSGlobal
 class JavaScriptImporter extends js.Object {
   def importYaml(name: String, mode: String): Promise[js.Object] = js.native
 }
diff --git a/js/src/main/scala/io/kaitai/struct/MainJs.scala b/js/src/main/scala/io/kaitai/struct/MainJs.scala
index a89470b98..73ad1a38e 100644
--- a/js/src/main/scala/io/kaitai/struct/MainJs.scala
+++ b/js/src/main/scala/io/kaitai/struct/MainJs.scala
@@ -7,9 +7,9 @@ import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 import scala.scalajs.js
 import scala.scalajs.js.JSConverters._
-import scala.scalajs.js.annotation.JSExport
+import scala.scalajs.js.annotation.{JSExport, JSExportTopLevel}
 
-@JSExport
+@JSExportTopLevel("MainJs")
 object MainJs {
   KSVersion.current = Version.version