From 23335e05f8c7aa863f21c88ae65265aa94271e98 Mon Sep 17 00:00:00 2001 From: exoego Date: Sun, 21 Jun 2020 22:53:15 +0900 Subject: [PATCH 1/4] Those should extend js.Object --- .../io/scalajs/nodejs/child_process/SpawnSyncResult.scala | 2 +- .../scala/io/scalajs/nodejs/crypto/DiffieHellmanOptions.scala | 2 +- app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/Fs.scala | 4 ++-- app/nodejs-v14/src/main/scala/io/scalajs/nodejs/vm/VM.scala | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/child_process/SpawnSyncResult.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/child_process/SpawnSyncResult.scala index 1d1660ede..53eef3b5f 100644 --- a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/child_process/SpawnSyncResult.scala +++ b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/child_process/SpawnSyncResult.scala @@ -6,7 +6,7 @@ import scala.scalajs.js import scala.scalajs.js.| @Factory -trait SpawnSyncResult { +trait SpawnSyncResult extends js.Object { var pid: Int var output: js.Array[Output] var stdout: Output diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/DiffieHellmanOptions.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/DiffieHellmanOptions.scala index a0ec3f634..b9d579f33 100644 --- a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/DiffieHellmanOptions.scala +++ b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/DiffieHellmanOptions.scala @@ -4,7 +4,7 @@ import scala.scalajs.js import net.exoego.scalajs.types.util.Factory @Factory -trait DiffieHellmanOptions { +trait DiffieHellmanOptions extends js.Object { var privateKey: KeyObject var publicKey: KeyObject } diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/Fs.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/Fs.scala index 3fafacd16..a4ff5a5e7 100644 --- a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/Fs.scala +++ b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/Fs.scala @@ -1332,7 +1332,7 @@ trait FileAppendOptions extends js.Object { } @Factory -trait FileEncodingOptions { +trait FileEncodingOptions extends js.Object { var encoding: js.UndefOr[String] = js.undefined } @@ -1400,7 +1400,7 @@ trait FileWatcherOptions extends js.Object { } @Factory -trait StatOptions { +trait StatOptions extends js.Object { var bigint: js.UndefOr[Boolean] = js.undefined } diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/vm/VM.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/vm/VM.scala index 757addad9..a21e0551b 100644 --- a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/vm/VM.scala +++ b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/vm/VM.scala @@ -85,7 +85,7 @@ trait VM extends js.Object { object VM extends VM @Factory -trait CompileFunctionOptions { +trait CompileFunctionOptions extends js.Object { var filename: js.UndefOr[String] = js.undefined var lineOffset: js.UndefOr[Int] = js.undefined var columnOffset: js.UndefOr[Int] = js.undefined From a294eb409989ed8fa0e0ec097acc0b9a81091c78 Mon Sep 17 00:00:00 2001 From: exoego Date: Sun, 21 Jun 2020 22:53:33 +0900 Subject: [PATCH 2/4] this parameter is optional --- .../main/scala/io/scalajs/nodejs/cluster/ClusterSettings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/cluster/ClusterSettings.scala b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/cluster/ClusterSettings.scala index 69bcb3b9c..4ed6958c4 100644 --- a/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/cluster/ClusterSettings.scala +++ b/app/nodejs-v14/src/main/scala/io/scalajs/nodejs/cluster/ClusterSettings.scala @@ -35,7 +35,7 @@ trait ClusterSettings extends js.Object { * From Node.js v13.2.0, v12.16.0. */ @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12) - var serialization: String = js.native + var serialization: js.UndefOr[String] = js.native /** Sets the user identity of the process. (See setuid(2).) */ var uid: UID = js.native From 9553b425690132b186085d4d292176dc8fcf6f24 Mon Sep 17 00:00:00 2001 From: exoego Date: Sun, 21 Jun 2020 22:53:45 +0900 Subject: [PATCH 3/4] Update factory macro --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c542df79a..a91224a4f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -16,7 +16,7 @@ object Dependencies { val app = Def.setting( Seq( scalaReflect.value, - "net.exoego" %%% "scalajs-types-util" % "0.1.0", + "net.exoego" %%% "scalajs-types-util" % "0.2.0", "org.scalatest" %%% "scalatest" % scalatestVersion % "test", "com.thoughtworks.enableIf" %% "enableif" % "1.1.7" ) From 389745ed88609a9f59ced0fe6b8c373ea0eb5038 Mon Sep 17 00:00:00 2001 From: exoego Date: Mon, 22 Jun 2020 10:16:28 +0900 Subject: [PATCH 4/4] Update macro lib to not get warned on traits extending js.object through inheritance --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a91224a4f..ccd363efa 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -16,7 +16,7 @@ object Dependencies { val app = Def.setting( Seq( scalaReflect.value, - "net.exoego" %%% "scalajs-types-util" % "0.2.0", + "net.exoego" %%% "scalajs-types-util" % "0.2.1", "org.scalatest" %%% "scalatest" % scalatestVersion % "test", "com.thoughtworks.enableIf" %% "enableif" % "1.1.7" )