Update mongoose to the latest version 🚀

lib/error-handler.js

@@ -1,6 +1,29 @@
 const errors = require('@feathersjs/errors');
 
 module.exports = function errorHandler (error) {
+  if (error.code === 11000 || error.code === 11001) {
+    // NOTE (EK): Error parsing as discussed in this github thread
+    // https://github.com/Automattic/mongoose/issues/2129
+    const match1 = error.message.match(/_?([a-zA-Z]*)_?\d?\s*dup key/i);
+    const match2 = error.message.match(/\s*dup key:\s*\{\s*:\s*"?(\S+)"?\s*\}/i);
+
+    const key = match1 ? match1[1] : 'path';
+    let value = match2 ? match2[1] : 'value';
+
+    if (value === 'null') {
+      value = null;
+    } else if (value === 'undefined') {
+      value = undefined;
+    }
+
+    error.message = `${key}: ${value} already exists.`;
+    error.errors = {
+      [key]: value
+    };
+
+    return Promise.reject(new errors.Conflict(error));
+  }
+
   if (error.name) {
     switch (error.name) {
       case 'ValidationError':
@@ -14,29 +37,6 @@ module.exports = function errorHandler (error) {
       case 'DivergentArrayError':
         return Promise.reject(new errors.GeneralError(error));
       case 'MongoError':
-        if (error.code === 11000 || error.code === 11001) {
-          // NOTE (EK): Error parsing as discussed in this github thread
-          // https://github.com/Automattic/mongoose/issues/2129
-          const match1 = error.message.match(/_?([a-zA-Z]*)_?\d?\s*dup key/i);
-          const match2 = error.message.match(/\s*dup key:\s*\{\s*:\s*"?(\S+)"?\s*\}/i);
-
-          const key = match1 ? match1[1] : 'path';
-          let value = match2 ? match2[1] : 'value';
-
-          if (value === 'null') {
-            value = null;
-          } else if (value === 'undefined') {
-            value = undefined;
-          }
-
-          error.message = `${key}: ${value} already exists.`;
-          error.errors = {
-            [key]: value
-          };
-
-          return Promise.reject(new errors.Conflict(error));
-        }
-
         return Promise.reject(new errors.GeneralError(error));
     }
   }

lib/service.js

@@ -235,7 +235,7 @@ class Service {
     // we create a list of the ids of all items that will be changed
     // to re-query them after the update
     const ids = id === null ? this._find(params)
-        .then(mapIds) : Promise.resolve([ id ]);
+      .then(mapIds) : Promise.resolve([ id ]);
 
     // Handle case where data might be a mongoose model
     if (typeof data.toObject === 'function') {

package.json

@@ -71,7 +71,7 @@
     "feathers-service-tests": "^0.10.0",
     "istanbul": "^1.1.0-alpha.1",
     "mocha": "^5.0.0",
-    "mongoose": "^4.10.4",
+    "mongoose": "^5.0.0",
     "semistandard": "^12.0.0",
     "sinon": "^4.0.0",
     "sinon-chai": "^2.8.0"

test/index.test.js

@@ -404,39 +404,39 @@ describe('Feathers Mongoose Service', () => {
 
     afterEach(done => {
       posts.remove(null, { query: {} })
-      .then(data => {
-        done();
-      });
+        .then(data => {
+          done();
+        });
     });
 
     it('can get a discriminated model', function (done) {
       posts.create(data)
-      .then(data => posts.get(data._id))
-      .then(data => {
-        expect(data._type).to.equal('text');
-        expect(data.text).to.equal('Feathers!!!');
-        done();
-      });
+        .then(data => posts.get(data._id))
+        .then(data => {
+          expect(data._type).to.equal('text');
+          expect(data.text).to.equal('Feathers!!!');
+          done();
+        });
     });
 
     it('can find discriminated models by the type', function (done) {
       posts.create(data)
-      .then(data => posts.find({ query: { _type: 'text' } }))
-      .then(data => {
-        data.forEach(element => {
-          expect(element._type).to.equal('text');
+        .then(data => posts.find({ query: { _type: 'text' } }))
+        .then(data => {
+          data.forEach(element => {
+            expect(element._type).to.equal('text');
+          });
+          done();
         });
-        done();
-      });
     });
 
     it('can create a discriminated model', function (done) {
       posts.create(data)
-      .then(data => {
-        expect(data._type).to.equal('text');
-        expect(data.text).to.equal('Feathers!!!');
-        done();
-      });
+        .then(data => {
+          expect(data._type).to.equal('text');
+          expect(data.text).to.equal('Feathers!!!');
+          done();
+        });
     });
 
     it('can update a discriminated model', function (done) {
@@ -452,12 +452,12 @@ describe('Feathers Mongoose Service', () => {
         }
       };
       posts.create(data)
-      .then(data => posts.update(data._id, update, params))
-      .then(data => {
-        expect(data._type).to.equal('text');
-        expect(data.text).to.equal('Hello, world!');
-        done();
-      });
+        .then(data => posts.update(data._id, update, params))
+        .then(data => {
+          expect(data._type).to.equal('text');
+          expect(data.text).to.equal('Hello, world!');
+          done();
+        });
     });
 
     it('can patch a discriminated model', function (done) {
@@ -470,20 +470,20 @@ describe('Feathers Mongoose Service', () => {
         }
       };
       posts.create(data)
-      .then(data => posts.patch(data._id, update, params))
-      .then(data => {
-        expect(data.text).to.equal('Howdy folks!');
-        done();
-      });
+        .then(data => posts.patch(data._id, update, params))
+        .then(data => {
+          expect(data.text).to.equal('Howdy folks!');
+          done();
+        });
     });
 
     it('can remove a discriminated model', function (done) {
       posts.create(data)
-      .then(data => posts.remove(data._id, { query: { _type: 'text' } }))
-      .then(data => {
-        expect(data._type).to.equal('text');
-        done();
-      });
+        .then(data => posts.remove(data._id, { query: { _type: 'text' } }))
+        .then(data => {
+          expect(data._type).to.equal('text');
+          done();
+        });
     });
   });
 

test/models/todo.js

@@ -3,7 +3,7 @@ var Schema = mongoose.Schema;
 
 var TodoSchema = new Schema({
   text: {type: String, required: true},
-  complete: {type: Boolean, 'default': false, index: true},
+  complete: {type: Boolean, 'default': false},
   createdAt: {type: Date, 'default': Date.now},
   updatedAt: {type: Date, 'default': Date.now}
 });