lib: replace Symbol global by the primordials Symbol

Sebastien-Ahkrin · BethGriggs · commit b95c50b3928b · 2020-02-06T02:49:22.000Z
PR-URL: #30737 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
@@ -23,6 +23,8 @@ rules:
 message: "Use `const{Object } = primordials;` instead of the global."
 - name: Reflect
 message: "Use `const{Reflect } = primordials;` instead of the global."
+ - name: Symbol
+ message: "Use `const{Symbol } = primordials;` instead of the global."
 no-restricted-syntax:
 # Config copied from .eslintrc.js
 - error
diff --git a/lib/_http_agent.js b/lib/_http_agent.js
@@ -25,6 +25,7 @@ const{
 ObjectKeys,
 ObjectSetPrototypeOf,
 ObjectValues,
+ Symbol,
 } = primordials;
 
 const net = require('net');
diff --git a/lib/_http_common.js b/lib/_http_common.js
@@ -23,6 +23,7 @@
 
 const{
 MathMin,
+ Symbol,
 } = primordials;
 const{setImmediate } = require('timers');
 
diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
@@ -28,6 +28,7 @@ const{
 ObjectKeys,
 ObjectPrototypeHasOwnProperty,
 ObjectSetPrototypeOf,
+ Symbol,
 } = primordials;
 
 const{getDefaultHighWaterMark } = require('internal/streams/state');
diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -24,6 +24,7 @@
 const{
 ObjectKeys,
 ObjectSetPrototypeOf,
+ Symbol,
 } = primordials;
 
 const net = require('net');
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -27,6 +27,7 @@ const{
 NumberIsNaN,
 ObjectDefineProperty,
 ObjectSetPrototypeOf,
+ Symbol,
 } = primordials;
 
 module.exports = Readable;
diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
@@ -29,6 +29,7 @@ const{
 Array,
 ObjectDefineProperty,
 ObjectSetPrototypeOf,
+ Symbol,
 } = primordials;
 
 module.exports = Writable;
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -25,6 +25,7 @@ const{
 ObjectAssign,
 ObjectDefineProperty,
 ObjectSetPrototypeOf,
+ Symbol,
 } = primordials;
 
 const{
diff --git a/lib/async_hooks.js b/lib/async_hooks.js
@@ -3,6 +3,7 @@
 const{
 NumberIsSafeInteger,
 ReflectApply,
+ Symbol,
 } = primordials;
 
 const{
diff --git a/lib/buffer.js b/lib/buffer.js
@@ -34,6 +34,7 @@ const{
 ObjectDefineProperties,
 ObjectDefineProperty,
 ObjectSetPrototypeOf,
+ Symbol,
 } = primordials;
 
 const{
diff --git a/lib/domain.js b/lib/domain.js
@@ -30,6 +30,7 @@ const{
 Array,
 ObjectDefineProperty,
 ReflectApply,
+ Symbol,
 } = primordials;
 
 const EventEmitter = require('events');
diff --git a/lib/inspector.js b/lib/inspector.js
@@ -3,6 +3,7 @@
 const{
 JSONParse,
 JSONStringify,
+ Symbol,
 } = primordials;
 
 const{
diff --git 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
@@ -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
@@ -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
@@ -13,6 +13,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
@@ -2,6 +2,7 @@
 
 const{
 ObjectSetPrototypeOf,
+ Symbol,
 } = primordials;
 
 const{
diff --git 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
@@ -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
@@ -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
@@ -7,6 +7,7 @@ const{
 ObjectCreate,
 ObjectDefineProperties,
 ObjectGetOwnPropertyDescriptors,
+ Symbol,
 } = primordials;
 
 const{
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -7,6 +7,7 @@ const{
 NumberIsFinite,
 ObjectSetPrototypeOf,
 ReflectOwnKeys,
+ Symbol,
 } = primordials;
 
 const{Buffer, kMaxLength } = require('buffer');
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,7 +11,9 @@ const{
 ObjectGetPrototypeOf,
 ObjectSetPrototypeOf,
 ReflectConstruct,
+ Symbol,
 } = primordials;
+
 const{
 codes:{
 ERR_INVALID_ARG_TYPE,
diff --git a/lib/internal/vm/module.js b/lib/internal/vm/module.js
@@ -4,8 +4,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
@@ -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
@@ -7,6 +7,7 @@ const{
 ObjectGetOwnPropertyDescriptors,
 ObjectGetPrototypeOf,
 ObjectSetPrototypeOf,
+ Symbol,
 } = primordials;
 
 const{
diff --git a/lib/net.js b/lib/net.js
diff --git a/lib/os.js b/lib/os.js
diff --git a/lib/perf_hooks.js b/lib/perf_hooks.js
diff --git a/lib/readline.js b/lib/readline.js
diff --git a/lib/repl.js b/lib/repl.js
diff --git a/lib/string_decoder.js b/lib/string_decoder.js
diff --git a/lib/trace_events.js b/lib/trace_events.js
diff --git a/lib/v8.js b/lib/v8.js
diff --git a/lib/vm.js b/lib/vm.js
diff --git a/lib/zlib.js b/lib/zlib.js

-Original file line number
+Diff line change
  ObjectKeys,
  ObjectSetPrototypeOf,
  ObjectValues,
 + Symbol,
 }=primordials;
 constnet=require('net');