bson 0.4.15 → 0.4.19

package/HISTORY

@@ -1,3 +1,20 @@
+0.4.19 2015-10-15
+-----------------
+- Remove all support for bson-ext.
+
+0.4.18 2015-10-15
+-----------------
+- ObjectID equality check should return boolean instead of throwing exception for invalid oid string #139
+- add option for deserializing binary into Buffer object #116
+
+0.4.17 2015-10-15
+-----------------
+- Validate regexp string for null bytes and throw if there is one.
+
+0.4.16 2015-10-07
+-----------------
+- Fixed issue with return statement in Map.js.
+
 0.4.15 2015-10-06
 -----------------
 - Exposed Map correctly via index.js file.

package/README.md

@@ -63,6 +63,7 @@ The API consists of two simple methods to serialize/deserialize objects to/from
        * **evalFunctions** {Boolean, default:false}, evaluate functions in the BSON document scoped to the object deserialized.
        * **cacheFunctions** {Boolean, default:false}, cache evaluated functions for reuse.
        * **cacheFunctionsCrc32** {Boolean, default:false}, use a crc32 code for caching, otherwise use the string of the function.
+       * **promoteBuffers** {Boolean, default:false}, deserialize Binary data directly into node.js Buffer object.
      * @param {TypedArray/Array} a TypedArray/Array containing the BSON data
      * @param {Object} [options] additional options used for the deserialization.
      * @param {Boolean} [isArray] ignore used for recursive parsing.

package/lib/bson/index.js

@@ -1,6 +1,6 @@
 try {
   exports.BSONPure = require('./bson');
-  exports.BSONNative = require('bson-ext');
+  exports.BSONNative = require('./bson');
 } catch(err) {
 }
 
