Skip to content

Commit

Permalink
feat: update nestjs, typeorm, typescript, etc
Browse files Browse the repository at this point in the history
Update @nestjs to 10.0.5

#17
  • Loading branch information
Svetlozar committed Jul 13, 2023
1 parent 1f5899f commit 9a39969
Show file tree
Hide file tree
Showing 12 changed files with 1,434 additions and 1,920 deletions.
12 changes: 4 additions & 8 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
const tsconfig = require('tsconfig-extends');
const { pathsToModuleNameMapper } = require('ts-jest/utils');
const { pathsToModuleNameMapper } = require('ts-jest');
const compilerOptions = tsconfig.load_file_sync('./tsconfig.jest.json', __dirname);

module.exports = {
setupFilesAfterEnv: ['jest-extended'],
setupFilesAfterEnv: ['jest-extended/all'],
moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, {
prefix: '<rootDir>/packages/',
}),
moduleFileExtensions: ['ts', 'js'],
testRegex: '\\.spec.ts$',
rootDir: '.',
transform: {
'^.+\\.ts$': 'ts-jest',
},
globals: {
'ts-jest': {
tsConfig: 'tsconfig.jest.json',
},
'^.+\\.ts$': ['ts-jest', compilerOptions],
},
globals: {},
coverageReporters: ['json', 'lcov', 'text-summary'],
coverageDirectory: 'coverage',
collectCoverageFrom: [
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,26 @@
"peerDependencies": {},
"optionalDependencies": {},
"dependencies": {
"@nestjs/common": "8.2.4",
"@nestjs/core": "8.2.4",
"@nestjs/platform-express": "8.2.4",
"@nestjs/swagger": "5.1.5",
"@nestjs/testing": "8.2.4",
"@nestjs/typeorm": "8.1.3",
"@nestjs/common": "10.0.5",
"@nestjs/core": "10.0.5",
"@nestjs/platform-express": "10.0.5",
"@nestjs/swagger": "7.1.1",
"@nestjs/testing": "10.0.5",
"@nestjs/typeorm": "10.0.0",
"@nuxtjs/opencollective": "0.3.2",
"@types/jest": "26.0.24",
"@types/node": "12.7.5",
"@types/qs": "6.5.3",
"@types/jest": "29.5.3",
"@types/node": "18.11.9",
"@types/qs": "6.9.7",
"@types/supertest": "2.0.12",
"class-transformer": "0.5.1",
"class-validator": "0.13.2",
"commitizen": "4.2.4",
"coveralls": "3.1.1",
"cz-conventional-changelog": "3.3.0",
"husky": "3.1.0",
"jest": "26.6.3",
"jest-extended": "0.11.5",
"lerna": "7.1.1",
"jest": "29.6.1",
"jest-extended": "4.0.0",
"lerna": "7.1.3",
"mysql": "2.18.1",
"nodemon": "1.19.4",
"npm-check": "5.9.2",
Expand All @@ -79,21 +79,21 @@
"pluralize": "8.0.0",
"prettier": "1.18.2",
"pretty-quick": "1.11.1",
"qs": "6.8.0",
"qs": "6.11.2",
"redis": "3.1.2",
"reflect-metadata": "0.1.13",
"rimraf": "3.0.0",
"rxjs": "7.5.5",
"rxjs": "7.8.1",
"supertest": "4.0.2",
"swagger-ui-express": "4.3.0",
"ts-jest": "26.5.6",
"ts-node": "9.1.1",
"ts-jest": "29.1.1",
"ts-node": "10.9.1",
"tsconfig-extends": "1.0.1",
"tsconfig-paths": "3.9.0",
"tslint": "5.20.0",
"tslint": "6.1.3",
"tslint-config-prettier": "1.18.0",
"typeorm": "0.3.6",
"typescript": "4.2.4",
"typeorm": "0.3.17",
"typescript": "^5.1.6",
"validate-commit-msg": "2.14.0"
},
"resolutions": {
Expand Down
46 changes: 23 additions & 23 deletions packages/crud-typeorm/test/b.query-params.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ describe('#crud-typeorm', () => {
describe('#select', () => {
it('should throw status 400', (done) => {
const query = qb.setFilter({ field: 'invalid', operator: 'isnull' }).query();
return request(server)
request(server)
.get('/companies')
.query(query)
.end((_, res) => {
Expand All @@ -231,7 +231,7 @@ describe('#crud-typeorm', () => {
describe('#query filter', () => {
it('should return data with limit', (done) => {
const query = qb.setLimit(4).query();
return request(server)
request(server)
.get('/companies')
.query(query)
.end((_, res) => {
Expand All @@ -245,7 +245,7 @@ describe('#crud-typeorm', () => {
});
it('should return with maxLimit', (done) => {
const query = qb.setLimit(7).query();
return request(server)
request(server)
.get('/companies')
.query(query)
.end((_, res) => {
Expand All @@ -259,7 +259,7 @@ describe('#crud-typeorm', () => {
.setFilter({ field: 'name', operator: 'notin', value: ['Name2', 'Name3'] })
.setOr({ field: 'domain', operator: 'cont', value: 5 })
.query();
return request(server)
request(server)
.get('/companies')
.query(query)
.end((_, res) => {
Expand All @@ -274,7 +274,7 @@ describe('#crud-typeorm', () => {
.setOr({ field: 'name', operator: 'starts', value: 'P' })
.setOr({ field: 'isActive', operator: 'eq', value: true })
.query();
return request(server)
request(server)
.get('/projects')
.query(query)
.end((_, res) => {
Expand All @@ -289,7 +289,7 @@ describe('#crud-typeorm', () => {
.setFilter({ field: 'companyId', operator: 'gte', value: 6 })
.setFilter({ field: 'companyId', operator: 'lt', value: 10 })
.query();
return request(server)
request(server)
.get('/projects')
.query(query)
.end((_, res) => {
Expand All @@ -305,7 +305,7 @@ describe('#crud-typeorm', () => {
.setFilter({ field: 'isActive', operator: 'eq', value: false })
.setFilter({ field: 'description', operator: 'notnull' })
.query();
return request(server)
request(server)
.get('/projects')
.query(query)
.end((_, res) => {
Expand All @@ -316,7 +316,7 @@ describe('#crud-typeorm', () => {
});
it('should return with filter and or, 5', (done) => {
const query = qb.setOr({ field: 'companyId', operator: 'isnull' }).query();
return request(server)
request(server)
.get('/projects')
.query(query)
.end((_, res) => {
Expand All @@ -329,7 +329,7 @@ describe('#crud-typeorm', () => {
const query = qb
.setOr({ field: 'companyId', operator: 'between', value: [1, 5] })
.query();
return request(server)
request(server)
.get('/projects')
.query(query)
.end((_, res) => {
Expand All @@ -340,7 +340,7 @@ describe('#crud-typeorm', () => {
});
it('should return with filter, 1', (done) => {
const query = qb.setOr({ field: 'companyId', operator: 'eq', value: 1 }).query();
return request(server)
request(server)
.get('/projects')
.query(query)
.end((_, res) => {
Expand All @@ -354,7 +354,7 @@ describe('#crud-typeorm', () => {
describe('#query join', () => {
it('should return joined entity, 1', (done) => {
const query = qb.setJoin({ field: 'company', select: ['name'] }).query();
return request(server)
request(server)
.get('/projects/2')
.query(query)
.end((_, res) => {
Expand All @@ -365,7 +365,7 @@ describe('#crud-typeorm', () => {
});
it('should return joined entity, 2', (done) => {
const query = qb.setJoin({ field: 'users', select: ['name'] }).query();
return request(server)
request(server)
.get('/companies/2')
.query(query)
.end((_, res) => {
Expand All @@ -377,7 +377,7 @@ describe('#crud-typeorm', () => {
});
it('should eager join without selection', (done) => {
const query = qb.search({ 'userCompany.id': { $eq: 1 } }).query();
return request(server)
request(server)
.get('/myusers')
.query(query)
.end((_, res) => {
Expand All @@ -400,7 +400,7 @@ describe('#crud-typeorm', () => {
value: 'invalid',
})
.query();
return request(server)
request(server)
.get('/users/1')
.query(query)
.end((_, res) => {
Expand All @@ -418,7 +418,7 @@ describe('#crud-typeorm', () => {
value: 'invalid',
})
.query();
return request(server)
request(server)
.get('/users/1')
.query(query)
.end((_, res) => {
Expand All @@ -436,7 +436,7 @@ describe('#crud-typeorm', () => {
value: 'invalid',
})
.query();
return request(server)
request(server)
.get('/users/1')
.query(query)
.end((_, res) => {
Expand All @@ -449,7 +449,7 @@ describe('#crud-typeorm', () => {
.setJoin({ field: 'company' })
.setJoin({ field: 'company.projectsinvalid' })
.query();
return request(server)
request(server)
.get('/users/1')
.query(query)
.end((_, res) => {
Expand All @@ -463,7 +463,7 @@ describe('#crud-typeorm', () => {
.setJoin({ field: 'company' })
.setJoin({ field: 'company.projects' })
.query();
return request(server)
request(server)
.get('/users/1')
.query(query)
.end((_, res) => {
Expand All @@ -479,7 +479,7 @@ describe('#crud-typeorm', () => {
.setJoin({ field: 'company' })
.setJoin({ field: 'company.projects' })
.query();
return request(server)
request(server)
.get('/users/1')
.query(query)
.end((_, res) => {
Expand All @@ -495,7 +495,7 @@ describe('#crud-typeorm', () => {
.setJoin({ field: 'company' })
.setJoin({ field: 'company.projects' })
.query();
return request(server)
request(server)
.get('/users2/1')
.query(query)
.end((_, res) => {
Expand All @@ -510,7 +510,7 @@ describe('#crud-typeorm', () => {
.setJoin({ field: 'users' })
.setJoin({ field: 'userProjects' })
.query();
return request(server)
request(server)
.get('/projects/1')
.query(query)
.end((_, res) => {
Expand All @@ -529,7 +529,7 @@ describe('#crud-typeorm', () => {
describe('#query composite key join', () => {
it('should return joined relation', (done) => {
const query = qb.setJoin({ field: 'userLicenses' }).query();
return request(server)
request(server)
.get('/users/1')
.query(query)
.end((_, res) => {
Expand Down Expand Up @@ -609,7 +609,7 @@ describe('#crud-typeorm', () => {
})
.query();

return request(server)
request(server)
.get('/companies')
.query(query)
.end((_, res) => {
Expand Down
Loading

0 comments on commit 9a39969

Please sign in to comment.