refactor errors exposure

MongooseError base class: mongoose.Error All MongooseError subclasses: mongoose.Error.xxxx
slouffka · Nov 14, 2012 · 1849d74 · 1849d74
1 parent 9f04f95
commit 1849d74
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 35 deletions.
diff --git a/lib/error.js b/lib/error.js
@@ -23,4  23,14 @@ MongooseError.prototype.__proto__ = Error.prototype;
  * Module exports.
  */
 
-module.exports = MongooseError;
 module.exports = exports = MongooseError;
 
 /*!
  * Expose subclasses
  */
 
 MongooseError.CastError = require('./errors/cast');
 MongooseError.DocumentError = require('./errors/document');
 MongooseError.ValidationError = require('./errors/validation')
 MongooseError.ValidatorError = require('./errors/validator')
 MongooseError.VersionError =require('./errors/version')
diff --git a/lib/errors/index.js b/lib/errors/index.js
diff --git a/lib/index.js b/lib/index.js
@@ -475,12  475,6 @@ mongoose.Document = Document;
 
 mongoose.Error = require('./error');
 
-/**
- * All MongooseErrors
- */
-
-mongoose.Errors = require('./errors')
-
 /**
  * The node-mongodb-native driver Mongoose uses.
  *

diff --git a/lib/schematype.js b/lib/schematype.js
@@ -3,8  3,8 @@
  */
 
 var utils = require('./utils');
-var CastError = require('./errors/cast')
-var ValidatorError = require('./errors/validator')
 var CastError = require('./error').CastError;
 var ValidatorError = require('./error').ValidatorError;
 
 /**
  * SchemaType constructor

diff --git a/test/document.modified.test.js b/test/document.modified.test.js
@@ -10,9  10,9 @@ var start = require('./common')
   , Query = require('../lib/query')
   , Schema = mongoose.Schema
   , SchemaType = mongoose.SchemaType
-  , CastError = mongoose.Errors.CastError
-  , ValidatorError = mongoose.Errors.ValidatorError
-  , ValidationError = mongoose.Errors.ValidationError
   , CastError = mongoose.Error.CastError
   , ValidatorError = mongoose.Error.ValidatorError
   , ValidationError = mongoose.Error.ValidationError
   , ObjectId = Schema.ObjectId
   , DocumentObjectId = mongoose.Types.ObjectId
   , DocumentArray = mongoose.Types.DocumentArray

diff --git a/test/document.strict.test.js b/test/document.strict.test.js
@@ -10,9  10,9 @@ var start = require('./common')
   , Query = require('../lib/query')
   , Schema = mongoose.Schema
   , SchemaType = mongoose.SchemaType
-  , CastError = mongoose.Errors.CastError
-  , ValidatorError = mongoose.Errors.ValidatorError
-  , ValidationError = mongoose.Errors.ValidationError
   , CastError = mongoose.Error.CastError
   , ValidatorError = mongoose.Error.ValidatorError
   , ValidationError = mongoose.Error.ValidationError
   , ObjectId = Schema.Types.ObjectId
   , DocumentObjectId = mongoose.Types.ObjectId
   , DocumentArray = mongoose.Types.DocumentArray

diff --git a/test/index.test.js b/test/index.test.js
@@ -316,12  316,12 @@ describe('mongoose module:', function(){
     assert.equal('function', typeof mongoose.Promise);
     assert.equal('function', typeof mongoose.Model);
     assert.equal('function', typeof mongoose.Document);
-    assert.equal('Object', mongoose.Errors.constructor.name);
-    assert.equal('function', typeof mongoose.Errors.CastError);
-    assert.equal('function', typeof mongoose.Errors.DocumentError);
-    assert.equal('function', typeof mongoose.Errors.ValidationError);
-    assert.equal('function', typeof mongoose.Errors.ValidatorError);
-    assert.equal('function', typeof mongoose.Errors.VersionError);
     assert.equal('function', typeof mongoose.Error);
     assert.equal('function', typeof mongoose.Error.CastError);
     assert.equal('function', typeof mongoose.Error.DocumentError);
     assert.equal('function', typeof mongoose.Error.ValidationError);
     assert.equal('function', typeof mongoose.Error.ValidatorError);
     assert.equal('function', typeof mongoose.Error.VersionError);
     done()
   })
 

diff --git a/test/model.test.js b/test/model.test.js
@@ -10,9  10,9 @@ var start = require('./common')
   , Query = require('../lib/query')
   , Schema = mongoose.Schema
   , SchemaType = mongoose.SchemaType
-  , CastError = mongoose.Errors.CastError
-  , ValidatorError = mongoose.Errors.ValidatorError
-  , ValidationError = mongoose.Errors.ValidationError
   , CastError = mongoose.Error.CastError
   , ValidatorError = mongoose.Error.ValidatorError
   , ValidationError = mongoose.Error.ValidationError
   , ObjectId = Schema.Types.ObjectId
   , DocumentObjectId = mongoose.Types.ObjectId
   , DocumentArray = mongoose.Types.DocumentArray

diff --git a/test/schema.test.js b/test/schema.test.js
@@ -10,7  10,7 @@ var start = require('./common')
   , Document = mongoose.Document
   , SchemaType = mongoose.SchemaType
   , VirtualType = mongoose.VirtualType
-  , ValidatorError = mongoose.Errors.ValidatorError
   , ValidatorError = mongoose.Error.ValidatorError
   , SchemaTypes = Schema.Types
   , ObjectId = SchemaTypes.ObjectId
   , Mixed = SchemaTypes.Mixed

diff --git a/test/versioning.test.js b/test/versioning.test.js
@@ -16,10  16,10 @@ var start = require('./common')
   , EmbeddedDocument = mongoose.Types.Embedded
   , MongooseArray = mongoose.Types.Array
   , MongooseError = mongoose.Error
-  , CastError = mongoose.Errors.CastError
-  , ValidatorError = mongoose.Errors.ValidatorError
-  , ValidationError = mongoose.Errors.ValidationError
-  , VersionError = mongoose.Errors.VersionError
   , CastError = mongoose.Error.CastError
   , ValidatorError = mongoose.Error.ValidatorError
   , ValidationError = mongoose.Error.ValidationError
   , VersionError = mongoose.Error.VersionError
   ;
 
 /**