Continued development

1. Continued work on the multer module (node)
2. Continued work on the mongodb module (node)

Author: ldaniels528

README.md

@@ -83,7 +83,7 @@ The following NodeJS modules have been implemented thus far:
 | https             | 6.1.0   | means-node-core       | Node.js Core |
 | jwt-simple        | 0.5.0   | means-node-jwt-simple | JWT(JSON Web Token) encode and decode module |
 | kafka-node        | 0.0.11  | means-node-kafkanode  | A node binding for librdkafka |
-| mongodb           | 2.1     | means-node-mongodb    | Node.js MongoDB Driver |
+| mongodb           | 2.1.18  | means-node-mongodb    | Node.js MongoDB Driver |
 | multer            | 1.1.0   | means-node-multer     | Multer is a node.js middleware for handling multipart/form-data. |
 | net               | 6.1.0   | means-node-core       | Node.js Core |
 | oppressor         | 0.0.1   | means-node-oppressor  | Streaming http compression response negotiator. |

build.sbt

@@ -4,7 +4,7 @@ import sbt.Keys._
 import sbt.Project.projectToRef
 import sbt._
 
-val apiVersion = "0.1.8"
+val apiVersion = "0.1.9"
 val paradisePluginVersion = "3.0.0-M1" //"2.1.0"
 val _scalaVersion = "2.11.8"
 val scalaJsDomVersion = "0.9.0"

core/src/main/scala/com/github/ldaniels528/meansjs/util/ScalaJsHelper.scala

@@ -3,6 +3,7 @@ package com.github.ldaniels528.meansjs.util
 import scala.concurrent.{Future, Promise}
 import scala.language.implicitConversions
 import scala.scalajs.js
+import scala.scalajs.js.JSConverters._
 import scala.scalajs.runtime.wrapJavaScriptException
 
 /**
@@ -12,13 +13,11 @@ import scala.scalajs.runtime.wrapJavaScriptException
 object ScalaJsHelper {
 
   ////////////////////////////////////////////////////////////////////////
-  //    Convenience Functions
+  //    Concurrency Functions
   ////////////////////////////////////////////////////////////////////////
 
   implicit def promise2Future[T](promise: js.Promise[T]): Future[T] = promise.toFuture
 
-  implicit def exception2JsError(cause: Throwable): js.Error = js.Error(cause.getMessage)
-
   /**
     * Converts a JavaScript-style callback to a Scala-style future
     * @param f the given callback function
@@ -79,6 +78,10 @@ object ScalaJsHelper {
     promise.future
   }
 
+  ////////////////////////////////////////////////////////////////////////
+  //    Convenience Functions
+  ////////////////////////////////////////////////////////////////////////
+
   @inline
   def die[T](message: String): T = throw new IllegalStateException(message)
 
@@ -168,6 +171,8 @@ object ScalaJsHelper {
 
     @inline def contains(value: T): Boolean = valueA.exists(_ == value)
 
+    @inline def flat = valueA.flatMap(Option(_).orUndefined)
+
     @inline def orDie(message: String): js.UndefOr[T] = if (valueA.isDefined) valueA else throw new IllegalArgumentException(message)
 
   }

node/core/src/main/scala/com/github/ldaniels528/meansjs/nodejs/http/ServerResponse.scala

@@ -1,5 +1,6 @@
 package com.github.ldaniels528.meansjs.nodejs.http
 
+import com.github.ldaniels528.meansjs.nodejs.events.EventEmitter
 import com.github.ldaniels528.meansjs.nodejs.stream.Writable
 
 import scala.scalajs.js
@@ -10,7 +11,7 @@ import scala.scalajs.js
   * @see [[https://nodejs.org/api/http.html#http_class_http_serverresponse]]
   */
 @js.native
