tools: add prefer-proto rule

fixup: add support for `Object.create(null)` fixup: extend to any 1-argument Object.create call
nodejs · Jan 4, 2023 · eb9100e · eb9100e
1 parent 5d4cb84
commit eb9100e
Show file tree

Hide file tree

Showing 85 changed files with 232 additions and 227 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -314,6 +314,7 @@ module.exports = {
     // Custom rules from eslint-plugin-node-core
     'node-core/no-unescaped-regexp-dot': 'error',
     'node-core/no-duplicate-requires': 'error',
+    'node-core/prefer-proto': 'error',
   },
   globals: {
     ByteLengthQueuingStrategy: 'readable',

diff --git a/benchmark/es/map-bench.js b/benchmark/es/map-bench.js
@@ -25,7 +25,7 @@ function runObject(n) {
 }
 
 function runNullProtoObject(n) {
-  const m = Object.create(null);
+  const m = { __proto__: null };
   bench.start();
   for (let i = 0; i < n; i++) {
     m[`i${i}`] = i;
@@ -51,7 +51,7 @@ function runNullProtoLiteralObject(n) {
 }
 
 function StorageObject() {}
-StorageObject.prototype = Object.create(null);
+StorageObject.prototype = { __proto__: null };
 
 function runStorageObject(n) {
   const m = new StorageObject();

diff --git a/lib/_http_agent.js b/lib/_http_agent.js
@@ -32,7 +32,6 @@ const {
   FunctionPrototypeCall,
   NumberIsNaN,
   NumberParseInt,
-  ObjectCreate,
   ObjectKeys,
   ObjectSetPrototypeOf,
   ObjectValues,
@@ -111,9 +110,9 @@ function Agent(options) {
 
   // Don't confuse net and make it think that we're connecting to a pipe
   this.options.path = null;
-  this.requests = ObjectCreate(null);
-  this.sockets = ObjectCreate(null);
-  this.freeSockets = ObjectCreate(null);
+  this.requests = { __proto__: null };
+  this.sockets = { __proto__: null };
+  this.freeSockets = { __proto__: null };
   this.keepAliveMsecs = this.options.keepAliveMsecs || 1000;
   this.keepAlive = this.options.keepAlive || false;
   this.maxSockets = this.options.maxSockets || Agent.defaultMaxSockets;

diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
@@ -28,7 +28,6 @@ const {
   MathAbs,
   MathFloor,
   NumberPrototypeToString,
-  ObjectCreate,
   ObjectDefineProperty,
   ObjectKeys,
   ObjectValues,
@@ -217,7 +216,7 @@ ObjectDefineProperty(OutgoingMessage.prototype, '_headers', {
     if (val == null) {
       this[kOutHeaders] = null;
     } else if (typeof val === 'object') {
-      const headers = this[kOutHeaders] = ObjectCreate(null);
+      const headers = this[kOutHeaders] = { __proto__: null };
       const keys = ObjectKeys(val);
       // Retain for(;;) loop for performance reasons
       // Refs: https://github.com/nodejs/node/pull/30958
@@ -244,7 +243,7 @@ ObjectDefineProperty(OutgoingMessage.prototype, '_headerNames', {
   get: internalUtil.deprecate(function() {
     const headers = this[kOutHeaders];
     if (headers !== null) {
-      const out = ObjectCreate(null);
+      const out = { __proto__: null };
       const keys = ObjectKeys(headers);
       // Retain for(;;) loop for performance reasons
       // Refs: https://github.com/nodejs/node/pull/30958
@@ -667,7 +666,7 @@ OutgoingMessage.prototype.setHeader = function setHeader(name, value) {
 
   let headers = this[kOutHeaders];
   if (headers === null)
-    this[kOutHeaders] = headers = ObjectCreate(null);
+    this[kOutHeaders] = headers = { __proto__: null };
 
   headers[StringPrototypeToLowerCase(name)] = [name, value];
   return this;
@@ -742,7 +741,7 @@ OutgoingMessage.prototype.getRawHeaderNames = function getRawHeaderNames() {
 // Returns a shallow copy of the current outgoing headers.
 OutgoingMessage.prototype.getHeaders = function getHeaders() {
   const headers = this[kOutHeaders];
-  const ret = ObjectCreate(null);
+  const ret = { __proto__: null };
   if (headers) {
     const keys = ObjectKeys(headers);
     // Retain for(;;) loop for performance reasons

diff --git a/lib/_tls_common.js b/lib/_tls_common.js
@@ -26,7 +26,6 @@ const tls = require('tls');
 const {
   ArrayPrototypePush,
   JSONParse,
-  ObjectCreate,
   RegExpPrototypeSymbolReplace,
 } = primordials;
 
@@ -131,7 +130,7 @@ function translatePeerCertificate(c) {
   }
   if (c.infoAccess != null) {
     const info = c.infoAccess;
-    c.infoAccess = ObjectCreate(null);
+    c.infoAccess = { __proto__: null };
 
     // XXX: More key validation?
     RegExpPrototypeSymbolReplace(/([^\n:]*):([^\n]*)(?:\n|$)/g, info,

diff --git a/lib/buffer.js b/lib/buffer.js
@@ -33,7 +33,6 @@ const {
   NumberIsNaN,
   NumberMAX_SAFE_INTEGER,
   NumberMIN_SAFE_INTEGER,
-  ObjectCreate,
   ObjectDefineProperties,
   ObjectDefineProperty,
   ObjectSetPrototypeOf,
@@ -146,7 +145,7 @@ const constants = ObjectDefineProperties({}, {
 Buffer.poolSize = 8 * 1024;
 let poolSize, poolOffset, allocPool;
 
-const encodingsMap = ObjectCreate(null);
+const encodingsMap = { __proto__: null };
 for (let i = 0; i < encodings.length; ++i)
   encodingsMap[encodings[i]] = i;
 
@@ -845,7 +844,7 @@ Buffer.prototype[customInspectSymbol] = function inspect(recurseTimes, ctx) {
   if (ctx) {
     let extras = false;
     const filter = ctx.showHidden ? ALL_PROPERTIES : ONLY_ENUMERABLE;
-    const obj = ObjectCreate(null);
+    const obj = { __proto__: null };
     ArrayPrototypeForEach(getOwnNonIndexProperties(this, filter),
                           (key) => {
                             extras = true;

diff --git a/lib/diagnostics_channel.js b/lib/diagnostics_channel.js
@@ -4,7 +4,6 @@ const {
   ArrayPrototypeIndexOf,
   ArrayPrototypePush,
   ArrayPrototypeSplice,
-  ObjectCreate,
   ObjectGetPrototypeOf,
   ObjectSetPrototypeOf,
   SymbolHasInstance,
@@ -92,7 +91,7 @@ class Channel {
   publish() {}
 }
 
-const channels = ObjectCreate(null);
+const channels = { __proto__: null };
 
 function channel(name) {
   let channel;

diff --git a/lib/events.js b/lib/events.js
@@ -35,7 +35,6 @@ const {
   FunctionPrototypeCall,
   NumberIsNaN,
   NumberMAX_SAFE_INTEGER,
-  ObjectCreate,
   ObjectDefineProperty,
   ObjectDefineProperties,
   ObjectGetPrototypeOf,
@@ -344,7 +343,7 @@ EventEmitter.init = function(opts) {
 
   if (this._events === undefined ||
       this._events === ObjectGetPrototypeOf(this)._events) {
-    this._events = ObjectCreate(null);
+    this._events = { __proto__: null };
     this._eventsCount = 0;
   }
 
@@ -553,7 +552,7 @@ function _addListener(target, type, listener, prepend) {
 
   events = target._events;
   if (events === undefined) {
-    events = target._events = ObjectCreate(null);
+    events = target._events = { __proto__: null };
     target._eventsCount = 0;
   } else {
     // To avoid recursion in the case that type === "newListener"! Before
@@ -691,7 +690,7 @@ EventEmitter.prototype.removeListener =
 
       if (list === listener || list.listener === listener) {
         if (--this._eventsCount === 0)
-          this._events = ObjectCreate(null);
+          this._events = { __proto__: null };
         else {
           delete events[type];
           if (events.removeListener)
@@ -746,11 +745,11 @@ EventEmitter.prototype.removeAllListeners =
       // Not listening for removeListener, no need to emit
       if (events.removeListener === undefined) {
         if (arguments.length === 0) {
-          this._events = ObjectCreate(null);
+          this._events = { __proto__: null };
           this._eventsCount = 0;
         } else if (events[type] !== undefined) {
           if (--this._eventsCount === 0)
-            this._events = ObjectCreate(null);
+            this._events = { __proto__: null };
           else
             delete events[type];
         }
@@ -764,7 +763,7 @@ EventEmitter.prototype.removeAllListeners =
           this.removeAllListeners(key);
         }
         this.removeAllListeners('removeListener');
-        this._events = ObjectCreate(null);
+        this._events = { __proto__: null };
         this._eventsCount = 0;
         return this;
       }

diff --git a/lib/internal/assert/assertion_error.js b/lib/internal/assert/assertion_error.js
@@ -6,7 +6,6 @@ const {
   Error,
   ErrorCaptureStackTrace,
   MathMax,
-  ObjectCreate,
   ObjectDefineProperty,
   ObjectGetPrototypeOf,
   ObjectKeys,
@@ -48,7 +47,7 @@ const kMaxShortLength = 12;
 
 function copyError(source) {
   const keys = ObjectKeys(source);
-  const target = ObjectCreate(ObjectGetPrototypeOf(source));
+  const target = { __proto__: ObjectGetPrototypeOf(source) };
   for (const key of keys) {
     target[key] = source[key];
   }

diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -49,7 +49,6 @@ const {
   ArrayPrototypePush,
   ArrayPrototypeSlice,
   Error,
-  ObjectCreate,
   ObjectDefineProperty,
   ObjectKeys,
   ObjectPrototypeHasOwnProperty,
@@ -129,7 +128,7 @@ const schemelessBlockList = new SafeSet([
 
 // Set up process.binding() and process._linkedBinding().
 {
-  const bindingObj = ObjectCreate(null);
+  const bindingObj = { __proto__: null };
 
   process.binding = function binding(module) {
     module = String(module);
@@ -167,7 +166,7 @@ const schemelessBlockList = new SafeSet([
  */
 let internalBinding;
 {
-  const bindingObj = ObjectCreate(null);
+  const bindingObj = { __proto__: null };
   // eslint-disable-next-line no-global-assign
   internalBinding = function internalBinding(module) {
     let mod = bindingObj[module];

diff --git a/lib/internal/cluster/round_robin_handle.js b/lib/internal/cluster/round_robin_handle.js
@@ -3,7 +3,6 @@
 const {
   ArrayIsArray,
   Boolean,
-  ObjectCreate,
   SafeMap,
 } = primordials;
 
@@ -19,7 +18,7 @@ function RoundRobinHandle(key, address, { port, fd, flags, backlog, readableAll,
   this.key = key;
   this.all = new SafeMap();
   this.free = new SafeMap();
-  this.handles = init(ObjectCreate(null));
+  this.handles = init({ __proto__: null });
   this.handle = null;
   this.server = net.createServer(assert.fail);
 

diff --git a/lib/internal/console/constructor.js b/lib/internal/console/constructor.js
@@ -15,7 +15,6 @@ const {
   MathFloor,
   Number,
   NumberPrototypeToFixed,
-  ObjectCreate,
   ObjectDefineProperties,
   ObjectDefineProperty,
   ObjectKeys,
@@ -572,7 +571,7 @@ const consoleMethods = {
       return final([iterKey, valuesKey], [getIndexArray(length), values]);
     }
 
-    const map = ObjectCreate(null);
+    const map = { __proto__: null };
     let hasPrimitives = false;
     const valuesKeyArray = [];
     const indexKeyArray = ObjectKeys(tabularData);

diff --git a/lib/internal/console/global.js b/lib/internal/console/global.js
@@ -14,7 +14,6 @@
 
 const {
   FunctionPrototypeBind,
-  ObjectCreate,
   ReflectDefineProperty,
   ReflectGetOwnPropertyDescriptor,
   ReflectOwnKeys,
@@ -24,7 +23,7 @@ const {
   Console
 } = require('internal/console/constructor');
 
-const globalConsole = ObjectCreate({});
+const globalConsole = { __proto__: {} };
 
 // Since Console is not on the prototype chain of the global console,
 // the symbol properties on Console.prototype have to be looked up from

diff --git a/lib/internal/dns/utils.js b/lib/internal/dns/utils.js
@@ -9,7 +9,6 @@ const {
   NumberParseInt,
   RegExpPrototypeExec,
   RegExpPrototypeSymbolReplace,
-  ObjectCreate,
   Symbol,
 } = primordials;
 
@@ -286,7 +285,7 @@ function setDefaultResultOrder(value) {
 }
 
 function createResolverClass(resolver) {
-  const resolveMap = ObjectCreate(null);
+  const resolveMap = { __proto__: null };
 
   class Resolver extends ResolverBase {}
 

diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
@@ -5,7 +5,6 @@
 
 const {
   Boolean,
-  ObjectCreate,
   ObjectDefineProperties,
   ObjectGetOwnPropertyDescriptors,
   ObjectSetPrototypeOf,
@@ -350,9 +349,9 @@ class TextEncoder {
     if (typeof depth === 'number' && depth < 0)
       return this;
     const ctor = getConstructorOf(this);
-    const obj = ObjectCreate({
+    const obj = { __proto__: {
       constructor: ctor === null ? TextEncoder : ctor
-    });
+    } };
     obj.encoding = this.encoding;
     // Lazy to avoid circular dependency
     return require('internal/util/inspect').inspect(obj, opts);
@@ -571,7 +570,7 @@ const sharedProperties = ObjectGetOwnPropertyDescriptors({
     if (typeof depth === 'number' && depth < 0)
       return this;
     const constructor = getConstructorOf(this) || TextDecoder;
-    const obj = ObjectCreate({ constructor });
+    const obj = { __proto__: { constructor } };
     obj.encoding = this.encoding;
     obj.fatal = this.fatal;
     obj.ignoreBOM = this.ignoreBOM;

diff --git a/lib/internal/error_serdes.js b/lib/internal/error_serdes.js
@@ -33,7 +33,7 @@ const errors = {
 const errorConstructorNames = new SafeSet(ObjectKeys(errors));
 
 function TryGetAllProperties(object, target = object) {
-  const all = ObjectCreate(null);
+  const all = { __proto__: null };
   if (object === null)
     return all;
   ObjectAssign(all,

diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
@@ -6,7 +6,6 @@ const {
   Boolean,
   FunctionPrototypeBind,
   ObjectAssign,
-  ObjectCreate,
   ObjectKeys,
   ObjectPrototypeHasOwnProperty,
   Proxy,
@@ -483,8 +482,8 @@ class Http2ServerResponse extends Stream {
       sendDate: true,
       statusCode: HTTP_STATUS_OK,
     };
-    this[kHeaders] = ObjectCreate(null);
-    this[kTrailers] = ObjectCreate(null);
+    this[kHeaders] = { __proto__: null };
+    this[kTrailers] = { __proto__: null };
     this[kStream] = stream;
     stream[kProxySocket] = null;
     stream[kResponse] = this;
@@ -603,7 +602,7 @@ class Http2ServerResponse extends Stream {
   }
 
   getHeaders() {
-    const headers = ObjectCreate(null);
+    const headers = { __proto__: null };
     return ObjectAssign(headers, this[kHeaders]);
   }
 
@@ -851,7 +850,7 @@ class Http2ServerResponse extends Stream {
   writeEarlyHints(hints) {
     validateObject(hints, 'hints');
 
-    const headers = ObjectCreate(null);
+    const headers = { __proto__: null };
 
     const linkHeaderValue = validateLinkHeaderValue(hints.link);