suggested changes

Author: aditi-khare-mongoDB

index.js

@@ -46,7 +46,6 @@ module.exports.Decimal128 = mongoose.Decimal128;
 module.exports.Mixed = mongoose.Mixed;
 module.exports.Date = mongoose.Date;
 module.exports.Number = mongoose.Number;
-module.exports.Int32 = mongoose.Int32;
 module.exports.Error = mongoose.Error;
 module.exports.MongooseError = mongoose.MongooseError;
 module.exports.now = mongoose.now;

lib/cast/int32.js

@@ -21,14 +21,7 @@ module.exports = function castInt32(val) {
     return null;
   }
 
-  let coercedVal;
-  if (val instanceof BSON.Int32 || val instanceof BSON.Double) {
-    coercedVal = val.value;
-  } else if (val instanceof BSON.Long) {
-    coercedVal = val.toNumber();
-  } else {
-    coercedVal = Number(val);
-  }
+  const coercedVal = val instanceof BSON.Long ? val.toNumber() : Number(val);
 
   const INT32_MAX = 0x7FFFFFFF;
   const INT32_MIN = -0x80000000;

lib/mongoose.js

@@ -1140,21 +1140,6 @@ Mongoose.prototype.syncIndexes = function(options) {
 Mongoose.prototype.Decimal128 = SchemaTypes.Decimal128;
 
 
-/**
- * The Mongoose Int32 [SchemaType](https://mongoosejs.com/docs/schematypes.html). Used for
- * declaring paths in your schema that should be 32-bit integers.
- * Do not use this to create a new Int32 instance, use `mongoose.Types.Int32`
- * instead.
- *
- * #### Example:
- *
- *     const vehicleSchema = new Schema({ numTires: mongoose.Int32 });
- *
- * @property Int32
- * @api public
- */
-Mongoose.prototype.Int32 = SchemaTypes.Int32;
-
 /**
  * The Mongoose Mixed [SchemaType](https://mongoosejs.com/docs/schematypes.html). Used for
  * declaring paths in your schema that Mongoose's change tracking, casting,

test/int32.test.js

@@ -3,14 +3,15 @@
 const assert = require('assert');
 const start = require('./common');
 const BSON = require('bson');
+const sinon = require('sinon');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;
 
 const INT32_MAX = 0x7FFFFFFF;
 const INT32_MIN = -0x80000000;
 
-describe('Int32', function() {
+describe.only('Int32', function() {
   beforeEach(() => mongoose.deleteModel(/Test/));
 
   it('is a valid schema type', function() {
@@ -27,7 +28,7 @@ describe('Int32', function() {
   });
 
   describe('supports the required property', function() {
-    it('when vaglue is null', async function() {
+    it('when value is null', async function() {
       const schema = new Schema({
         int32: {
           type: Schema.Types.Int32,
@@ -141,7 +142,7 @@ describe('Int32', function() {
       const Test = mongoose.model('Test', schema);
 
       const doc = new Test({
-        myInt: -42
+        myInt: '-42'
       });
       assert.strictEqual(doc.myInt, -42);
     });
@@ -182,16 +183,40 @@ describe('Int32', function() {
       assert.strictEqual(doc.myInt, -997);
     });
 
-    it('casts from BSON.Long provided its value is within bounds of Int32', function() {
-      const schema = new Schema({
-        myInt: Schema.Types.Int32
+    describe('long', function() {
+      after(function() {
+        sinon.restore();
       });
-      const Test = mongoose.model('Test', schema);
 
-      const doc = new Test({
-        myInt: BSON.Long.fromNumber(-997)
+      it('casts from BSON.Long provided its value is within bounds of Int32', function() {
+        const schema = new Schema({
+          myInt: Schema.Types.Int32
+        });
+        const Test = mongoose.model('Test', schema);
+
+        const doc = new Test({
+          myInt: BSON.Long.fromNumber(-997)
+        });
+        assert.strictEqual(doc.myInt, -997);
+      });
+
+      it('calls Long.toNumber when casting long', function() {
+        // this is a perf optimization, since long.toNumber() is faster than Number(long)
+        const schema = new Schema({
+          myInt: Schema.Types.Int32
+        });
+        const Test = mongoose.model('Test', schema);
+
+        sinon.stub(BSON.Long.prototype, 'toNumber').callsFake(function() {
+          return 2;
+        });
+
+        const doc = new Test({
+          myInt: BSON.Long.fromNumber(-997)
+        });
+
+        assert.strictEqual(doc.myInt, 2);
       });
-      assert.strictEqual(doc.myInt, -997);
     });
 
     it('casts from BSON.Double provided its value is an integer', function() {