-trait ServerResponse extends Writable {
+trait ServerResponse extends EventEmitter with Writable {
 
   /////////////////////////////////////////////////////////////////////////////////
   //      Properties
@@ -142,7 +143,7 @@ object ServerResponse {
     * Server Response Extensions
     * @author [email protected]
     */
-  implicit class ServerResponseEnrich(val response: ServerResponse) extends AnyVal {
+  implicit class ServerResponseExtensions(val response: ServerResponse) extends AnyVal {
 
     @inline
     def badRequest() = response.sendStatus(400)

node/express/src/main/scala/com/github/ldaniels528/meansjs/nodejs/express/Application.scala

@@ -89,25 +89,25 @@ trait Application extends Router with EventEmitter {
     * This method is identical to Node’s http.Server.listen().
     * @example app.listen(port, [hostname], [backlog], [callback])
     */
-  def listen(port: Int, hostname: String, backlog: Int, callback: js.Function): Server = js.native
+  def listen(port: Int, hostname: String, backlog: Int, callback: js.Function): Unit = js.native
 
   /**
     * Binds and listens for connections on the specified host and port.
     * This method is identical to Node’s http.Server.listen().
     */
-  def listen(port: Int, hostname: String, backlog: Int): Server = js.native
+  def listen(port: Int, hostname: String, backlog: Int): Unit = js.native
 
   /**
     * Binds and listens for connections on the specified host and port.
     * This method is identical to Node’s http.Server.listen().
     */
-  def listen(port: Int, hostname: String, callback: js.Function): Server = js.native
+  def listen(port: Int, hostname: String, callback: js.Function): Unit = js.native
 
   /**
     * Binds and listens for connections on the specified host and port.
     * This method is identical to Node’s http.Server.listen().
     */
-  def listen(port: Int, hostname: String): Server = js.native
+  def listen(port: Int, hostname: String): Unit = js.native
 
   /**
     * Binds and listens for connections on the specified host and port.
@@ -119,7 +119,7 @@ trait Application extends Router with EventEmitter {
     * Binds and listens for connections on the specified host and port.
     * This method is identical to Node’s http.Server.listen().
     */
-  def listen(port: Int): Server = js.native
+  def listen(port: Int): Unit = js.native
 
   /**
     * Returns the canonical path of the app, a string.

node/mongodb/src/main/scala/com/github/ldaniels528/meansjs/nodejs/mongodb/Collection.scala

@@ -6,7 +6,7 @@ import scala.scalajs.js
 /**
   * Mongo Collection
   * @author [email protected]
-  * @see [[https://mongodb.github.io/node-mongodb-native/api-articles/nodekoarticle1.html]]
+  * @see [[http://mongodb.github.io/node-mongodb-native/2.1/api/index.html]]
   */
 @js.native
 trait Collection extends js.Object {
@@ -765,23 +765,23 @@ trait Collection extends js.Object {
     * @param options  Optional settings.
     * @param callback The command result callback
     */
-  def updateMany(filter: js.Any, update: js.Any, options: js.Any, callback: js.Function2[MongoError, UpdateWriteOpResultObject, Any]): Unit = js.native
+  def updateMany(filter: js.Any, update: js.Any, options: UpdateOptions, callback: js.Function2[MongoError, UpdateWriteOpResultObject, Any]): Unit = js.native
 
   /**
     * Update multiple documents on MongoDB
     * @param filter   The Filter used to select the document to update
     * @param update   The update operations to be applied to the document
     * @param callback The command result callback
     */
-  def updateMany(filter: js.Any, update: js.Any, callback: js.Function2[MongoError, UpdateWriteOpResultObject, Any]): Unit = js.native
+  def updateMany(filter: js.Any, update: UpdateOptions, callback: js.Function2[MongoError, UpdateWriteOpResultObject, Any]): Unit = js.native
 
   /**
     * Update multiple documents on MongoDB
     * @param filter  The Filter used to select the document to update
     * @param update  The update operations to be applied to the document
     * @param options Optional settings.
     */
-  def updateMany(filter: js.Any, update: js.Any, options: js.Any = null): js.Promise[UpdateWriteOpResultObject] = js.native
+  def updateMany(filter: js.Any, update: js.Any, options: UpdateOptions = null): js.Promise[UpdateWriteOpResultObject] = js.native
 
   /**
     * Update a single document on MongoDB
@@ -791,7 +791,7 @@ trait Collection extends js.Object {
     * @param callback The command result callback
     * @return [[js.Promise]] if no callback passed
     */
-  def updateOne(filter: js.Any, update: js.Any, options: js.Any, callback: js.Function2[MongoError, UpdateWriteOpResultObject, Any]): Unit = js.native
+  def updateOne(filter: js.Any, update: js.Any, options: UpdateOptions, callback: js.Function2[MongoError, UpdateWriteOpResultObject, Any]): Unit = js.native
 
   /**
     * Update a single document on MongoDB
@@ -809,7 +809,7 @@ trait Collection extends js.Object {
     * @param options Optional settings.
     * @return [[js.Promise]] if no callback passed
     */
-  def updateOne(filter: js.Any, update: js.Any, options: js.Any = null): js.Promise[UpdateWriteOpResultObject] = js.native
+  def updateOne(filter: js.Any, update: js.Any, options: UpdateOptions = null): js.Promise[UpdateWriteOpResultObject] = js.native
 
 }
 

node/mongodb/src/main/scala/com/github/ldaniels528/meansjs/nodejs/mongodb/InsertWriteOpResult.scala

@@ -51,7 +51,9 @@ object InsertWriteOpResult {
     */
   @js.native
   trait Result extends js.Object {
+    // ok == 1 when successful
     var ok: Int = js.native
+
     // Is 1 if the command executed correctly.
     var n: Int = js.native // The total count of documents inserted.
   }

node/mongodb/src/main/scala/com/github/ldaniels528/meansjs/nodejs/mongodb/UpdateOptions.scala

@@ -0,0 +1,33 @@
+package com.github.ldaniels528.meansjs.nodejs.mongodb
+
+import scala.scalajs.js
+import scala.scalajs.js.annotation.ScalaJSDefined
+
+/**
+  * Document Update Options
+  * @param w        The write concern
+  * @param wtimeout The write concern timeout.
+  * @param j        Specify a journal write concern.
+  * @param upsert   Update operation is an upsert.
+  */
+@ScalaJSDefined
+class UpdateOptions(w: js.UndefOr[Int],
+                    wtimeout: js.UndefOr[Int],
+                    j: js.UndefOr[Boolean],
+                    upsert: js.UndefOr[Boolean]) extends js.Object
+
+/**
+  * Update Options Companion
+  * @author [email protected]
+  */
+object UpdateOptions {
+
+  def apply(w: js.UndefOr[Int] = js.undefined,
+            wtimeout: js.UndefOr[Int] = js.undefined,
+            j: js.UndefOr[Boolean] = js.undefined,
+            upsert: js.UndefOr[Boolean] = js.undefined) = {
+    new UpdateOptions(w, wtimeout, j, upsert)
+  }
+
+}
+

node/mongodb/src/main/scala/com/github/ldaniels528/meansjs/nodejs/mongodb/UpdateWriteOpResultObject.scala

@@ -44,13 +44,14 @@ object UpdateWriteOpResultObject {
   @js.native
   trait Result extends js.Object {
     // Is 1 if the command executed correctly.
-    var ok: js.Any = js.native
+    var ok: Int = js.native
 
     // The total count of documents scanned.
-    var n: js.Any = js.native
+    var n: Int = js.native
 
     // The total count of documents modified.
-    var nModified: js.Any = js.native
+    var nModified: Int = js.native
+
   }
 
 }

node/mongodb/src/main/scala/com/github/ldaniels528/meansjs/nodejs/mongodb/WriteOptions.scala

@@ -8,20 +8,26 @@ import scala.scalajs.js.annotation.ScalaJSDefined
   * @author [email protected]
   */
 @ScalaJSDefined
-class WriteOptions extends js.Object {
-  var w: Int = _
-}
+class WriteOptions(w: js.UndefOr[Int],
+                   wtimeout: js.UndefOr[Int],
+                   j: js.UndefOr[Boolean],
+                   upsert: js.UndefOr[Boolean],
+                   multi: js.UndefOr[Boolean],
+                   bypassDocumentValidation: js.UndefOr[Boolean]) extends js.Object
 
 /**
   * Write Options Companion
   * @author [email protected]
   */
 object WriteOptions {
 
-  def apply(w: Int): WriteOptions = {
-    val options = new WriteOptions()
-    options.w = w
-    options
+  def apply(w: js.UndefOr[Int] = js.undefined,
+            wtimeout: js.UndefOr[Int] = js.undefined,
+            j: js.UndefOr[Boolean] = js.undefined,
+            upsert: js.UndefOr[Boolean] = js.undefined,
+            multi: js.UndefOr[Boolean] = js.undefined,
+            bypassDocumentValidation: js.UndefOr[Boolean] = js.undefined) = {
+    new WriteOptions(w, wtimeout, j, upsert, multi, bypassDocumentValidation)
   }
 
 }

node/mongodb/src/main/scala/com/github/ldaniels528/meansjs/nodejs/mongodb/package.scala

@@ -97,6 +97,13 @@ package object mongodb {
   @inline
   def $position(pos: => Int) = "$position" -> pos
 
+  /**
+    * The $set operator replaces the value of a field with the specified value.
+    * @example { $set: { field1: value1, ... } }
+    */
+  @inline
+  def $set(value: => js.Any) = "$set" -> value
+
   /**
     * Performs text search.
     * @example db.articles.find( { $text: { $search: "coffee" } } )
@@ -131,7 +138,7 @@ package object mongodb {
       * @example { $addToSet: {letters: [ "c", "d" ] } }
       */
     @inline
-    def $addToSet(value: => js.Any) = attribute -> doc("$addToSet"  -> value)
+    def $addToSet(value: => js.Any) = attribute -> doc("$addToSet" -> value)
 
     /**
       * The $all is equivalent to an $and operation of the specified values; i.e. the following statement:

node/multer/src/main/scala/com/github/ldaniels528/meansjs/nodejs/multer/DiskStorage.scala

@@ -0,0 +1,12 @@
+package com.github.ldaniels528.meansjs.nodejs.multer
+
+import scala.scalajs.js
+
+/**
+  * Disk Storage
+  * @author [email protected]
+  */
+@js.native
+trait DiskStorage extends js.Object {
+
+}

node/multer/src/main/scala/com/github/ldaniels528/meansjs/nodejs/multer/DiskStorageOptions.scala

@@ -0,0 +1,11 @@
+package com.github.ldaniels528.meansjs.nodejs.multer
+
+import scala.scalajs.js
+import scala.scalajs.js.annotation.ScalaJSDefined
+
+/**
+  * Disk Storage Options
+  * @author [email protected]
+  */
+@ScalaJSDefined
+class DiskStorageOptions() extends js.Object

node/multer/src/main/scala/com/github/ldaniels528/meansjs/nodejs/multer/MemoryStorage.scala

@@ -0,0 +1,12 @@
+package com.github.ldaniels528.meansjs.nodejs.multer
+
+import scala.scalajs.js
+
+/**
+  * Memory Storage
+  * @author [email protected]
+  */
+@js.native
+trait MemoryStorage extends js.Object {
+
+}

node/multer/src/main/scala/com/github/ldaniels528/meansjs/nodejs/multer/MemoryStorageOptions.scala

@@ -0,0 +1,11 @@
+package com.github.ldaniels528.meansjs.nodejs.multer
+
+import scala.scalajs.js
+import scala.scalajs.js.annotation.ScalaJSDefined
+
+/**
+  * Memory Storage Options
+  * @author [email protected]
+  */
+@ScalaJSDefined
+class MemoryStorageOptions() extends js.Object