Skip to content

Commit b7f022a

Browse files
Awk34Awk34
committed
refactor(gen:endpoint): style/refactor to pass ESLint
1 parent d4a61c3 commit b7f022a

File tree

5 files changed

+60
-79
lines changed

5 files changed

+60
-79
lines changed

‎templates/endpoint/basename.controller.js

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
/**
22
* Using Rails-like standard naming convention for endpoints.
3-
* GET <%= route %> -> index<% if (filters.models) { %>
3+
* GET <%= route %> -> index<% if(filters.models) { %>
44
* POST <%= route %> -> create
55
* GET <%= route %>/:id -> show
66
* PUT <%= route %>/:id -> update
77
* DELETE <%= route %>/:id -> destroy<% } %>
88
*/
99

10-
'use strict';<% if (filters.models) { %>
10+
'use strict';<% if(filters.models) { %>
1111

12-
import _ from 'lodash';<% if (filters.mongooseModels) { %>
13-
import <%= classedName %> from './<%= basename %>.model';<% } if (filters.sequelizeModels) { %>
12+
import _ from 'lodash';<% if(filters.mongooseModels) { %>
13+
import <%= classedName %> from './<%= basename %>.model';<% } if(filters.sequelizeModels) { %>
1414
import {<%= classedName %>} from '<%= relativeRequire(config.get('registerModelsFile')) %>';<% } %>
1515

1616
function respondWithResult(res, statusCode) {
1717
statusCode = statusCode || 200;
1818
return function(entity) {
19-
if (entity) {
19+
if(entity) {
2020
res.status(statusCode).json(entity);
2121
}
2222
};
2323
}
2424

2525
function saveUpdates(updates) {
2626
return function(entity) {
27-
<% if (filters.mongooseModels) { %>var updated = _.merge(entity, updates);
28-
return updated.save()
29-
.then(updated => {<% }
30-
if (filters.sequelizeModels) { %>return entity.updateAttributes(updates)
31-
.then(updated => {<% } %>
32-
return updated;
33-
});
27+
<%_ if(filters.mongooseModels) { -%>
28+
var updated = _.merge(entity, updates);
29+
return updated.save();
30+
<%_ } -%>
31+
<%_ if(filters.sequelizeModels) { -%>
32+
return entity.updateAttributes(updates);
33+
<%_ } -%>
3434
};
3535
}
3636

3737
function removeEntity(res) {
3838
return function(entity) {
39-
if (entity) {
40-
<% if (filters.mongooseModels) { %>return entity.remove()<% }
41-
if (filters.sequelizeModels) { %>return entity.destroy()<% } %>
39+
if(entity) {
40+
<% if(filters.mongooseModels) { %>return entity.remove()<% }
41+
if(filters.sequelizeModels) { %>return entity.destroy()<% } %>
4242
.then(() => {
4343
res.status(204).end();
4444
});
@@ -48,7 +48,7 @@ function removeEntity(res) {
4848

4949
function handleEntityNotFound(res) {
5050
return function(entity) {
51-
if (!entity) {
51+
if(!entity) {
5252
res.status(404).end();
5353
return null;
5454
}
@@ -64,18 +64,18 @@ function handleError(res, statusCode) {
6464
}<% } %>
6565

6666
// Gets a list of <%= classedName %>s
67-
export function index(req, res) {<% if (!filters.models) { %>
67+
export function index(req, res) {<% if(!filters.models) { %>
6868
res.json([]);<% } else { %>
69-
<% if (filters.mongooseModels) { %>return <%= classedName %>.find().exec()<% }
70-
if (filters.sequelizeModels) { %>return <%= classedName %>.findAll()<% } %>
69+
<% if(filters.mongooseModels) { %>return <%= classedName %>.find().exec()<% }
70+
if(filters.sequelizeModels) { %>return <%= classedName %>.findAll()<% } %>
7171
.then(respondWithResult(res))
7272
.catch(handleError(res));<% } %>
73-
}<% if (filters.models) { %>
73+
}<% if(filters.models) { %>
7474

7575
// Gets a single <%= classedName %> from the DB
7676
export function show(req, res) {
77-
<% if (filters.mongooseModels) { %>return <%= classedName %>.findById(req.params.id).exec()<% }
78-
if (filters.sequelizeModels) { %>return <%= classedName %>.find({
77+
<% if(filters.mongooseModels) { %>return <%= classedName %>.findById(req.params.id).exec()<% }
78+
if(filters.sequelizeModels) { %>return <%= classedName %>.find({
7979
where: {
8080
_id: req.params.id
8181
}
@@ -87,19 +87,19 @@ export function show(req, res) {
8787

8888
// Creates a new <%= classedName %> in the DB
8989
export function create(req, res) {
90-
<% if (filters.mongooseModels) { %>return <%= classedName %>.create(req.body)<% }
91-
if (filters.sequelizeModels) { %>return <%= classedName %>.create(req.body)<% } %>
90+
<% if(filters.mongooseModels) { %>return <%= classedName %>.create(req.body)<% }
91+
if(filters.sequelizeModels) { %>return <%= classedName %>.create(req.body)<% } %>
9292
.then(respondWithResult(res, 201))
9393
.catch(handleError(res));
9494
}
9595

9696
// Updates an existing <%= classedName %> in the DB
9797
export function update(req, res) {
98-
if (req.body._id) {
98+
if(req.body._id) {
9999
delete req.body._id;
100100
}
101-
<% if (filters.mongooseModels) { %>return <%= classedName %>.findById(req.params.id).exec()<% }
102-
if (filters.sequelizeModels) { %>return <%= classedName %>.find({
101+
<% if(filters.mongooseModels) { %>return <%= classedName %>.findById(req.params.id).exec()<% }
102+
if(filters.sequelizeModels) { %>return <%= classedName %>.find({
103103
where: {
104104
_id: req.params.id
105105
}
@@ -112,8 +112,8 @@ export function update(req, res) {
112112

113113
// Deletes a <%= classedName %> from the DB
114114
export function destroy(req, res) {
115-
<% if (filters.mongooseModels) { %>return <%= classedName %>.findById(req.params.id).exec()<% }
116-
if (filters.sequelizeModels) { %>return <%= classedName %>.find({
115+
<% if(filters.mongooseModels) { %>return <%= classedName %>.findById(req.params.id).exec()<% }
116+
if(filters.sequelizeModels) { %>return <%= classedName %>.find({
117117
where: {
118118
_id: req.params.id
119119
}

‎templates/endpoint/basename.events(models).js

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,41 @@
44

55
'use strict';
66

7-
import {EventEmitter} from 'events';<% if (filters.mongooseModels) { %>
8-
import <%= classedName %> from './<%= basename %>.model';<% } if (filters.sequelizeModels) { %>
7+
import {EventEmitter} from 'events';<% if(filters.mongooseModels) { %>
8+
import <%= classedName %> from './<%= basename %>.model';<% } if(filters.sequelizeModels) { %>
99
var <%= classedName %> = require('<%= relativeRequire(config.get('registerModelsFile')) %>').<%= classedName %>;<% } %>
1010
var <%= classedName %>Events = new EventEmitter();
1111

1212
// Set max event listeners (0 == unlimited)
1313
<%= classedName %>Events.setMaxListeners(0);
1414

15-
// Model events<% if (filters.mongooseModels) { %>
15+
// Model events
16+
<%_ if(filters.mongooseModels) { -%>
1617
var events = {
17-
'save': 'save',
18-
'remove': 'remove'
19-
};<% } if (filters.sequelizeModels) { %>
18+
save: 'save',
19+
remove: 'remove'
20+
};
21+
<%_ } if(filters.sequelizeModels) { -%>
2022
var events = {
21-
'afterCreate': 'save',
22-
'afterUpdate': 'save',
23-
'afterDestroy': 'remove'
24-
};<% } %>
23+
afterCreate: 'save',
24+
afterUpdate: 'save',
25+
afterDestroy: 'remove'
26+
};
27+
<%_ } -%>
2528

2629
// Register the event emitter to the model events
27-
for (var e in events) {
28-
var event = events[e];<% if (filters.mongooseModels) { %>
29-
<%= classedName %>.schema.post(e, emitEvent(event));<% } if (filters.sequelizeModels) { %>
30+
for(var e in events) {
31+
let event = events[e];<% if(filters.mongooseModels) { %>
32+
<%= classedName %>.schema.post(e, emitEvent(event));<% } if(filters.sequelizeModels) { %>
3033
<%= classedName %>.hook(e, emitEvent(event));<% } %>
3134
}
3235

3336
function emitEvent(event) {
34-
return function(doc<% if (filters.sequelizeModels) { %>, options, done<% } %>) {
37+
return function(doc<% if(filters.sequelizeModels) { %>, options, done<% } %>) {
3538
<%= classedName %>Events.emit(event + ':' + doc._id, doc);
36-
<%= classedName %>Events.emit(event, doc);<% if (filters.sequelizeModels) { %>
39+
<%= classedName %>Events.emit(event, doc);<% if(filters.sequelizeModels) { %>
3740
done(null);<% } %>
38-
}
41+
};
3942
}
4043

4144
export default <%= classedName %>Events;

‎templates/endpoint/basename.integration.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import request from 'supertest';<% if(filters.models) { %>
66
var new<%= classedName %>;<% } %>
77

88
describe('<%= classedName %> API:', function() {
9-
109
describe('GET <%= route %>', function() {
1110
var <%= cameledName %>s;
1211

@@ -16,7 +15,7 @@ describe('<%= classedName %> API:', function() {
1615
.expect(200)
1716
.expect('Content-Type', /json/)
1817
.end((err, res) => {
19-
if (err) {
18+
if(err) {
2019
return done(err);
2120
}
2221
<%= cameledName %>s = res.body;
@@ -27,7 +26,6 @@ describe('<%= classedName %> API:', function() {
2726
it('should respond with JSON array', function() {
2827
<%= expect() %><%= cameledName %>s<%= to() %>.be.instanceOf(Array);
2928
});
30-
3129
});<% if(filters.models) { %>
3230

3331
describe('POST <%= route %>', function() {
@@ -41,7 +39,7 @@ describe('<%= classedName %> API:', function() {
4139
.expect(201)
4240
.expect('Content-Type', /json/)
4341
.end((err, res) => {
44-
if (err) {
42+
if(err) {
4543
return done(err);
4644
}
4745
new<%= classedName %> = res.body;
@@ -53,7 +51,6 @@ describe('<%= classedName %> API:', function() {
5351
<%= expect() %>new<%= classedName %>.name<%= to() %>.equal('New <%= classedName %>');
5452
<%= expect() %>new<%= classedName %>.info<%= to() %>.equal('This is the brand new <%= cameledName %>!!!');
5553
});
56-
5754
});
5855

5956
describe('GET <%= route %>/:id', function() {
@@ -65,7 +62,7 @@ describe('<%= classedName %> API:', function() {
6562
.expect(200)
6663
.expect('Content-Type', /json/)
6764
.end((err, res) => {
68-
if (err) {
65+
if(err) {
6966
return done(err);
7067
}
7168
<%= cameledName %> = res.body;
@@ -81,7 +78,6 @@ describe('<%= classedName %> API:', function() {
8178
<%= expect() %><%= cameledName %>.name<%= to() %>.equal('New <%= classedName %>');
8279
<%= expect() %><%= cameledName %>.info<%= to() %>.equal('This is the brand new <%= cameledName %>!!!');
8380
});
84-
8581
});
8682

8783
describe('PUT <%= route %>/:id', function() {
@@ -97,7 +93,7 @@ describe('<%= classedName %> API:', function() {
9793
.expect(200)
9894
.expect('Content-Type', /json/)
9995
.end(function(err, res) {
100-
if (err) {
96+
if(err) {
10197
return done(err);
10298
}
10399
updated<%= classedName %> = res.body;
@@ -113,17 +109,15 @@ describe('<%= classedName %> API:', function() {
113109
<%= expect() %>updated<%= classedName %>.name<%= to() %>.equal('Updated <%= classedName %>');
114110
<%= expect() %>updated<%= classedName %>.info<%= to() %>.equal('This is the updated <%= cameledName %>!!!');
115111
});
116-
117112
});
118113

119114
describe('DELETE <%= route %>/:id', function() {
120-
121115
it('should respond with 204 on successful removal', function(done) {
122116
request(app)
123117
.delete('<%= route %>/' + new<%= classedName %>._id)
124118
.expect(204)
125-
.end((err, res) => {
126-
if (err) {
119+
.end(err => {
120+
if(err) {
127121
return done(err);
128122
}
129123
done();
@@ -134,14 +128,12 @@ describe('<%= classedName %> API:', function() {
134128
request(app)
135129
.delete('<%= route %>/' + new<%= classedName %>._id)
136130
.expect(404)
137-
.end((err, res) => {
138-
if (err) {
131+
.end(err => {
132+
if(err) {
139133
return done(err);
140134
}
141135
done();
142136
});
143137
});
144-
145138
});<% } %>
146-
147139
});

‎templates/endpoint/basename.socket(socketio).js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ var events = ['save', 'remove'];
1111

1212
export function register(socket) {
1313
// Bind model events to socket events
14-
for (var i = 0, eventsLength = events.length; i < eventsLength; i++) {
14+
for(var i = 0, eventsLength = events.length; i < eventsLength; i++) {
1515
var event = events[i];
16-
var listener = createListener('<%= cameledName %>:' + event, socket);
16+
var listener = createListener(`<%= cameledName %>:${event}`, socket);
1717

1818
<%= classedName %>Events.on(event, listener);
1919
socket.on('disconnect', removeListener(event, listener));

‎templates/endpoint/index.spec.js

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,78 +20,64 @@ var routerStub = {
2020

2121
// require the index with our stubbed out modules
2222
var <%= cameledName %>Index = proxyquire('./index.js', {
23-
'express': {
24-
Router: function() {
23+
express: {
24+
Router() {
2525
return routerStub;
2626
}
2727
},
2828
'./<%= basename %>.controller': <%= cameledName %>CtrlStub
2929
});
3030

3131
describe('<%= classedName %> API Router:', function() {
32-
3332
it('should return an express router instance', function() {
3433
<%= expect() %><%= cameledName %>Index<%= to() %>.equal(routerStub);
3534
});
3635

3736
describe('GET <%= route %>', function() {
38-
3937
it('should route to <%= cameledName %>.controller.index', function() {
4038
<%= expect() %>routerStub.get
4139
.withArgs('/', '<%= cameledName %>Ctrl.index')
4240
<%= to() %>.have.been.calledOnce;
4341
});
44-
4542
});<% if(filters.models) { %>
4643

4744
describe('GET <%= route %>/:id', function() {
48-
4945
it('should route to <%= cameledName %>.controller.show', function() {
5046
<%= expect() %>routerStub.get
5147
.withArgs('/:id', '<%= cameledName %>Ctrl.show')
5248
<%= to() %>.have.been.calledOnce;
5349
});
54-
5550
});
5651

5752
describe('POST <%= route %>', function() {
58-
5953
it('should route to <%= cameledName %>.controller.create', function() {
6054
<%= expect() %>routerStub.post
6155
.withArgs('/', '<%= cameledName %>Ctrl.create')
6256
<%= to() %>.have.been.calledOnce;
6357
});
64-
6558
});
6659

6760
describe('PUT <%= route %>/:id', function() {
68-
6961
it('should route to <%= cameledName %>.controller.update', function() {
7062
<%= expect() %>routerStub.put
7163
.withArgs('/:id', '<%= cameledName %>Ctrl.update')
7264
<%= to() %>.have.been.calledOnce;
7365
});
74-
7566
});
7667

7768
describe('PATCH <%= route %>/:id', function() {
78-
7969
it('should route to <%= cameledName %>.controller.update', function() {
8070
<%= expect() %>routerStub.patch
8171
.withArgs('/:id', '<%= cameledName %>Ctrl.update')
8272
<%= to() %>.have.been.calledOnce;
8373
});
84-
8574
});
8675

8776
describe('DELETE <%= route %>/:id', function() {
88-
8977
it('should route to <%= cameledName %>.controller.destroy', function() {
9078
<%= expect() %>routerStub.delete
9179
.withArgs('/:id', '<%= cameledName %>Ctrl.destroy')
9280
<%= to() %>.have.been.calledOnce;
9381
});
94-
9582
});<% } %>
96-
9783
});

0 commit comments

Comments
 (0)