lib: enforce the use of Object from primordials

PR-URL: #27146 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gus Caplan <me@gus.host>
nodejs · Apr 12, 2019 · 908292c · 908292c
1 parent 9ad5106
commit 908292c
Show file tree

Hide file tree

Showing 85 changed files with 167 additions and 64 deletions.
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
@@ -10,6 +10,8 @@ rules:
       message: "Use `const { JSON } = primordials;` instead of the global."
     - name: Math
       message: "Use `const { Math } = primordials;` instead of the global."
+    - name: Object
+      message: "Use `const { Object } = primordials;` instead of the global."
     - name: Reflect
       message: "Use `const { Reflect } = primordials;` instead of the global."
   no-restricted-syntax:

diff --git a/lib/_http_agent.js b/lib/_http_agent.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const net = require('net');
 const EventEmitter = require('events');
 const debug = require('internal/util/debuglog').debuglog('http');

diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const net = require('net');
 const url = require('url');
 const assert = require('internal/assert');

diff --git a/lib/_http_incoming.js b/lib/_http_incoming.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const Stream = require('stream');
 
 function readStart(socket) {

diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-const { ObjectPrototype } = primordials;
+const { Object, ObjectPrototype } = primordials;
 
 const assert = require('internal/assert');
 const Stream = require('stream');

diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const net = require('net');
 const assert = require('internal/assert');
 const {

diff --git a/lib/_stream_duplex.js b/lib/_stream_duplex.js
@@ -26,6 +26,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 module.exports = Duplex;
 
 const Readable = require('_stream_readable');

diff --git a/lib/_stream_passthrough.js b/lib/_stream_passthrough.js
@@ -25,6 +25,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 module.exports = PassThrough;
 
 const Transform = require('_stream_transform');

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 module.exports = Readable;
 Readable.ReadableState = ReadableState;
 

diff --git a/lib/_stream_transform.js b/lib/_stream_transform.js
@@ -63,6 +63,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 module.exports = Transform;
 const {
   ERR_METHOD_NOT_IMPLEMENTED,

diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
@@ -25,6 +25,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 module.exports = Writable;
 Writable.WritableState = WritableState;
 

diff --git a/lib/_tls_common.js b/lib/_tls_common.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const { parseCertString } = require('internal/tls');
 const { isArrayBufferView } = require('internal/util/types');
 const tls = require('tls');

diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const {
   assertCrypto,
   deprecate

diff --git a/lib/assert.js b/lib/assert.js
@@ -20,6 +20,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const { Buffer } = require('buffer');
 const { codes: {
   ERR_AMBIGUOUS_ARGUMENT,

diff --git a/lib/buffer.js b/lib/buffer.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-const { Math } = primordials;
+const { Math, Object } = primordials;
 
 const {
   byteLengthUtf8,

diff --git a/lib/child_process.js b/lib/child_process.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object, ObjectPrototype } = primordials;
+
 const {
   promisify,
   convertToValidSignal,
@@ -515,8 +517,7 @@ function normalizeSpawnArguments(file, args, options) {
   // process.env.NODE_V8_COVERAGE always propagates, making it possible to
   // collect coverage for programs that spawn with white-listed environment.
   if (process.env.NODE_V8_COVERAGE &&
-      !Object.prototype.hasOwnProperty.call(options.env || {},
-                                            'NODE_V8_COVERAGE')) {
+      !ObjectPrototype.hasOwnProperty(options.env || {}, 'NODE_V8_COVERAGE')) {
     env.NODE_V8_COVERAGE = process.env.NODE_V8_COVERAGE;
   }
 

diff --git a/lib/constants.js b/lib/constants.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 // This module is deprecated in documentation only. Users should be directed
 // towards using the specific constants exposed by the individual modules on
 // which they are most relevant.

diff --git a/lib/crypto.js b/lib/crypto.js
@@ -24,6 +24,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const {
   assertCrypto,
   deprecate

diff --git a/lib/dgram.js b/lib/dgram.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const errors = require('internal/errors');
 const {
   kStateSymbol,

diff --git a/lib/dns.js b/lib/dns.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const cares = internalBinding('cares_wrap');
 const { toASCII } = require('internal/idna');
 const { isIP, isIPv4, isLegalPort } = require('internal/net');

diff --git a/lib/domain.js b/lib/domain.js
@@ -26,7 +26,7 @@
 // No new pull requests targeting this module will be accepted
 // unless they address existing, critical bugs.
 
-const { Reflect } = primordials;
+const { Object, Reflect } = primordials;
 
 const util = require('util');
 const EventEmitter = require('events');

diff --git a/lib/events.js b/lib/events.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-const { Math, Reflect } = primordials;
+const { Math, Object, Reflect } = primordials;
 
 var spliceOne;
 

diff --git a/lib/fs.js b/lib/fs.js
@@ -24,7 +24,7 @@
 
 'use strict';
 
-const { Math, Reflect } = primordials;
+const { Math, Object, Reflect } = primordials;
 
 const { fs: constants } = internalBinding('constants');
 const {

diff --git a/lib/http.js b/lib/http.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 const httpAgent = require('_http_agent');
 const { ClientRequest } = require('_http_client');
 const { methods } = require('_http_common');

diff --git a/lib/https.js b/lib/https.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const { Object } = primordials;
+
 require('internal/util').assertCrypto();
 
 const tls = require('tls');

diff --git a/lib/internal/assert/assertion_error.js b/lib/internal/assert/assertion_error.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { Math } = primordials;
+const { Math, Object } = primordials;
 
 const { inspect } = require('internal/util/inspect');
 const { codes: {

diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { FunctionPrototype, Reflect } = primordials;
+const { FunctionPrototype, Object, Reflect } = primordials;
 
 const {
   ERR_ASYNC_TYPE,

diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const { Object } = primordials;
+
 const { getOptionValue } = require('internal/options');
 const { Buffer } = require('buffer');
 

diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { JSON } = primordials;
+const { JSON, Object } = primordials;
 
 const {
   errnoException,

diff --git a/lib/internal/cluster/child.js b/lib/internal/cluster/child.js
@@ -1,4 +1,7 @@
 'use strict';
+
+const { Object } = primordials;
+
 const assert = require('internal/assert');
 const path = require('path');
 const EventEmitter = require('events');

diff --git a/lib/internal/cluster/master.js b/lib/internal/cluster/master.js
@@ -1,4 +1,7 @@
 'use strict';
+
+const { Object } = primordials;
+
 const assert = require('internal/assert');
 const { fork } = require('child_process');
 const path = require('path');
@@ -8,7 +11,6 @@ const SharedHandle = require('internal/cluster/shared_handle');
 const Worker = require('internal/cluster/worker');
 const { internal, sendHelper } = require('internal/cluster/utils');
 const { ERR_SOCKET_BAD_PORT } = require('internal/errors').codes;
-const keys = Object.keys;
 const cluster = new EventEmitter();
 const intercom = new EventEmitter();
 const SCHED_NONE = 1;
@@ -141,7 +143,7 @@ function removeWorker(worker) {
   assert(worker);
   delete cluster.workers[worker.id];
 
-  if (keys(cluster.workers).length === 0) {
+  if (Object.keys(cluster.workers).length === 0) {
     assert(handles.size === 0, 'Resource leak detected.');
     intercom.emit('disconnect');
   }
@@ -219,7 +221,7 @@ function emitForkNT(worker) {
 }
 
 cluster.disconnect = function(cb) {
-  const workers = keys(cluster.workers);
+  const workers = Object.keys(cluster.workers);
 
   if (workers.length === 0) {
     process.nextTick(() => intercom.emit('disconnect'));

diff --git a/lib/internal/cluster/worker.js b/lib/internal/cluster/worker.js
@@ -1,4 +1,7 @@
 'use strict';
+
+const { Object } = primordials;
+
 const EventEmitter = require('events');
 
 module.exports = Worker;

diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js
@@ -3,7 +3,7 @@
 // The Console constructor is not actually used to construct the global
 // console. It's exported for backwards compatibility.
 
-const { ObjectPrototype, Reflect } = primordials;
+const { Object, ObjectPrototype, Reflect } = primordials;
 
 const { trace } = internalBinding('trace_events');
 const {
@@ -32,11 +32,6 @@ const kTraceBegin = 'b'.charCodeAt(0);
 const kTraceEnd = 'e'.charCodeAt(0);
 const kTraceInstant = 'n'.charCodeAt(0);
 
-const {
-  keys: ObjectKeys,
-  values: ObjectValues,
-} = Object;
-
 const {
   isArray: ArrayIsArray,
   from: ArrayFrom,
@@ -414,7 +409,7 @@ const consoleMethods = {
       const depth = v !== null &&
                     typeof v === 'object' &&
                     !isArray(v) &&
-                    ObjectKeys(v).length > 2 ? -1 : 0;
+                    Object.keys(v).length > 2 ? -1 : 0;
       const opt = {
         depth,
         maxArrayLength: 3,
@@ -478,7 +473,7 @@ const consoleMethods = {
     const map = {};
     let hasPrimitives = false;
     const valuesKeyArray = [];
-    const indexKeyArray = ObjectKeys(tabularData);
+    const indexKeyArray = Object.keys(tabularData);
 
     for (; i < indexKeyArray.length; i++) {
       const item = tabularData[indexKeyArray[i]];
@@ -488,7 +483,7 @@ const consoleMethods = {
         hasPrimitives = true;
         valuesKeyArray[i] = _inspect(item);
       } else {
-        const keys = properties || ObjectKeys(item);
+        const keys = properties || Object.keys(item);
         for (const key of keys) {
           if (map[key] === undefined)
             map[key] = [];
@@ -501,8 +496,8 @@ const consoleMethods = {
       }
     }
 
-    const keys = ObjectKeys(map);
-    const values = ObjectValues(map);
+    const keys = Object.keys(map);
+    const values = Object.values(map);
     if (hasPrimitives) {
       keys.push(valuesKey);
       values.push(valuesKeyArray);

diff --git a/lib/internal/console/global.js b/lib/internal/console/global.js
@@ -12,7 +12,7 @@
 // Therefore, the console.Console.prototype is not
 // in the global console prototype chain anymore.
 
-const { Reflect } = primordials;
+const { Object, Reflect } = primordials;
 
 const {
   Console,

diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const { Object } = primordials;
+
 const {
   RSA_PKCS1_OAEP_PADDING,
   RSA_PKCS1_PADDING