lib: flatten access to primordials

Store all primordials as properties of the primordials object. Static functions are prefixed by the constructor's name and prototype methods are prefixed by the constructor's name followed by "Prototype". For example: primordials.Object.keys becomes primordials.ObjectKeys. Backport-PR-URL: #30731 PR-URL: #30610 Refs: #29766 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>

Author: targos

lib/_http_agent.js

@@ -22,11 +22,9 @@
 'use strict';
 
 const{
-Object: {
-setPrototypeOf: ObjectSetPrototypeOf,
-keys: ObjectKeys,
-values: ObjectValues
-}
+ ObjectKeys,
+ ObjectSetPrototypeOf,
+ ObjectValues,
 }=primordials;
 
 constnet=require('net');

lib/_http_client.js

@@ -21,7 +21,11 @@
 
 'use strict';
 
-const{ Object }=primordials;
+const{
+ ObjectAssign,
+ ObjectKeys,
+ ObjectSetPrototypeOf,
+}=primordials;
 
 constnet=require('net');
 consturl=require('url');
@@ -108,7 +112,7 @@ function ClientRequest(input, options, cb){
 cb=options;
 options=input||{};
 }else{
-options=Object.assign(input||{},options);
+options=ObjectAssign(input||{},options);
 }
 
 letagent=options.agent;
