From 219b7ca2006e10e16f2fbce764b7e4ae7488d0cf Mon Sep 17 00:00:00 2001 From: XmiliaH Date: Sun, 28 Jun 2020 20:00:26 +0200 Subject: [PATCH 1/3] Fix Promise delete from global --- lib/contextify.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/contextify.js b/lib/contextify.js index 99aa650..12f8385 100644 --- a/lib/contextify.js +++ b/lib/contextify.js @@ -529,7 +529,7 @@ Decontextify.value = (value, traps, deepTraps, flags, mock) => { } else if (instanceOf(value, WeakMap)) { return Decontextify.instance(value, host.WeakMap, deepTraps, flags, 'WeakMap'); } else if (instanceOf(value, Set)) { return Decontextify.instance(value, host.Set, deepTraps, flags, 'Set'); } else if (instanceOf(value, WeakSet)) { return Decontextify.instance(value, host.WeakSet, deepTraps, flags, 'WeakSet'); - } else if (Promise && instanceOf(value, Promise)) { return Decontextify.instance(value, host.Promise, deepTraps, flags, 'Promise'); + } else if (typeof Promise === 'function' && instanceOf(value, Promise)) { return Decontextify.instance(value, host.Promise, deepTraps, flags, 'Promise'); } else if (local.Reflect.getPrototypeOf(value) === null) { return Decontextify.instance(value, null, deepTraps, flags); } else { @@ -907,7 +907,7 @@ Contextify.value = (value, traps, deepTraps, flags, mock) => { } else if (instanceOf(value, host.WeakMap)) { return Contextify.instance(value, WeakMap, deepTraps, flags, 'WeakMap'); } else if (instanceOf(value, host.Set)) { return Contextify.instance(value, Set, deepTraps, flags, 'Set'); } else if (instanceOf(value, host.WeakSet)) { return Contextify.instance(value, WeakSet, deepTraps, flags, 'WeakSet'); - } else if (instanceOf(value, host.Promise)) { return Contextify.instance(value, Promise, deepTraps, flags, 'Promise'); + } else if (typeof Promise === 'function' && instanceOf(value, host.Promise)) { return Contextify.instance(value, Promise, deepTraps, flags, 'Promise'); } else if (instanceOf(value, host.Buffer)) { return Contextify.instance(value, LocalBuffer, deepTraps, flags, 'Uint8Array'); } else if (host.Reflect.getPrototypeOf(value) === null) { return Contextify.instance(value, null, deepTraps, flags); From ad52457a4120b657169c4f40431a88690c3fe49e Mon Sep 17 00:00:00 2001 From: XmiliaH Date: Sun, 28 Jun 2020 20:13:57 +0200 Subject: [PATCH 2/3] Make lint happy --- lib/contextify.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/contextify.js b/lib/contextify.js index 12f8385..554cd2b 100644 --- a/lib/contextify.js +++ b/lib/contextify.js @@ -529,7 +529,8 @@ Decontextify.value = (value, traps, deepTraps, flags, mock) => { } else if (instanceOf(value, WeakMap)) { return Decontextify.instance(value, host.WeakMap, deepTraps, flags, 'WeakMap'); } else if (instanceOf(value, Set)) { return Decontextify.instance(value, host.Set, deepTraps, flags, 'Set'); } else if (instanceOf(value, WeakSet)) { return Decontextify.instance(value, host.WeakSet, deepTraps, flags, 'WeakSet'); - } else if (typeof Promise === 'function' && instanceOf(value, Promise)) { return Decontextify.instance(value, host.Promise, deepTraps, flags, 'Promise'); + } else if (typeof Promise === 'function' && instanceOf(value, Promise)) { + return Decontextify.instance(value, host.Promise, deepTraps, flags, 'Promise'); } else if (local.Reflect.getPrototypeOf(value) === null) { return Decontextify.instance(value, null, deepTraps, flags); } else { @@ -907,7 +908,8 @@ Contextify.value = (value, traps, deepTraps, flags, mock) => { } else if (instanceOf(value, host.WeakMap)) { return Contextify.instance(value, WeakMap, deepTraps, flags, 'WeakMap'); } else if (instanceOf(value, host.Set)) { return Contextify.instance(value, Set, deepTraps, flags, 'Set'); } else if (instanceOf(value, host.WeakSet)) { return Contextify.instance(value, WeakSet, deepTraps, flags, 'WeakSet'); - } else if (typeof Promise === 'function' && instanceOf(value, host.Promise)) { return Contextify.instance(value, Promise, deepTraps, flags, 'Promise'); + } else if (typeof Promise === 'function' && instanceOf(value, host.Promise)) { + return Contextify.instance(value, Promise, deepTraps, flags, 'Promise'); } else if (instanceOf(value, host.Buffer)) { return Contextify.instance(value, LocalBuffer, deepTraps, flags, 'Uint8Array'); } else if (host.Reflect.getPrototypeOf(value) === null) { return Contextify.instance(value, null, deepTraps, flags); From 43665f1dc1365793aaa29366a3b44481cec81699 Mon Sep 17 00:00:00 2001 From: XmiliaH Date: Sun, 28 Jun 2020 20:16:24 +0200 Subject: [PATCH 3/3] Make lint happy the second --- lib/contextify.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/contextify.js b/lib/contextify.js index 554cd2b..b070e98 100644 --- a/lib/contextify.js +++ b/lib/contextify.js @@ -529,7 +529,7 @@ Decontextify.value = (value, traps, deepTraps, flags, mock) => { } else if (instanceOf(value, WeakMap)) { return Decontextify.instance(value, host.WeakMap, deepTraps, flags, 'WeakMap'); } else if (instanceOf(value, Set)) { return Decontextify.instance(value, host.Set, deepTraps, flags, 'Set'); } else if (instanceOf(value, WeakSet)) { return Decontextify.instance(value, host.WeakSet, deepTraps, flags, 'WeakSet'); - } else if (typeof Promise === 'function' && instanceOf(value, Promise)) { + } else if (typeof Promise === 'function' && instanceOf(value, Promise)) { return Decontextify.instance(value, host.Promise, deepTraps, flags, 'Promise'); } else if (local.Reflect.getPrototypeOf(value) === null) { return Decontextify.instance(value, null, deepTraps, flags); @@ -908,7 +908,7 @@ Contextify.value = (value, traps, deepTraps, flags, mock) => { } else if (instanceOf(value, host.WeakMap)) { return Contextify.instance(value, WeakMap, deepTraps, flags, 'WeakMap'); } else if (instanceOf(value, host.Set)) { return Contextify.instance(value, Set, deepTraps, flags, 'Set'); } else if (instanceOf(value, host.WeakSet)) { return Contextify.instance(value, WeakSet, deepTraps, flags, 'WeakSet'); - } else if (typeof Promise === 'function' && instanceOf(value, host.Promise)) { + } else if (typeof Promise === 'function' && instanceOf(value, host.Promise)) { return Contextify.instance(value, Promise, deepTraps, flags, 'Promise'); } else if (instanceOf(value, host.Buffer)) { return Contextify.instance(value, LocalBuffer, deepTraps, flags, 'Uint8Array'); } else if (host.Reflect.getPrototypeOf(value) === null) {