Merge pull request #179 from exoego/package-object

Move implicit classes to package object so companion can be js.Object

Author: exoego

app/current/src/main/scala/io/scalajs/nodejs/fs/FSWatcher.scala

@@ -19,49 +19,6 @@ trait FSWatcher extends IEventEmitter {
   def close(): Unit = js.native
 }
 
-/**
-  * File System Watcher Companion
-  */
-object FSWatcher {
-
-  /**
-    * File System Watcher Extensions
-    */
-  implicit final class FSWatcherExtensions[T <: FSWatcher](private val watcher: T) extends AnyVal {
-
-    /**
-      * Emitted when something changes in a watched directory or file. See more details in fs.watch().
-      *
-      * The filename argument may not be provided depending on operating system support. If filename is provided,
-      * it will be provided as a Buffer if fs.watch() is called with it's encoding option set to 'buffer', otherwise
-      * filename will be a string.
-      * @param listener the event handler
-      *                 <ul>
-      *                 <li>event: String - The type of fs change</li>
-      *                 <li>filename: String> | Buffer - The filename that changed (if relevant/available)</li>
-      *                 </ul>
-      * @since 0.5.8
-      */
-    @inline
-    def onChange(listener: (String, js.Any) => Any): T = watcher.on("change", listener)
-
-    /**
-      * Added in Node.js v10.0.0
-      * @see https://nodejs.org/api/fs.html#fs_event_close
-      */
-    @inline
-    def onClose(listener: () => Any): T = watcher.on("close", listener)
-
-    /**
-      * Emitted when an error occurs.
-      * @param listener the event handler
-      * @since 0.5.8
-      */
-    @inline
-    def onError(listener: Error => Any): T = watcher.on("error", listener)
-  }
-}
-
 /**
   * FS Watcher Options
   * @param encoding   Specifies the character encoding to be used for the filename passed to the listener (default: "utf8")

app/current/src/main/scala/io/scalajs/nodejs/fs/ReadStream.scala

@@ -3,10 +3,7 @@ package fs
 
 import com.thoughtworks.enableIf
 import io.scalajs.nodejs.buffer.Buffer
-import io.scalajs.nodejs.stream
-import io.scalajs.util.PromiseHelper.promiseCallback1
 
-import scala.concurrent.Future
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
@@ -47,44 +44,3 @@ class ReadStream(path: Path) extends stream.Readable {
   @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
   val pending: Boolean = js.native
 }
-
-/**
-  * Read Stream Companion
-  */
-object ReadStream {
-
-  /**
-    * Read Stream Events
-    */
-  implicit final class ReadStreamExtensions[R <: ReadStream](private val stream: R) extends AnyVal {
-
-    /**
-      * Emitted when the ReadStream's underlying file descriptor has been closed using the fs.close() method.
-      * @param listener the event handler
-      * @since 0.1.93
-      */
-    @inline
-    def onClose(listener: () => Any): R = stream.on("close", listener)
-
-    /**
-      * Emitted when the ReadStream's file is opened.
-      * @param listener the event handler
-      *                 <ul>
-      *                 <li>fd: Integer - file descriptor used by the ReadStream.</li>
-      *                 </ul>
-      * @since 0.1.93
-      */
-    @inline
-    def onOpen(listener: FileDescriptor => Any): R = stream.on("open", listener)
-
-    /**
-      * Added in Node.js v9.11.0
-      * @see https://nodejs.org/api/fs.html#fs_event_ready
-      */
-    @inline
-    def onReady(listener: () => Any): R = stream.on("ready", listener)
-
-    @inline
-    def closeFuture: Future[Unit] = promiseCallback1[Unit](stream.close)
-  }
-}

app/current/src/main/scala/io/scalajs/nodejs/fs/WriteStream.scala

@@ -2,10 +2,7 @@ package io.scalajs.nodejs
 package fs
 
 import io.scalajs.nodejs.buffer.Buffer
-import io.scalajs.nodejs.stream
-import io.scalajs.util.PromiseHelper._
 
-import scala.concurrent.Future
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.|
@@ -43,44 +40,3 @@ class WriteStream(path: Path) extends stream.Writable {
     */
   def close(callback: js.Function1[Unit, Any]): Unit = js.native
 }
-
-/**
-  * Write Stream Companion
-  */
-object WriteStream {
-
-  /**
-    * Write Stream Events
-    */
-  implicit final class WriteStreamExtensions[T <: WriteStream](private val stream: T) extends AnyVal {
-
-    /**
-      * Emitted when the WriteStream's underlying file descriptor has been closed using the fs.close() method.
-      * @param listener the event handler
-      * @since 0.1.93
-      */
-    @inline
-    def onClose(listener: () => Any): T = stream.on("close", listener)
-
-    /**
-      * Emitted when the WriteStream's file is opened.
-      * @param listener the event handler
-      *                 <ul>
-      *                 <li>fd: Integer - file descriptor used by the ReadStream.</li>
-      *                 </ul>
-      * @since 0.1.93
-      */
-    @inline
-    def onOpen(listener: FileDescriptor => Any): T = stream.on("open", listener)
-
-    /**
-      * Added in Node.js v9.11.0
-      * @see https://nodejs.org/api/fs.html#fs_event_ready_1
-      */
-    @inline
-    def onReady(listener: () => Any): T = stream.on("ready", listener)
-
-    @inline
-    def closeFuture: Future[Unit] = promiseCallback1[Unit](stream.close)
-  }
-}

