Object.prototype.toString removed from UnknownRecord.is

gcanti · Oct 6, 2022 · 4edbeb3 · 4edbeb3
1 parent 7069ed0
commit 4edbeb3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -992,10 +992,7 @@ export class AnyDictionaryType extends Type<{ [key: string]: unknown }> {
   constructor() {
     super(
       'UnknownRecord',
-      (u): u is { [key: string]: unknown } => {
-        const s = Object.prototype.toString.call(u)
-        return s === '[object Object]' || s === '[object Window]'
-      },
+      (u): u is { [key: string]: unknown } => u !== null && typeof u === 'object' && !Array.isArray(u),
       (u, c) => (this.is(u) ? success(u) : failure(u, c)),
       identity
     )

diff --git a/test/2.1.x/default-types.ts b/test/2.1.x/default-types.ts
@@ -8,12 +8,12 @@ describe('UnknownRecord', () => {
       const T = t.UnknownRecord
       assert.strictEqual(T.is({}), true)
       assert.strictEqual(T.is({ a: 1 }), true)
+      assert.strictEqual(T.is(new Number()), true)
     })
 
     it('should return `false` for invalid objects', () => {
       const T = t.UnknownRecord
       assert.strictEqual(T.is(undefined), false)
-      assert.strictEqual(T.is(new Number()), false)
       // #407
       assert.strictEqual(T.is([]), false)
     })
@@ -24,6 +24,7 @@ describe('UnknownRecord', () => {
       const T = t.UnknownRecord
       assertSuccess(T.decode({}))
       assertSuccess(T.decode({ a: 1 }))
+      assertSuccess(T.decode(new Number()))
     })
 
     it('should fail validating an invalid value', () => {
@@ -33,7 +34,6 @@ describe('UnknownRecord', () => {
       assertFailure(T, true, ['Invalid value true supplied to : UnknownRecord'])
       assertFailure(T, null, ['Invalid value null supplied to : UnknownRecord'])
       assertFailure(T, undefined, ['Invalid value undefined supplied to : UnknownRecord'])
-      assertFailure(T, new Number(), ['Invalid value 0 supplied to : UnknownRecord'])
       // #407
       assertFailure(T, [], ['Invalid value [] supplied to : UnknownRecord'])
     })

diff --git a/test/2.1.x/record.ts b/test/2.1.x/record.ts
@@ -28,6 +28,7 @@ describe('record', () => {
         const T1 = t.record(t.string, t.number)
         assert.strictEqual(T1.is({}), true)
         assert.strictEqual(T1.is({ a: 1 }), true)
+        assert.strictEqual(T1.is(new Number()), true)
 
         const T2 = t.record(t.string, NumberFromString)
         assert.strictEqual(T2.is({}), true)
@@ -42,7 +43,6 @@ describe('record', () => {
         const T1 = t.record(t.string, t.number)
         assert.strictEqual(T1.is({ a: 'a' }), false)
         assert.strictEqual(T1.is(null), false)
-        assert.strictEqual(T1.is(new Number()), false)
         // #407
         assert.strictEqual(T1.is([]), false)
 
@@ -73,6 +73,7 @@ describe('record', () => {
         const T = t.record(t.string, t.number)
         assertSuccess(T.decode({}))
         assertSuccess(T.decode({ a: 1 }))
+        assertSuccess(T.decode(new Number()))
       })
 
       it('should return the same reference while decoding isomorphic values', () => {
@@ -106,7 +107,6 @@ describe('record', () => {
         const T1 = t.record(t.string, t.number)
         assertFailure(T1, 1, ['Invalid value 1 supplied to : { [K in string]: number }'])
         assertFailure(T1, { aa: 's' }, ['Invalid value "s" supplied to : { [K in string]: number }/aa: number'])
-        assertFailure(T1, new Number(), ['Invalid value 0 supplied to : { [K in string]: number }'])
         // #407
         assertFailure(T1, [], ['Invalid value [] supplied to : { [K in string]: number }'])
         // #407