Merge pull request #343 from epoberezkin/fix-equal

fix: compare Date and RegExp objects, closes #342

lib/compile/equal.js

@@ -1,5 +1,7 @@
 'use strict';
 
+/*eslint complexity: 0*/
+
 module.exports = function equal(a, b) {
   if (a === b) return true;
 
@@ -18,11 +20,20 @@ module.exports = function equal(a, b) {
 
   if (a && b && typeof a === 'object' && typeof b === 'object') {
     var keys = Object.keys(a);
-
     if (keys.length !== Object.keys(b).length) return false;
 
+    var dateA = a instanceof Date
+      , dateB = b instanceof Date;
+    if (dateA && dateB) return a.getTime() == b.getTime();
+    if (dateA != dateB) return false;
+
+    var regexpA = a instanceof RegExp
+      , regexpB = b instanceof RegExp;
+    if (regexpA && regexpB) return a.toString() == b.toString();
+    if (regexpA != regexpB) return false;
+
     for (i = 0; i < keys.length; i++)
-      if (b[keys[i]] === undefined) return false;
+      if (!Object.prototype.hasOwnProperty.call(b, keys[i])) return false;
 
     for (i = 0; i < keys.length; i++)
       if(!equal(a[keys[i]], b[keys[i]])) return false;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ajv",
-  "version": "4.8.2",
+  "version": "4.9.0",
   "description": "Another JSON Schema Validator",
   "main": "lib/ajv.js",
   "webpack": "dist/ajv.bundle.js",

spec/.eslintrc.json

@@ -8,6 +8,7 @@
   "globals": {
     "describe": false,
     "it": false,
+    "before": false,
     "beforeEach": false
   }
 }

spec/issues.spec.js

@@ -467,3 +467,32 @@ describe('issue #259, support validating [meta-]schemas against themselves', fun
     ajv.addMetaSchema(hyperSchema);
   });
 });
+
+
+describe('issue #342, support uniqueItems with some non-JSON objects', function() {
+  var validate;
+
+  before(function() {
+    var ajv = new Ajv;
+    validate = ajv.compile({ uniqueItems: true });
+  });
+
+  it('should allow different RegExps', function() {
+    validate([/foo/, /bar/]) .should.equal(true);
+    validate([/foo/ig, /foo/gi]) .should.equal(false);
+    validate([/foo/, {}]) .should.equal(true);
+  });
+
+  it('should allow different Dates', function() {
+    validate([new Date('2016-11-11'), new Date('2016-11-12')]) .should.equal(true);
+    validate([new Date('2016-11-11'), new Date('2016-11-11')]) .should.equal(false);
+    validate([new Date('2016-11-11'), {}]) .should.equal(true);
+  });
+
+  it('should allow undefined properties', function() {
+    validate([{}, {foo: undefined}]) .should.equal(true);
+    validate([{foo: undefined}, {}]) .should.equal(true);
+    validate([{foo: undefined}, {bar: undefined}]) .should.equal(true);
+    validate([{foo: undefined}, {foo: undefined}]) .should.equal(false);
+  });
+});