@@ -76,7 +76,7 @@ exports.native = function() {
 
   // Catch error and return no classes found
   try {
-    classes['BSON'] = require('bson-ext')
+    classes['BSON'] = require('./bson');
   } catch(err) {
     return exports.pure();
   }

package/lib/bson/map.js

@@ -4,124 +4,123 @@
 if(typeof global.Map !== 'undefined') {
   module.exports = global.Map;
   module.exports.Map = global.Map;
-  return;
-}
-
-// We will return a polyfill
-var Map = function(array) {
-  this._keys = [];
-  this._values = {};
-
-  for(var i = 0; i < array.length; i++) {
-    if(array[i] == null) continue;  // skip null and undefined
-    var entry = array[i];
-    var key = entry[0];
-    var value = entry[1];
-    // Add the key to the list of keys in order
-    this._keys.push(key);
-    // Add the key and value to the values dictionary with a point
-    // to the location in the ordered keys list
-    this._values[key] = {v: value, i: this._keys.length - 1};
+} else {
+  // We will return a polyfill
+  var Map = function(array) {
+    this._keys = [];
+    this._values = {};
+
+    for(var i = 0; i < array.length; i++) {
+      if(array[i] == null) continue;  // skip null and undefined
+      var entry = array[i];
+      var key = entry[0];
+      var value = entry[1];
+      // Add the key to the list of keys in order
+      this._keys.push(key);
+      // Add the key and value to the values dictionary with a point
+      // to the location in the ordered keys list
+      this._values[key] = {v: value, i: this._keys.length - 1};
+    }
   }
-}
-
-Map.prototype.clear = function() {
-  this._keys = [];
-  this._values = {};
-}
-
-Map.prototype.delete = function(key) {
-  var value = this._values[key];
-  if(value == null) return false;
-  // Delete entry
-  delete this._values[key];
-  // Remove the key from the ordered keys list
-  this._keys.splice(value.i, 1);
-  return true;
-}
-
-Map.prototype.entries = function() {
-  var self = this;
-  var index = 0;
-
-  return {
-    next: function() {
-      var key = self._keys[index++];
-      return {
-        value: key !== undefined ? [key, self._values[key].v] : undefined,
-        done: key !== undefined ? false : true
+
+  Map.prototype.clear = function() {
+    this._keys = [];
+    this._values = {};
+  }
+
+  Map.prototype.delete = function(key) {
+    var value = this._values[key];
+    if(value == null) return false;
+    // Delete entry
+    delete this._values[key];
+    // Remove the key from the ordered keys list
+    this._keys.splice(value.i, 1);
+    return true;
+  }
+
+  Map.prototype.entries = function() {
+    var self = this;
+    var index = 0;
+
+    return {
+      next: function() {
+        var key = self._keys[index++];
+        return {
+          value: key !== undefined ? [key, self._values[key].v] : undefined,
+          done: key !== undefined ? false : true
+        }
       }
+    };
+  }
+
+  Map.prototype.forEach = function(callback, self) {
+    self = self || this;
+
+    for(var i = 0; i < this._keys.length; i++) {
+      var key = this._keys[i];
+      // Call the forEach callback
+      callback.call(self, this._values[key].v, key, self);
     }
-  };
-}
+  }
 
-Map.prototype.forEach = function(callback, self) {
-  self = self || this;
+  Map.prototype.get = function(key) {
+    return this._values[key] ? this._values[key].v : undefined;
+  }
 
-  for(var i = 0; i < this._keys.length; i++) {
-    var key = this._keys[i];
-    // Call the forEach callback
-    callback.call(self, this._values[key].v, key, self);
+  Map.prototype.has = function(key) {
+    return this._values[key] != null;
   }
-}
-
-Map.prototype.get = function(key) {
-  return this._values[key] ? this._values[key].v : undefined;
-}
-
-Map.prototype.has = function(key) {
-  return this._values[key] != null;
-}
-
-Map.prototype.keys = function(key) {
-  var self = this;
-  var index = 0;
-
-  return {
-    next: function() {
-      var key = self._keys[index++];
-      return {
-        value: key !== undefined ? key : undefined,
-        done: key !== undefined ? false : true
+
+  Map.prototype.keys = function(key) {
+    var self = this;
+    var index = 0;
+
+    return {
+      next: function() {
+        var key = self._keys[index++];
+        return {
+          value: key !== undefined ? key : undefined,
+          done: key !== undefined ? false : true
+        }
       }
+    };
+  }
+
+  Map.prototype.set = function(key, value) {
+    if(this._values[key]) {
+      this._values[key].v = value;
+      return this;
     }
-  };
-}
 
-Map.prototype.set = function(key, value) {
-  if(this._values[key]) {
-    this._values[key].v = value;
+    // Add the key to the list of keys in order
+    this._keys.push(key);
+    // Add the key and value to the values dictionary with a point
+    // to the location in the ordered keys list
+    this._values[key] = {v: value, i: this._keys.length - 1};
     return this;
   }
 
-  // Add the key to the list of keys in order
-  this._keys.push(key);
-  // Add the key and value to the values dictionary with a point
-  // to the location in the ordered keys list
-  this._values[key] = {v: value, i: this._keys.length - 1};
-  return this;
-}
-
-Map.prototype.values = function(key, value) {
-  var self = this;
-  var index = 0;
-
-  return {
-    next: function() {
-      var key = self._keys[index++];
-      return {
-        value: key !== undefined ? self._values[key].v : undefined,
-        done: key !== undefined ? false : true
+  Map.prototype.values = function(key, value) {
+    var self = this;
+    var index = 0;
+
+    return {
+      next: function() {
+        var key = self._keys[index++];
+        return {
+          value: key !== undefined ? self._values[key].v : undefined,
+          done: key !== undefined ? false : true
+        }
       }
-    }
-  };
-}
+    };
+  }
 
-// Last ismaster
-Object.defineProperty(Map.prototype, 'size', {
-  enumerable:true,
-  get: function() { return this._keys.length; }
-});
+  // Last ismaster
+  Object.defineProperty(Map.prototype, 'size', {
+    enumerable:true,
+    get: function() { return this._keys.length; }
+  });
 
-module.exports = Map;
-module.exports.Map = Map;
+  module.exports = Map;
+  module.exports.Map = Map;
+}

package/lib/bson/objectid.js

@@ -156,10 +156,15 @@ ObjectID.prototype.toJSON = function() {
 * @return {boolean} the result of comparing two ObjectID's
 */
 ObjectID.prototype.equals = function equals (otherID) {
-  if(otherID == null) return false;
-  var id = (otherID instanceof ObjectID || otherID.toHexString)
-    ? otherID.id
-    : ObjectID.createFromHexString(otherID).id;
+  var id;
+
+  if(otherID != null && (otherID instanceof ObjectID || otherID.toHexString)) {
+    id = otherID.id;
+  } else if(typeof otherID == 'string' && ObjectID.isValid(otherID)) {
+    id = ObjectID.createFromHexString(otherID).id;
+  } else {
+    return false;
+  }
 
   return this.id === id;
 }

package/lib/bson/parser/deserializer.js

@@ -62,6 +62,7 @@ var deserializeObject = function(buffer, options, isArray) {
 	var fieldsAsRaw = options['fieldsAsRaw'] == null ? {} : options['fieldsAsRaw'];
   // Return BSONRegExp objects instead of native regular expressions
   var bsonRegExp = typeof options['bsonRegExp'] == 'boolean' ? options['bsonRegExp'] : false;
+  var promoteBuffers = options['promoteBuffers'] == null ? false : options['promoteBuffers'];
 
   // Validate that we have at least 4 bytes of buffer
   if(buffer.length < 5) throw new Error("corrupt bson message < 5 bytes long");
@@ -136,8 +137,13 @@ var deserializeObject = function(buffer, options, isArray) {
         if(subType == Binary.SUBTYPE_BYTE_ARRAY) {
           binarySize = buffer[index++] | buffer[index++] << 8 | buffer[index++] << 16 | buffer[index++] << 24;
         }
-        // Slice the data
-        object[name] = new Binary(buffer.slice(index, index + binarySize), subType);
+        if(promoteBuffers) {
+          // assign reference to sliced Buffer object
+          object[name] = buffer.slice(index, index + binarySize);
+        } else {
+          // Slice the data
+          object[name] = new Binary(buffer.slice(index, index + binarySize), subType);
+        }
       } else {
         var _buffer = typeof Uint8Array != 'undefined' ? new Uint8Array(new ArrayBuffer(binarySize)) : new Array(binarySize);
         // If we have subtype 2 skip the 4 bytes for the size
@@ -148,8 +154,13 @@ var deserializeObject = function(buffer, options, isArray) {
         for(var i = 0; i < binarySize; i++) {
           _buffer[i] = buffer[index + i];
         }
-        // Create the binary object
-        object[name] = new Binary(_buffer, subType);
+        if(promoteBuffers) {
+          // assign reference to Buffer object
+          object[name] = _buffer;
+        } else {
+          // Create the binary object
+          object[name] = new Binary(_buffer, subType);
+        }
       }
       // Update the index
       index = index + binarySize;

package/lib/bson/parser/serializer.js

@@ -175,6 +175,9 @@ var serializeRegExp = function(buffer, key, value, index) {
   // Encode the name
   index = index + numberOfWrittenBytes;
   buffer[index++] = 0;
+  if (value.source && value.source.match(regexp) != null) {
+    throw Error("value " + value.source + " must not contain null bytes");
+  }
   // Adjust the index
   index = index + buffer.write(value.source, index, 'utf8');
   // Write zero

package/package.json

@@ -1,7 +1,7 @@
 { "name" :            "bson"
 , "description" :     "A bson parser for node.js and the browser"
 , "keywords" :        ["mongodb", "bson", "parser"]
-, "version" :         "0.4.15"
+, "version" :         "0.4.19"
 , "author" :          "Christian Amor Kvalheim <christkv@gmail.com>"
 , "contributors" :  []