fix isValid case where isValid(Array<ObjectId>) => true to => false

index.js

@@ -1,14 +1,12 @@
-var inherits = require('util').inherits
 var ObjectId = require('bson').ObjectId
-var toString = require('to-string')
 
 ObjectId.prototype.equals = function (oidB) {
   return equals(this, oidB)
 }
 
 var objIdPattern = /^[0-9a-fA-F]{24}$/;
 var isValid = function (alleged) {
-  return (!!alleged && objIdPattern.test(toString(alleged)))
+  return (Boolean(alleged) && !Array.isArray(alleged) && objIdPattern.test(String(alleged)))
 }
 
 var equals = function (oidA, oidB) {
@@ -20,8 +18,8 @@ var equals = function (oidA, oidB) {
   }
 
   if (oidA === oidB) { return true; }
-  if (!oidA || !oidB) { return false }
-  return (oidA.toString() === oidB.toString())
+  if (!isValid(oidA) || !isValid(oidB)) { return false }
+  return (String(oidA) === String(oidB))
   return false;
 }
 
@@ -42,7 +40,7 @@ function Id(id) {
     return new ObjectId()
   }
 
-  id = toString(id)
+  id = String(id)
 
   if (isValid(id)) {
     return new ObjectId(id)
@@ -57,4 +55,4 @@ module.exports = Id;
 module.exports.constructor = ObjectId;
 module.exports.tryParse = tryParse;
 module.exports.equals = equals;
-module.exports.isValid = isValid;
+module.exports.isValid = isValid;

test.js

@@ -129,6 +129,10 @@ describe('objectid', function () {
       ObjectId.isValid(new NativeObjectId).should.equal(true)
     })
 
+    it('false for 1-element array of ObjectId', function () {
+      ObjectId.isValid([ObjectId()]).should.equal(false)
+    })
+
   })
 
   describe('.equals', function () {
@@ -142,8 +146,9 @@ describe('objectid', function () {
       var oidB = '511083bb08ce6b1b00000003'
       ObjectId.equals(oidA, oidB).should.equal(true)
     })
-    it('returns false otherwise', function () {
+    it('returns false if A or B are not ObjectIds', function () {
       ObjectId.equals('sdfsdfsdfsdf', testOid).should.equal(false)
+      ObjectId.equals('511083bb08ce6b1b00000003', ['511083bb08ce6b1b00000003']).should.equal(false)
     })
     it('is also on ObjectId.prototype', function () {
       var oidA = ObjectId()