Skip to content

Commit 6f1d7bb

Browse files
virkt25virkt25
committed
fix(cli): tweaks to templates
- Move `ping.controller.acceptance.ts` from `/test` to `/test/acceptance`. - For REST Controller Template change `obj` to the model name as it's more descriptive - Remove unused import from datasource template - Run `tslint:fix` before `prettire:fix` for `lint:fix` since I ran into an issue where tslint:fix breaks prettier formatting requiring you to run `prettier:fix` / `lint:fix` again. - Reorder the dependencies so they are alphabetical otherwise `npm install` results in additional changes to the file diff ass it reorders the deps alphabetically.
1 parent 56f89b6 commit 6f1d7bb

File tree

6 files changed

+32
-28
lines changed

6 files changed

+32
-28
lines changed

‎packages/cli/generators/app/templates/test/ping.controller.acceptance.ts.ejs renamed to ‎packages/cli/generators/app/templates/test/acceptance/ping.controller.acceptance.ts.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {createClientForHandler, supertest} from '@loopback/testlab';
22
import {RestServer} from '@loopback/rest';
3-
import {<%= project.applicationName %>} from '../';
3+
import {<%= project.applicationName %>} from '../..';
44

55
describe('PingController', () => {
66
let app: <%= project.applicationName %>;

‎packages/cli/generators/controller/templates/src/controllers/controller-rest-template.ts.ejs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ export class <%= className %>Controller {
1717
) {}
1818

1919
@post('<%= httpPathName %>')
20-
async create(@requestBody() obj: <%= modelName %>)
20+
async create(@requestBody() <%= name %>: <%= modelName %>)
2121
: Promise<<%= modelName %>> {
22-
return await this.<%= repositoryNameCamel %>.create(obj);
22+
return await this.<%= repositoryNameCamel %>.create(<%= name %>);
2323
}
2424

2525
@get('<%= httpPathName %>/count')
@@ -35,10 +35,10 @@ export class <%= className %>Controller {
3535

3636
@patch('<%= httpPathName %>')
3737
async updateAll(
38-
@requestBody() obj: <%= modelName %>,
38+
@requestBody() <%= name %>: <%= modelName %>,
3939
@param.query.string('where') where?: Where
4040
): Promise<number> {
41-
return await this.<%= repositoryNameCamel %>.updateAll(obj, where);
41+
return await this.<%= repositoryNameCamel %>.updateAll(<%= name %>, where);
4242
}
4343

4444
@get('<%= httpPathName %>/{id}')
@@ -49,9 +49,9 @@ export class <%= className %>Controller {
4949
@patch('<%= httpPathName %>/{id}')
5050
async updateById(
5151
@param.path.<%= idType %>('id') id: <%= idType %>,
52-
@requestBody() obj: <%= modelName %>
52+
@requestBody() <%= name %>: <%= modelName %>
5353
): Promise<boolean> {
54-
return await this.<%= repositoryNameCamel %>.updateById(id, obj);
54+
return await this.<%= repositoryNameCamel %>.updateById(id, <%= name %>);
5555
}
5656

5757
@del('<%= httpPathName %>/{id}')

‎packages/cli/generators/datasource/templates/datasource.ts.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {inject} from '@loopback/core';
2-
import {juggler, DataSource, AnyObject} from '@loopback/repository';
2+
import {juggler, AnyObject} from '@loopback/repository';
33
const config = require('./<%= jsonFileName %>');
44

55
export class <%= className %>DataSource extends juggler.DataSource {

‎packages/cli/generators/project/templates/package.json.ejs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"clean": "lb-clean dist*",
2121
<% if (project.prettier && project.tslint) { -%>
2222
"lint": "npm run prettier:check && npm run tslint",
23-
"lint:fix": "npm run prettier:fix && npm run tslint:fix",
23+
"lint:fix": "npm run tslint:fix && npm run prettier:fix",
2424
<% } else if (project.prettier) { -%>
2525
"lint": "npm run prettier:check",
2626
"lint:fix": "npm run prettier:fix",
@@ -72,29 +72,29 @@
7272
"src"
7373
],
7474
"dependencies": {
75-
"@loopback/context": "<%= project.dependencies['@loopback/context'] -%>",
7675
"@loopback/boot": "<%= project.dependencies['@loopback/boot'] -%>",
76+
"@loopback/context": "<%= project.dependencies['@loopback/context'] -%>",
7777
<% if (project.projectType === 'application') { -%>
7878
"@loopback/core": "<%= project.dependencies['@loopback/core'] -%>",
7979
"@loopback/dist-util": "<%= project.dependencies['@loopback/dist-util'] -%>",
80+
"@loopback/openapi-v3": "<%= project.dependencies['@loopback/openapi-v3'] -%>",
8081
"@loopback/repository": "<%= project.dependencies['@loopback/repository'] -%>",
81-
"@loopback/rest": "<%= project.dependencies['@loopback/rest'] -%>",
82-
"@loopback/openapi-v3": "<%= project.dependencies['@loopback/openapi-v3'] -%>"
82+
"@loopback/rest": "<%= project.dependencies['@loopback/rest'] -%>"
8383
<% } else { -%>
8484
"@loopback/core": "<%= project.dependencies['@loopback/core'] -%>",
8585
"@loopback/dist-util": "<%= project.dependencies['@loopback/dist-util'] -%>"
8686
<% } -%>
8787
},
8888
"devDependencies": {
8989
"@loopback/build": "<%= project.dependencies['@loopback/build'] -%>",
90-
"@types/node": "<%= project.dependencies['@types/node'] -%>",
91-
<% if (project.mocha) { -%>
9290
"@loopback/testlab": "<%= project.dependencies['@loopback/testlab'] -%>",
91+
<% if (project.mocha) { -%>
9392
"@types/mocha": "<%= project.dependencies['@types/mocha'] -%>",
93+
<% } -%>
94+
"@types/node": "<%= project.dependencies['@types/node'] -%>"<% if (project.mocha) { -%>,<% } %>
95+
<% if (project.mocha) { -%>
9496
"mocha": "<%= project.dependencies['mocha'] -%>",
9597
"source-map-support": "<%= project.dependencies['source-map-support'] -%>"
96-
<% } else { -%>
97-
"@loopback/testlab": "<%= project.dependencies['@loopback/testlab'] -%>"
9898
<% } -%>
9999
}
100100
}

‎packages/cli/generators/project/templates/package.plain.json.ejs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"clean": "rm -rf dist",
1818
<% if (project.prettier && project.tslint) { -%>
1919
"lint": "npm run prettier:check && npm run tslint",
20-
"lint:fix": "npm run prettier:fix && npm run tslint:fix",
20+
"lint:fix": "npm run tslint:fix && npm run prettier:fix",
2121
<% } else if (project.prettier) { -%>
2222
"lint": "npm run prettier:check",
2323
"lint:fix": "npm run prettier:fix",
@@ -67,32 +67,36 @@
6767
"src"
6868
],
6969
"dependencies": {
70-
"@loopback/context": "<%= project.dependencies['@loopback/context'] -%>",
7170
"@loopback/boot": "<%= project.dependencies['@loopback/boot'] -%>",
71+
"@loopback/context": "<%= project.dependencies['@loopback/context'] -%>",
7272
<% if (project.projectType === 'application') { -%>
7373
"@loopback/core": "<%= project.dependencies['@loopback/core'] -%>",
7474
"@loopback/dist-util": "<%= project.dependencies['@loopback/dist-util'] -%>",
75+
"@loopback/openapi-v3": "<%= project.dependencies['@loopback/openapi-v3'] -%>",
7576
"@loopback/repository": "<%= project.dependencies['@loopback/repository'] -%>",
76-
"@loopback/rest": "<%= project.dependencies['@loopback/rest'] -%>",
77-
"@loopback/openapi-v3": "<%= project.dependencies['@loopback/openapi-v3'] -%>"
77+
"@loopback/rest": "<%= project.dependencies['@loopback/rest'] -%>"
7878
<% } else { -%>
7979
"@loopback/core": "<%= project.dependencies['@loopback/core'] -%>"
8080
<% } -%>
8181
},
8282
"devDependencies": {
83-
<% if (project.prettier) { -%>
84-
"prettier": "<%= project.dependencies['prettier'] -%>",
85-
<% } -%>
86-
<% if (project.tslint) { -%>
87-
"tslint": "<%= project.dependencies['tslint'] -%>",
88-
<% } -%>
8983
"@loopback/testlab": "<%= project.dependencies['@loopback/testlab'] -%>",
9084
<% if (project.mocha) { -%>
9185
"@types/mocha": "<%= project.dependencies['@types/mocha'] -%>",
86+
<% } -%>
87+
"@types/node": "<%= project.dependencies['@types/node'] -%>",
88+
<% if (project.mocha) { -%>
9289
"mocha": "<%= project.dependencies['mocha'] -%>",
90+
<% } -%>
91+
<% if (project.prettier) { -%>
92+
"prettier": "<%= project.dependencies['prettier'] -%>",
93+
<% } -%>
94+
<% if (project.mocha) { -%>
9395
"source-map-support": "<%= project.dependencies['source-map-support'] -%>",
9496
<% } -%>
95-
"@types/node": "<%= project.dependencies['@types/node'] -%>",
97+
<% if (project.tslint) { -%>
98+
"tslint": "<%= project.dependencies['tslint'] -%>",
99+
<% } -%>
96100
"typescript": "<%= project.dependencies['typescript'] -%>"
97101
}
98102
}

‎packages/cli/test/integration/generators/datasource.integration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ function checkBasicDataSourceFiles() {
163163
assert.fileContent(expectedTSFile, /import {inject} from '@loopback\/core';/);
164164
assert.fileContent(
165165
expectedTSFile,
166-
/import {juggler, DataSource, AnyObject} from '@loopback\/repository';/,
166+
/import {juggler, AnyObject} from '@loopback\/repository';/,
167167
);
168168
assert.fileContent(
169169
expectedTSFile,

0 commit comments

Comments
 (0)