Merge branch 'master' into release

CHANGELOG.md

@@ -4,6 +4,19 @@ For a human friendly description of what changed in each release, take a look
 at the [Releases](https://github.com/SierraSoftworks/Iridium/releases) page.
 
 
+## Version [7.2.2](https://github.com/SierraSoftworks/Iridium/releases/tag/v7.2.2)
+<a style="border-radius: 2px; padding: 4px 8px; background: rgb(64, 120, 192); color: #fff;" href="https://github.com/SierraSoftworks/Iridium/releases/tag/v7.2.2">tag: **v7.2.2**</a>
+
+```sh
+npm install iridium@7.2.2
+```
+
+### Changes
+ - [5453437](https://github.com/SierraSoftworks/Iridium/commit/5453437) 7.2.2
+ - [33d7019](https://github.com/SierraSoftworks/Iridium/commit/33d7019) chore: Update to support latest TypeScript compiler and MongoDB type definitions
+ - [fdc71d1](https://github.com/SierraSoftworks/Iridium/commit/fdc71d1) doc: Update changelog
+ - [6e726ea](https://github.com/SierraSoftworks/Iridium/commit/6e726ea) doc: Update documentation
+
 ## Version [7.2.1](https://github.com/SierraSoftworks/Iridium/releases/tag/v7.2.1)
 <a style="border-radius: 2px; padding: 4px 8px; background: rgb(64, 120, 192); color: #fff;" href="https://github.com/SierraSoftworks/Iridium/releases/tag/v7.2.1">tag: **v7.2.1**</a>
 

lib/Model.ts

@@ -397,7 +397,7 @@ export class Model<TDocument extends { _id?: any }, TInstance> {
 
                 return cursor.next((err, result) => {
                     if (err) return reject(err);
-                    return resolve(result);
+                    return resolve(<TDocument|null>result);
                 });
             });
         }).then((document) => {
@@ -799,15 +799,18 @@ export class Model<TDocument extends { _id?: any }, TInstance> {
      */
     dropIndex(index: Index.IndexSpecification, callback?: General.Callback<boolean>): Bluebird<boolean>;
     dropIndex(specification: string | Index.IndexSpecification, callback?: General.Callback<boolean>): Bluebird<boolean> {
-        let index: string;
+        let index: string|undefined;
 
         if (typeof (specification) === "string") index = <string>specification;
         else {
             index = _(<Index.IndexSpecification>specification).map((direction: number, key: string) => `${key}_${direction}`).reduce<string>((x, y) => `${x}_${y}`);
         }
 
+        if (!index)
+            return Bluebird.reject(new Error("Expected a valid index name to be provided"));
+
         return new Bluebird<boolean>((resolve, reject) => {
-            this.collection.dropIndex(index, (err: Error, result: { ok: number }) => {
+            this.collection.dropIndex(index!, (err: Error, result: { ok: number }) => {
                 if (err) return reject(err);
                 return resolve(<any>!!result.ok);
             });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iridium",
-  "version": "7.2.1",
+  "version": "7.2.2",
   "author": "Benjamin Pannell <admin@sierrasoftworks.com>",
   "description": "A custom lightweight ORM for MongoDB designed for power-users",
   "license": "MIT",
@@ -52,11 +52,11 @@
   "dependencies": {
     "@types/bluebird": "^3.5.4",
     "@types/lodash": "^4.14.64",
-    "@types/mongodb": "^2.2.2",
+    "@types/mongodb": "^2.2.4",
     "@types/chai": "^3.5.2",
     "bluebird": "^3.5.0",
     "lodash": "^4.17.4",
-    "mongodb": "^2.2.26",
+    "mongodb": "^2.2.28",
     "skmatc": "~1.2.2"
   },
   "peerDependencies": {

test/Core.ts

@@ -150,20 +150,12 @@ describe("Core",() => {
             let core = new Iridium.Core({
                 database: "test",
                 options: {
-                    server: {
-                        socketOptions: {
-                            connectTimeoutMS: 1000
-                        }
-                    }
+                    connectTimeoutMS: 1000
                 }
             });
 
             chai.expect(core.settings!.options).to.eql({
-                server: {
-                    socketOptions: {
-                        connectTimeoutMS: 1000
-                    }
-                }
+                connectTimeoutMS: 1000
             });
         });
     });