chore: Update to support latest TypeScript compiler and MongoDB type …

…definitions
SierraSoftworks · Jun 9, 2017 · 33d7019 · 33d7019
1 parent fdc71d1
commit 33d7019
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/lib/Model.ts b/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);
             });

diff --git a/package.json b/package.json
@@ -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": {

diff --git a/test/Core.ts b/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
             });
         });
     });