Skip to content

Commit 932ca09

Browse files
lpincalpinca
committed
[minor] Use spread syntax instead of _.assign() where possible
1 parent deafc9e commit 932ca09

7 files changed

+47
-49
lines changed

‎index.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
const transform = require('lodash/transform');
44
const defaults = require('lodash/defaults');
5-
const assign = require('lodash/assign');
65
const EventEmitter = require('events');
76
const stopcock = require('stopcock');
87
const got = require('got');
@@ -115,7 +114,7 @@ Shopify.prototype.updateLimits = function updateLimits(header) {
115114
*/
116115
Shopify.prototype.request = function request(uri, method, key, data, headers) {
117116
const options = {
118-
headers: assign({ 'User-Agent': `${pkg.name}/${pkg.version}` }, headers),
117+
headers: { 'User-Agent': `${pkg.name}/${pkg.version}`, ...headers },
119118
timeout: this.options.timeout,
120119
responseType: 'json',
121120
retry: 0,
@@ -141,11 +140,11 @@ Shopify.prototype.request = function request(uri, method, key, data, headers) {
141140
const { pathname, search } = url.parse(res.headers['location']);
142141

143142
return delay(retryAfter).then(() => {
144-
const url = { pathname };
143+
const uri = { pathname, ...this.baseUrl };
145144

146-
if (search) url.search = search;
145+
if (search) uri.search = search;
147146

148-
return this.request(assign(url, this.baseUrl), 'GET', key);
147+
return this.request(uri, 'GET', key);
149148
});
150149
}
151150

@@ -211,7 +210,7 @@ Shopify.prototype.graphql = function graphql(data, variables) {
211210

212211
pathname += '/graphql.json';
213212

214-
const uri = assign({ pathname }, this.baseUrl);
213+
const uri = { pathname, ...this.baseUrl };
215214
const json = variables !== undefined && variables !== null;
216215
const options = {
217216
headers: {

‎mixins/base-child.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
const assign = require('lodash/assign');
43
const qs = require('qs');
54

65
/**
@@ -113,13 +112,13 @@ const baseChild = {
113112
pathname += `/${this.parentName}/${parentId}/${this.name}/${id}`;
114113
pathname = pathname.replace(/\/+/g, '/').replace(/\/$/, '') + '.json';
115114

116-
const url = { pathname };
115+
const url = { pathname, ...this.shopify.baseUrl };
117116

118117
if (query) {
119118
url.search = '?' + qs.stringify(query, { arrayFormat: 'brackets' });
120119
}
121120

122-
return assign(url, this.shopify.baseUrl);
121+
return url;
123122
}
124123
};
125124

‎mixins/base.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
const assign = require('lodash/assign');
43
const qs = require('qs');
54

65
/**
@@ -105,13 +104,13 @@ const base = {
105104
pathname += `/${this.name}/${id}`;
106105
pathname = pathname.replace(/\/+/g, '/').replace(/\/$/, '') + '.json';
107106

108-
const url = { pathname };
107+
const url = { pathname, ...this.shopify.baseUrl };
109108

110109
if (query) {
111110
url.search = '?' + qs.stringify(query, { arrayFormat: 'brackets' });
112111
}
113112

114-
return assign(url, this.shopify.baseUrl);
113+
return url;
115114
}
116115
};
117116

‎mixins/shopify-payments.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
const assign = require('lodash/assign');
43
const qs = require('qs');
54

65
/**
@@ -30,13 +29,13 @@ const shopifyPayments = {
3029
pathname += `/shopify_payments/${this.name}/${id}`;
3130
pathname = pathname.replace(/\/+/g, '/').replace(/\/$/, '') + '.json';
3231

33-
const url = { pathname };
32+
const url = { pathname, ...this.shopify.baseUrl };
3433

3534
if (query) {
3635
url.search = '?' + qs.stringify(query, { arrayFormat: 'brackets' });
3736
}
3837

39-
return assign(url, this.shopify.baseUrl);
38+
return url;
4039
}
4140
};
4241

‎resources/access-scope.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict';
22

3-
const assign = require('lodash/assign');
4-
53
/**
64
* Creates an AccessScope instance.
75
*
@@ -23,7 +21,7 @@ function AccessScope(shopify) {
2321
*/
2422
AccessScope.prototype.list = function list() {
2523
const pathname = `/admin/oauth/${this.name}.json`;
26-
const url = assign({ pathname }, this.shopify.baseUrl);
24+
const url = { pathname, ...this.shopify.baseUrl };
2725
return this.shopify.request(url, 'GET', this.name);
2826
};
2927

‎resources/fulfillment-event.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
const assign = require('lodash/assign');
43
const qs = require('qs');
54

65
/**
@@ -149,13 +148,13 @@ FulfillmentEvent.prototype.buildUrl = function buildUrl(
149148
.replace(/\/+/g, '/')
150149
.replace(/\/$/, '') + '.json';
151150

152-
const url = { pathname };
151+
const url = { pathname, ...this.shopify.baseUrl };
153152

154153
if (query) {
155154
url.search = '?' + qs.stringify(query, { arrayFormat: 'brackets' });
156155
}
157156

158-
return assign(url, this.shopify.baseUrl);
157+
return url;
159158
};
160159

161160
module.exports = FulfillmentEvent;

‎test/shopify.test.js

+33-28
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ describe('Shopify', () => {
22
'use strict';
33

44
const expect = require('chai').expect;
5-
const assign = require('lodash/assign');
65
const format = require('url').format;
76
const nock = require('nock');
87
const got = require('got');
@@ -115,7 +114,7 @@ describe('Shopify', () => {
115114
});
116115

117116
describe('Shopify#request', () => {
118-
const url = assign({ pathname: '/test' }, shopify.baseUrl);
117+
const url = { pathname: '/test', ...shopify.baseUrl };
119118
const scope = common.scope;
120119

121120
afterEach(() => expect(nock.isDone()).to.be.true);
@@ -209,7 +208,7 @@ describe('Shopify', () => {
209208

210209
it('uses basic auth as intended', () => {
211210
const shopify = new Shopify({ shopName, apiKey, password });
212-
const url = assign({ pathname: '/test' }, shopify.baseUrl);
211+
const url = { pathname: '/test', ...shopify.baseUrl };
213212

214213
nock(`https://${shopName}.myshopify.com`, {
215214
reqheaders: {
@@ -370,19 +369,18 @@ describe('Shopify', () => {
370369
'eyJsYXN0X2lkIjo0MzI2NTYxMTIwMjkxLCJsYXN0X3ZhbHVlIjoiMSIsImRpcmVjdG' +
371370
'lvbiI6Im5leHQifQ'
372371
};
373-
const nextLink = format(
374-
assign({ pathname: '/test', query: nextPageParams }, shopify.baseUrl)
375-
);
372+
const nextLink = format({
373+
pathname: '/test',
374+
query: nextPageParams,
375+
...shopify.baseUrl
376+
});
376377

377378
scope
378379
.get('/test')
379380
.query({ limit: 1 })
380381
.reply(200, data, { Link: `<${nextLink}>; rel="next"` });
381382

382-
const url = assign(
383-
{ pathname: '/test', search: '?limit=1' },
384-
shopify.baseUrl
385-
);
383+
const url = { pathname: '/test', search: '?limit=1', ...shopify.baseUrl };
386384

387385
return shopify.request(url, 'GET', 'foo').then((res) => {
388386
expect(res).to.deep.equal(data.foo);
@@ -406,18 +404,22 @@ describe('Shopify', () => {
406404
'eyJkaXJlY3Rpb24iOiJwcmV2IiwibGFzdF9pZCI6NDMyNjU2MTIxODU5NSwibGFzdF' +
407405
'92YWx1ZSI6IjIifQ'
408406
};
409-
const prevLink = format(
410-
assign({ pathname: '/test', query: prevPageParams }, shopify.baseUrl)
411-
);
407+
const prevLink = format({
408+
pathname: '/test',
409+
query: prevPageParams,
410+
...shopify.baseUrl
411+
});
412412
const nextPageParams = {
413413
limit: '1',
414414
page_info:
415415
'eyJkaXJlY3Rpb24iOiJuZXh0IiwibGFzdF9pZCI6NDMyNjU2MTIxODU5NSwibGFzdF' +
416416
'92YWx1ZSI6IjIifQ'
417417
};
418-
const nextLink = format(
419-
assign({ pathname: '/test', query: nextPageParams }, shopify.baseUrl)
420-
);
418+
const nextLink = format({
419+
pathname: '/test',
420+
query: nextPageParams,
421+
...shopify.baseUrl
422+
});
421423

422424
scope
423425
.get('/test')
@@ -426,11 +428,11 @@ describe('Shopify', () => {
426428
Link: `<${prevLink}>; rel="previous", <${nextLink}>; rel="next"`
427429
});
428430

429-
const url = assign(
430-
{ pathname: '/test', search: `?${qs.stringify(query)}` },
431-
shopify.baseUrl
432-
);
433-
431+
const url = {
432+
pathname: '/test',
433+
search: `?${qs.stringify(query)}`,
434+
...shopify.baseUrl
435+
};
434436
return shopify.request(url, 'GET', 'foo').then((res) => {
435437
expect(res).to.deep.equal(data.foo);
436438
expect(res.nextPageParameters).to.deep.equal(nextPageParams);
@@ -453,19 +455,22 @@ describe('Shopify', () => {
453455
'eyJkaXJlY3Rpb24iOiJwcmV2IiwibGFzdF9pZCI6NDMyNjU2MTQxNTIwMywibGFzdF' +
454456
'92YWx1ZSI6IjMifQ'
455457
};
456-
const prevLink = format(
457-
assign({ pathname: '/test', query: prevPageParams }, shopify.baseUrl)
458-
);
458+
const prevLink = format({
459+
pathname: '/test',
460+
query: prevPageParams,
461+
...shopify.baseUrl
462+
});
459463

460464
scope
461465
.get('/test')
462466
.query(query)
463467
.reply(200, data, { Link: `<${prevLink}>; rel="previous"` });
464468

465-
const url = assign(
466-
{ pathname: '/test', search: `?${qs.stringify(query)}` },
467-
shopify.baseUrl
468-
);
469+
const url = {
470+
pathname: '/test',
471+
search: `?${qs.stringify(query)}`,
472+
...shopify.baseUrl
473+
};
469474

470475
return shopify.request(url, 'GET', 'foo').then((res) => {
471476
expect(res).to.deep.equal(data.foo);

0 commit comments

Comments
 (0)