Change Object.assign to object spread

tshemsedinov · tshemsedinov · commit 84c1fec3d68c · 2018-12-20T20:50:04.000+02:00
Refs: nodejs/node#25104
diff --git a/lib/application.js b/lib/application.js
@@ -341,7 +341,7 @@ class Application extends api.events.EventEmitter {
           } else {
             client.files = files;
             client.fields = fields;
-            Object.assign(client.parameters, client.fields);
+            client.parameters = { ...client.parameters, ...client.fields };
             client.dispatch();
           }
         });
@@ -356,7 +356,7 @@ class Application extends api.events.EventEmitter {
           } else {
             client.fields = api.querystring.parse(client.data);
           }
-          Object.assign(client.parameters, client.fields);
+          client.parameters = { ...client.parameters, ...client.fields };
           client.dispatch();
         });
       }
diff --git a/lib/client.js b/lib/client.js
@@ -48,10 +48,13 @@ class Client {
     this.query = api.querystring.parse(url.query);
     this.schema = config.transport === 'tls' ? 'https' : 'http';
     this.method = req.method.toLowerCase();
-    this.access = Object.assign({}, DEFAULT_ACCESS);
+    this.access = { ...DEFAULT_ACCESS };
     this.calculateAccess();
-    this.parameters = req.parameters || {}; // <Object>
-    Object.assign(this.parameters, this.query);
+    if (req.parameters) {
+      this.parameters = { ...req.parameters, ...this.query };
+    } else {
+      this.parameters = { ...this.query };
+    }
     this.fields = null; // <Object>
     this.files = null; // <Object>
     this.slowTime = config.slowTime || DEFAULT_SLOW_TIME;
@@ -555,7 +558,7 @@ class Client {
       }
       if (handler === 'access') {
         // fn is an object here, not function
-        Object.assign(this.access, fn);
+        this.access = { ...this.access, ...fn };
         this.calculateAccess();
         callback();
         return;
diff --git a/lib/core.js b/lib/core.js
@@ -271,7 +271,7 @@ const prepareServersConfig = () => {
     }
     for (let i = 0; i < config.ports.length; i++) {
       const port = config.ports[i];
-      const server = Object.assign({}, config);
+      const server = { ...config };
       server.port = port;
       const serviceName = serverName + (serverName === 'master' ? '' : port);
       if (server.inspect) server.inspect += i;
diff --git a/lib/workers.js b/lib/workers.js
@@ -12,7 +12,7 @@ impress.fork = (env, inspect) => {
     argv.push('--inspect=' + inspect);
   }
   const opt = {
-    env: Object.assign({}, process.env, env),
+    env: { ...process.env, ...env },
     execArgv: argv
   };
   return api.cp.fork(modulePath, args, opt);

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ class Application extends api.events.EventEmitter {`
`341`	`341`	`} else {`
`342`	`342`	`client.files = files;`
`343`	`343`	`client.fields = fields;`
`344`		`- Object.assign(client.parameters, client.fields);`
	`344`	`+ client.parameters = { ...client.parameters, ...client.fields };`
`345`	`345`	`client.dispatch();`
`346`	`346`	`}`
`347`	`347`	`});`
`@@ -356,7 +356,7 @@ class Application extends api.events.EventEmitter {`
`356`	`356`	`} else {`
`357`	`357`	`client.fields = api.querystring.parse(client.data);`
`358`	`358`	`}`
`359`		`- Object.assign(client.parameters, client.fields);`
	`359`	`+ client.parameters = { ...client.parameters, ...client.fields };`
`360`	`360`	`client.dispatch();`
`361`	`361`	`});`
`362`	`362`	`}`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ const prepareServersConfig = () => {`
`271`	`271`	`}`
`272`	`272`	`for (let i = 0; i < config.ports.length; i++) {`
`273`	`273`	`const port = config.ports[i];`
`274`		`- const server = Object.assign({}, config);`
	`274`	`+ const server = { ...config };`
`275`	`275`	`server.port = port;`
`276`	`276`	`const serviceName = serverName + (serverName === 'master' ? '' : port);`
`277`	`277`	`if (server.inspect) server.inspect += i;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ impress.fork = (env, inspect) => {`
`12`	`12`	`argv.push('--inspect=' + inspect);`
`13`	`13`	`}`
`14`	`14`	`const opt = {`
`15`		`- env: Object.assign({}, process.env, env),`
	`15`	`+ env: { ...process.env, ...env },`
`16`	`16`	`execArgv: argv`
`17`	`17`	`};`
`18`	`18`	`return api.cp.fork(modulePath, args, opt);`