stream: combine properties using defineProperties

Backport-PR-URL: #32164 PR-URL: #31187 Refs: #31144 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Denys Otrishko <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

Author: antsmartian

lib/_stream_writable.js

@@ -29,6 +29,7 @@ const{
  Array,
  FunctionPrototype,
  ObjectDefineProperty,
+ ObjectDefineProperties,
  ObjectSetPrototypeOf,
  Symbol,
  SymbolHasInstance,
@@ -358,46 +359,6 @@ Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding){
 returnthis;
 };
 
-ObjectDefineProperty(Writable.prototype,'writableBuffer',{
-// Making it explicit this property is not enumerable
-// because otherwise some prototype manipulation in
-// userland will fail
-enumerable: false,
-get: function(){
-returnthis._writableState&&this._writableState.getBuffer();
-}
-});
-
-ObjectDefineProperty(Writable.prototype,'writableEnded',{
-// Making it explicit this property is not enumerable
-// because otherwise some prototype manipulation in
-// userland will fail
-enumerable: false,
-get: function(){
-returnthis._writableState ? this._writableState.ending : false;
-}
-});
-
-ObjectDefineProperty(Writable.prototype,'writableHighWaterMark',{
-// Making it explicit this property is not enumerable
-// because otherwise some prototype manipulation in
-// userland will fail
-enumerable: false,
-get: function(){
-returnthis._writableState&&this._writableState.highWaterMark;
-}
-});
-
-ObjectDefineProperty(Writable.prototype,'writableCorked',{
-// Making it explicit this property is not enumerable
-// because otherwise some prototype manipulation in
-// userland will fail
-enumerable: false,
-get: function(){
-returnthis._writableState ? this._writableState.corked : 0;
-}
-});
-
 // If we're already writing something, then just put this
 // in the queue, and wait our turn. Otherwise, call _write
 // If we return false, then we need a drain event, so set that flag.
@@ -669,16 +630,6 @@ Writable.prototype.end = function(chunk, encoding, cb){
 returnthis;
 };
 
-ObjectDefineProperty(Writable.prototype,'writableLength',{
-// Making it explicit this property is not enumerable
-// because otherwise some prototype manipulation in
-// userland will fail
-enumerable: false,
-get(){
-returnthis._writableState.length;
-}
-});
-
 functionneedFinish(state){
 return(state.ending&&
 state.length===0&&
@@ -762,44 +713,60 @@ function onCorkedFinish(corkReq, state, err){
 state.corkedRequestsFree.next=corkReq;
 }
 
-ObjectDefineProperty(Writable.prototype,'destroyed',{
-// Making it explicit this property is not enumerable
-// because otherwise some prototype manipulation in
-// userland will fail
-enumerable: false,
-get(){
-if(this._writableState===undefined){
-returnfalse;
+ObjectDefineProperties(Writable.prototype,{
+
+destroyed: {
+get(){
+returnthis._writableState ? this._writableState.destroyed : false;
+},
+set(value){
+// Backward compatibility, the user is explicitly managing destroyed
+if(this._writableState){
+this._writableState.destroyed=value;
+}
 }
-returnthis._writableState.destroyed;
 },
-set(value){
-// We ignore the value if the stream
-// has not been initialized yet
-if(!this._writableState){
-return;
+
+writableFinished: {
+get(){
+returnthis._writableState ? this._writableState.finished : false;
 }
+},
 
-// Backward compatibility, the user is explicitly
-// managing destroyed
-this._writableState.destroyed=value;
-}
-});
+writableObjectMode: {
+get(){
+returnthis._writableState ? this._writableState.objectMode : false;
+}
+},
 
-ObjectDefineProperty(Writable.prototype,'writableObjectMode',{
-enumerable: false,
-get(){
-returnthis._writableState ? this._writableState.objectMode : false;
-}
-});
+writableBuffer: {
+get(){
+returnthis._writableState&&this._writableState.getBuffer();
+}
+},
+
+writableEnded: {
+get(){
+returnthis._writableState ? this._writableState.ending : false;
+}
+},
+
+writableHighWaterMark: {
+get(){
+returnthis._writableState&&this._writableState.highWaterMark;
+}
+},
 
-ObjectDefineProperty(Writable.prototype,'writableFinished',{
-// Making it explicit this property is not enumerable
-// because otherwise some prototype manipulation in
-// userland will fail
-enumerable: false,
-get(){
-returnthis._writableState ? this._writableState.finished : false;
+writableCorked: {
+get(){
+returnthis._writableState ? this._writableState.corked : 0;
+}
+},
+
+writableLength: {
+get(){
+returnthis._writableState&&this._writableState.length;
+}
 }
 });