app/current/src/main/scala/io/scalajs/nodejs/fs/package.scala

@@ -483,4 +483,108 @@ package object fs {
       promiseWithError0[js.Error](instance.close _)
     }
   }
+
+  /**
+    * File System Watcher Extensions
+    */
+  implicit final class FSWatcherExtensions[T <: FSWatcher](private val watcher: T) extends AnyVal {
+
+    /**
+      * Emitted when something changes in a watched directory or file. See more details in fs.watch().
+      *
+      * The filename argument may not be provided depending on operating system support. If filename is provided,
+      * it will be provided as a Buffer if fs.watch() is called with it's encoding option set to 'buffer', otherwise
+      * filename will be a string.
+      * @param listener the event handler
+      *                 <ul>
+      *                 <li>event: String - The type of fs change</li>
+      *                 <li>filename: String> | Buffer - The filename that changed (if relevant/available)</li>
+      *                 </ul>
+      * @since 0.5.8
+      */
+    @inline
+    def onChange(listener: (String, js.Any) => Any): T = watcher.on("change", listener)
+
+    /**
+      * Added in Node.js v10.0.0
+      * @see https://nodejs.org/api/fs.html#fs_event_close
+      */
+    @inline
+    def onClose(listener: () => Any): T = watcher.on("close", listener)
+
+    /**
+      * Emitted when an error occurs.
+      * @param listener the event handler
+      * @since 0.5.8
+      */
+    @inline
+    def onError(listener: Error => Any): T = watcher.on("error", listener)
+  }
+
+  implicit final class ReadStreamExtensions[R <: ReadStream](private val stream: R) extends AnyVal {
+
+    /**
+      * Emitted when the ReadStream's underlying file descriptor has been closed using the fs.close() method.
+      * @param listener the event handler
+      * @since 0.1.93
+      */
+    @inline
+    def onClose(listener: () => Any): R = stream.on("close", listener)
+
+    /**
+      * Emitted when the ReadStream's file is opened.
+      * @param listener the event handler
+      *                 <ul>
+      *                 <li>fd: Integer - file descriptor used by the ReadStream.</li>
+      *                 </ul>
+      * @since 0.1.93
+      */
+    @inline
+    def onOpen(listener: FileDescriptor => Any): R = stream.on("open", listener)
+
+    /**
+      * Added in Node.js v9.11.0
+      * @see https://nodejs.org/api/fs.html#fs_event_ready
+      */
+    @inline
+    def onReady(listener: () => Any): R = stream.on("ready", listener)
+
+    @inline
+    def closeFuture: Future[Unit] = promiseCallback1[Unit](stream.close)
+  }
+
+  /**
+    * Write Stream Events
+    */
+  implicit final class WriteStreamExtensions[T <: WriteStream](private val stream: T) extends AnyVal {
+
+    /**
+      * Emitted when the WriteStream's underlying file descriptor has been closed using the fs.close() method.
+      * @param listener the event handler
+      * @since 0.1.93
+      */
+    @inline
+    def onClose(listener: () => Any): T = stream.on("close", listener)
+
+    /**
+      * Emitted when the WriteStream's file is opened.
+      * @param listener the event handler
+      *                 <ul>
+      *                 <li>fd: Integer - file descriptor used by the ReadStream.</li>
+      *                 </ul>
+      * @since 0.1.93
+      */
+    @inline
+    def onOpen(listener: FileDescriptor => Any): T = stream.on("open", listener)
+
+    /**
+      * Added in Node.js v9.11.0
+      * @see https://nodejs.org/api/fs.html#fs_event_ready_1
+      */
+    @inline
+    def onReady(listener: () => Any): T = stream.on("ready", listener)
+
+    @inline
+    def closeFuture: Future[Unit] = promiseCallback1[Unit](stream.close)
+  }
 }

app/current/src/main/scala/io/scalajs/nodejs/http/Agent.scala

@@ -2,9 +2,7 @@ package io.scalajs.nodejs
 package http
 
 import io.scalajs.nodejs.events.IEventEmitter
-import io.scalajs.util.PromiseHelper._
 
-import scala.concurrent.Future
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport
 
@@ -88,27 +86,3 @@ class Agent(options: AgentOptions = js.native) extends IEventEmitter {
 
   def getName(options: GetNameOptions): String = js.native
 }
-
-/**
-  * Agent Companion
-  */
-object Agent {
-
-  /**
-    * Agent Extensions
-    */
-  implicit final class AgentExtensions[T <: Agent](private val agent: T) extends AnyVal {
-
-    /**
-      * Produces a socket/stream to be used for HTTP requests. By default, this function is the same
-      * as net.createConnection(). However, custom Agents may override this method in case greater
-      * flexibility is desired.
-      */
-    @inline
-    def createConnectionFuture(options: ConnectionOptions): Future[js.Any] = {
-      promiseWithError1[Error, js.Any](agent.createConnection(options, _))
-    }
-
-    @inline def onKeylog(handler: () => Any): T = agent.on("keylog", handler)
-  }
-}