Record / ReadonlyRecord: handle this in hasOwnProperty, fix #1249

gcanti · Jul 1, 2020 · 0b29bf9 · 0b29bf9
1 parent 99c045c
commit 0b29bf9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/ReadonlyRecord.ts b/src/ReadonlyRecord.ts
@@ -159,12 +159,13 @@ export function insertAt<A>(k: string, a: A): (r: ReadonlyRecord<string, A>) =>
 
 const _hasOwnProperty = Object.prototype.hasOwnProperty
 
-// TODO: rename to avoid #1249?
+// TODO: rename in v3 to avoid #1249
 /**
  * @since 2.5.0
  */
-export function hasOwnProperty<K extends string>(k: string, r: ReadonlyRecord<K, unknown>): k is K {
-  return _hasOwnProperty.call(r, k)
+export function hasOwnProperty<K extends string>(k: string, r: ReadonlyRecord<K, unknown>): k is K
+export function hasOwnProperty<K extends string>(this: any, k: string, r?: ReadonlyRecord<K, unknown>): k is K {
+  return _hasOwnProperty.call(r === undefined ? this : r, k)
 }
 
 /**

diff --git a/test/ReadonlyRecord.ts b/test/ReadonlyRecord.ts
@@ -407,6 +407,11 @@ describe('ReadonlyRecord', () => {
     const x: _.ReadonlyRecord<string, number> = { a: 1 }
     assert.deepStrictEqual(_.hasOwnProperty('a', x), true)
     assert.deepStrictEqual(_.hasOwnProperty('b', x), false)
+    // TODO: remove in v3
+    // #1249
+    const hasOwnProperty: any = _.hasOwnProperty
+    assert.deepStrictEqual(hasOwnProperty.call(x, 'a'), true)
+    assert.deepStrictEqual(hasOwnProperty.call(x, 'b'), false)
   })
 
   it('updateAt', () => {