From eac3f0adc46c3af0e94d70bb8635440382df7d7f Mon Sep 17 00:00:00 2001 From: Sebastien Ahkrin Date: Sat, 30 Nov 2019 16:55:29 +0100 Subject: lib: replace Symbol global by the primordials Symbol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/30737 Reviewed-By: Michaël Zasso Reviewed-By: Trivikram Kamat Reviewed-By: Colin Ihrig Reviewed-By: Ruben Bridgewater Reviewed-By: Luigi Pinca --- lib/internal/async_hooks.js | 1 + lib/internal/child_process.js | 1 + lib/internal/child_process/serialization.js | 1 + lib/internal/console/constructor.js | 1 + lib/internal/crypto/hash.js | 1 + lib/internal/crypto/keys.js | 1 + lib/internal/crypto/util.js | 4 ++++ lib/internal/dgram.js | 5 +++++ lib/internal/encoding.js | 1 + lib/internal/errors.js | 1 + lib/internal/freeze_intrinsics.js | 2 +- lib/internal/fs/dir.js | 1 + lib/internal/fs/promises.js | 1 + lib/internal/fs/utils.js | 1 + lib/internal/fs/watchers.js | 1 + lib/internal/http.js | 4 ++++ lib/internal/http2/compat.js | 1 + lib/internal/http2/core.js | 1 + lib/internal/http2/util.js | 1 + lib/internal/js_stream_socket.js | 4 ++++ lib/internal/net.js | 4 ++++ lib/internal/priority_queue.js | 1 + lib/internal/repl/utils.js | 4 ++++ lib/internal/stream_base_commons.js | 1 + lib/internal/streams/async_iterator.js | 1 + lib/internal/streams/buffer_list.js | 4 ++++ lib/internal/streams/duplexpair.js | 5 +++++ lib/internal/streams/from.js | 4 ++++ lib/internal/timers.js | 1 + lib/internal/trace_events_async_hooks.js | 1 + lib/internal/url.js | 1 + lib/internal/util.js | 2 ++ lib/internal/util/comparisons.js | 1 + lib/internal/vm/module.js | 2 +- lib/internal/worker.js | 1 + lib/internal/worker/io.js | 1 + 36 files changed, 66 insertions(+), 2 deletions(-) (limited to 'lib/internal') diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js index b17406c782..bf5456a858 100644 --- a/lib/internal/async_hooks.js +++ b/lib/internal/async_hooks.js @@ -4,6 +4,7 @@ const { FunctionPrototypeBind, NumberIsSafeInteger, ObjectDefineProperty, + Symbol, } = primordials; const { diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js index 3836ee8e3d..b07a38d6f6 100644 --- a/lib/internal/child_process.js +++ b/lib/internal/child_process.js @@ -4,6 +4,7 @@ const { ArrayIsArray, ObjectDefineProperty, ObjectSetPrototypeOf, + Symbol, } = primordials; const { diff --git a/lib/internal/child_process/serialization.js b/lib/internal/child_process/serialization.js index 48b6d7ffe0..9f03a8e844 100644 --- a/lib/internal/child_process/serialization.js +++ b/lib/internal/child_process/serialization.js @@ -3,6 +3,7 @@ const { JSONParse, JSONStringify, + Symbol, } = primordials; const { Buffer } = require('buffer'); const { StringDecoder } = require('string_decoder'); diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js index 76b2066e9b..85b88a72ea 100644 --- a/lib/internal/console/constructor.js +++ b/lib/internal/console/constructor.js @@ -15,6 +15,7 @@ const { ObjectPrototypeHasOwnProperty, ObjectValues, ReflectOwnKeys, + Symbol, } = primordials; const { trace } = internalBinding('trace_events'); diff --git a/lib/internal/crypto/hash.js b/lib/internal/crypto/hash.js index 56784275f9..dca0ba767f 100644 --- a/lib/internal/crypto/hash.js +++ b/lib/internal/crypto/hash.js @@ -2,6 +2,7 @@ const { ObjectSetPrototypeOf, + Symbol, } = primordials; const { diff --git a/lib/internal/crypto/keys.js b/lib/internal/crypto/keys.js index 25ef888495..087cef014f 100644 --- a/lib/internal/crypto/keys.js +++ b/lib/internal/crypto/keys.js @@ -2,6 +2,7 @@ const { ObjectDefineProperty, + Symbol, } = primordials; const { diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js index 8bf66e9cdf..286efc39a6 100644 --- a/lib/internal/crypto/util.js +++ b/lib/internal/crypto/util.js @@ -1,5 +1,9 @@ 'use strict'; +const { + Symbol, +} = primordials; + const { getCiphers: _getCiphers, getCurves: _getCurves, diff --git a/lib/internal/dgram.js b/lib/internal/dgram.js index 0c0fefa27c..8a8d9ba8c0 100644 --- a/lib/internal/dgram.js +++ b/lib/internal/dgram.js @@ -1,4 +1,9 @@ 'use strict'; + +const { + Symbol, +} = primordials; + const { codes } = require('internal/errors'); const { UDP } = internalBinding('udp_wrap'); const { guessHandleType } = internalBinding('util'); diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js index fe940f6e86..c053a3cfa3 100644 --- a/lib/internal/encoding.js +++ b/lib/internal/encoding.js @@ -7,6 +7,7 @@ const { ObjectCreate, ObjectDefineProperties, ObjectGetOwnPropertyDescriptors, + Symbol, } = primordials; const { diff --git a/lib/internal/errors.js b/lib/internal/errors.js index 8e6962e256..f76fe328c2 100644 --- a/lib/internal/errors.js +++ b/lib/internal/errors.js @@ -16,6 +16,7 @@ const { NumberIsInteger, ObjectDefineProperty, ObjectKeys, + Symbol, } = primordials; const messages = new Map(); diff --git a/lib/internal/freeze_intrinsics.js b/lib/internal/freeze_intrinsics.js index 6135c3090d..60fff67f2e 100644 --- a/lib/internal/freeze_intrinsics.js +++ b/lib/internal/freeze_intrinsics.js @@ -31,7 +31,7 @@ module.exports = function() { getOwnPropertyDescriptors, getOwnPropertyNames, getOwnPropertySymbols, - getPrototypeOf + getPrototypeOf, } = Object; const objectHasOwnProperty = Object.prototype.hasOwnProperty; const { ownKeys } = Reflect; diff --git a/lib/internal/fs/dir.js b/lib/internal/fs/dir.js index c4e0a3746c..749e22ee69 100644 --- a/lib/internal/fs/dir.js +++ b/lib/internal/fs/dir.js @@ -2,6 +2,7 @@ const { ObjectDefineProperty, + Symbol, } = primordials; const pathModule = require('path'); diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js index daf18e19d1..cc3f98268c 100644 --- a/lib/internal/fs/promises.js +++ b/lib/internal/fs/promises.js @@ -4,6 +4,7 @@ const { MathMax, MathMin, NumberIsSafeInteger, + Symbol, } = primordials; const { diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js index 951030c5a5..ac258bdb11 100644 --- a/lib/internal/fs/utils.js +++ b/lib/internal/fs/utils.js @@ -7,6 +7,7 @@ const { NumberIsFinite, ObjectSetPrototypeOf, ReflectOwnKeys, + Symbol, } = primordials; const { Buffer } = require('buffer'); diff --git a/lib/internal/fs/watchers.js b/lib/internal/fs/watchers.js index c94739d718..59f8bfcebc 100644 --- a/lib/internal/fs/watchers.js +++ b/lib/internal/fs/watchers.js @@ -3,6 +3,7 @@ const { ObjectDefineProperty, ObjectSetPrototypeOf, + Symbol, } = primordials; const errors = require('internal/errors'); diff --git a/lib/internal/http.js b/lib/internal/http.js index 09294888be..aab4170a2f 100644 --- a/lib/internal/http.js +++ b/lib/internal/http.js @@ -1,5 +1,9 @@ 'use strict'; +const { + Symbol, +} = primordials; + const { setUnrefTimeout } = require('internal/timers'); const { PerformanceEntry, notify } = internalBinding('performance'); diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js index 6a55b4edd1..94282cc4bb 100644 --- a/lib/internal/http2/compat.js +++ b/lib/internal/http2/compat.js @@ -8,6 +8,7 @@ const { ObjectKeys, ObjectPrototypeHasOwnProperty, ReflectGetPrototypeOf, + Symbol, } = primordials; const assert = require('internal/assert'); diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index 167044f840..b48e405b8d 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -11,6 +11,7 @@ const { ObjectDefineProperty, ObjectPrototypeHasOwnProperty, ReflectGetPrototypeOf, + Symbol, } = primordials; const { diff --git a/lib/internal/http2/util.js b/lib/internal/http2/util.js index d97ce2f13f..3bf3a8fdd5 100644 --- a/lib/internal/http2/util.js +++ b/lib/internal/http2/util.js @@ -6,6 +6,7 @@ const { Number, ObjectCreate, ObjectKeys, + Symbol, } = primordials; const binding = internalBinding('http2'); diff --git a/lib/internal/js_stream_socket.js b/lib/internal/js_stream_socket.js index 7c35a55b1c..1a805ae830 100644 --- a/lib/internal/js_stream_socket.js +++ b/lib/internal/js_stream_socket.js @@ -1,5 +1,9 @@ 'use strict'; +const { + Symbol, +} = primordials; + const { setImmediate } = require('timers'); const assert = require('internal/assert'); const { Socket } = require('net'); diff --git a/lib/internal/net.js b/lib/internal/net.js index bbdc9bf843..5f6e476b58 100644 --- a/lib/internal/net.js +++ b/lib/internal/net.js @@ -1,5 +1,9 @@ 'use strict'; +const { + Symbol, +} = primordials; + const Buffer = require('buffer').Buffer; const { writeBuffer } = internalBinding('fs'); const errors = require('internal/errors'); diff --git a/lib/internal/priority_queue.js b/lib/internal/priority_queue.js index afd2cef643..c31c1eea38 100644 --- a/lib/internal/priority_queue.js +++ b/lib/internal/priority_queue.js @@ -2,6 +2,7 @@ const { Array, + Symbol, } = primordials; const kCompare = Symbol('compare'); diff --git a/lib/internal/repl/utils.js b/lib/internal/repl/utils.js index d60b332088..6c011e8533 100644 --- a/lib/internal/repl/utils.js +++ b/lib/internal/repl/utils.js @@ -1,5 +1,9 @@ 'use strict'; +const { + Symbol, +} = primordials; + const acorn = require('internal/deps/acorn/acorn/dist/acorn'); const privateMethods = require('internal/deps/acorn-plugins/acorn-private-methods/index'); diff --git a/lib/internal/stream_base_commons.js b/lib/internal/stream_base_commons.js index 504de5fc57..800ba4cefd 100644 --- a/lib/internal/stream_base_commons.js +++ b/lib/internal/stream_base_commons.js @@ -2,6 +2,7 @@ const { Array, + Symbol, } = primordials; const { Buffer } = require('buffer'); diff --git a/lib/internal/streams/async_iterator.js b/lib/internal/streams/async_iterator.js index e05813e5df..a6b8bd9d18 100644 --- a/lib/internal/streams/async_iterator.js +++ b/lib/internal/streams/async_iterator.js @@ -4,6 +4,7 @@ const { ObjectCreate, ObjectGetPrototypeOf, ObjectSetPrototypeOf, + Symbol, } = primordials; const finished = require('internal/streams/end-of-stream'); diff --git a/lib/internal/streams/buffer_list.js b/lib/internal/streams/buffer_list.js index 5e23f2cf46..c7adc5b073 100644 --- a/lib/internal/streams/buffer_list.js +++ b/lib/internal/streams/buffer_list.js @@ -1,5 +1,9 @@ 'use strict'; +const { + Symbol, +} = primordials; + const { Buffer } = require('buffer'); const { inspect } = require('internal/util/inspect'); diff --git a/lib/internal/streams/duplexpair.js b/lib/internal/streams/duplexpair.js index 6735bcb2b9..ec92cbe871 100644 --- a/lib/internal/streams/duplexpair.js +++ b/lib/internal/streams/duplexpair.js @@ -1,4 +1,9 @@ 'use strict'; + +const { + Symbol, +} = primordials; + const { Duplex } = require('stream'); const kCallback = Symbol('Callback'); diff --git a/lib/internal/streams/from.js b/lib/internal/streams/from.js index e809f2658d..7e1c2fbb19 100644 --- a/lib/internal/streams/from.js +++ b/lib/internal/streams/from.js @@ -1,5 +1,9 @@ 'use strict'; +const { + Symbol, +} = primordials; + const { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes; diff --git a/lib/internal/timers.js b/lib/internal/timers.js index 84b3c34d87..1b6422f41e 100644 --- a/lib/internal/timers.js +++ b/lib/internal/timers.js @@ -77,6 +77,7 @@ const { MathTrunc, NumberMIN_SAFE_INTEGER, ObjectCreate, + Symbol, } = primordials; const { diff --git a/lib/internal/trace_events_async_hooks.js b/lib/internal/trace_events_async_hooks.js index 87ee63d8ba..84c7745e47 100644 --- a/lib/internal/trace_events_async_hooks.js +++ b/lib/internal/trace_events_async_hooks.js @@ -4,6 +4,7 @@ const { ObjectKeys, SafeMap, SafeSet, + Symbol, } = primordials; const { trace } = internalBinding('trace_events'); diff --git a/lib/internal/url.js b/lib/internal/url.js index 3c75baf27b..54b9a18caf 100644 --- a/lib/internal/url.js +++ b/lib/internal/url.js @@ -11,6 +11,7 @@ const { ObjectKeys, ReflectGetOwnPropertyDescriptor, ReflectOwnKeys, + Symbol, } = primordials; const { inspect } = require('internal/util/inspect'); diff --git a/lib/internal/util.js b/lib/internal/util.js index 0a31973918..526d2504ea 100644 --- a/lib/internal/util.js +++ b/lib/internal/util.js @@ -11,7 +11,9 @@ const { ObjectGetPrototypeOf, ObjectSetPrototypeOf, ReflectConstruct, + Symbol, } = primordials; + const { codes: { ERR_INVALID_ARG_TYPE, diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js index b26012923c..b27b0bf7ce 100644 --- a/lib/internal/util/comparisons.js +++ b/lib/internal/util/comparisons.js @@ -15,6 +15,7 @@ const { ObjectPrototypePropertyIsEnumerable, ObjectPrototypeToString, StringPrototypeValueOf, + Symbol, SymbolPrototypeValueOf, } = primordials; diff --git a/lib/internal/vm/module.js b/lib/internal/vm/module.js index ee2fec2e43..9e6aa6b6b8 100644 --- a/lib/internal/vm/module.js +++ b/lib/internal/vm/module.js @@ -5,8 +5,8 @@ const { ArrayIsArray, ObjectCreate, ObjectDefineProperty, - Symbol, SafePromise, + Symbol, } = primordials; const { isContext } = internalBinding('contextify'); diff --git a/lib/internal/worker.js b/lib/internal/worker.js index fb033b2472..6051a02178 100644 --- a/lib/internal/worker.js +++ b/lib/internal/worker.js @@ -7,6 +7,7 @@ const { MathMax, ObjectCreate, ObjectEntries, + Symbol, } = primordials; const EventEmitter = require('events'); diff --git a/lib/internal/worker/io.js b/lib/internal/worker/io.js index a672dac94c..1167198676 100644 --- a/lib/internal/worker/io.js +++ b/lib/internal/worker/io.js @@ -7,6 +7,7 @@ const { ObjectGetOwnPropertyDescriptors, ObjectGetPrototypeOf, ObjectSetPrototypeOf, + Symbol, } = primordials; const { -- cgit v1.2.3