fix #25: Address issues when cloning values of type MongoDB.ObjectID …

…and MongoDB.Binary
SierraSoftworks · Dec 15, 2015 · 2a6b079 · 2a6b079
1 parent 95a5dff
commit 2a6b079
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 16 deletions.
diff --git a/dist/lib/ModelHelpers.js b/dist/lib/ModelHelpers.js
diff --git a/dist/lib/ModelHelpers.js.map b/dist/lib/ModelHelpers.js.map
diff --git a/dist/lib/Transforms.js b/dist/lib/Transforms.js
diff --git a/dist/lib/Transforms.js.map b/dist/lib/Transforms.js.map
diff --git a/lib/ModelHelpers.ts b/lib/ModelHelpers.ts
@@ -118,7 +118,15 @@ export class ModelHelpers<TDocument extends { _id?: any }, TInstance> {
     cloneDocument<T>(original: T): T {
         return _.cloneDeep(original, (value) => {
            if(Buffer.isBuffer(value)) {
-               return (<Buffer>value).slice();
+               return value;
+           }
+
+           if(value instanceof MongoDB.Binary) {
+               return value;
+           }
+
+           if(value instanceof MongoDB.ObjectID) {
+               return value;
            }
         });
     }

diff --git a/lib/Transforms.ts b/lib/Transforms.ts
@@ -36,15 +36,14 @@ export interface PropertyTransform<T> {
 }
 
 export const DefaultTransforms = {
- 	ObjectID: <PropertyTransform<MongoDB.ObjectID | BSON.ObjectID>>{
-		fromDB: value => value && (<BSON.ObjectID>value)._bsontype == 'ObjectID' ? new MongoDB.ObjectID((<BSON.ObjectID>value).id).toHexString() : value,
+ 	ObjectID: <PropertyTransform<MongoDB.ObjectID>>{
+		fromDB: value => value instanceof MongoDB.ObjectID ? value.toHexString() : value,
 		toDB: value => typeof value === 'string' ? new MongoDB.ObjectID(value) : value
 	},
-	Binary: <PropertyTransform<MongoDB.Binary | BSON.Binary>>{
+	Binary: <PropertyTransform<MongoDB.Binary>>{
 		fromDB: value => {
 			if(!value) return null;
-			if((<BSON.Binary>value)._bsontype === "Binary")
-				return (<BSON.Binary>value).buffer;
+			if(value instanceof MongoDB.Binary) return (<any>value).buffer;
 
 			return value;
 		},

diff --git a/test/Decorators.ts b/test/Decorators.ts
@@ -122,7 +122,7 @@ describe("Decorators", () => {
 
 		describe("the ObjectID transform", () => {
 			it("should convert an ObjectID to a string", () => {
-				chai.expect(Test.transforms['_id'].fromDB({ _bsontype: 'ObjectID', id: 'aaaaaaaaaaaaaaaaaaaaaaaa' }, '_id', null)).to.eql('aaaaaaaaaaaaaaaaaaaaaaaa');
+				chai.expect(Test.transforms['_id'].fromDB(Iridium.toObjectID('aaaaaaaaaaaaaaaaaaaaaaaa'), '_id', null)).to.eql('aaaaaaaaaaaaaaaaaaaaaaaa');
 			});
 
 			it("should convert a string to an ObjectID", () => {

diff --git a/test/Transforms.ts b/test/Transforms.ts
@@ -218,10 +218,7 @@ describe("Transforms", () => {
 		describe("the default Buffer transform", () => {
 			it("should convert a MongoDB BSON Binary object into a buffer", () => {
 				let transform = DefaultTransforms.Binary.fromDB;
-				let result = transform({
-					_bsontype: 'Binary',
-					buffer: new Buffer('test', 'utf8')
-				}, '_id', null);
+				let result = transform(new MongoDB.Binary(new Buffer('test', 'utf8')), '_id', null);
 
 				chai.expect(result).to.exist;
 				chai.expect(result.toString('utf8')).to.eql('test');