Contains fix for error during equals check on Record with undefined o…

…r null
immutable-js · Jun 9, 2017 · 7554820 · 7554820
1 parent c0308e7
commit 7554820
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/__tests__/Record.ts b/__tests__/Record.ts
@@ -82,6 +82,13 @@ describe('Record', () => {
     expect(t1.equals(t2));
   });
 
+  it('if compared against undefined or null should return false', () => {
+    const MyType = Record({ a: 1, b: 2 });
+    const t1 = new MyType();
+    expect(t1.equals(undefined)).toBeFalsy();
+    expect(t1.equals(null)).toBeFalsy();
+  });
+
   it('merges in Objects and other Records', () => {
     let Point2 = Record({x: 0, y: 0});
     let Point3 = Record({x: 0, y: 0, z: 0});

diff --git a/dist/immutable.js b/dist/immutable.js
@@ -5236,7 +5236,9 @@ Record.prototype.toString = function toString () {
 
 Record.prototype.equals = function equals (other) {
   return this === other ||
-    (this._keys === other._keys && recordSeq(this).equals(recordSeq(other)));
+    (other &&
+      this._keys === other._keys &&
+      recordSeq(this).equals(recordSeq(other)));
 };
 
 Record.prototype.hashCode = function hashCode () {

diff --git a/dist/immutable.min.js b/dist/immutable.min.js
diff --git a/src/Record.js b/src/Record.js
@@ -87,7 +87,9 @@ export class Record {
 
   equals(other) {
     return this === other ||
-      (this._keys === other._keys && recordSeq(this).equals(recordSeq(other)));
+      (other &&
+        this._keys === other._keys &&
+        recordSeq(this).equals(recordSeq(other)));
   }
 
   hashCode() {