Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit b6f7c73

Browse files
authored
Merge pull request #281 from exoego/factory-update
"option" objects should extend js.Object & ClusterSettings.serialization should be optional
2 parents ffb8d62 + 389745e commit b6f7c73

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

app/nodejs-v14/src/main/scala/io/scalajs/nodejs/child_process/SpawnSyncResult.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import scala.scalajs.js
66
import scala.scalajs.js.|
77

88
@Factory
9-
trait SpawnSyncResult {
9+
trait SpawnSyncResult extends js.Object {
1010
var pid: Int
1111
var output: js.Array[Output]
1212
var stdout: Output

app/nodejs-v14/src/main/scala/io/scalajs/nodejs/cluster/ClusterSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ trait ClusterSettings extends js.Object {
3535
* From Node.js v13.2.0, v12.16.0.
3636
*/
3737
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
38-
var serialization: String = js.native
38+
var serialization: js.UndefOr[String] = js.native
3939

4040
/** <Number> Sets the user identity of the process. (See setuid(2).) */
4141
var uid: UID = js.native

app/nodejs-v14/src/main/scala/io/scalajs/nodejs/crypto/DiffieHellmanOptions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scala.scalajs.js
44
import net.exoego.scalajs.types.util.Factory
55

66
@Factory
7-
trait DiffieHellmanOptions {
7+
trait DiffieHellmanOptions extends js.Object {
88
var privateKey: KeyObject
99
var publicKey: KeyObject
1010
}

app/nodejs-v14/src/main/scala/io/scalajs/nodejs/fs/Fs.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,7 +1332,7 @@ trait FileAppendOptions extends js.Object {
13321332
}
13331333

13341334
@Factory
1335-
trait FileEncodingOptions {
1335+
trait FileEncodingOptions extends js.Object {
13361336
var encoding: js.UndefOr[String] = js.undefined
13371337
}
13381338

@@ -1400,7 +1400,7 @@ trait FileWatcherOptions extends js.Object {
14001400
}
14011401

14021402
@Factory
1403-
trait StatOptions {
1403+
trait StatOptions extends js.Object {
14041404
var bigint: js.UndefOr[Boolean] = js.undefined
14051405
}
14061406

app/nodejs-v14/src/main/scala/io/scalajs/nodejs/vm/VM.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ trait VM extends js.Object {
8585
object VM extends VM
8686

8787
@Factory
88-
trait CompileFunctionOptions {
88+
trait CompileFunctionOptions extends js.Object {
8989
var filename: js.UndefOr[String] = js.undefined
9090
var lineOffset: js.UndefOr[Int] = js.undefined
9191
var columnOffset: js.UndefOr[Int] = js.undefined

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ object Dependencies {
1616
val app = Def.setting(
1717
Seq(
1818
scalaReflect.value,
19-
"net.exoego" %%% "scalajs-types-util" % "0.1.0",
19+
"net.exoego" %%% "scalajs-types-util" % "0.2.1",
2020
"org.scalatest" %%% "scalatest" % scalatestVersion % "test",
2121
"com.thoughtworks.enableIf" %% "enableif" % "1.1.7"
2222
)

0 commit comments

Comments
 (0)