Skip to content

Commit 75906ac

Browse files
CodingItWrongCodingItWrong
committed
Remove bracket spacing
1 parent ddfcb9c commit 75906ac

File tree

3 files changed

+78
-77
lines changed

3 files changed

+78
-77
lines changed

‎.prettierrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module.exports = {
22
arrowParens: 'avoid',
3+
bracketSpacing: false,
34
singleQuote: true,
45
trailingComma: 'all',
56
};

‎src/Resource.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const getOptionsQuery = (optionsObject = {}) =>
1010
.map(k => `${k}=${encodeURIComponent(optionsObject[k])}`)
1111
.join('&');
1212

13-
const relatedResourceUrl = ({ parent, relationship }) => {
13+
const relatedResourceUrl = ({parent, relationship}) => {
1414
const builtUrl = `${parent.type}/${parent.id}/${relationship}`;
1515

1616
if (
@@ -37,62 +37,62 @@ const extractErrorResponse = error => {
3737
};
3838

3939
class Resource {
40-
constructor({ name, httpClient }) {
40+
constructor({name, httpClient}) {
4141
this.name = name;
4242
this.api = httpClient;
4343
}
4444

45-
all({ options = {} } = {}) {
45+
all({options = {}} = {}) {
4646
let url;
4747

4848
if (options.url) {
49-
({ url } = options);
49+
({url} = options);
5050
} else {
5151
url = `${this.name}?${getOptionsQuery(options)}`;
5252
}
5353

5454
return this.api.get(url).then(extractData).catch(extractErrorResponse);
5555
}
5656

57-
find({ id, options } = {}) {
57+
find({id, options} = {}) {
5858
const url = `${this.name}/${id}?${getOptionsQuery(options)}`;
5959

6060
return this.api.get(url).then(extractData).catch(extractErrorResponse);
6161
}
6262

63-
where({ filter, options } = {}) {
63+
where({filter, options} = {}) {
6464
const queryString = filterQueryString(filter);
6565
return this.api
6666
.get(`${this.name}?${queryString}&${getOptionsQuery(options)}`)
6767
.then(extractData)
6868
.catch(extractErrorResponse);
6969
}
7070

71-
related({ parent, relationship = this.name, options }) {
72-
const baseUrl = relatedResourceUrl({ parent, relationship });
71+
related({parent, relationship = this.name, options}) {
72+
const baseUrl = relatedResourceUrl({parent, relationship});
7373
const url = `${baseUrl}?${getOptionsQuery(options)}`;
7474
return this.api.get(url).then(extractData).catch(extractErrorResponse);
7575
}
7676

7777
create(partialRecord) {
78-
const record = Object.assign({}, partialRecord, { type: this.name });
79-
const requestData = { data: record };
78+
const record = Object.assign({}, partialRecord, {type: this.name});
79+
const requestData = {data: record};
8080
return this.api
8181
.post(`${this.name}`, requestData)
8282
.then(extractData)
8383
.catch(extractErrorResponse);
8484
}
8585

86-
update({ id, attributes, relationships, options }) {
86+
update({id, attributes, relationships, options}) {
8787
// http://jsonapi.org/faq/#wheres-put
88-
const record = { type: this.name, id };
88+
const record = {type: this.name, id};
8989
if (attributes) {
9090
record.attributes = attributes;
9191
}
9292
if (relationships) {
9393
record.relationships = relationships;
9494
}
95-
const requestData = { data: record };
95+
const requestData = {data: record};
9696
return this.api
9797
.patch(
9898
`${this.name}/${record.id}?${getOptionsQuery(options)}`,
@@ -102,7 +102,7 @@ class Resource {
102102
.catch(extractErrorResponse);
103103
}
104104

105-
delete({ id }) {
105+
delete({id}) {
106106
return this.api.delete(`${this.name}/${id}`).catch(extractErrorResponse);
107107
}
108108
}

‎test/Resource.spec.js‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ describe('Resource', () => {
2222
patch: jest.fn(),
2323
delete: jest.fn(),
2424
};
25-
resource = new Resource({ httpClient: api, name });
25+
resource = new Resource({httpClient: api, name});
2626
});
2727

2828
describe('all', () => {
2929
it('can retrieve all records', () => {
3030
const expectedResult = {
3131
data: records,
32-
included: { fake: 'included' },
32+
included: {fake: 'included'},
3333
};
34-
api.get.mockResolvedValue({ data: expectedResult });
34+
api.get.mockResolvedValue({data: expectedResult});
3535

3636
const result = resource.all();
3737

@@ -40,27 +40,27 @@ describe('Resource', () => {
4040
});
4141

4242
it('can request included records', () => {
43-
const expectedResult = { data: records };
44-
api.get.mockResolvedValue({ data: expectedResult });
43+
const expectedResult = {data: records};
44+
api.get.mockResolvedValue({data: expectedResult});
4545

46-
resource.all({ options: optionsWithInclude });
46+
resource.all({options: optionsWithInclude});
4747

4848
expect(api.get).toHaveBeenCalledWith('widgets?include=comments');
4949
});
5050

5151
it('can request an arbitrary url', () => {
5252
const url = 'https://arbitrary.example.com/endpoint?key=value';
53-
const expectedResult = { data: records };
54-
api.get.mockResolvedValue({ data: expectedResult });
53+
const expectedResult = {data: records};
54+
api.get.mockResolvedValue({data: expectedResult});
5555

56-
resource.all({ options: { url } });
56+
resource.all({options: {url}});
5757

5858
expect(api.get).toHaveBeenCalledWith(url);
5959
});
6060

6161
it('rejects with the response upon server error', () => {
62-
const errorResponse = { dummy: 'data' };
63-
api.get.mockRejectedValue({ response: errorResponse });
62+
const errorResponse = {dummy: 'data'};
63+
api.get.mockRejectedValue({response: errorResponse});
6464

6565
const result = resource.all();
6666

@@ -83,29 +83,29 @@ describe('Resource', () => {
8383

8484
describe('find', () => {
8585
it('can find one record', () => {
86-
const expectedResponse = { data: record };
87-
api.get.mockResolvedValue({ data: expectedResponse });
86+
const expectedResponse = {data: record};
87+
api.get.mockResolvedValue({data: expectedResponse});
8888

89-
const result = resource.find({ id: 1 });
89+
const result = resource.find({id: 1});
9090

9191
expect(api.get).toHaveBeenCalledWith('widgets/1?');
9292
return expect(result).resolves.toEqual(expectedResponse);
9393
});
9494

9595
it('can request included records', () => {
96-
const expectedResponse = { data: record };
97-
api.get.mockResolvedValue({ data: expectedResponse });
96+
const expectedResponse = {data: record};
97+
api.get.mockResolvedValue({data: expectedResponse});
9898

99-
resource.find({ id: 1, options: optionsWithInclude });
99+
resource.find({id: 1, options: optionsWithInclude});
100100

101101
expect(api.get).toHaveBeenCalledWith('widgets/1?include=comments');
102102
});
103103

104104
it('rejects with the response upon error', () => {
105-
const errorResponse = { dummy: 'data' };
106-
api.get.mockRejectedValue({ response: errorResponse });
105+
const errorResponse = {dummy: 'data'};
106+
api.get.mockRejectedValue({response: errorResponse});
107107

108-
const result = resource.find({ id: 1 });
108+
const result = resource.find({id: 1});
109109

110110
return result.catch(error => {
111111
expect(error).toEqual(errorResponse);
@@ -119,31 +119,31 @@ describe('Resource', () => {
119119
};
120120

121121
it('can find records by criteria', () => {
122-
const expectedResponse = { data: records };
123-
api.get.mockResolvedValue({ data: expectedResponse });
122+
const expectedResponse = {data: records};
123+
api.get.mockResolvedValue({data: expectedResponse});
124124

125-
const result = resource.where({ filter });
125+
const result = resource.where({filter});
126126

127127
expect(api.get).toHaveBeenCalledWith('widgets?filter[status]=draft&');
128128
return expect(result).resolves.toEqual(expectedResponse);
129129
});
130130

131131
it('can request included records', () => {
132-
const expectedResponse = { data: records };
133-
api.get.mockResolvedValue({ data: expectedResponse });
132+
const expectedResponse = {data: records};
133+
api.get.mockResolvedValue({data: expectedResponse});
134134

135-
resource.where({ filter, options: optionsWithInclude });
135+
resource.where({filter, options: optionsWithInclude});
136136

137137
expect(api.get).toHaveBeenCalledWith(
138138
'widgets?filter[status]=draft&include=comments',
139139
);
140140
});
141141

142142
it('rejects with the response upon error', () => {
143-
const errorResponse = { dummy: 'data' };
144-
api.get.mockRejectedValue({ response: errorResponse });
143+
const errorResponse = {dummy: 'data'};
144+
api.get.mockRejectedValue({response: errorResponse});
145145

146-
const result = resource.where({ filter });
146+
const result = resource.where({filter});
147147

148148
return result.catch(error => {
149149
expect(error).toEqual(errorResponse);
@@ -173,29 +173,29 @@ describe('Resource', () => {
173173
});
174174

175175
it('can find related records', () => {
176-
const expectedResponse = { data: records };
177-
api.get.mockResolvedValue({ data: expectedResponse });
176+
const expectedResponse = {data: records};
177+
api.get.mockResolvedValue({data: expectedResponse});
178178

179-
const result = resource.related({ parent });
179+
const result = resource.related({parent});
180180

181181
expect(api.get).toHaveBeenCalledWith('users/1/widgets?');
182182
return expect(result).resolves.toEqual(expectedResponse);
183183
});
184184

185185
it('can find related records with a different relationship name', () => {
186-
const expectedResponse = { data: records };
187-
api.get.mockResolvedValue({ data: expectedResponse });
186+
const expectedResponse = {data: records};
187+
api.get.mockResolvedValue({data: expectedResponse});
188188

189189
const relationship = 'purchased-widgets';
190-
const result = resource.related({ parent, relationship });
190+
const result = resource.related({parent, relationship});
191191

192192
expect(api.get).toHaveBeenCalledWith('users/1/purchased-widgets?');
193193
return expect(result).resolves.toEqual(expectedResponse);
194194
});
195195

196196
it('can find related link with a parent has relationships', () => {
197-
const expectedResponse = { data: records };
198-
api.get.mockResolvedValue({ data: expectedResponse });
197+
const expectedResponse = {data: records};
198+
api.get.mockResolvedValue({data: expectedResponse});
199199

200200
const relationship = 'purchased-widgets';
201201
const parent = parentWithRelationship(relationship);
@@ -211,8 +211,8 @@ describe('Resource', () => {
211211
});
212212

213213
it('can use builtUrl if parent has relationships without links', () => {
214-
const expectedResponse = { data: records };
215-
api.get.mockResolvedValue({ data: expectedResponse });
214+
const expectedResponse = {data: records};
215+
api.get.mockResolvedValue({data: expectedResponse});
216216

217217
const relationship = 'purchased-widgets';
218218
resource.related({
@@ -224,19 +224,19 @@ describe('Resource', () => {
224224
});
225225

226226
it('can request included records', () => {
227-
const expectedResponse = { data: records };
228-
api.get.mockResolvedValue({ data: expectedResponse });
227+
const expectedResponse = {data: records};
228+
api.get.mockResolvedValue({data: expectedResponse});
229229

230-
resource.related({ parent, options: optionsWithInclude });
230+
resource.related({parent, options: optionsWithInclude});
231231

232232
expect(api.get).toHaveBeenCalledWith('users/1/widgets?include=comments');
233233
});
234234

235235
it('rejects with the response upon error', () => {
236-
const errorResponse = { dummy: 'data' };
237-
api.get.mockRejectedValue({ response: errorResponse });
236+
const errorResponse = {dummy: 'data'};
237+
api.get.mockRejectedValue({response: errorResponse});
238238

239-
const result = resource.related({ parent });
239+
const result = resource.related({parent});
240240

241241
return result.catch(error => {
242242
expect(error).toEqual(errorResponse);
@@ -246,10 +246,10 @@ describe('Resource', () => {
246246

247247
describe('create', () => {
248248
it('can create a record', () => {
249-
const partialRecord = { attributes: { key: 'value' } };
249+
const partialRecord = {attributes: {key: 'value'}};
250250

251-
const responseBody = { data: record };
252-
api.post.mockResolvedValue({ data: responseBody });
251+
const responseBody = {data: record};
252+
api.post.mockResolvedValue({data: responseBody});
253253

254254
const result = resource.create(partialRecord);
255255

@@ -263,8 +263,8 @@ describe('Resource', () => {
263263
});
264264

265265
it('rejects with the response upon error', () => {
266-
const errorResponse = { dummy: 'data' };
267-
api.post.mockRejectedValue({ response: errorResponse });
266+
const errorResponse = {dummy: 'data'};
267+
api.post.mockRejectedValue({response: errorResponse});
268268

269269
const result = resource.create(record);
270270

@@ -276,24 +276,24 @@ describe('Resource', () => {
276276

277277
describe('update', () => {
278278
const id = '1';
279-
const attributes = { key: 'value' };
280-
const relationships = { key: 'value' };
279+
const attributes = {key: 'value'};
280+
const relationships = {key: 'value'};
281281

282282
it('can update a record', () => {
283-
const responseBody = { data: record };
284-
api.patch.mockResolvedValue({ data: responseBody });
283+
const responseBody = {data: record};
284+
api.patch.mockResolvedValue({data: responseBody});
285285

286-
const result = resource.update({ id, attributes, relationships });
286+
const result = resource.update({id, attributes, relationships});
287287

288288
expect(api.patch).toHaveBeenCalledWith('widgets/1?', {
289-
data: { id, type: 'widgets', attributes, relationships },
289+
data: {id, type: 'widgets', attributes, relationships},
290290
});
291291
return expect(result).resolves.toEqual(responseBody);
292292
});
293293

294294
it('passes options', () => {
295-
const responseBody = { data: record };
296-
api.patch.mockResolvedValue({ data: responseBody });
295+
const responseBody = {data: record};
296+
api.patch.mockResolvedValue({data: responseBody});
297297

298298
resource.update({
299299
id,
@@ -303,13 +303,13 @@ describe('Resource', () => {
303303
});
304304

305305
expect(api.patch).toHaveBeenCalledWith('widgets/1?include=comments', {
306-
data: { id, type: 'widgets', attributes, relationships },
306+
data: {id, type: 'widgets', attributes, relationships},
307307
});
308308
});
309309

310310
it('rejects with the response upon error', () => {
311-
const errorResponse = { dummy: 'data' };
312-
api.patch.mockRejectedValue({ response: errorResponse });
311+
const errorResponse = {dummy: 'data'};
312+
api.patch.mockRejectedValue({response: errorResponse});
313313

314314
const result = resource.update(record);
315315

@@ -330,8 +330,8 @@ describe('Resource', () => {
330330
});
331331

332332
it('rejects with the response upon error', () => {
333-
const errorResponse = { dummy: 'data' };
334-
api.delete.mockRejectedValue({ response: errorResponse });
333+
const errorResponse = {dummy: 'data'};
334+
api.delete.mockRejectedValue({response: errorResponse});
335335

336336
const result = resource.delete(record);
337337

0 commit comments

Comments
 (0)