Merge pull request #64 from exoego/avoid-raw-options

exoego · web-flow · commit 1e75317e09cf · 2019-09-24T10:34:21.000+09:00
Avoid RawOptions where options have its own class.
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/child_process/ChildProcess.scala b/app/current/src/main/scala/io/scalajs/nodejs/child_process/ChildProcess.scala
@@ -21,7 +21,7 @@ trait ChildProcess extends IEventEmitter {
   def unref(): Unit                                          = js.native
   // TODO: Are those available in limited scenario?
   //def disconnect(): Unit = js.native
-  //def send(message: js.Any, sendHandle: Handle = js.native, options: SendOptions | RawOptions = js.native, callback: js.Function1[nodejs.Error, Any] = js.native): Boolean = js.native
+  //def send(message: js.Any, sendHandle: Handle = js.native, options: SendOptions  = js.native, callback: js.Function1[nodejs.Error, Any] = js.native): Boolean = js.native
 
   val channel: js.UndefOr[js.Object] = js.native
   val connected: Boolean             = js.native
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/dns/DNS.scala b/app/current/src/main/scala/io/scalajs/nodejs/dns/DNS.scala
@@ -1,7 +1,5 @@
 package io.scalajs.nodejs.dns
 
-import io.scalajs.RawOptions
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
@@ -44,7 +42,7 @@ trait DNS extends js.Object {
     * All properties are optional.
     * @example dns.lookup(hostname[, options], callback)
     */
-  def lookup(hostname: String, options: DnsOptions | RawOptions | Int, callback: DnsCallback1[String]): Unit = js.native
+  def lookup(hostname: String, options: DnsOptions | Int, callback: DnsCallback1[String]): Unit = js.native
 
   /**
     * Resolves a hostname (e.g. 'nodejs.org') into the first found A (IPv4) or AAAA (IPv6) record. options can be an
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/dns/package.scala b/app/current/src/main/scala/io/scalajs/nodejs/dns/package.scala
@@ -1,6 +1,5 @@
 package io.scalajs.nodejs
 
-import io.scalajs.RawOptions
 import io.scalajs.util.PromiseHelper._
 
 import scala.concurrent.Future
@@ -70,7 +69,7 @@ package object dns {
       * integer, then it must be 4 or 6.
       */
     @inline
-    def lookupFuture(hostname: String, options: DnsOptions | RawOptions | Int = null): Future[String] = {
+    def lookupFuture(hostname: String, options: DnsOptions | Int = null): Future[String] = {
       promiseWithError1[DnsError, String](dns.lookup(hostname, options, _))
     }
 
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/fs/Fs.scala b/app/current/src/main/scala/io/scalajs/nodejs/fs/Fs.scala
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/fs/package.scala b/app/current/src/main/scala/io/scalajs/nodejs/fs/package.scala
@@ -15,10 +15,11 @@ import scala.scalajs.js.|
   */
 package object fs {
 
-  type Path       = Uint8Array | String | URL
-  type Time       = Int | String | js.Date
-  type BufferLike = TypedArray[_, _] | DataView
-  type Output     = String | Buffer
+  type Path             = Uint8Array | String | URL
+  type Time             = Int | String | js.Date
+  type BufferLike       = TypedArray[_, _] | DataView
+  type Output           = String | Buffer
+  type FileWriteOptions = FileAppendOptions
 
   @enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
   type Dirent = Fs.Dirent
@@ -135,7 +136,7 @@ package object fs {
     @inline
     def readdirDirentFuture(path: Buffer | String): Future[js.Array[Dirent]] = {
       val callback: FsCallback1[js.Array[Dirent]] => Unit = { callback =>
-        fs.readdir(path, new ReaddirOptions(withFileTypes = true), callback.asInstanceOf[FsCallback1[ReaddirArrays]])
+        fs.readdir(path, new ReaddirOptions(withFileTypes = true), callback.asInstanceOf[FsCallback1[ReaddirArrays2]])
       }
       promiseWithError1[FileIOError, js.Array[Dirent]](callback)
     }
@@ -212,12 +213,12 @@ package object fs {
     }
 
     @inline
-    def writeFileFuture(file: String, data: Buffer, options: FileOutputOptions = null): Future[Unit] = {
+    def writeFileFuture(file: String, data: Buffer, options: FileWriteOptions = null): Future[Unit] = {
       promiseWithError0[FileIOError](fs.writeFile(file, data, options, _))
     }
 
     @inline
-    def writeFileFuture(file: String, data: String, options: FileOutputOptions): Future[Unit] = {
+    def writeFileFuture(file: String, data: String, options: FileWriteOptions): Future[Unit] = {
       promiseWithError0[FileIOError](fs.writeFile(file, data, options, _))
     }
 
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/http/Agent.scala b/app/current/src/main/scala/io/scalajs/nodejs/http/Agent.scala
@@ -1,12 +1,10 @@
 package io.scalajs.nodejs
 package http
 
-import io.scalajs.RawOptions
 import io.scalajs.util.PromiseHelper._
 
 import scala.concurrent.Future
 import scala.scalajs.js
-import scala.scalajs.js.|
 
 /**
   * The HTTP Agent is used for pooling sockets used in HTTP client requests.
@@ -75,7 +73,7 @@ trait Agent extends js.Object {
     * callback has a signature of (err, stream).
     * @example agent.createConnection(options[, callback])
     */
-  def createConnection(options: ConnectionOptions | RawOptions, callback: js.Function): Unit = js.native
+  def createConnection(options: ConnectionOptions, callback: js.Function): Unit = js.native
 
   /**
     * Destroy any sockets that are currently in use by the agent.
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/https/Https.scala b/app/current/src/main/scala/io/scalajs/nodejs/https/Https.scala
@@ -1,12 +1,10 @@
 package io.scalajs.nodejs.https
 
-import io.scalajs.RawOptions
 import io.scalajs.nodejs.events.IEventEmitter
 import io.scalajs.nodejs.http.RequestOptions
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * HTTPS is the HTTP protocol over TLS/SSL. In Node.js this is implemented as a separate module.
@@ -33,14 +31,14 @@ trait Https extends IEventEmitter {
     * The requestListener is a function which is automatically added to the 'request' event.
     * @example https.createServer(options[, requestListener])
     */
-  def createServer(options: ServerOptions | RawOptions, requestListener: js.Function): Server = js.native
+  def createServer(options: ServerOptions, requestListener: js.Function): Server = js.native
 
   /**
     * Returns a new HTTPS web server object. The options is similar to tls.createServer().
     * The requestListener is a function which is automatically added to the 'request' event.
     * @example https.createServer(options[, requestListener])
     */
-  def createServer(options: ServerOptions | RawOptions): Server = js.native
+  def createServer(options: ServerOptions): Server = js.native
 
   /**
     * Like http.get() but for HTTPS.
@@ -54,14 +52,14 @@ trait Https extends IEventEmitter {
     * @example https.get(options, (res) => { ... })
     * @see [[io.scalajs.nodejs.http.Http.get()]]
     */
-  def get(options: RequestOptions | RawOptions, callback: js.Function): Unit = js.native
+  def get(options: RequestOptions, callback: js.Function): Unit = js.native
 
   /**
     * Makes a request to a secure web server.
     * @param options can be an object or a string. If options is a string, it is automatically parsed with url.parse().
     * @example http.request(options, callback)
     */
-  def request(options: RequestOptions | RawOptions, callback: js.Function): Unit = js.native
+  def request(options: RequestOptions, callback: js.Function): Unit = js.native
 
   /**
     * Makes a request to a secure web server.
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/https/package.scala b/app/current/src/main/scala/io/scalajs/nodejs/https/package.scala
@@ -2,10 +2,9 @@ package io.scalajs.nodejs
 
 import io.scalajs.nodejs.http.{RequestOptions, ServerResponse}
 import io.scalajs.util.PromiseHelper._
-import io.scalajs.{RawOptions, nodejs}
+import io.scalajs.nodejs
 
 import scala.concurrent.Future
-import scala.scalajs.js.|
 
 /**
   * https package object
@@ -21,7 +20,7 @@ package object https {
       * Like http.get() but for HTTPS.
       */
     @inline
-    def getFuture(options: RequestOptions | RawOptions): Future[ServerResponse] = {
+    def getFuture(options: RequestOptions): Future[ServerResponse] = {
       promiseCallback1[ServerResponse](https.get(options, _))
     }
 
@@ -37,7 +36,7 @@ package object https {
       * Makes a request to a secure web server.
       */
     @inline
-    def requestFuture(options: RequestOptions | RawOptions): Future[ServerResponse] = {
+    def requestFuture(options: RequestOptions): Future[ServerResponse] = {
       promiseWithError1[nodejs.Error, ServerResponse](https.request(options, _))
     }
 
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/net/Socket.scala b/app/current/src/main/scala/io/scalajs/nodejs/net/Socket.scala
@@ -1,12 +1,10 @@
 package io.scalajs.nodejs
 package net
 
-import io.scalajs.RawOptions
 import io.scalajs.nodejs.stream.IDuplex
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * net.Socket - This object is an abstraction of a TCP or local socket. net.Socket instances implement a duplex Stream
@@ -15,7 +13,7 @@ import scala.scalajs.js.|
   */
 @js.native
 @JSImport("net", "Socket")
-class Socket(options: SocketOptions | RawOptions = js.native) extends IDuplex with HasHandle {
+class Socket(options: SocketOptions = js.native) extends IDuplex with HasHandle {
 
   /////////////////////////////////////////////////////////////////////////////////
   //      Properties
@@ -119,7 +117,7 @@ class Socket(options: SocketOptions | RawOptions = js.native) extends IDuplex wi
     * @param connectListener the optional connect listener
     * @example socket.connect(options[, connectListener])
     */
-  def connect(options: ConnectOptions | RawOptions, connectListener: js.Function = js.native): Unit = js.native
+  def connect(options: ConnectOptions, connectListener: js.Function = js.native): Unit = js.native
 
   /**
     * Opens the connection for a given socket.
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/querystring/QueryString.scala b/app/current/src/main/scala/io/scalajs/nodejs/querystring/QueryString.scala
@@ -1,10 +1,7 @@
 package io.scalajs.nodejs.querystring
 
-import io.scalajs.RawOptions
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * Query String
@@ -43,7 +40,7 @@ trait QueryString extends js.Object {
   def parse(str: String,
             sep: String = js.native,
             eq: String = js.native,
-            options: QueryDecodeOptions | RawOptions = js.native): js.Dictionary[String] = js.native
+            options: QueryDecodeOptions = js.native): js.Dictionary[String] = js.native
 
   /**
     * The querystring.stringify() method produces a URL query string from a given obj by iterating through the
@@ -56,7 +53,7 @@ trait QueryString extends js.Object {
   def stringify(obj: js.Any,
                 sep: String = js.native,
                 eq: String = js.native,
-                options: QueryEncodeOptions | RawOptions = js.native): String = js.native
+                options: QueryEncodeOptions = js.native): String = js.native
 
   /**
     * The querystring.unescape() method performs decoding of URL percent-encoded characters on the given str.
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/querystring/package.scala b/app/current/src/main/scala/io/scalajs/nodejs/querystring/package.scala
@@ -1,9 +1,6 @@
 package io.scalajs.nodejs
 
-import io.scalajs.RawOptions
-
 import scala.scalajs.js
-import scala.scalajs.js.|
 
 /**
   * query string package object
@@ -19,7 +16,7 @@ package object querystring {
     def parseAs[T <: js.Object](str: String,
                                 sep: String = null,
                                 eq: String = null,
-                                options: QueryDecodeOptions | RawOptions = null): T = {
+                                options: QueryDecodeOptions = null): T = {
       qs.parse(str, sep, eq, options).asInstanceOf[T]
     }
 
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/readline/Readline.scala b/app/current/src/main/scala/io/scalajs/nodejs/readline/Readline.scala
@@ -1,11 +1,9 @@
 package io.scalajs.nodejs.readline
 
-import io.scalajs.RawOptions
 import io.scalajs.nodejs.events.IEventEmitter
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * Readline allows reading of a stream (such as process.stdin) on a line-by-line basis.
@@ -37,7 +35,7 @@ trait Readline extends IEventEmitter {
     * Creates a readline Interface instance.
     * @example readline.createInterface(options)
     */
-  def createInterface(options: ReadlineOptions | RawOptions): Interface = js.native
+  def createInterface(options: ReadlineOptions): Interface = js.native
 
   /**
     * Move cursor to the specified position in a given TTY stream.
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/repl/REPL.scala b/app/current/src/main/scala/io/scalajs/nodejs/repl/REPL.scala
@@ -1,12 +1,10 @@
 package io.scalajs.nodejs.repl
 
-import io.scalajs.RawOptions
 import io.scalajs.nodejs.events.IEventEmitter
 import io.scalajs.nodejs.net.Socket
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * The repl module provides a Read-Eval-Print-Loop (REPL) implementation that is available
@@ -22,7 +20,7 @@ trait REPL extends IEventEmitter {
   /**
     * @example repl.start([options])
     */
-  def start(options: REPLOptions | RawOptions): REPLServer = js.native
+  def start(options: REPLOptions): REPLServer = js.native
 
   /**
     * @example repl.start([options])
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/stream/Readable.scala b/app/current/src/main/scala/io/scalajs/nodejs/stream/Readable.scala
@@ -1,14 +1,11 @@
 package io.scalajs.nodejs
 package stream
 
-import io.scalajs.RawOptions
 import io.scalajs.nodejs.buffer.Buffer
 import io.scalajs.nodejs.events.IEventEmitter
 
 import scala.scalajs.js
 
-import scala.scalajs.js.|
-
 /**
   * The Readable stream interface is the abstraction for a source of data that you are reading from.
   * In other words, data comes out of a Readable stream.
@@ -75,7 +72,7 @@ trait Readable extends IEventEmitter {
     * Multiple destinations can be piped to safely.
     * @example readable.pipe(destination[, options])
     */
-  def pipe(destination: Writable, options: ReadablePipeOptions | RawOptions = js.native): this.type = js.native
+  def pipe(destination: Writable, options: ReadablePipeOptions = js.native): this.type = js.native
 
   /**
     * When chunk is a Buffer or string, the chunk of data will be added to the internal queue for users
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/tls/TLSSocket.scala b/app/current/src/main/scala/io/scalajs/nodejs/tls/TLSSocket.scala
@@ -1,13 +1,11 @@
 package io.scalajs.nodejs
 package tls
 
-import io.scalajs.RawOptions
 import io.scalajs.nodejs.buffer.Buffer
 import io.scalajs.nodejs.net.Socket
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * The tls.TLSSocket is a subclass of net.Socket that performs transparent encryption of written data
@@ -19,7 +17,7 @@ import scala.scalajs.js.|
   */
 @js.native
 @JSImport("tls", "TLSSocket")
-class TLSSocket(socket: Socket, options: TLSSocketOptions | RawOptions = js.native) extends net.Socket {
+class TLSSocket(socket: Socket, options: TLSSocketOptions = js.native) extends net.Socket {
 
   /**
     * Returns an object representing the peer's certificate. The returned object has some properties corresponding to
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/tls/Tls.scala b/app/current/src/main/scala/io/scalajs/nodejs/tls/Tls.scala
@@ -1,11 +1,8 @@
 package io.scalajs.nodejs
 package tls
 
-import io.scalajs.RawOptions
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * The tls module provides an implementation of the Transport Layer Security (TLS) and Secure Socket Layer (SSL)
@@ -23,7 +20,7 @@ trait Tls extends js.Object {
     * @param callback See tls.connect().
     * @example connect(port[, host][, options][, callback])
     */
-  def connect(port: Int, host: String, options: TlsConnectOptions | RawOptions, callback: js.Function): Unit = js.native
+  def connect(port: Int, host: String, options: TlsConnectOptions, callback: js.Function): Unit = js.native
 
 }
 
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/url/URLSearchParams.scala b/app/current/src/main/scala/io/scalajs/nodejs/url/URLSearchParams.scala
@@ -1,10 +1,7 @@
 package io.scalajs.nodejs.url
 
-import io.scalajs.RawOptions
-
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
-import scala.scalajs.js.|
 
 /**
   * The URLSearchParams API provides read and write access to the query of a URL. The URLSearchParams
@@ -143,10 +140,10 @@ class URLSearchParams extends js.Object {
   /**
     * Returns a customizable serialization of a URL String representation of a WHATWG URL object.
     * @param url     the given [[URL]]
-    * @param options the given [[RawOptions options]]
+    * @param options the given [[UrlFormatOptions options]]
     * @return a customizable serialization of a URL String representation of a WHATWG URL object.
     */
-  def format(url: URL, options: UrlFormatOptions | RawOptions = js.native): String = js.native
+  def format(url: URL, options: UrlFormatOptions = js.native): String = js.native
 
 }
 
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/util/Util.scala b/app/current/src/main/scala/io/scalajs/nodejs/util/Util.scala
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/vm/VM.scala b/app/current/src/main/scala/io/scalajs/nodejs/vm/VM.scala
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/zlib/Zlib.scala b/app/current/src/main/scala/io/scalajs/nodejs/zlib/Zlib.scala
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/zlib/package.scala b/app/current/src/main/scala/io/scalajs/nodejs/zlib/package.scala