@@ -225,7 +229,7 @@ function ClientRequest(input, options, cb){
 constheadersArray=Array.isArray(options.headers);
 if(!headersArray){
 if(options.headers){
-constkeys=Object.keys(options.headers);
+constkeys=ObjectKeys(options.headers);
 for(leti=0;i<keys.length;i++){
 constkey=keys[i];
 this.setHeader(key,options.headers[key]);
@@ -304,8 +308,8 @@ function ClientRequest(input, options, cb){
 
 this._deferToConnect(null,null,()=>this._flush());
 }
-Object.setPrototypeOf(ClientRequest.prototype,OutgoingMessage.prototype);
-Object.setPrototypeOf(ClientRequest,OutgoingMessage);
+ObjectSetPrototypeOf(ClientRequest.prototype,OutgoingMessage.prototype);
+ObjectSetPrototypeOf(ClientRequest,OutgoingMessage);
 
 ClientRequest.prototype._finish=function_finish(){
 DTRACE_HTTP_CLIENT_REQUEST(this,this.connection);

lib/_http_common.js

@@ -21,7 +21,9 @@
 
 'use strict';
 
-const{ Math }=primordials;
+const{
+ MathMin,
+}=primordials;
 const{ setImmediate }=require('timers');
 
 const{ getOptionValue }=require('internal/options');
@@ -100,7 +102,7 @@ function parserOnHeadersComplete(versionMajor, versionMinor, headers, method,
 
 // If parser.maxHeaderPairs <= 0 assume that there's no limit.
 if(parser.maxHeaderPairs>0)
-n=Math.min(n,parser.maxHeaderPairs);
+n=MathMin(n,parser.maxHeaderPairs);
 
 incoming._addHeaderLines(headers,n);
 

lib/_http_incoming.js

@@ -21,7 +21,9 @@
 
 'use strict';
 
-const{ Object }=primordials;
+const{
+ ObjectSetPrototypeOf,
+}=primordials;
 
 constStream=require('stream');
 
@@ -81,8 +83,8 @@ function IncomingMessage(socket){
 // read by the user, so there's no point continuing to handle it.
 this._dumped=false;
 }
-Object.setPrototypeOf(IncomingMessage.prototype,Stream.Readable.prototype);
-Object.setPrototypeOf(IncomingMessage,Stream.Readable);
+ObjectSetPrototypeOf(IncomingMessage.prototype,Stream.Readable.prototype);
+ObjectSetPrototypeOf(IncomingMessage,Stream.Readable);
 
 IncomingMessage.prototype.setTimeout=functionsetTimeout(msecs,callback){
 if(callback)

lib/_http_outgoing.js

@@ -21,7 +21,13 @@
 
 'use strict';
 
-const{ Object, ObjectPrototype }=primordials;
+const{
+ ObjectCreate,
+ ObjectDefineProperty,
+ ObjectKeys,
+ ObjectPrototypeHasOwnProperty,
+ ObjectSetPrototypeOf,
+}=primordials;
 
 const{ getDefaultHighWaterMark }=require('internal/streams/state');
 constassert=require('internal/assert');
@@ -109,10 +115,10 @@ function OutgoingMessage(){
 
 this._onPendingData=noopPendingOutput;
 }
-Object.setPrototypeOf(OutgoingMessage.prototype,Stream.prototype);
-Object.setPrototypeOf(OutgoingMessage,Stream);
+ObjectSetPrototypeOf(OutgoingMessage.prototype,Stream.prototype);
+ObjectSetPrototypeOf(OutgoingMessage,Stream);
 
-Object.defineProperty(OutgoingMessage.prototype,'writableFinished',{
+ObjectDefineProperty(OutgoingMessage.prototype,'writableFinished',{
 get(){
 return(
 this.finished&&
@@ -122,41 +128,41 @@ Object.defineProperty(OutgoingMessage.prototype, 'writableFinished',{
 }
 });
 
-Object.defineProperty(OutgoingMessage.prototype,'writableObjectMode',{
+ObjectDefineProperty(OutgoingMessage.prototype,'writableObjectMode',{
 get(){
 returnfalse;
 }
 });
 
-Object.defineProperty(OutgoingMessage.prototype,'writableLength',{
+ObjectDefineProperty(OutgoingMessage.prototype,'writableLength',{
 get(){
 returnthis.outputSize+(this.socket ? this.socket.writableLength : 0);
 }
 });
 
-Object.defineProperty(OutgoingMessage.prototype,'writableHighWaterMark',{
+ObjectDefineProperty(OutgoingMessage.prototype,'writableHighWaterMark',{
 get(){
 returnthis.socket ? this.socket.writableHighWaterMark : HIGH_WATER_MARK;
 }
 });
 
-Object.defineProperty(OutgoingMessage.prototype,'writableCorked',{
+ObjectDefineProperty(OutgoingMessage.prototype,'writableCorked',{
 get(){
 constcorked=this.socket ? this.socket.writableCorked : 0;
 returncorked+this[kCorked];
 }
 });
 
-Object.defineProperty(OutgoingMessage.prototype,'_headers',{
+ObjectDefineProperty(OutgoingMessage.prototype,'_headers',{
 get: internalUtil.deprecate(function(){
 returnthis.getHeaders();
 },'OutgoingMessage.prototype._headers is deprecated','DEP0066'),
 set: internalUtil.deprecate(function(val){
 if(val==null){
 this[kOutHeaders]=null;
 }elseif(typeofval==='object'){
-constheaders=this[kOutHeaders]=Object.create(null);
-constkeys=Object.keys(val);
+constheaders=this[kOutHeaders]=ObjectCreate(null);
+constkeys=ObjectKeys(val);
 for(vari=0;i<keys.length;++i){
 constname=keys[i];
 headers[name.toLowerCase()]=[name,val[name]];
@@ -165,12 +171,12 @@ Object.defineProperty(OutgoingMessage.prototype, '_headers',{
 },'OutgoingMessage.prototype._headers is deprecated','DEP0066')
 });
 
-Object.defineProperty(OutgoingMessage.prototype,'_headerNames',{
+ObjectDefineProperty(OutgoingMessage.prototype,'_headerNames',{
 get: internalUtil.deprecate(function(){
 constheaders=this[kOutHeaders];
 if(headers!==null){
-constout=Object.create(null);
-constkeys=Object.keys(headers);
+constout=ObjectCreate(null);
+constkeys=ObjectKeys(headers);
 for(vari=0;i<keys.length;++i){
 constkey=keys[i];
 constval=headers[key][0];
@@ -185,7 +191,7 @@ Object.defineProperty(OutgoingMessage.prototype, '_headerNames',{
 constheaders=this[kOutHeaders];
 if(!headers)
 return;
-constkeys=Object.keys(val);
+constkeys=ObjectKeys(val);
 for(vari=0;i<keys.length;++i){
 constheader=headers[keys[i]];
 if(header)
@@ -205,7 +211,7 @@ OutgoingMessage.prototype._renderHeaders = function _renderHeaders(){
 constheaders={};
 
 if(headersMap!==null){
-constkeys=Object.keys(headersMap);
+constkeys=ObjectKeys(headersMap);
 for(vari=0,l=keys.length;i<l;i++){
 constkey=keys[i];
 headers[headersMap[key][0]]=headersMap[key][1];
@@ -350,7 +356,7 @@ function _storeHeader(firstLine, headers){
 }
 }else{
 for(constkeyinheaders){
-if(ObjectPrototype.hasOwnProperty(headers,key)){
+if(ObjectPrototypeHasOwnProperty(headers,key)){
 processHeader(this,state,key,headers[key],true);
 }
 }
@@ -511,7 +517,7 @@ OutgoingMessage.prototype.setHeader = function setHeader(name, value){
 
 letheaders=this[kOutHeaders];
 if(headers===null)
-this[kOutHeaders]=headers=Object.create(null);
+this[kOutHeaders]=headers=ObjectCreate(null);
 
 headers[name.toLowerCase()]=[name,value];
 };
@@ -531,16 +537,16 @@ OutgoingMessage.prototype.getHeader = function getHeader(name){
 
 // Returns an array of the names of the current outgoing headers.
 OutgoingMessage.prototype.getHeaderNames=functiongetHeaderNames(){
-returnthis[kOutHeaders]!==null ? Object.keys(this[kOutHeaders]) : [];
+returnthis[kOutHeaders]!==null ? ObjectKeys(this[kOutHeaders]) : [];
 };
 
 
 // Returns a shallow copy of the current outgoing headers.
 OutgoingMessage.prototype.getHeaders=functiongetHeaders(){
 constheaders=this[kOutHeaders];
-constret=Object.create(null);
+constret=ObjectCreate(null);
 if(headers){
-constkeys=Object.keys(headers);
+constkeys=ObjectKeys(headers);
 for(vari=0;i<keys.length;++i){
 constkey=keys[i];
 constval=headers[key][1];
@@ -592,13 +598,13 @@ OutgoingMessage.prototype._implicitHeader = function _implicitHeader(){
 this.emit('error',newERR_METHOD_NOT_IMPLEMENTED('_implicitHeader()'));
 };
 
-Object.defineProperty(OutgoingMessage.prototype,'headersSent',{
+ObjectDefineProperty(OutgoingMessage.prototype,'headersSent',{
 configurable: true,
 enumerable: true,
 get: function(){return!!this._header;}
 });
 
-Object.defineProperty(OutgoingMessage.prototype,'writableEnded',{
+ObjectDefineProperty(OutgoingMessage.prototype,'writableEnded',{
 get: function(){returnthis.finished;}
 });
 
@@ -679,7 +685,7 @@ function connectionCorkNT(conn){
 
 OutgoingMessage.prototype.addTrailers=functionaddTrailers(headers){
 this._trailer='';
-constkeys=Object.keys(headers);
+constkeys=ObjectKeys(headers);
 constisArray=Array.isArray(headers);
 varfield,value;
 for(vari=0,l=keys.length;i<l;i++){

lib/_http_server.js

@@ -22,10 +22,8 @@
 'use strict';
 
 const{
-Object: {
-setPrototypeOf: ObjectSetPrototypeOf,
-keys: ObjectKeys,
-}
+ ObjectKeys,
+ ObjectSetPrototypeOf,
 }=primordials;
 
 constnet=require('net');
@@ -265,7 +263,7 @@ function writeHead(statusCode, reason, obj){
 letk;
 if(obj){
 constkeys=ObjectKeys(obj);
-for(vari=0;i<keys.length;i++){
+for(leti=0;i<keys.length;i++){
 k=keys[i];
 if(k)this.setHeader(k,obj[k]);
 }

lib/_stream_duplex.js

@@ -26,19 +26,23 @@
 
 'use strict';
 
-const{ Object }=primordials;
+const{
+ ObjectDefineProperty,
+ ObjectKeys,
+ ObjectSetPrototypeOf,
+}=primordials;
 
 module.exports=Duplex;
 
 constReadable=require('_stream_readable');
 constWritable=require('_stream_writable');
 
-Object.setPrototypeOf(Duplex.prototype,Readable.prototype);
-Object.setPrototypeOf(Duplex,Readable);
+ObjectSetPrototypeOf(Duplex.prototype,Readable.prototype);
+ObjectSetPrototypeOf(Duplex,Readable);
 
 {
 // Allow the keys array to be GC'ed.
-constkeys=Object.keys(Writable.prototype);
+constkeys=ObjectKeys(Writable.prototype);
 for(letv=0;v<keys.length;v++){
 constmethod=keys[v];
 if(!Duplex.prototype[method])
@@ -68,7 +72,7 @@ function Duplex(options){
 }
 }
 
-Object.defineProperty(Duplex.prototype,'writableHighWaterMark',{
+ObjectDefineProperty(Duplex.prototype,'writableHighWaterMark',{
 // Making it explicit this property is not enumerable
 // because otherwise some prototype manipulation in
 // userland will fail
@@ -78,7 +82,7 @@ Object.defineProperty(Duplex.prototype, 'writableHighWaterMark',{
 }
 });
 
-Object.defineProperty(Duplex.prototype,'writableBuffer',{
+ObjectDefineProperty(Duplex.prototype,'writableBuffer',{
 // Making it explicit this property is not enumerable
 // because otherwise some prototype manipulation in
 // userland will fail
@@ -88,7 +92,7 @@ Object.defineProperty(Duplex.prototype, 'writableBuffer',{
 }
 });
 
-Object.defineProperty(Duplex.prototype,'writableLength',{
+ObjectDefineProperty(Duplex.prototype,'writableLength',{
 // Making it explicit this property is not enumerable
 // because otherwise some prototype manipulation in
 // userland will fail
@@ -98,7 +102,7 @@ Object.defineProperty(Duplex.prototype, 'writableLength',{
 }
 });
 
-Object.defineProperty(Duplex.prototype,'writableFinished',{
+ObjectDefineProperty(Duplex.prototype,'writableFinished',{
 // Making it explicit this property is not enumerable
 // because otherwise some prototype manipulation in
 // userland will fail
@@ -108,7 +112,7 @@ Object.defineProperty(Duplex.prototype, 'writableFinished',{
 }
 });
 
-Object.defineProperty(Duplex.prototype,'writableCorked',{
+ObjectDefineProperty(Duplex.prototype,'writableCorked',{
 // Making it explicit this property is not enumerable
 // because otherwise some prototype manipulation in
 // userland will fail
@@ -118,7 +122,7 @@ Object.defineProperty(Duplex.prototype, 'writableCorked',{
 }
 });
 
-Object.defineProperty(Duplex.prototype,'writableEnded',{
+ObjectDefineProperty(Duplex.prototype,'writableEnded',{
 // Making it explicit this property is not enumerable
 // because otherwise some prototype manipulation in
 // userland will fail
@@ -143,7 +147,7 @@ function onEndNT(self){
 self.end();
 }
 
-Object.defineProperty(Duplex.prototype,'destroyed',{
+ObjectDefineProperty(Duplex.prototype,'destroyed',{
 // Making it explicit this property is not enumerable
 // because otherwise some prototype manipulation in
 // userland will fail