mirror of
https://github.com/nestjs/nest.git
synced 2026-02-23 15:52:50 +00:00
Compare commits
294 Commits
feat/allow
...
v10.4.14
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d457fe79f | ||
|
|
e52f80af3c | ||
|
|
c7e5e08c97 | ||
|
|
ef67824272 | ||
|
|
3044aae2fe | ||
|
|
e22768083e | ||
|
|
27aaa560e1 | ||
|
|
d3f525135b | ||
|
|
fd7d10f69f | ||
|
|
c9a600c3f5 | ||
|
|
a9a7a9095c | ||
|
|
2c276ac8ec | ||
|
|
0d0b5f7098 | ||
|
|
0e5bf68e7a | ||
|
|
6029a251ba | ||
|
|
cf9bf7cdc2 | ||
|
|
03e0af6440 | ||
|
|
9e5e4f6db3 | ||
|
|
39cc540826 | ||
|
|
4971ef3a5a | ||
|
|
f4b242a6aa | ||
|
|
31a5a552ca | ||
|
|
b642364f6b | ||
|
|
fb72d01118 | ||
|
|
8c1a6878cd | ||
|
|
42c4316777 | ||
|
|
a03363f9ca | ||
|
|
563c088f2a | ||
|
|
31c6fadbc3 | ||
|
|
e24a6833af | ||
|
|
84ab3145a9 | ||
|
|
f0824383ba | ||
|
|
762406a78d | ||
|
|
e0e9002bb7 | ||
|
|
15c04cd0e5 | ||
|
|
f5f226c513 | ||
|
|
26f1341429 | ||
|
|
07886bf320 | ||
|
|
0e54f52d27 | ||
|
|
50796582df | ||
|
|
e3c95e4f60 | ||
|
|
6ea7dcebb6 | ||
|
|
34c5ba6191 | ||
|
|
edb8b1b0e8 | ||
|
|
ce764067a4 | ||
|
|
ef66275ae9 | ||
|
|
21143d757b | ||
|
|
06349b61cd | ||
|
|
1eba0121a0 | ||
|
|
c5bbd1e40f | ||
|
|
265f6d03c8 | ||
|
|
3f127e6a2f | ||
|
|
b1b262f4c3 | ||
|
|
59bf615d29 | ||
|
|
c53eee2065 | ||
|
|
25feb4540a | ||
|
|
9edc20d84c | ||
|
|
f6240160ae | ||
|
|
5a558b271f | ||
|
|
2c72d447c1 | ||
|
|
a7dd69328a | ||
|
|
57c5e6f118 | ||
|
|
bc50321c7a | ||
|
|
9b0cd523aa | ||
|
|
24e0106b46 | ||
|
|
439231ed61 | ||
|
|
425121d809 | ||
|
|
d0fe4833ad | ||
|
|
c95ed06498 | ||
|
|
d7b460c8b8 | ||
|
|
28b785991b | ||
|
|
72b32356dc | ||
|
|
b1a2582abc | ||
|
|
c8c9ce7e89 | ||
|
|
cf8d27c2f3 | ||
|
|
526f3d4b0a | ||
|
|
3eea086936 | ||
|
|
74c4376bbc | ||
|
|
6474afae9d | ||
|
|
f53d138b04 | ||
|
|
6563c18417 | ||
|
|
a071a73e6d | ||
|
|
fb9a534531 | ||
|
|
d220da6b6f | ||
|
|
c0a87b868f | ||
|
|
988d49e0d0 | ||
|
|
fc8c3e2167 | ||
|
|
19f9e4ed1b | ||
|
|
50e97b2abe | ||
|
|
18389c7261 | ||
|
|
4808efa0cd | ||
|
|
d51448cae6 | ||
|
|
da369005f2 | ||
|
|
b31f9e4825 | ||
|
|
34eb4c1be9 | ||
|
|
ccfd0f19b6 | ||
|
|
7db85ad33c | ||
|
|
f69bb660e0 | ||
|
|
ffaa6de5c4 | ||
|
|
315a430197 | ||
|
|
eca955d3d0 | ||
|
|
0e92425c0e | ||
|
|
a23e7df2a4 | ||
|
|
5b0824385f | ||
|
|
95d5dc1af3 | ||
|
|
f1226548f7 | ||
|
|
bedf1fa2a6 | ||
|
|
96e3e79acc | ||
|
|
c5e1c2e74a | ||
|
|
a9b198c08f | ||
|
|
043d4a095b | ||
|
|
09f1d002f3 | ||
|
|
91dffa5da4 | ||
|
|
13a22ef3d6 | ||
|
|
d7d784f926 | ||
|
|
e411d80d4d | ||
|
|
9fb542968b | ||
|
|
e6fe92ce79 | ||
|
|
2df0c754da | ||
|
|
a119a1a9c1 | ||
|
|
5ebe4b93b3 | ||
|
|
4a9a3d86c2 | ||
|
|
1cf339c5be | ||
|
|
2c2d766502 | ||
|
|
dbeaa0b316 | ||
|
|
5396c8c6f0 | ||
|
|
13092aeac0 | ||
|
|
6aa6d47c25 | ||
|
|
38bea6e544 | ||
|
|
42a443ee9a | ||
|
|
f39cffe8ea | ||
|
|
f97c8bc586 | ||
|
|
ca78cbe447 | ||
|
|
9e21f093d8 | ||
|
|
619db30f16 | ||
|
|
9174dd647e | ||
|
|
f95758d88d | ||
|
|
7854ceb1db | ||
|
|
d8343a22cc | ||
|
|
38ab78272f | ||
|
|
45f3322832 | ||
|
|
9bbc4dbab3 | ||
|
|
b46508793e | ||
|
|
feb75da3ce | ||
|
|
46db58c196 | ||
|
|
638d4666fb | ||
|
|
91190b4175 | ||
|
|
d1a76abe21 | ||
|
|
055709dd3a | ||
|
|
f80b00793c | ||
|
|
b876e6b60d | ||
|
|
a7392981cf | ||
|
|
afb889dd21 | ||
|
|
8da7ebcbfd | ||
|
|
c90553bb05 | ||
|
|
8102325bd2 | ||
|
|
bba5fde16e | ||
|
|
416830c392 | ||
|
|
9286733482 | ||
|
|
81597f7ed9 | ||
|
|
84b8744f90 | ||
|
|
95c8547b68 | ||
|
|
ae0517b364 | ||
|
|
8ffae006c8 | ||
|
|
f7248e2d8d | ||
|
|
25ad5b4b80 | ||
|
|
3324703b88 | ||
|
|
3b5cb562a1 | ||
|
|
67e30e2f1f | ||
|
|
f650c22af8 | ||
|
|
2b90f44621 | ||
|
|
3cf1130eaa | ||
|
|
646c663366 | ||
|
|
f39fdacf8a | ||
|
|
7fe2f43d28 | ||
|
|
180a3e6bd3 | ||
|
|
afbba2d318 | ||
|
|
e3e9636dcc | ||
|
|
a4ddd867e6 | ||
|
|
f99353f45e | ||
|
|
f3c0fcde5b | ||
|
|
29cc21c7b7 | ||
|
|
40dbb27519 | ||
|
|
2111a40e47 | ||
|
|
440e9cf6a3 | ||
|
|
f76a69341e | ||
|
|
a3acefffda | ||
|
|
73dea121d7 | ||
|
|
a1732f5b3d | ||
|
|
76e73c26d5 | ||
|
|
62e3bd5a16 | ||
|
|
45f4612ed5 | ||
|
|
aabde1aadb | ||
|
|
de6f7ca20e | ||
|
|
33be15afd5 | ||
|
|
48a74b338b | ||
|
|
5064d9b4a4 | ||
|
|
d98524ab9c | ||
|
|
ddf99c39d0 | ||
|
|
691e7d448e | ||
|
|
518879b3d6 | ||
|
|
b770d7d9b2 | ||
|
|
8b978e3028 | ||
|
|
0f25e83229 | ||
|
|
f3ec5f22fa | ||
|
|
467697599f | ||
|
|
1dafb5fdce | ||
|
|
71e8acec39 | ||
|
|
6094701679 | ||
|
|
99b5a5bbfe | ||
|
|
1531e6a767 | ||
|
|
3fa80a9dab | ||
|
|
439516d7dc | ||
|
|
22c4e9cae3 | ||
|
|
2dda578d9a | ||
|
|
b65c41c5a8 | ||
|
|
f0c3cef7d4 | ||
|
|
e2e70c1bc3 | ||
|
|
70c18e9e7b | ||
|
|
102718ad1b | ||
|
|
02d26a6fd7 | ||
|
|
8279fb5319 | ||
|
|
d4e5743c9b | ||
|
|
b1e33ece5d | ||
|
|
e15d73190d | ||
|
|
4564503936 | ||
|
|
30a6b52c50 | ||
|
|
bc19f81729 | ||
|
|
989075e6c1 | ||
|
|
c60428a6fd | ||
|
|
92e2db8d99 | ||
|
|
5911ed245e | ||
|
|
1b4decf75e | ||
|
|
36756dd194 | ||
|
|
27193cc99f | ||
|
|
194732f4aa | ||
|
|
3559e0c1f2 | ||
|
|
2e4ebe4870 | ||
|
|
7d62aad5fc | ||
|
|
ef8f64cf42 | ||
|
|
afa667509f | ||
|
|
dc09280634 | ||
|
|
8115930ec8 | ||
|
|
8fc1c9786a | ||
|
|
2b9f2fd493 | ||
|
|
2867dff697 | ||
|
|
ee7eb9d48d | ||
|
|
f38a07719a | ||
|
|
af8cd7e4c9 | ||
|
|
c800b06a22 | ||
|
|
f00192f4f1 | ||
|
|
b8ddf4fa59 | ||
|
|
a9954025dd | ||
|
|
0d9b7c85db | ||
|
|
d9a592d899 | ||
|
|
ef24801fcc | ||
|
|
bde210677f | ||
|
|
d35006a0d3 | ||
|
|
29a80ba8ab | ||
|
|
3c5180d2d5 | ||
|
|
a7b73e3107 | ||
|
|
491ed77f22 | ||
|
|
e64ab182ba | ||
|
|
dade6d5889 | ||
|
|
49dc36d9e5 | ||
|
|
831d29553d | ||
|
|
1a076fc4cb | ||
|
|
5c6986f0c7 | ||
|
|
229d97f018 | ||
|
|
1fe4dc2cad | ||
|
|
9cd43532ae | ||
|
|
aff30bf63d | ||
|
|
0dafaaa0b9 | ||
|
|
6dba4debb9 | ||
|
|
3e061e9b14 | ||
|
|
d0b2835293 | ||
|
|
2da82286d2 | ||
|
|
3c6a295037 | ||
|
|
3117b241c1 | ||
|
|
f0527d08fc | ||
|
|
daf0f88366 | ||
|
|
91beaf7bc2 | ||
|
|
0f00a347a6 | ||
|
|
14cffb328a | ||
|
|
cb8e04dd62 | ||
|
|
069676fd84 | ||
|
|
86826a651a | ||
|
|
bb520c073e | ||
|
|
992b18e12a | ||
|
|
d073083757 | ||
|
|
1a80a9c6cd | ||
|
|
c032e83e4d | ||
|
|
5c9bcc85ef | ||
|
|
7ec3eb235d |
@@ -121,7 +121,7 @@ jobs:
|
||||
lint:
|
||||
working_directory: ~/nest
|
||||
docker:
|
||||
- image: cimg/node:<< pipeline.parameters.maintenance-node-version >>
|
||||
- image: cimg/node:<< pipeline.parameters.current-node-version >>
|
||||
steps:
|
||||
- checkout
|
||||
- *restore-cache
|
||||
|
||||
20
.eslintrc.js
20
.eslintrc.js
@@ -17,13 +17,13 @@ module.exports = {
|
||||
sourceType: 'module',
|
||||
},
|
||||
rules: {
|
||||
'@typescript-eslint/interface-name-prefix': 'off',
|
||||
'@typescript-eslint/explicit-function-return-type': 'off',
|
||||
'@typescript-eslint/no-explicit-any': 'off',
|
||||
'@typescript-eslint/explicit-module-boundary-types': 'off',
|
||||
'@typescript-eslint/no-unused-vars': 'off',
|
||||
'@typescript-eslint/ban-types': 'off',
|
||||
'@typescript-eslint/no-array-constructor': 'off',
|
||||
'@typescript-eslint/no-unsafe-function-type': 'off',
|
||||
'@typescript-eslint/no-unused-expressions': 'off',
|
||||
'@typescript-eslint/no-require-imports': 'off',
|
||||
'@typescript-eslint/no-empty-object-type': 'off',
|
||||
'@typescript-eslint/no-wrapper-object-types': 'off',
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -34,13 +34,13 @@ module.exports = {
|
||||
sourceType: 'module',
|
||||
},
|
||||
rules: {
|
||||
'@typescript-eslint/interface-name-prefix': 'off',
|
||||
'@typescript-eslint/explicit-function-return-type': 'off',
|
||||
'@typescript-eslint/no-explicit-any': 'off',
|
||||
'@typescript-eslint/explicit-module-boundary-types': 'off',
|
||||
'@typescript-eslint/no-unused-vars': 'off',
|
||||
'@typescript-eslint/ban-types': 'off',
|
||||
'@typescript-eslint/no-empty-function': 'off',
|
||||
'@typescript-eslint/no-unsafe-function-type': 'off',
|
||||
'@typescript-eslint/no-unused-expressions': 'off',
|
||||
'@typescript-eslint/no-require-imports': 'off',
|
||||
'@typescript-eslint/no-empty-object-type': 'off',
|
||||
'@typescript-eslint/no-wrapper-object-types': 'off',
|
||||
},
|
||||
}
|
||||
]
|
||||
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -1,4 +1,5 @@
|
||||
packages/*/package-lock.json
|
||||
sample/*/package-lock.json
|
||||
|
||||
# dependencies
|
||||
node_modules/
|
||||
@@ -10,7 +11,7 @@ node_modules/
|
||||
/.devcontainer
|
||||
/.classpath
|
||||
/.project
|
||||
/.settings
|
||||
/.settings
|
||||
*.code-workspace
|
||||
|
||||
# Vim
|
||||
@@ -50,3 +51,4 @@ build/config\.gypi
|
||||
|
||||
.npmrc
|
||||
pnpm-lock.yaml
|
||||
/.history
|
||||
|
||||
@@ -25,7 +25,7 @@ services:
|
||||
- "9001:9001"
|
||||
restart: always
|
||||
mysql:
|
||||
image: mysql:8.3.0
|
||||
image: mysql:9.1.0
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: root
|
||||
MYSQL_DATABASE: test
|
||||
@@ -50,7 +50,7 @@ services:
|
||||
zookeeper:
|
||||
container_name: test-zookeeper
|
||||
hostname: zookeeper
|
||||
image: confluentinc/cp-zookeeper:7.5.3
|
||||
image: confluentinc/cp-zookeeper:7.8.0
|
||||
ports:
|
||||
- "2181:2181"
|
||||
environment:
|
||||
@@ -59,7 +59,7 @@ services:
|
||||
kafka:
|
||||
container_name: test-kafka
|
||||
hostname: kafka
|
||||
image: confluentinc/cp-kafka:7.5.3
|
||||
image: confluentinc/cp-kafka:7.8.0
|
||||
depends_on:
|
||||
- zookeeper
|
||||
ports:
|
||||
|
||||
@@ -43,7 +43,10 @@ describe('OnModuleDestroy', () => {
|
||||
it('should sort modules by distance (topological sort) - DESC order', async () => {
|
||||
@Injectable()
|
||||
class BB implements OnModuleDestroy {
|
||||
onModuleDestroy = Sinon.spy();
|
||||
public field: string;
|
||||
async onModuleDestroy() {
|
||||
this.field = 'b-field';
|
||||
}
|
||||
}
|
||||
|
||||
@Module({
|
||||
@@ -54,10 +57,13 @@ describe('OnModuleDestroy', () => {
|
||||
|
||||
@Injectable()
|
||||
class AA implements OnModuleDestroy {
|
||||
public field: string;
|
||||
constructor(private bb: BB) {}
|
||||
onModuleDestroy = Sinon.spy();
|
||||
}
|
||||
|
||||
async onModuleDestroy() {
|
||||
this.field = this.bb.field + '_a-field';
|
||||
}
|
||||
}
|
||||
@Module({
|
||||
imports: [B],
|
||||
providers: [AA],
|
||||
@@ -72,8 +78,7 @@ describe('OnModuleDestroy', () => {
|
||||
await app.init();
|
||||
await app.close();
|
||||
|
||||
const aa = module.get(AA);
|
||||
const bb = module.get(BB);
|
||||
Sinon.assert.callOrder(aa.onModuleDestroy, bb.onModuleDestroy);
|
||||
const instance = module.get(AA);
|
||||
expect(instance.field).to.equal('b-field_a-field');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -39,39 +39,11 @@ describe('OnModuleInit', () => {
|
||||
});
|
||||
|
||||
it('should sort modules by distance (topological sort) - DESC order', async () => {
|
||||
@Injectable()
|
||||
class CC implements OnModuleInit {
|
||||
public field: string;
|
||||
|
||||
async onModuleInit() {
|
||||
this.field = 'c-field';
|
||||
}
|
||||
}
|
||||
|
||||
@Module({})
|
||||
class C {
|
||||
static forRoot() {
|
||||
return {
|
||||
module: C,
|
||||
global: true,
|
||||
providers: [
|
||||
{
|
||||
provide: CC,
|
||||
useValue: new CC(),
|
||||
},
|
||||
],
|
||||
exports: [CC],
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
class BB implements OnModuleInit {
|
||||
public field: string;
|
||||
constructor(private cc: CC) {}
|
||||
|
||||
async onModuleInit() {
|
||||
this.field = this.cc.field + '_b-field';
|
||||
this.field = 'b-field';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,19 +68,14 @@ describe('OnModuleInit', () => {
|
||||
})
|
||||
class A {}
|
||||
|
||||
@Module({
|
||||
imports: [A, C.forRoot()],
|
||||
})
|
||||
class AppModule {}
|
||||
|
||||
const module = await Test.createTestingModule({
|
||||
imports: [AppModule],
|
||||
imports: [A],
|
||||
}).compile();
|
||||
|
||||
const app = module.createNestApplication();
|
||||
await app.init();
|
||||
|
||||
const instance = module.get(AA);
|
||||
expect(instance.field).to.equal('c-field_b-field_a-field');
|
||||
expect(instance.field).to.equal('b-field_a-field');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { Controller } from '@nestjs/common';
|
||||
import { MessagePattern, Payload } from '@nestjs/microservices';
|
||||
import { ExternalSvcService } from './external-svc.service';
|
||||
import { CreateExternalSvcDto } from './dto/create-external-svc.dto';
|
||||
import { UpdateExternalSvcDto } from './dto/update-external-svc.dto';
|
||||
import { ExternalSvcService } from './external-svc.service';
|
||||
|
||||
@Controller()
|
||||
export class ExternalSvcController {
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
import { INestApplication } from '@nestjs/common';
|
||||
import { Test } from '@nestjs/testing';
|
||||
import { TransientLazyModule } from '../src/transient.module';
|
||||
import { LazyController } from '../src/lazy.controller';
|
||||
import * as chai from 'chai';
|
||||
import { expect } from 'chai';
|
||||
import * as request from 'supertest';
|
||||
|
||||
describe('Lazy Transient providers', () => {
|
||||
let app: INestApplication;
|
||||
|
||||
beforeEach(async () => {
|
||||
const module = await Test.createTestingModule({
|
||||
controllers: [LazyController],
|
||||
}).compile();
|
||||
|
||||
app = module.createNestApplication();
|
||||
await app.init();
|
||||
});
|
||||
|
||||
it('should not recreate dependencies for default scope', async () => {
|
||||
const resultOne = await request(app.getHttpServer()).get('/lazy/transient');
|
||||
|
||||
const resultTwo = await request(app.getHttpServer()).get('/lazy/transient');
|
||||
|
||||
expect(resultOne.text).to.be.equal('Hi! Counter is 1');
|
||||
expect(resultOne.statusCode).to.be.equal(200);
|
||||
|
||||
expect(resultTwo.text).to.be.equal('Hi! Counter is 2');
|
||||
expect(resultTwo.statusCode).to.be.equal(200);
|
||||
});
|
||||
});
|
||||
@@ -3,7 +3,13 @@ import { GlobalService } from './global.module';
|
||||
|
||||
@Injectable()
|
||||
export class EagerService {
|
||||
private counter = 0;
|
||||
constructor(public globalService: GlobalService) {}
|
||||
|
||||
sayHello() {
|
||||
this.counter++;
|
||||
return 'Hi! Counter is ' + this.counter;
|
||||
}
|
||||
}
|
||||
|
||||
@Module({
|
||||
|
||||
18
integration/lazy-modules/src/lazy.controller.ts
Normal file
18
integration/lazy-modules/src/lazy.controller.ts
Normal file
@@ -0,0 +1,18 @@
|
||||
import { Controller, Get } from '@nestjs/common';
|
||||
import { LazyModuleLoader } from '@nestjs/core';
|
||||
|
||||
@Controller('lazy')
|
||||
export class LazyController {
|
||||
constructor(private lazyLoadModule: LazyModuleLoader) {}
|
||||
|
||||
@Get('transient')
|
||||
async exec() {
|
||||
const { TransientLazyModule } = await import('./transient.module');
|
||||
const moduleRef = await this.lazyLoadModule.load(() => TransientLazyModule);
|
||||
|
||||
const { TransientService } = await import('./transient.service');
|
||||
const _service = await moduleRef.resolve(TransientService);
|
||||
|
||||
return _service.eager();
|
||||
}
|
||||
}
|
||||
11
integration/lazy-modules/src/transient.module.ts
Normal file
11
integration/lazy-modules/src/transient.module.ts
Normal file
@@ -0,0 +1,11 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { GlobalService } from './global.module';
|
||||
import { EagerService } from './eager.module';
|
||||
import { TransientService } from './transient.service';
|
||||
|
||||
@Module({
|
||||
imports: [],
|
||||
providers: [TransientService, GlobalService, EagerService],
|
||||
exports: [TransientService],
|
||||
})
|
||||
export class TransientLazyModule {}
|
||||
11
integration/lazy-modules/src/transient.service.ts
Normal file
11
integration/lazy-modules/src/transient.service.ts
Normal file
@@ -0,0 +1,11 @@
|
||||
import { Injectable, Scope } from '@nestjs/common';
|
||||
import { EagerService } from './eager.module';
|
||||
|
||||
@Injectable({ scope: Scope.TRANSIENT })
|
||||
export class TransientService {
|
||||
constructor(private eagerService: EagerService) {}
|
||||
|
||||
eager() {
|
||||
return this.eagerService.sayHello();
|
||||
}
|
||||
}
|
||||
@@ -1,98 +0,0 @@
|
||||
import {
|
||||
Controller,
|
||||
INestMicroservice,
|
||||
Injectable,
|
||||
Module,
|
||||
} from '@nestjs/common';
|
||||
import { NestFactory } from '@nestjs/core';
|
||||
import {
|
||||
AsyncOptions,
|
||||
ClientTCP,
|
||||
ClientsModule,
|
||||
MessagePattern,
|
||||
MicroserviceOptions,
|
||||
Payload,
|
||||
TcpOptions,
|
||||
Transport,
|
||||
} from '@nestjs/microservices';
|
||||
import { expect } from 'chai';
|
||||
|
||||
let port: number;
|
||||
|
||||
do {
|
||||
port = Math.round(Math.random() * 10000);
|
||||
} while (port < 1000);
|
||||
|
||||
@Injectable()
|
||||
class RpcOptionsProvider {
|
||||
getOptions(): TcpOptions {
|
||||
return {
|
||||
transport: Transport.TCP,
|
||||
options: {
|
||||
port,
|
||||
host: '0.0.0.0',
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@Controller()
|
||||
class RpcController {
|
||||
@MessagePattern({ cmd: 'sum' })
|
||||
sumPayload(@Payload() payload: number[]) {
|
||||
return payload.reduce((a, b) => a + b, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
ClientsModule.register([
|
||||
{
|
||||
name: 'RPC_CLIENT',
|
||||
transport: Transport.TCP,
|
||||
options: {
|
||||
port,
|
||||
host: '0.0.0.0',
|
||||
},
|
||||
},
|
||||
]),
|
||||
],
|
||||
controllers: [RpcController],
|
||||
providers: [RpcOptionsProvider],
|
||||
})
|
||||
class RpcModule {}
|
||||
|
||||
describe('RPC Async transport', () => {
|
||||
let app: INestMicroservice;
|
||||
let client: ClientTCP;
|
||||
|
||||
beforeEach(async () => {
|
||||
app = await NestFactory.createMicroservice<
|
||||
AsyncOptions<MicroserviceOptions>
|
||||
>(RpcModule, {
|
||||
logger: false,
|
||||
inject: [RpcOptionsProvider],
|
||||
useFactory: (optionsProvider: RpcOptionsProvider) =>
|
||||
optionsProvider.getOptions(),
|
||||
});
|
||||
|
||||
await app.listen();
|
||||
client = app.get('RPC_CLIENT', { strict: false });
|
||||
});
|
||||
|
||||
it(`/POST`, done => {
|
||||
let retData = 0;
|
||||
client.send({ cmd: 'sum' }, [1, 2, 3, 4, 5]).subscribe({
|
||||
next: val => (retData += val),
|
||||
error: done,
|
||||
complete: () => {
|
||||
expect(retData).to.eq(15);
|
||||
done();
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await app.close();
|
||||
});
|
||||
});
|
||||
@@ -24,8 +24,9 @@ export class DisconnectedClientController {
|
||||
return throwError(() =>
|
||||
code === 'ECONNREFUSED' ||
|
||||
code === 'CONN_ERR' ||
|
||||
code === 'ENOTFOUND' ||
|
||||
code === 'CONNECTION_REFUSED' ||
|
||||
error.message === 'Connection is closed.'
|
||||
error.message.includes('Connection is closed.')
|
||||
? new RequestTimeoutException('ECONNREFUSED')
|
||||
: new InternalServerErrorException(),
|
||||
);
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import { Injectable, Module } from '@nestjs/common';
|
||||
import { Module, Injectable } from '@nestjs/common';
|
||||
import { AppController } from './app.controller';
|
||||
import {
|
||||
ClientOptions,
|
||||
ClientsModule,
|
||||
Transport,
|
||||
ClientsModuleOptionsFactory,
|
||||
ClientOptions,
|
||||
ClientTCP,
|
||||
RpcException,
|
||||
Transport,
|
||||
} from '@nestjs/microservices';
|
||||
import { AppController } from './app.controller';
|
||||
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
|
||||
@@ -27,10 +27,14 @@ describe('Durable providers', () => {
|
||||
tenantId: number,
|
||||
end: (err?: any) => void,
|
||||
endpoint = '/durable',
|
||||
opts: {
|
||||
forceError: boolean;
|
||||
} = { forceError: false },
|
||||
) =>
|
||||
request(server)
|
||||
.get(endpoint)
|
||||
.set({ ['x-tenant-id']: tenantId })
|
||||
.set({ ['x-tenant-id']: String(tenantId) })
|
||||
.set({ ['x-force-error']: opts.forceError ? 'true' : 'false' })
|
||||
.end((err, res) => {
|
||||
if (err) return end(err);
|
||||
end(res);
|
||||
@@ -84,6 +88,42 @@ describe('Durable providers', () => {
|
||||
);
|
||||
expect(result.body).deep.equal({ tenantId: '3' });
|
||||
});
|
||||
|
||||
it(`should return the same tenantId both from durable request scoped service and non-durable request scoped service`, async () => {
|
||||
let result: request.Response;
|
||||
result = await new Promise<request.Response>(resolve =>
|
||||
performHttpCall(1, resolve, '/durable/request-context'),
|
||||
);
|
||||
expect(result.body).deep.equal({
|
||||
durableService: '1',
|
||||
nonDurableService: '1',
|
||||
});
|
||||
|
||||
result = await new Promise<request.Response>(resolve =>
|
||||
performHttpCall(2, resolve, '/durable/request-context'),
|
||||
);
|
||||
expect(result.body).deep.equal({
|
||||
durableService: '2',
|
||||
nonDurableService: '2',
|
||||
});
|
||||
});
|
||||
|
||||
it(`should not cache durable providers that throw errors`, async () => {
|
||||
let result: request.Response;
|
||||
|
||||
result = await new Promise<request.Response>(resolve =>
|
||||
performHttpCall(10, resolve, '/durable/echo', { forceError: true }),
|
||||
);
|
||||
|
||||
expect(result.statusCode).equal(412);
|
||||
|
||||
// The second request should be successful
|
||||
result = await new Promise<request.Response>(resolve =>
|
||||
performHttpCall(10, resolve, '/durable/echo'),
|
||||
);
|
||||
|
||||
expect(result.body).deep.equal({ tenantId: '10' });
|
||||
});
|
||||
});
|
||||
|
||||
after(async () => {
|
||||
|
||||
@@ -1,11 +1,18 @@
|
||||
import { ContextId, ContextIdStrategy, HostComponentInfo } from '@nestjs/core';
|
||||
import { Request } from 'express';
|
||||
|
||||
export type TenantContext = {
|
||||
tenantId: string;
|
||||
forceError?: boolean;
|
||||
};
|
||||
|
||||
const tenants = new Map<string, ContextId>();
|
||||
|
||||
export class DurableContextIdStrategy implements ContextIdStrategy {
|
||||
attach(contextId: ContextId, request: Request) {
|
||||
const tenantId = request.headers['x-tenant-id'] as string;
|
||||
const forceError = request.headers['x-force-error'] === 'true';
|
||||
|
||||
let tenantSubTreeId: ContextId;
|
||||
|
||||
if (tenants.has(tenantId)) {
|
||||
@@ -14,10 +21,15 @@ export class DurableContextIdStrategy implements ContextIdStrategy {
|
||||
tenantSubTreeId = { id: +tenantId } as ContextId;
|
||||
tenants.set(tenantId, tenantSubTreeId);
|
||||
}
|
||||
|
||||
const payload: TenantContext = { tenantId };
|
||||
if (forceError) {
|
||||
payload.forceError = true;
|
||||
}
|
||||
return {
|
||||
resolve: (info: HostComponentInfo) =>
|
||||
info.isTreeDurable ? tenantSubTreeId : contextId,
|
||||
payload: { tenantId },
|
||||
payload,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
import { Controller, Get } from '@nestjs/common';
|
||||
import { DurableService } from './durable.service';
|
||||
import { NonDurableService } from './non-durable.service';
|
||||
|
||||
@Controller('durable')
|
||||
export class DurableController {
|
||||
constructor(private readonly durableService: DurableService) {}
|
||||
constructor(
|
||||
private readonly durableService: DurableService,
|
||||
private readonly nonDurableService: NonDurableService,
|
||||
) {}
|
||||
|
||||
@Get()
|
||||
greeting(): string {
|
||||
@@ -12,6 +16,16 @@ export class DurableController {
|
||||
|
||||
@Get('echo')
|
||||
echo() {
|
||||
return this.durableService.requestPayload;
|
||||
return {
|
||||
tenantId: this.durableService.getTenantId(),
|
||||
};
|
||||
}
|
||||
|
||||
@Get('request-context')
|
||||
getRequestContext() {
|
||||
return {
|
||||
durableService: this.durableService.getTenantId(),
|
||||
nonDurableService: this.nonDurableService.getTenantId(),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,11 +3,13 @@ import { APP_GUARD } from '@nestjs/core';
|
||||
import { DurableController } from './durable.controller';
|
||||
import { DurableGuard } from './durable.guard';
|
||||
import { DurableService } from './durable.service';
|
||||
import { NonDurableService } from './non-durable.service';
|
||||
|
||||
@Module({
|
||||
controllers: [DurableController],
|
||||
providers: [
|
||||
DurableService,
|
||||
NonDurableService,
|
||||
{
|
||||
provide: APP_GUARD,
|
||||
useClass: DurableGuard,
|
||||
|
||||
@@ -1,14 +1,30 @@
|
||||
import { Inject, Injectable, Scope } from '@nestjs/common';
|
||||
import {
|
||||
Inject,
|
||||
Injectable,
|
||||
PreconditionFailedException,
|
||||
Scope,
|
||||
} from '@nestjs/common';
|
||||
import { REQUEST } from '@nestjs/core';
|
||||
import { TenantContext } from './durable-context-id.strategy';
|
||||
|
||||
@Injectable({ scope: Scope.REQUEST, durable: true })
|
||||
export class DurableService {
|
||||
public instanceCounter = 0;
|
||||
|
||||
constructor(@Inject(REQUEST) public readonly requestPayload: unknown) {}
|
||||
constructor(
|
||||
@Inject(REQUEST) private readonly requestPayload: TenantContext,
|
||||
) {
|
||||
if (requestPayload.forceError) {
|
||||
throw new PreconditionFailedException('Forced error');
|
||||
}
|
||||
}
|
||||
|
||||
greeting() {
|
||||
++this.instanceCounter;
|
||||
return `Hello world! Counter: ${this.instanceCounter}`;
|
||||
}
|
||||
|
||||
getTenantId() {
|
||||
return this.requestPayload.tenantId;
|
||||
}
|
||||
}
|
||||
|
||||
14
integration/scopes/src/durable/non-durable.service.ts
Normal file
14
integration/scopes/src/durable/non-durable.service.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
import { Inject, Injectable, Scope } from '@nestjs/common';
|
||||
import { REQUEST } from '@nestjs/core';
|
||||
import { TenantContext } from './durable-context-id.strategy';
|
||||
|
||||
@Injectable()
|
||||
export class NonDurableService {
|
||||
constructor(
|
||||
@Inject(REQUEST) private readonly requestPayload: TenantContext,
|
||||
) {}
|
||||
|
||||
getTenantId() {
|
||||
return this.requestPayload.tenantId;
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,9 @@
|
||||
import { INestApplication } from '@nestjs/common';
|
||||
import { Test } from '@nestjs/testing';
|
||||
import { expect } from 'chai';
|
||||
import * as EventSource from 'eventsource';
|
||||
import { io } from 'socket.io-client';
|
||||
import { AppController as LongConnectionController } from '../../nest-application/sse/src/app.controller';
|
||||
import { ApplicationGateway } from '../src/app.gateway';
|
||||
import { NamespaceGateway } from '../src/namespace.gateway';
|
||||
import { ServerGateway } from '../src/server.gateway';
|
||||
@@ -15,7 +17,7 @@ async function createNestApp(...gateways): Promise<INestApplication> {
|
||||
}
|
||||
|
||||
describe('WebSocketGateway', () => {
|
||||
let ws, app;
|
||||
let ws: ReturnType<typeof io>, app: INestApplication;
|
||||
|
||||
it(`should handle message (2nd port)`, async () => {
|
||||
app = await createNestApp(ApplicationGateway);
|
||||
@@ -98,5 +100,78 @@ describe('WebSocketGateway', () => {
|
||||
);
|
||||
});
|
||||
|
||||
describe('shared server for WS and Long-Running connections', () => {
|
||||
afterEach(() => {});
|
||||
it('should block application shutdown', function (done) {
|
||||
let eventSource;
|
||||
|
||||
(async () => {
|
||||
this.timeout(30000);
|
||||
|
||||
setTimeout(() => {
|
||||
const instance = testingModule.get(ServerGateway);
|
||||
expect(instance.onApplicationShutdown.called).to.be.false;
|
||||
eventSource.close();
|
||||
done();
|
||||
}, 25000);
|
||||
|
||||
const testingModule = await Test.createTestingModule({
|
||||
providers: [ServerGateway],
|
||||
controllers: [LongConnectionController],
|
||||
}).compile();
|
||||
app = testingModule.createNestApplication();
|
||||
|
||||
await app.listen(3000);
|
||||
|
||||
ws = io(`http://localhost:3000`);
|
||||
eventSource = new EventSource(`http://localhost:3000/sse`);
|
||||
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
ws.on('connect', resolve);
|
||||
ws.on('error', reject);
|
||||
});
|
||||
|
||||
await new Promise((resolve, reject) => {
|
||||
eventSource.onmessage = resolve;
|
||||
eventSource.onerror = reject;
|
||||
});
|
||||
|
||||
app.close();
|
||||
})();
|
||||
});
|
||||
|
||||
it('should shutdown application immediately when forceCloseConnections is true', async () => {
|
||||
const testingModule = await Test.createTestingModule({
|
||||
providers: [ServerGateway],
|
||||
controllers: [LongConnectionController],
|
||||
}).compile();
|
||||
|
||||
app = testingModule.createNestApplication({
|
||||
forceCloseConnections: true,
|
||||
});
|
||||
|
||||
await app.listen(3000);
|
||||
|
||||
ws = io(`http://localhost:3000`);
|
||||
const eventSource = new EventSource(`http://localhost:3000/sse`);
|
||||
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
ws.on('connect', resolve);
|
||||
ws.on('error', reject);
|
||||
});
|
||||
|
||||
await new Promise((resolve, reject) => {
|
||||
eventSource.onmessage = resolve;
|
||||
eventSource.onerror = reject;
|
||||
});
|
||||
|
||||
await app.close();
|
||||
|
||||
const instance = testingModule.get(ServerGateway);
|
||||
expect(instance.onApplicationShutdown.called).to.be.true;
|
||||
eventSource.close();
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(() => app.close());
|
||||
});
|
||||
|
||||
@@ -218,61 +218,6 @@ describe('WebSocketGateway (WsAdapter)', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('should set messageParser by using setMessageParser method', async () => {
|
||||
const testingModule = await Test.createTestingModule({
|
||||
providers: [ApplicationGateway],
|
||||
}).compile();
|
||||
app = testingModule.createNestApplication();
|
||||
|
||||
const wsAdapter = new WsAdapter(app);
|
||||
wsAdapter.setMessageParser(data => {
|
||||
const [event, payload] = JSON.parse(data.toString());
|
||||
return { event, data: payload };
|
||||
});
|
||||
app.useWebSocketAdapter(wsAdapter);
|
||||
await app.listen(3000);
|
||||
|
||||
ws = new WebSocket('ws://localhost:8080');
|
||||
await new Promise(resolve => ws.on('open', resolve));
|
||||
|
||||
ws.send(JSON.stringify(['push', { test: 'test' }]));
|
||||
await new Promise<void>(resolve =>
|
||||
ws.on('message', data => {
|
||||
expect(JSON.parse(data).data.test).to.be.eql('test');
|
||||
ws.close();
|
||||
resolve();
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('should set messageParser by using constructor options', async () => {
|
||||
const testingModule = await Test.createTestingModule({
|
||||
providers: [ApplicationGateway],
|
||||
}).compile();
|
||||
app = testingModule.createNestApplication();
|
||||
|
||||
const wsAdapter = new WsAdapter(app, {
|
||||
messageParser: data => {
|
||||
const [event, payload] = JSON.parse(data.toString());
|
||||
return { event, data: payload };
|
||||
},
|
||||
});
|
||||
app.useWebSocketAdapter(wsAdapter);
|
||||
await app.listen(3000);
|
||||
|
||||
ws = new WebSocket('ws://localhost:8080');
|
||||
await new Promise(resolve => ws.on('open', resolve));
|
||||
|
||||
ws.send(JSON.stringify(['push', { test: 'test' }]));
|
||||
await new Promise<void>(resolve =>
|
||||
ws.on('message', data => {
|
||||
expect(JSON.parse(data).data.test).to.be.eql('test');
|
||||
ws.close();
|
||||
resolve();
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
afterEach(async function () {
|
||||
await app.close();
|
||||
});
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import { UseInterceptors } from '@nestjs/common';
|
||||
import { OnApplicationShutdown, UseInterceptors } from '@nestjs/common';
|
||||
import { SubscribeMessage, WebSocketGateway } from '@nestjs/websockets';
|
||||
import * as Sinon from 'sinon';
|
||||
import { RequestInterceptor } from './request.interceptor';
|
||||
|
||||
@WebSocketGateway()
|
||||
export class ServerGateway {
|
||||
export class ServerGateway implements OnApplicationShutdown {
|
||||
@SubscribeMessage('push')
|
||||
onPush(client, data) {
|
||||
return {
|
||||
@@ -20,4 +21,6 @@ export class ServerGateway {
|
||||
data: { ...data, path: client.pattern },
|
||||
};
|
||||
}
|
||||
|
||||
onApplicationShutdown = Sinon.spy();
|
||||
}
|
||||
|
||||
@@ -3,5 +3,5 @@
|
||||
"packages": [
|
||||
"packages/*"
|
||||
],
|
||||
"version": "10.4.7"
|
||||
"version": "10.4.14"
|
||||
}
|
||||
|
||||
51239
package-lock.json
generated
51239
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
90
package.json
90
package.json
@@ -59,59 +59,58 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@nuxtjs/opencollective": "0.3.2",
|
||||
"ansis": "3.3.2",
|
||||
"class-transformer": "0.5.1",
|
||||
"class-validator": "0.14.1",
|
||||
"cli-color": "2.0.4",
|
||||
"cors": "2.8.5",
|
||||
"express": "4.21.1",
|
||||
"express": "4.21.2",
|
||||
"fast-json-stringify": "6.0.0",
|
||||
"fast-safe-stringify": "2.1.1",
|
||||
"graphql-subscriptions": "2.0.0",
|
||||
"iterare": "1.2.1",
|
||||
"object-hash": "3.0.0",
|
||||
"path-to-regexp": "3.2.0",
|
||||
"path-to-regexp": "3.3.0",
|
||||
"reflect-metadata": "0.2.2",
|
||||
"rxjs": "7.8.1",
|
||||
"socket.io": "4.8.0",
|
||||
"tslib": "2.7.0",
|
||||
"socket.io": "4.8.1",
|
||||
"tslib": "2.8.1",
|
||||
"uid": "2.0.2",
|
||||
"uuid": "10.0.0"
|
||||
"uuid": "11.0.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@apollo/server": "4.11.0",
|
||||
"@apollo/server": "4.11.2",
|
||||
"@codechecks/client": "0.1.12",
|
||||
"@commitlint/cli": "19.5.0",
|
||||
"@commitlint/config-angular": "19.5.0",
|
||||
"@commitlint/cli": "19.6.0",
|
||||
"@commitlint/config-angular": "19.6.0",
|
||||
"@fastify/cors": "9.0.1",
|
||||
"@fastify/formbody": "7.4.0",
|
||||
"@fastify/middie": "8.3.1",
|
||||
"@fastify/middie": "8.3.3",
|
||||
"@fastify/multipart": "8.3.0",
|
||||
"@fastify/static": "7.0.4",
|
||||
"@fastify/view": "9.1.0",
|
||||
"@grpc/grpc-js": "1.11.1",
|
||||
"@grpc/grpc-js": "1.12.4",
|
||||
"@grpc/proto-loader": "0.7.13",
|
||||
"@nestjs/apollo": "12.2.0",
|
||||
"@nestjs/graphql": "12.2.0",
|
||||
"@nestjs/mongoose": "10.0.10",
|
||||
"@nestjs/apollo": "12.2.2",
|
||||
"@nestjs/graphql": "12.2.2",
|
||||
"@nestjs/mongoose": "10.1.0",
|
||||
"@nestjs/typeorm": "10.0.2",
|
||||
"@types/amqplib": "0.10.5",
|
||||
"@types/bytes": "3.1.4",
|
||||
"@types/chai": "4.3.16",
|
||||
"@types/amqplib": "0.10.6",
|
||||
"@types/bytes": "3.1.5",
|
||||
"@types/chai": "4.3.20",
|
||||
"@types/chai-as-promised": "7.1.8",
|
||||
"@types/cors": "2.8.17",
|
||||
"@types/express": "4.17.21",
|
||||
"@types/gulp": "4.0.17",
|
||||
"@types/http-errors": "2.0.4",
|
||||
"@types/mocha": "10.0.8",
|
||||
"@types/node": "22.5.5",
|
||||
"@types/mocha": "10.0.10",
|
||||
"@types/node": "22.10.0",
|
||||
"@types/sinon": "17.0.3",
|
||||
"@types/supertest": "2.0.16",
|
||||
"@types/ws": "8.5.12",
|
||||
"@typescript-eslint/eslint-plugin": "7.18.0",
|
||||
"@typescript-eslint/parser": "7.18.0",
|
||||
"@types/supertest": "6.0.2",
|
||||
"@types/ws": "8.5.13",
|
||||
"@typescript-eslint/eslint-plugin": "8.17.0",
|
||||
"@typescript-eslint/parser": "8.17.0",
|
||||
"amqp-connection-manager": "4.1.14",
|
||||
"amqplib": "0.10.4",
|
||||
"artillery": "2.0.20",
|
||||
"amqplib": "0.10.5",
|
||||
"artillery": "2.0.21",
|
||||
"body-parser": "1.20.3",
|
||||
"bytes": "3.1.2",
|
||||
"cache-manager": "5.7.6",
|
||||
@@ -119,57 +118,58 @@
|
||||
"chai": "4.5.0",
|
||||
"chai-as-promised": "7.1.2",
|
||||
"clang-format": "1.8.0",
|
||||
"concurrently": "9.0.1",
|
||||
"concurrently": "9.1.0",
|
||||
"conventional-changelog": "6.0.0",
|
||||
"core-js": "3.38.1",
|
||||
"core-js": "3.39.0",
|
||||
"coveralls": "3.1.1",
|
||||
"delete-empty": "3.0.0",
|
||||
"engine.io-client": "6.6.1",
|
||||
"engine.io-client": "6.6.2",
|
||||
"eslint": "8.57.1",
|
||||
"eslint-config-prettier": "9.1.0",
|
||||
"eslint-plugin-import": "2.29.1",
|
||||
"eslint-plugin-import": "2.31.0",
|
||||
"eventsource": "2.0.2",
|
||||
"fancy-log": "2.0.0",
|
||||
"fastify": "4.28.1",
|
||||
"graphql": "16.9.0",
|
||||
"graphql-tools": "9.0.1",
|
||||
"gulp": "4.0.2",
|
||||
"graphql-tools": "9.0.5",
|
||||
"graphql-subscriptions": "2.0.0",
|
||||
"gulp": "5.0.0",
|
||||
"gulp-clang-format": "1.0.27",
|
||||
"gulp-clean": "0.4.0",
|
||||
"gulp-sourcemaps": "3.0.0",
|
||||
"gulp-typescript": "5.0.1",
|
||||
"gulp-watch": "5.0.1",
|
||||
"http-errors": "2.0.0",
|
||||
"husky": "9.1.5",
|
||||
"husky": "9.1.7",
|
||||
"imports-loader": "5.0.0",
|
||||
"ioredis": "5.4.1",
|
||||
"json-loader": "0.5.7",
|
||||
"kafkajs": "2.2.4",
|
||||
"lerna": "2.11.0",
|
||||
"lerna-changelog": "2.2.0",
|
||||
"light-my-request": "6.1.0",
|
||||
"light-my-request": "6.3.0",
|
||||
"lint-staged": "15.2.10",
|
||||
"markdown-table": "2.0.0",
|
||||
"mocha": "10.7.3",
|
||||
"mongoose": "8.6.2",
|
||||
"mqtt": "5.6.0",
|
||||
"mocha": "10.8.2",
|
||||
"mongoose": "8.8.4",
|
||||
"mqtt": "5.10.3",
|
||||
"multer": "1.4.4",
|
||||
"mysql2": "3.11.3",
|
||||
"mysql2": "3.11.4",
|
||||
"nats": "2.28.2",
|
||||
"nodemon": "3.1.5",
|
||||
"nyc": "14.1.1",
|
||||
"prettier": "3.3.3",
|
||||
"nodemon": "3.1.7",
|
||||
"nyc": "17.1.0",
|
||||
"prettier": "3.4.2",
|
||||
"redis": "4.7.0",
|
||||
"rxjs-compat": "6.6.7",
|
||||
"sinon": "19.0.2",
|
||||
"sinon-chai": "3.7.0",
|
||||
"socket.io-client": "4.8.0",
|
||||
"sinon-chai": "4.0.0",
|
||||
"socket.io-client": "4.8.1",
|
||||
"subscriptions-transport-ws": "0.11.0",
|
||||
"supertest": "7.0.0",
|
||||
"ts-morph": "23.0.0",
|
||||
"ts-morph": "24.0.0",
|
||||
"ts-node": "10.9.2",
|
||||
"typeorm": "0.3.20",
|
||||
"typescript": "5.6.2",
|
||||
"typescript": "5.6.3",
|
||||
"wrk": "1.2.1",
|
||||
"ws": "8.18.0"
|
||||
},
|
||||
|
||||
@@ -94,7 +94,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
|
||||
<td><a href="https://www.mercedes-benz.com/" target="_blank"><img src="https://nestjs.com/img/logos/mercedes-logo.png" width="100" valign="middle" /></a></td>
|
||||
<td><a href="https://www.dinii.jp/" target="_blank"><img src="https://nestjs.com/img/logos/dinii-logo.png" width="65" valign="middle" /></a></td>
|
||||
<td><a href="https://bloodycase.com/?promocode=NEST" target="_blank"><img src="https://nestjs.com/img/logos/bloodycase-logo.png" width="65" valign="middle" /></a></td>
|
||||
<td><a href="https://handsontable.com/docs/react-data-grid/?utm_source=NestJS_GH&utm_medium=sponsorship&utm_campaign=library_sponsorship_2024" target="_blank"><img src="https://nestjs.com/img/logos/handsontable-logo.svg" width="150" valign="middle" /></a></td>
|
||||
<td><a href="https://handsontable.com/docs/react-data-grid/?utm_source=NestJS_GH&utm_medium=sponsorship&utm_campaign=library_sponsorship_2024" target="_blank"><img src="https://nestjs.com/img/logos/handsontable-dark-logo.svg#2" width="150" valign="middle" /></a></td>
|
||||
<td align="center" valign="middle"><a href="https://www.itflashcards.com/" target="_blank"><img src="https://nestjs.com/img/logos/it_flashcards-logo.png" width="170" valign="middle" /></a></td>
|
||||
<td align="center" valign="middle"><a href="https://arcjet.com/?ref=nestjs" target="_blank"><img src="https://nestjs.com/img/logos/arcjet-logo.svg" width="170" valign="middle" /></a></td>
|
||||
</tr>
|
||||
|
||||
@@ -3,7 +3,6 @@ import {
|
||||
PROPERTY_DEPS_METADATA,
|
||||
SELF_DECLARED_DEPS_METADATA,
|
||||
} from '../../constants';
|
||||
import { ForwardReference, InjectionToken } from '../../interfaces';
|
||||
import { isUndefined } from '../../utils/shared.utils';
|
||||
|
||||
/**
|
||||
@@ -35,8 +34,8 @@ import { isUndefined } from '../../utils/shared.utils';
|
||||
*
|
||||
* @publicApi
|
||||
*/
|
||||
export function Inject(
|
||||
token?: InjectionToken | ForwardReference,
|
||||
export function Inject<T = any>(
|
||||
token?: T,
|
||||
): PropertyDecorator & ParameterDecorator {
|
||||
const injectCallHasArguments = arguments.length > 0;
|
||||
|
||||
|
||||
@@ -16,8 +16,12 @@ export type ParamDecoratorEnhancer = ParameterDecorator;
|
||||
*
|
||||
* @publicApi
|
||||
*/
|
||||
export function createParamDecorator<FactoryData = any, FactoryOutput = any>(
|
||||
factory: CustomParamFactory<FactoryData, FactoryOutput>,
|
||||
export function createParamDecorator<
|
||||
FactoryData = any,
|
||||
FactoryInput = any,
|
||||
FactoryOutput = any,
|
||||
>(
|
||||
factory: CustomParamFactory<FactoryData, FactoryInput, FactoryOutput>,
|
||||
enhancers: ParamDecoratorEnhancer[] = [],
|
||||
): (
|
||||
...dataOrPipes: (Type<PipeTransform> | PipeTransform | FactoryData)[]
|
||||
|
||||
@@ -118,66 +118,3 @@ export const All = createMappingDecorator(RequestMethod.ALL);
|
||||
* @publicApi
|
||||
*/
|
||||
export const Search = createMappingDecorator(RequestMethod.SEARCH);
|
||||
|
||||
/**
|
||||
* Route handler (method) Decorator. Routes Webdav PROPFIND requests to the specified path.
|
||||
*
|
||||
* @see [Routing](https://docs.nestjs.com/controllers#routing)
|
||||
*
|
||||
* @publicApi
|
||||
*/
|
||||
export const Propfind = createMappingDecorator(RequestMethod.PROPFIND);
|
||||
|
||||
/**
|
||||
* Route handler (method) Decorator. Routes Webdav PROPPATCH requests to the specified path.
|
||||
*
|
||||
* @see [Routing](https://docs.nestjs.com/controllers#routing)
|
||||
*
|
||||
* @publicApi
|
||||
*/
|
||||
export const Proppatch = createMappingDecorator(RequestMethod.PROPPATCH);
|
||||
|
||||
/**
|
||||
* Route handler (method) Decorator. Routes Webdav MKCOL requests to the specified path.
|
||||
*
|
||||
* @see [Routing](https://docs.nestjs.com/controllers#routing)
|
||||
*
|
||||
* @publicApi
|
||||
*/
|
||||
export const Mkcol = createMappingDecorator(RequestMethod.MKCOL);
|
||||
|
||||
/**
|
||||
* Route handler (method) Decorator. Routes Webdav COPY requests to the specified path.
|
||||
*
|
||||
* @see [Routing](https://docs.nestjs.com/controllers#routing)
|
||||
*
|
||||
* @publicApi
|
||||
*/
|
||||
export const Copy = createMappingDecorator(RequestMethod.COPY);
|
||||
|
||||
/**
|
||||
* Route handler (method) Decorator. Routes Webdav MOVE requests to the specified path.
|
||||
*
|
||||
* @see [Routing](https://docs.nestjs.com/controllers#routing)
|
||||
*
|
||||
* @publicApi
|
||||
*/
|
||||
export const Move = createMappingDecorator(RequestMethod.MOVE);
|
||||
|
||||
/**
|
||||
* Route handler (method) Decorator. Routes Webdav LOCK requests to the specified path.
|
||||
*
|
||||
* @see [Routing](https://docs.nestjs.com/controllers#routing)
|
||||
*
|
||||
* @publicApi
|
||||
*/
|
||||
export const Lock = createMappingDecorator(RequestMethod.LOCK);
|
||||
|
||||
/**
|
||||
* Route handler (method) Decorator. Routes Webdav UNLOCK requests to the specified path.
|
||||
*
|
||||
* @see [Routing](https://docs.nestjs.com/controllers#routing)
|
||||
*
|
||||
* @publicApi
|
||||
*/
|
||||
export const Unlock = createMappingDecorator(RequestMethod.UNLOCK);
|
||||
|
||||
@@ -524,6 +524,32 @@ export function Body(
|
||||
*/
|
||||
export function RawBody(): ParameterDecorator;
|
||||
|
||||
/**
|
||||
* Route handler parameter decorator. Extracts the `rawBody` Buffer
|
||||
* property from the `req` object and populates the decorated parameter with that value.
|
||||
* Also applies pipes to the bound rawBody parameter.
|
||||
*
|
||||
* For example:
|
||||
* ```typescript
|
||||
* async create(@RawBody(new ValidationPipe()) rawBody: Buffer)
|
||||
* ```
|
||||
*
|
||||
* @param pipes one or more pipes - either instances or classes - to apply to
|
||||
* the bound body parameter.
|
||||
*
|
||||
* @see [Request object](https://docs.nestjs.com/controllers#request-object)
|
||||
* @see [Raw body](https://docs.nestjs.com/faq/raw-body)
|
||||
* @see [Working with pipes](https://docs.nestjs.com/custom-decorators#working-with-pipes)
|
||||
*
|
||||
* @publicApi
|
||||
*/
|
||||
export function RawBody(
|
||||
...pipes: (
|
||||
| Type<PipeTransform<Buffer | undefined>>
|
||||
| PipeTransform<Buffer | undefined>
|
||||
)[]
|
||||
): ParameterDecorator;
|
||||
|
||||
/**
|
||||
* Route handler parameter decorator. Extracts the `rawBody` Buffer
|
||||
* property from the `req` object and populates the decorated parameter with that value.
|
||||
|
||||
@@ -13,9 +13,6 @@ export enum HttpStatus {
|
||||
NO_CONTENT = 204,
|
||||
RESET_CONTENT = 205,
|
||||
PARTIAL_CONTENT = 206,
|
||||
MULTI_STATUS = 207,
|
||||
ALREADY_REPORTED = 208,
|
||||
CONTENT_DIFFERENT = 210,
|
||||
AMBIGUOUS = 300,
|
||||
MOVED_PERMANENTLY = 301,
|
||||
FOUND = 302,
|
||||
@@ -44,17 +41,13 @@ export enum HttpStatus {
|
||||
I_AM_A_TEAPOT = 418,
|
||||
MISDIRECTED = 421,
|
||||
UNPROCESSABLE_ENTITY = 422,
|
||||
LOCKED = 423,
|
||||
FAILED_DEPENDENCY = 424,
|
||||
PRECONDITION_REQUIRED = 428,
|
||||
TOO_MANY_REQUESTS = 429,
|
||||
UNRECOVERABLE_ERROR = 456,
|
||||
INTERNAL_SERVER_ERROR = 500,
|
||||
NOT_IMPLEMENTED = 501,
|
||||
BAD_GATEWAY = 502,
|
||||
SERVICE_UNAVAILABLE = 503,
|
||||
GATEWAY_TIMEOUT = 504,
|
||||
HTTP_VERSION_NOT_SUPPORTED = 505,
|
||||
INSUFFICIENT_STORAGE = 507,
|
||||
LOOP_DETECTED = 508,
|
||||
}
|
||||
|
||||
@@ -8,11 +8,4 @@ export enum RequestMethod {
|
||||
OPTIONS,
|
||||
HEAD,
|
||||
SEARCH,
|
||||
PROPFIND,
|
||||
PROPPATCH,
|
||||
MKCOL,
|
||||
COPY,
|
||||
MOVE,
|
||||
LOCK,
|
||||
UNLOCK,
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import {
|
||||
HttpExceptionBody,
|
||||
HttpExceptionBodyMessage,
|
||||
} from '../interfaces/http/http-exception-body.interface';
|
||||
import { isNumber, isObject, isString } from '../utils/shared.utils';
|
||||
import { isObject, isString } from '../utils/shared.utils';
|
||||
|
||||
export interface HttpExceptionOptions {
|
||||
/** original cause of the error */
|
||||
@@ -115,14 +115,17 @@ export class HttpException extends Error {
|
||||
message: HttpExceptionBodyMessage,
|
||||
statusCode: number,
|
||||
): HttpExceptionBody;
|
||||
|
||||
public static createBody(
|
||||
message: HttpExceptionBodyMessage,
|
||||
error: string,
|
||||
statusCode: number,
|
||||
): HttpExceptionBody;
|
||||
|
||||
public static createBody<Body extends Record<string, unknown>>(
|
||||
custom: Body,
|
||||
): Body;
|
||||
|
||||
public static createBody<Body extends Record<string, unknown>>(
|
||||
arg0: null | HttpExceptionBodyMessage | Body,
|
||||
arg1?: HttpExceptionBodyMessage | string,
|
||||
@@ -135,7 +138,7 @@ export class HttpException extends Error {
|
||||
};
|
||||
}
|
||||
|
||||
if (isString(arg0) || Array.isArray(arg0) || isNumber(arg0)) {
|
||||
if (isString(arg0) || Array.isArray(arg0)) {
|
||||
return {
|
||||
message: arg0,
|
||||
error: arg1 as string,
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { Readable } from 'stream';
|
||||
import { types } from 'util';
|
||||
import { HttpStatus } from '../enums';
|
||||
import { Logger } from '../services';
|
||||
import { isFunction } from '../utils/shared.utils';
|
||||
import { StreamableFileOptions, StreamableHandlerResponse } from './interfaces';
|
||||
import { Logger } from '../services';
|
||||
|
||||
/**
|
||||
* @see [Streaming files](https://docs.nestjs.com/techniques/streaming-files)
|
||||
@@ -31,7 +31,7 @@ export class StreamableFile {
|
||||
};
|
||||
|
||||
protected logError: (err: Error) => void = (err: Error) => {
|
||||
this.logger.error(err);
|
||||
this.logger.error(err.message, err.stack);
|
||||
};
|
||||
|
||||
constructor(buffer: Uint8Array, options?: StreamableFileOptions);
|
||||
|
||||
@@ -2,7 +2,7 @@ import { Type } from '../type.interface';
|
||||
import { ClassTransformOptions } from './class-transform-options.interface';
|
||||
|
||||
export interface TransformerPackage {
|
||||
plainToInstance<T>(
|
||||
plainToClass<T>(
|
||||
cls: Type<T>,
|
||||
plain: unknown,
|
||||
options?: ClassTransformOptions,
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
import { ExecutionContext } from './execution-context.interface';
|
||||
|
||||
/**
|
||||
* @publicApi
|
||||
*/
|
||||
export type CustomParamFactory<TData = any, TOutput = any> = (
|
||||
export type CustomParamFactory<TData = any, TInput = any, TOutput = any> = (
|
||||
data: TData,
|
||||
context: ExecutionContext,
|
||||
input: TInput,
|
||||
) => TOutput;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
export type HttpExceptionBodyMessage = string | string[] | number;
|
||||
export type HttpExceptionBodyMessage = string | string[];
|
||||
|
||||
export interface HttpExceptionBody {
|
||||
message: HttpExceptionBodyMessage;
|
||||
|
||||
@@ -47,20 +47,6 @@ export interface HttpServer<
|
||||
put(path: string, handler: RequestHandler<TRequest, TResponse>): any;
|
||||
patch(handler: RequestHandler<TRequest, TResponse>): any;
|
||||
patch(path: string, handler: RequestHandler<TRequest, TResponse>): any;
|
||||
propfind?(handler: RequestHandler<TRequest, TResponse>): any;
|
||||
propfind?(path: string, handler: RequestHandler<TRequest, TResponse>): any;
|
||||
proppatch?(handler: RequestHandler<TRequest, TResponse>): any;
|
||||
proppatch?(path: string, handler: RequestHandler<TRequest, TResponse>): any;
|
||||
mkcol?(handler: RequestHandler<TRequest, TResponse>): any;
|
||||
mkcol?(path: string, handler: RequestHandler<TRequest, TResponse>): any;
|
||||
copy?(handler: RequestHandler<TRequest, TResponse>): any;
|
||||
copy?(path: string, handler: RequestHandler<TRequest, TResponse>): any;
|
||||
move?(handler: RequestHandler<TRequest, TResponse>): any;
|
||||
move?(path: string, handler: RequestHandler<TRequest, TResponse>): any;
|
||||
lock?(handler: RequestHandler<TRequest, TResponse>): any;
|
||||
lock?(path: string, handler: RequestHandler<TRequest, TResponse>): any;
|
||||
unlock?(handler: RequestHandler<TRequest, TResponse>): any;
|
||||
unlock?(path: string, handler: RequestHandler<TRequest, TResponse>): any;
|
||||
all(path: string, handler: RequestHandler<TRequest, TResponse>): any;
|
||||
all(handler: RequestHandler<TRequest, TResponse>): any;
|
||||
options(handler: RequestHandler<TRequest, TResponse>): any;
|
||||
|
||||
@@ -35,6 +35,7 @@ export interface ModuleMetadata {
|
||||
*/
|
||||
exports?: Array<
|
||||
| DynamicModule
|
||||
| Promise<DynamicModule>
|
||||
| string
|
||||
| symbol
|
||||
| Provider
|
||||
|
||||
@@ -44,13 +44,4 @@ export class NestApplicationContextOptions {
|
||||
* @default false
|
||||
*/
|
||||
snapshot?: boolean;
|
||||
|
||||
/**
|
||||
* Determines what algorithm use to generate module ids.
|
||||
* When set to `deep-hash`, the module id is generated based on the serialized module definition.
|
||||
* When set to `reference`, each module obtains a unique id based on its reference.
|
||||
*
|
||||
* @default 'reference'
|
||||
*/
|
||||
moduleIdGeneratorAlgorithm?: 'deep-hash' | 'reference';
|
||||
}
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
import { ShutdownSignal } from '../enums/shutdown-signal.enum';
|
||||
import { LoggerService, LogLevel } from '../services/logger.service';
|
||||
import { DynamicModule } from './modules';
|
||||
import { NestApplicationContextOptions } from './nest-application-context-options.interface';
|
||||
import { Type } from './type.interface';
|
||||
|
||||
export type SelectOptions = Pick<NestApplicationContextOptions, 'abortOnError'>;
|
||||
|
||||
export interface GetOrResolveOptions {
|
||||
/**
|
||||
* If enabled, lookup will only be performed in the host module.
|
||||
@@ -30,10 +27,7 @@ export interface INestApplicationContext {
|
||||
* Allows navigating through the modules tree, for example, to pull out a specific instance from the selected module.
|
||||
* @returns {INestApplicationContext}
|
||||
*/
|
||||
select<T>(
|
||||
module: Type<T> | DynamicModule,
|
||||
options?: SelectOptions,
|
||||
): INestApplicationContext;
|
||||
select<T>(module: Type<T> | DynamicModule): INestApplicationContext;
|
||||
|
||||
/**
|
||||
* Retrieves an instance of either injectable or controller, otherwise, throws exception.
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { Observable } from 'rxjs';
|
||||
import { ExceptionFilter } from './exceptions/exception-filter.interface';
|
||||
import { CanActivate } from './features/can-activate.interface';
|
||||
import { NestInterceptor } from './features/nest-interceptor.interface';
|
||||
@@ -20,8 +19,8 @@ export interface INestMicroservice extends INestApplicationContext {
|
||||
listen(): Promise<any>;
|
||||
|
||||
/**
|
||||
* Registers a web socket adapter that will be used for Gateways.
|
||||
* Use to override the default `socket.io` library.
|
||||
* Register Ws Adapter which will be used inside Gateways.
|
||||
* Use when you want to override default `socket.io` library.
|
||||
*
|
||||
* @param {WebSocketAdapter} adapter
|
||||
* @returns {this}
|
||||
@@ -29,64 +28,37 @@ export interface INestMicroservice extends INestApplicationContext {
|
||||
useWebSocketAdapter(adapter: WebSocketAdapter): this;
|
||||
|
||||
/**
|
||||
* Registers global exception filters (will be used for every pattern handler).
|
||||
* Registers exception filters as global filters (will be used within every message pattern handler)
|
||||
*
|
||||
* @param {...ExceptionFilter} filters
|
||||
*/
|
||||
useGlobalFilters(...filters: ExceptionFilter[]): this;
|
||||
|
||||
/**
|
||||
* Registers global pipes (will be used for every pattern handler).
|
||||
* Registers pipes as global pipes (will be used within every message pattern handler)
|
||||
*
|
||||
* @param {...PipeTransform} pipes
|
||||
*/
|
||||
useGlobalPipes(...pipes: PipeTransform<any>[]): this;
|
||||
|
||||
/**
|
||||
* Registers global interceptors (will be used for every pattern handler).
|
||||
* Registers interceptors as global interceptors (will be used within every message pattern handler)
|
||||
*
|
||||
* @param {...NestInterceptor} interceptors
|
||||
*/
|
||||
useGlobalInterceptors(...interceptors: NestInterceptor[]): this;
|
||||
|
||||
/**
|
||||
* Registers global guards (will be used for every pattern handler).
|
||||
* Registers guards as global guards (will be used within every message pattern handler)
|
||||
*
|
||||
* @param {...CanActivate} guards
|
||||
*/
|
||||
useGlobalGuards(...guards: CanActivate[]): this;
|
||||
|
||||
/**
|
||||
* Terminates the application.
|
||||
* Terminates the application
|
||||
*
|
||||
* @returns {Promise<void>}
|
||||
*/
|
||||
close(): Promise<void>;
|
||||
|
||||
/**
|
||||
* Returns an observable that emits status changes.
|
||||
*
|
||||
* @returns {Observable<string>}
|
||||
*/
|
||||
status: Observable<string>;
|
||||
|
||||
/**
|
||||
* Registers an event listener for the given event.
|
||||
* @param event Event name
|
||||
* @param callback Callback to be executed when the event is emitted
|
||||
*/
|
||||
on<
|
||||
EventsMap extends Record<string, Function> = Record<string, Function>,
|
||||
EventKey extends keyof EventsMap = keyof EventsMap,
|
||||
EventCallback extends EventsMap[EventKey] = EventsMap[EventKey],
|
||||
>(
|
||||
event: EventKey,
|
||||
callback: EventCallback,
|
||||
): void;
|
||||
|
||||
/**
|
||||
* Returns an instance of the underlying server/broker instance,
|
||||
* or a group of servers if there are more than one.
|
||||
*/
|
||||
unwrap<T>(): T;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { isUndefined } from '../../utils/shared.utils';
|
||||
import {
|
||||
InjectionToken,
|
||||
Provider,
|
||||
@@ -6,15 +7,17 @@ import {
|
||||
} from '../../interfaces';
|
||||
|
||||
/**
|
||||
* check if x is OptionalFactoryDependency, based on prototype presence
|
||||
* (to avoid classes with a static 'token' field)
|
||||
* @param x
|
||||
* @returns x is OptionalFactoryDependency
|
||||
* @param value
|
||||
* @returns `true` if value is `OptionalFactoryDependency`
|
||||
*/
|
||||
function isOptionalFactoryDependency(
|
||||
x: InjectionToken | OptionalFactoryDependency,
|
||||
): x is OptionalFactoryDependency {
|
||||
return !!((x as any)?.token && !(x as any)?.prototype);
|
||||
value: InjectionToken | OptionalFactoryDependency,
|
||||
): value is OptionalFactoryDependency {
|
||||
return (
|
||||
!isUndefined((value as OptionalFactoryDependency).token) &&
|
||||
!isUndefined((value as OptionalFactoryDependency).optional) &&
|
||||
!(value as any).prototype
|
||||
);
|
||||
}
|
||||
|
||||
const mapInjectToTokens = (t: InjectionToken | OptionalFactoryDependency) =>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nestjs/common",
|
||||
"version": "10.4.7",
|
||||
"version": "10.4.14",
|
||||
"description": "Nest - modern, fast, powerful node.js web framework (@common)",
|
||||
"author": "Kamil Mysliwiec",
|
||||
"homepage": "https://nestjs.com",
|
||||
@@ -19,7 +19,7 @@
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"iterare": "1.2.1",
|
||||
"tslib": "2.7.0",
|
||||
"tslib": "2.8.1",
|
||||
"uid": "2.0.2"
|
||||
},
|
||||
"peerDependencies": {
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
export * from './default-value.pipe';
|
||||
export * from './file';
|
||||
export * from './parse-array.pipe';
|
||||
export * from './parse-bool.pipe';
|
||||
export * from './parse-date.pipe';
|
||||
export * from './parse-enum.pipe';
|
||||
export * from './parse-float.pipe';
|
||||
export * from './parse-int.pipe';
|
||||
export * from './parse-float.pipe';
|
||||
export * from './parse-enum.pipe';
|
||||
export * from './parse-uuid.pipe';
|
||||
export * from './validation.pipe';
|
||||
export * from './file';
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
PipeTransform,
|
||||
} from '../interfaces/features/pipe-transform.interface';
|
||||
import { HttpErrorByCode } from '../utils/http-error-by-code.util';
|
||||
import { isNil, isString, isUndefined } from '../utils/shared.utils';
|
||||
import { isNil, isUndefined, isString } from '../utils/shared.utils';
|
||||
import { ValidationPipe, ValidationPipeOptions } from './validation.pipe';
|
||||
|
||||
const VALIDATION_ERROR_MESSAGE = 'Validation failed (parsable array expected)';
|
||||
@@ -21,26 +21,9 @@ export interface ParseArrayOptions
|
||||
ValidationPipeOptions,
|
||||
'transform' | 'validateCustomDecorators' | 'exceptionFactory'
|
||||
> {
|
||||
/**
|
||||
* Type for items to be converted into
|
||||
*/
|
||||
items?: Type<unknown>;
|
||||
/**
|
||||
* Items separator to split string by
|
||||
* @default ','
|
||||
*/
|
||||
separator?: string;
|
||||
/**
|
||||
* If true, the pipe will return null or undefined if the value is not provided
|
||||
* @default false
|
||||
*/
|
||||
optional?: boolean;
|
||||
/**
|
||||
* A factory function that returns an exception object to be thrown
|
||||
* if validation fails.
|
||||
* @param error Error message or object
|
||||
* @returns The exception object
|
||||
*/
|
||||
exceptionFactory?: (error: any) => any;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,21 +15,8 @@ import { isNil } from '../utils/shared.utils';
|
||||
* @publicApi
|
||||
*/
|
||||
export interface ParseBoolPipeOptions {
|
||||
/**
|
||||
* The HTTP status code to be used in the response when the validation fails.
|
||||
*/
|
||||
errorHttpStatusCode?: ErrorHttpStatusCode;
|
||||
/**
|
||||
* A factory function that returns an exception object to be thrown
|
||||
* if validation fails.
|
||||
* @param error Error message
|
||||
* @returns The exception object
|
||||
*/
|
||||
exceptionFactory?: (error: string) => any;
|
||||
/**
|
||||
* If true, the pipe will return null or undefined if the value is not provided
|
||||
* @default false
|
||||
*/
|
||||
optional?: boolean;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
import { Injectable } from '../decorators/core/injectable.decorator';
|
||||
import { HttpStatus } from '../enums/http-status.enum';
|
||||
import { PipeTransform } from '../interfaces/features/pipe-transform.interface';
|
||||
import {
|
||||
ErrorHttpStatusCode,
|
||||
HttpErrorByCode,
|
||||
} from '../utils/http-error-by-code.util';
|
||||
import { isNil } from '../utils/shared.utils';
|
||||
|
||||
export interface ParseDatePipeOptions {
|
||||
/**
|
||||
* If true, the pipe will return null or undefined if the value is not provided
|
||||
* @default false
|
||||
*/
|
||||
optional?: boolean;
|
||||
/**
|
||||
* Default value for the date
|
||||
*/
|
||||
default?: () => Date;
|
||||
/**
|
||||
* The HTTP status code to be used in the response when the validation fails.
|
||||
*/
|
||||
errorHttpStatusCode?: ErrorHttpStatusCode;
|
||||
/**
|
||||
* A factory function that returns an exception object to be thrown
|
||||
* if validation fails.
|
||||
* @param error Error message
|
||||
* @returns The exception object
|
||||
*/
|
||||
exceptionFactory?: (error: string) => any;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class ParseDatePipe
|
||||
implements PipeTransform<string | number | undefined | null>
|
||||
{
|
||||
protected exceptionFactory: (error: string) => any;
|
||||
|
||||
constructor(private readonly options: ParseDatePipeOptions = {}) {
|
||||
const { exceptionFactory, errorHttpStatusCode = HttpStatus.BAD_REQUEST } =
|
||||
options;
|
||||
|
||||
this.exceptionFactory =
|
||||
exceptionFactory ||
|
||||
(error => new HttpErrorByCode[errorHttpStatusCode](error));
|
||||
}
|
||||
|
||||
/**
|
||||
* Method that accesses and performs optional transformation on argument for
|
||||
* in-flight requests.
|
||||
*
|
||||
* @param value currently processed route argument
|
||||
* @param metadata contains metadata about the currently processed route argument
|
||||
*/
|
||||
transform(value: string | number | undefined | null): Date {
|
||||
if (this.options.optional && isNil(value)) {
|
||||
return this.options.default
|
||||
? this.options.default()
|
||||
: (value as undefined | null);
|
||||
}
|
||||
|
||||
if (!value) {
|
||||
throw this.exceptionFactory('Validation failed (no Date provided)');
|
||||
}
|
||||
|
||||
const transformedValue = new Date(value);
|
||||
|
||||
if (isNaN(transformedValue.getTime())) {
|
||||
throw this.exceptionFactory('Validation failed (invalid date format)');
|
||||
}
|
||||
|
||||
return transformedValue;
|
||||
}
|
||||
}
|
||||
@@ -11,21 +11,8 @@ import { isNil } from '../utils/shared.utils';
|
||||
* @publicApi
|
||||
*/
|
||||
export interface ParseEnumPipeOptions {
|
||||
/**
|
||||
* If true, the pipe will return null or undefined if the value is not provided
|
||||
* @default false
|
||||
*/
|
||||
optional?: boolean;
|
||||
/**
|
||||
* The HTTP status code to be used in the response when the validation fails.
|
||||
*/
|
||||
errorHttpStatusCode?: ErrorHttpStatusCode;
|
||||
/**
|
||||
* A factory function that returns an exception object to be thrown
|
||||
* if validation fails.
|
||||
* @param error Error message
|
||||
* @returns The exception object
|
||||
*/
|
||||
exceptionFactory?: (error: string) => any;
|
||||
}
|
||||
|
||||
|
||||
@@ -11,21 +11,8 @@ import { isNil } from '../utils/shared.utils';
|
||||
* @publicApi
|
||||
*/
|
||||
export interface ParseFloatPipeOptions {
|
||||
/**
|
||||
* The HTTP status code to be used in the response when the validation fails.
|
||||
*/
|
||||
errorHttpStatusCode?: ErrorHttpStatusCode;
|
||||
/**
|
||||
* A factory function that returns an exception object to be thrown
|
||||
* if validation fails.
|
||||
* @param error Error message
|
||||
* @returns The exception object
|
||||
*/
|
||||
exceptionFactory?: (error: string) => any;
|
||||
/**
|
||||
* If true, the pipe will return null or undefined if the value is not provided
|
||||
* @default false
|
||||
*/
|
||||
optional?: boolean;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,21 +15,8 @@ import { isNil } from '../utils/shared.utils';
|
||||
* @publicApi
|
||||
*/
|
||||
export interface ParseIntPipeOptions {
|
||||
/**
|
||||
* The HTTP status code to be used in the response when the validation fails.
|
||||
*/
|
||||
errorHttpStatusCode?: ErrorHttpStatusCode;
|
||||
/**
|
||||
* A factory function that returns an exception object to be thrown
|
||||
* if validation fails.
|
||||
* @param error Error message
|
||||
* @returns The exception object
|
||||
*/
|
||||
exceptionFactory?: (error: string) => any;
|
||||
/**
|
||||
* If true, the pipe will return null or undefined if the value is not provided
|
||||
* @default false
|
||||
*/
|
||||
optional?: boolean;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,25 +15,9 @@ import { isNil, isString } from '../utils/shared.utils';
|
||||
* @publicApi
|
||||
*/
|
||||
export interface ParseUUIDPipeOptions {
|
||||
/**
|
||||
* UUID version to validate
|
||||
*/
|
||||
version?: '3' | '4' | '5' | '7';
|
||||
/**
|
||||
* The HTTP status code to be used in the response when the validation fails.
|
||||
*/
|
||||
errorHttpStatusCode?: ErrorHttpStatusCode;
|
||||
/**
|
||||
* A factory function that returns an exception object to be thrown
|
||||
* if validation fails.
|
||||
* @param error Error message
|
||||
* @returns The exception object
|
||||
*/
|
||||
exceptionFactory?: (errors: string) => any;
|
||||
/**
|
||||
* If true, the pipe will return null or undefined if the value is not provided
|
||||
* @default false
|
||||
*/
|
||||
optional?: boolean;
|
||||
}
|
||||
|
||||
|
||||
@@ -116,12 +116,13 @@ export class ValidationPipe implements PipeTransform<any> {
|
||||
: value;
|
||||
}
|
||||
const originalValue = value;
|
||||
value = this.toEmptyIfNil(value);
|
||||
value = this.toEmptyIfNil(value, metatype);
|
||||
|
||||
const isNil = value !== originalValue;
|
||||
const isPrimitive = this.isPrimitive(value);
|
||||
this.stripProtoKeys(value);
|
||||
let entity = classTransformer.plainToInstance(
|
||||
|
||||
let entity = classTransformer.plainToClass(
|
||||
metatype,
|
||||
value,
|
||||
this.transformOptions,
|
||||
@@ -203,19 +204,32 @@ export class ValidationPipe implements PipeTransform<any> {
|
||||
return value === true || value === 'true';
|
||||
}
|
||||
if (metatype === Number) {
|
||||
if (isUndefined(value)) {
|
||||
// This is a workaround to deal with optional numeric values since
|
||||
// optional numerics shouldn't be parsed to a valid number when
|
||||
// they were not defined
|
||||
return undefined;
|
||||
}
|
||||
return +value;
|
||||
}
|
||||
if (metatype === String && !isUndefined(value)) {
|
||||
return String(value);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
protected toEmptyIfNil<T = any, R = any>(value: T): R | {} {
|
||||
return isNil(value) ? {} : value;
|
||||
protected toEmptyIfNil<T = any, R = any>(
|
||||
value: T,
|
||||
metatype: Type<unknown> | object,
|
||||
): R | {} {
|
||||
if (!isNil(value)) {
|
||||
return value;
|
||||
}
|
||||
if (
|
||||
typeof metatype === 'function' ||
|
||||
(metatype && 'prototype' in metatype && metatype.prototype?.constructor)
|
||||
) {
|
||||
return {};
|
||||
}
|
||||
// Builder like SWC require empty string to be returned instead of an empty object
|
||||
// when the value is nil and the metatype is not a class instance, but a plain object (enum, for example).
|
||||
// Otherwise, the error will be thrown.
|
||||
// @see https://github.com/nestjs/nest/issues/12680
|
||||
return '';
|
||||
}
|
||||
|
||||
protected stripProtoKeys(value: any) {
|
||||
|
||||
@@ -94,11 +94,7 @@ export class ClassSerializerInterceptor implements NestInterceptor {
|
||||
if (plainOrClass instanceof options.type) {
|
||||
return classTransformer.classToPlain(plainOrClass, options);
|
||||
}
|
||||
const instance = classTransformer.plainToInstance(
|
||||
options.type,
|
||||
plainOrClass,
|
||||
options,
|
||||
);
|
||||
const instance = classTransformer.plainToClass(options.type, plainOrClass);
|
||||
return classTransformer.classToPlain(instance, options);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { inspect, InspectOptions } from 'util';
|
||||
import { Injectable, Optional } from '../decorators/core';
|
||||
import { clc, yellow } from '../utils/cli-colors.util';
|
||||
import {
|
||||
@@ -10,8 +9,6 @@ import {
|
||||
import { LoggerService, LogLevel } from './logger.service';
|
||||
import { isLogLevelEnabled } from './utils';
|
||||
|
||||
const DEFAULT_DEPTH = 5;
|
||||
|
||||
export interface ConsoleLoggerOptions {
|
||||
/**
|
||||
* Enabled log levels.
|
||||
@@ -19,73 +16,8 @@ export interface ConsoleLoggerOptions {
|
||||
logLevels?: LogLevel[];
|
||||
/**
|
||||
* If enabled, will print timestamp (time difference) between current and previous log message.
|
||||
* Note: This option is not used when `json` is enabled.
|
||||
*/
|
||||
timestamp?: boolean;
|
||||
/**
|
||||
* A prefix to be used for each log message.
|
||||
* Note: This option is not used when `json` is enabled.
|
||||
*/
|
||||
prefix?: string;
|
||||
/**
|
||||
* If enabled, will print the log message in JSON format.
|
||||
*/
|
||||
json?: boolean;
|
||||
/**
|
||||
* If enabled, will print the log message in color.
|
||||
* Default true if json is disabled, false otherwise
|
||||
*/
|
||||
colors?: boolean;
|
||||
/**
|
||||
* The context of the logger.
|
||||
*/
|
||||
context?: string;
|
||||
/**
|
||||
* If enabled, will print the log message in a single line, even if it is an object with multiple properties.
|
||||
* If set to a number, the most n inner elements are united on a single line as long as all properties fit into breakLength. Short array elements are also grouped together.
|
||||
* Default true when `json` is enabled, false otherwise.
|
||||
*/
|
||||
compact?: boolean | number;
|
||||
/**
|
||||
* Specifies the maximum number of Array, TypedArray, Map, Set, WeakMap, and WeakSet elements to include when formatting.
|
||||
* Set to null or Infinity to show all elements. Set to 0 or negative to show no elements.
|
||||
* Ignored when `json` is enabled, colors are disabled, and `compact` is set to true as it produces a parseable JSON output.
|
||||
* @default 100
|
||||
*/
|
||||
maxArrayLength?: number;
|
||||
/**
|
||||
* Specifies the maximum number of characters to include when formatting.
|
||||
* Set to null or Infinity to show all elements. Set to 0 or negative to show no characters.
|
||||
* Ignored when `json` is enabled, colors are disabled, and `compact` is set to true as it produces a parseable JSON output.
|
||||
* @default 10000.
|
||||
*/
|
||||
maxStringLength?: number;
|
||||
/**
|
||||
* If enabled, will sort keys while formatting objects.
|
||||
* Can also be a custom sorting function.
|
||||
* Ignored when `json` is enabled, colors are disabled, and `compact` is set to true as it produces a parseable JSON output.
|
||||
* @default false
|
||||
*/
|
||||
sorted?: boolean | ((a: string, b: string) => number);
|
||||
/**
|
||||
* Specifies the number of times to recurse while formatting object. T
|
||||
* This is useful for inspecting large objects. To recurse up to the maximum call stack size pass Infinity or null.
|
||||
* Ignored when `json` is enabled, colors are disabled, and `compact` is set to true as it produces a parseable JSON output.
|
||||
* @default 5
|
||||
*/
|
||||
depth?: number;
|
||||
/**
|
||||
* If true, object's non-enumerable symbols and properties are included in the formatted result.
|
||||
* WeakMap and WeakSet entries are also included as well as user defined prototype properties
|
||||
* @default false
|
||||
*/
|
||||
showHidden?: boolean;
|
||||
/**
|
||||
* The length at which input values are split across multiple lines. Set to Infinity to format the input as a single line (in combination with "compact" set to true).
|
||||
* Default Infinity when "compact" is true, 80 otherwise.
|
||||
* Ignored when `json` is enabled, colors are disabled, and `compact` is set to true as it produces a parseable JSON output.
|
||||
*/
|
||||
breakLength?: number;
|
||||
}
|
||||
|
||||
const DEFAULT_LOG_LEVELS: LogLevel[] = [
|
||||
@@ -108,54 +40,22 @@ const dateTimeFormatter = new Intl.DateTimeFormat(undefined, {
|
||||
|
||||
@Injectable()
|
||||
export class ConsoleLogger implements LoggerService {
|
||||
/**
|
||||
* The options of the logger.
|
||||
*/
|
||||
protected options: ConsoleLoggerOptions;
|
||||
/**
|
||||
* The context of the logger (can be set manually or automatically inferred).
|
||||
*/
|
||||
protected context?: string;
|
||||
/**
|
||||
* The original context of the logger (set in the constructor).
|
||||
*/
|
||||
protected originalContext?: string;
|
||||
/**
|
||||
* The options used for the "inspect" method.
|
||||
*/
|
||||
protected inspectOptions: InspectOptions;
|
||||
/**
|
||||
* The last timestamp at which the log message was printed.
|
||||
*/
|
||||
protected static lastTimestampAt?: number;
|
||||
private static lastTimestampAt?: number;
|
||||
private originalContext?: string;
|
||||
|
||||
constructor();
|
||||
constructor(context: string);
|
||||
constructor(options: ConsoleLoggerOptions);
|
||||
constructor(context: string, options: ConsoleLoggerOptions);
|
||||
constructor(
|
||||
@Optional()
|
||||
contextOrOptions?: string | ConsoleLoggerOptions,
|
||||
protected context?: string,
|
||||
@Optional()
|
||||
options?: ConsoleLoggerOptions,
|
||||
protected options: ConsoleLoggerOptions = {},
|
||||
) {
|
||||
// eslint-disable-next-line prefer-const
|
||||
let [context, opts] = isString(contextOrOptions)
|
||||
? [contextOrOptions, options]
|
||||
: !!options
|
||||
? [undefined, options]
|
||||
: [contextOrOptions?.context, contextOrOptions];
|
||||
|
||||
opts = opts ?? {};
|
||||
opts.logLevels ??= DEFAULT_LOG_LEVELS;
|
||||
opts.colors ??= opts.colors ?? (opts.json ? false : true);
|
||||
opts.prefix ??= 'Nest';
|
||||
|
||||
this.options = opts;
|
||||
this.inspectOptions = this.getInspectOptions();
|
||||
|
||||
if (!options.logLevels) {
|
||||
options.logLevels = DEFAULT_LOG_LEVELS;
|
||||
}
|
||||
if (context) {
|
||||
this.context = context;
|
||||
this.originalContext = context;
|
||||
}
|
||||
}
|
||||
@@ -191,7 +91,7 @@ export class ConsoleLogger implements LoggerService {
|
||||
const { messages, context, stack } =
|
||||
this.getContextAndStackAndMessagesToPrint([message, ...optionalParams]);
|
||||
|
||||
this.printMessages(messages, context, 'error', 'stderr', stack);
|
||||
this.printMessages(messages, context, 'error', 'stderr');
|
||||
this.printStackTrace(stack);
|
||||
}
|
||||
|
||||
@@ -303,18 +203,8 @@ export class ConsoleLogger implements LoggerService {
|
||||
context = '',
|
||||
logLevel: LogLevel = 'log',
|
||||
writeStreamType?: 'stdout' | 'stderr',
|
||||
errorStack?: unknown,
|
||||
) {
|
||||
messages.forEach(message => {
|
||||
if (this.options.json) {
|
||||
this.printAsJson(message, {
|
||||
context,
|
||||
logLevel,
|
||||
writeStreamType,
|
||||
errorStack,
|
||||
});
|
||||
return;
|
||||
}
|
||||
const pidMessage = this.formatPid(process.pid);
|
||||
const contextMessage = this.formatContext(context);
|
||||
const timestampDiff = this.updateAndGetTimestampDiff();
|
||||
@@ -332,57 +222,12 @@ export class ConsoleLogger implements LoggerService {
|
||||
});
|
||||
}
|
||||
|
||||
protected printAsJson(
|
||||
message: unknown,
|
||||
options: {
|
||||
context: string;
|
||||
logLevel: LogLevel;
|
||||
writeStreamType?: 'stdout' | 'stderr';
|
||||
errorStack?: unknown;
|
||||
},
|
||||
) {
|
||||
type JsonLogObject = {
|
||||
level: LogLevel;
|
||||
pid: number;
|
||||
timestamp: number;
|
||||
message: unknown;
|
||||
context?: string;
|
||||
stack?: unknown;
|
||||
};
|
||||
|
||||
const logObject: JsonLogObject = {
|
||||
level: options.logLevel,
|
||||
pid: process.pid,
|
||||
timestamp: Date.now(),
|
||||
message,
|
||||
};
|
||||
|
||||
if (options.context) {
|
||||
logObject.context = options.context;
|
||||
}
|
||||
|
||||
if (options.errorStack) {
|
||||
logObject.stack = options.errorStack;
|
||||
}
|
||||
|
||||
const formattedMessage =
|
||||
!this.options.colors && this.inspectOptions.compact === true
|
||||
? JSON.stringify(logObject, this.stringifyReplacer)
|
||||
: inspect(logObject, this.inspectOptions);
|
||||
process[options.writeStreamType ?? 'stdout'].write(`${formattedMessage}\n`);
|
||||
}
|
||||
|
||||
protected formatPid(pid: number) {
|
||||
return `[${this.options.prefix}] ${pid} - `;
|
||||
return `[Nest] ${pid} - `;
|
||||
}
|
||||
|
||||
protected formatContext(context: string): string {
|
||||
if (!context) {
|
||||
return '';
|
||||
}
|
||||
|
||||
context = `[${context}] `;
|
||||
return this.options.colors ? yellow(context) : context;
|
||||
return context ? yellow(`[${context}] `) : '';
|
||||
}
|
||||
|
||||
protected formatMessage(
|
||||
@@ -411,30 +256,23 @@ export class ConsoleLogger implements LoggerService {
|
||||
return this.stringifyMessage(message(), logLevel);
|
||||
}
|
||||
|
||||
if (typeof message === 'string') {
|
||||
return this.colorize(message, logLevel);
|
||||
}
|
||||
|
||||
const outputText = inspect(message, this.inspectOptions);
|
||||
if (isPlainObject(message)) {
|
||||
return `Object(${Object.keys(message).length}) ${outputText}`;
|
||||
}
|
||||
if (Array.isArray(message)) {
|
||||
return `Array(${message.length}) ${outputText}`;
|
||||
}
|
||||
return outputText;
|
||||
return isPlainObject(message) || Array.isArray(message)
|
||||
? `${this.colorize('Object:', logLevel)}\n${JSON.stringify(
|
||||
message,
|
||||
(key, value) =>
|
||||
typeof value === 'bigint' ? value.toString() : value,
|
||||
2,
|
||||
)}\n`
|
||||
: this.colorize(message as string, logLevel);
|
||||
}
|
||||
|
||||
protected colorize(message: string, logLevel: LogLevel) {
|
||||
if (!this.options.colors || this.options.json) {
|
||||
return message;
|
||||
}
|
||||
const color = this.getColorByLogLevel(logLevel);
|
||||
return color(message);
|
||||
}
|
||||
|
||||
protected printStackTrace(stack: string) {
|
||||
if (!stack || this.options.json) {
|
||||
if (!stack) {
|
||||
return;
|
||||
}
|
||||
process.stderr.write(`${stack}\n`);
|
||||
@@ -451,58 +289,7 @@ export class ConsoleLogger implements LoggerService {
|
||||
}
|
||||
|
||||
protected formatTimestampDiff(timestampDiff: number) {
|
||||
const formattedDiff = ` +${timestampDiff}ms`;
|
||||
return this.options.colors ? yellow(formattedDiff) : formattedDiff;
|
||||
}
|
||||
|
||||
protected getInspectOptions() {
|
||||
let breakLength = this.options.breakLength;
|
||||
if (typeof breakLength === 'undefined') {
|
||||
breakLength = this.options.colors
|
||||
? this.options.compact
|
||||
? Infinity
|
||||
: undefined
|
||||
: this.options.compact === false
|
||||
? undefined
|
||||
: Infinity; // default breakLength to Infinity if inline is not set and colors is false
|
||||
}
|
||||
|
||||
const inspectOptions: InspectOptions = {
|
||||
depth: this.options.depth ?? DEFAULT_DEPTH,
|
||||
sorted: this.options.sorted,
|
||||
showHidden: this.options.showHidden,
|
||||
compact: this.options.compact ?? (this.options.json ? true : false),
|
||||
colors: this.options.colors,
|
||||
breakLength,
|
||||
};
|
||||
|
||||
if (this.options.maxArrayLength) {
|
||||
inspectOptions.maxArrayLength = this.options.maxArrayLength;
|
||||
}
|
||||
if (this.options.maxStringLength) {
|
||||
inspectOptions.maxStringLength = this.options.maxStringLength;
|
||||
}
|
||||
|
||||
return inspectOptions;
|
||||
}
|
||||
|
||||
protected stringifyReplacer(key: string, value: unknown) {
|
||||
// Mimic util.inspect behavior for JSON logger with compact on and colors off
|
||||
if (typeof value === 'bigint') {
|
||||
return value.toString();
|
||||
}
|
||||
if (typeof value === 'symbol') {
|
||||
return value.toString();
|
||||
}
|
||||
|
||||
if (
|
||||
value instanceof Map ||
|
||||
value instanceof Set ||
|
||||
value instanceof Error
|
||||
) {
|
||||
return `${inspect(value, this.inspectOptions)}`;
|
||||
}
|
||||
return value;
|
||||
return yellow(` +${timestampDiff}ms`);
|
||||
}
|
||||
|
||||
private getContextAndMessagesToPrint(args: unknown[]) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { expect } from 'chai';
|
||||
import { GUARDS_METADATA } from '../../constants';
|
||||
import { applyDecorators, UseGuards } from '../../decorators';
|
||||
import { GUARDS_METADATA } from '../../constants';
|
||||
import { CanActivate } from '../../interfaces';
|
||||
|
||||
describe('applyDecorators', () => {
|
||||
|
||||
@@ -1,22 +1,7 @@
|
||||
import { expect } from 'chai';
|
||||
import { Body, HostParam, Param, Query, Search } from '../../decorators';
|
||||
import { RequestMethod } from '../../enums/request-method.enum';
|
||||
import {
|
||||
All,
|
||||
Delete,
|
||||
Get,
|
||||
ParseIntPipe,
|
||||
Patch,
|
||||
Post,
|
||||
Put,
|
||||
Propfind,
|
||||
Proppatch,
|
||||
Mkcol,
|
||||
Move,
|
||||
Copy,
|
||||
Lock,
|
||||
Unlock,
|
||||
} from '../../index';
|
||||
import { All, Delete, Get, ParseIntPipe, Patch, Post, Put } from '../../index';
|
||||
import { ROUTE_ARGS_METADATA } from '../../constants';
|
||||
import { RouteParamtypes } from '../../enums/route-paramtypes.enum';
|
||||
|
||||
@@ -430,409 +415,3 @@ describe('Inheritance', () => {
|
||||
expect(methodUsingArray).to.be.eql(requestPropsUsingArray.method);
|
||||
});
|
||||
});
|
||||
|
||||
describe('@PropFind', () => {
|
||||
const requestPath = 'test';
|
||||
const requestProps = {
|
||||
path: requestPath,
|
||||
method: RequestMethod.PROPFIND,
|
||||
};
|
||||
|
||||
const requestPathUsingArray = ['foo', 'bar'];
|
||||
const requestPropsUsingArray = {
|
||||
path: requestPathUsingArray,
|
||||
method: RequestMethod.PROPFIND,
|
||||
};
|
||||
|
||||
it('should enhance class with expected request metadata', () => {
|
||||
class Test {
|
||||
@Propfind(requestPath)
|
||||
public static test() {}
|
||||
|
||||
@Propfind(requestPathUsingArray)
|
||||
public static testUsingArray() {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const method = Reflect.getMetadata('method', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
const methodUsingArray = Reflect.getMetadata('method', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql(requestPath);
|
||||
expect(method).to.be.eql(requestProps.method);
|
||||
expect(pathUsingArray).to.be.eql(requestPathUsingArray);
|
||||
expect(methodUsingArray).to.be.eql(requestPropsUsingArray.method);
|
||||
});
|
||||
|
||||
it('should set path on "/" by default', () => {
|
||||
class Test {
|
||||
@Propfind()
|
||||
public static test(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
|
||||
@Propfind([])
|
||||
public static testUsingArray(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql('/');
|
||||
expect(pathUsingArray).to.be.eql('/');
|
||||
});
|
||||
});
|
||||
|
||||
describe('@PropPatch', () => {
|
||||
const requestPath = 'test';
|
||||
const requestProps = {
|
||||
path: requestPath,
|
||||
method: RequestMethod.PROPPATCH,
|
||||
};
|
||||
|
||||
const requestPathUsingArray = ['foo', 'bar'];
|
||||
const requestPropsUsingArray = {
|
||||
path: requestPathUsingArray,
|
||||
method: RequestMethod.PROPPATCH,
|
||||
};
|
||||
|
||||
it('should enhance class with expected request metadata', () => {
|
||||
class Test {
|
||||
@Proppatch(requestPath)
|
||||
public static test() {}
|
||||
|
||||
@Proppatch(requestPathUsingArray)
|
||||
public static testUsingArray() {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const method = Reflect.getMetadata('method', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
const methodUsingArray = Reflect.getMetadata('method', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql(requestPath);
|
||||
expect(method).to.be.eql(requestProps.method);
|
||||
expect(pathUsingArray).to.be.eql(requestPathUsingArray);
|
||||
expect(methodUsingArray).to.be.eql(requestPropsUsingArray.method);
|
||||
});
|
||||
|
||||
it('should set path on "/" by default', () => {
|
||||
class Test {
|
||||
@Proppatch()
|
||||
public static test(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
|
||||
@Proppatch([])
|
||||
public static testUsingArray(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql('/');
|
||||
expect(pathUsingArray).to.be.eql('/');
|
||||
});
|
||||
});
|
||||
|
||||
describe('@MkCol', () => {
|
||||
const requestPath = 'test';
|
||||
const requestProps = {
|
||||
path: requestPath,
|
||||
method: RequestMethod.MKCOL,
|
||||
};
|
||||
|
||||
const requestPathUsingArray = ['foo', 'bar'];
|
||||
const requestPropsUsingArray = {
|
||||
path: requestPathUsingArray,
|
||||
method: RequestMethod.MKCOL,
|
||||
};
|
||||
|
||||
it('should enhance class with expected request metadata', () => {
|
||||
class Test {
|
||||
@Mkcol(requestPath)
|
||||
public static test() {}
|
||||
|
||||
@Mkcol(requestPathUsingArray)
|
||||
public static testUsingArray() {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const method = Reflect.getMetadata('method', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
const methodUsingArray = Reflect.getMetadata('method', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql(requestPath);
|
||||
expect(method).to.be.eql(requestProps.method);
|
||||
expect(pathUsingArray).to.be.eql(requestPathUsingArray);
|
||||
expect(methodUsingArray).to.be.eql(requestPropsUsingArray.method);
|
||||
});
|
||||
|
||||
it('should set path on "/" by default', () => {
|
||||
class Test {
|
||||
@Mkcol()
|
||||
public static test(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
|
||||
@Mkcol([])
|
||||
public static testUsingArray(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql('/');
|
||||
expect(pathUsingArray).to.be.eql('/');
|
||||
});
|
||||
});
|
||||
|
||||
describe('@Copy', () => {
|
||||
const requestPath = 'test';
|
||||
const requestProps = {
|
||||
path: requestPath,
|
||||
method: RequestMethod.COPY,
|
||||
};
|
||||
|
||||
const requestPathUsingArray = ['foo', 'bar'];
|
||||
const requestPropsUsingArray = {
|
||||
path: requestPathUsingArray,
|
||||
method: RequestMethod.COPY,
|
||||
};
|
||||
|
||||
it('should enhance class with expected request metadata', () => {
|
||||
class Test {
|
||||
@Copy(requestPath)
|
||||
public static test() {}
|
||||
|
||||
@Copy(requestPathUsingArray)
|
||||
public static testUsingArray() {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const method = Reflect.getMetadata('method', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
const methodUsingArray = Reflect.getMetadata('method', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql(requestPath);
|
||||
expect(method).to.be.eql(requestProps.method);
|
||||
expect(pathUsingArray).to.be.eql(requestPathUsingArray);
|
||||
expect(methodUsingArray).to.be.eql(requestPropsUsingArray.method);
|
||||
});
|
||||
|
||||
it('should set path on "/" by default', () => {
|
||||
class Test {
|
||||
@Copy()
|
||||
public static test(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
|
||||
@Copy([])
|
||||
public static testUsingArray(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql('/');
|
||||
expect(pathUsingArray).to.be.eql('/');
|
||||
});
|
||||
});
|
||||
|
||||
describe('@Move', () => {
|
||||
const requestPath = 'test';
|
||||
const requestProps = {
|
||||
path: requestPath,
|
||||
method: RequestMethod.MOVE,
|
||||
};
|
||||
|
||||
const requestPathUsingArray = ['foo', 'bar'];
|
||||
const requestPropsUsingArray = {
|
||||
path: requestPathUsingArray,
|
||||
method: RequestMethod.MOVE,
|
||||
};
|
||||
|
||||
it('should enhance class with expected request metadata', () => {
|
||||
class Test {
|
||||
@Move(requestPath)
|
||||
public static test() {}
|
||||
|
||||
@Move(requestPathUsingArray)
|
||||
public static testUsingArray() {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const method = Reflect.getMetadata('method', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
const methodUsingArray = Reflect.getMetadata('method', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql(requestPath);
|
||||
expect(method).to.be.eql(requestProps.method);
|
||||
expect(pathUsingArray).to.be.eql(requestPathUsingArray);
|
||||
expect(methodUsingArray).to.be.eql(requestPropsUsingArray.method);
|
||||
});
|
||||
|
||||
it('should set path on "/" by default', () => {
|
||||
class Test {
|
||||
@Move()
|
||||
public static test(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
|
||||
@Move([])
|
||||
public static testUsingArray(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql('/');
|
||||
expect(pathUsingArray).to.be.eql('/');
|
||||
});
|
||||
});
|
||||
|
||||
describe('@Lock', () => {
|
||||
const requestPath = 'test';
|
||||
const requestProps = {
|
||||
path: requestPath,
|
||||
method: RequestMethod.LOCK,
|
||||
};
|
||||
|
||||
const requestPathUsingArray = ['foo', 'bar'];
|
||||
const requestPropsUsingArray = {
|
||||
path: requestPathUsingArray,
|
||||
method: RequestMethod.LOCK,
|
||||
};
|
||||
|
||||
it('should enhance class with expected request metadata', () => {
|
||||
class Test {
|
||||
@Lock(requestPath)
|
||||
public static test() {}
|
||||
|
||||
@Lock(requestPathUsingArray)
|
||||
public static testUsingArray() {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const method = Reflect.getMetadata('method', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
const methodUsingArray = Reflect.getMetadata('method', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql(requestPath);
|
||||
expect(method).to.be.eql(requestProps.method);
|
||||
expect(pathUsingArray).to.be.eql(requestPathUsingArray);
|
||||
expect(methodUsingArray).to.be.eql(requestPropsUsingArray.method);
|
||||
});
|
||||
|
||||
it('should set path on "/" by default', () => {
|
||||
class Test {
|
||||
@Lock()
|
||||
public static test(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
|
||||
@Lock([])
|
||||
public static testUsingArray(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql('/');
|
||||
expect(pathUsingArray).to.be.eql('/');
|
||||
});
|
||||
});
|
||||
|
||||
describe('@Unlock', () => {
|
||||
const requestPath = 'test';
|
||||
const requestProps = {
|
||||
path: requestPath,
|
||||
method: RequestMethod.UNLOCK,
|
||||
};
|
||||
|
||||
const requestPathUsingArray = ['foo', 'bar'];
|
||||
const requestPropsUsingArray = {
|
||||
path: requestPathUsingArray,
|
||||
method: RequestMethod.UNLOCK,
|
||||
};
|
||||
|
||||
it('should enhance class with expected request metadata', () => {
|
||||
class Test {
|
||||
@Unlock(requestPath)
|
||||
public static test() {}
|
||||
|
||||
@Unlock(requestPathUsingArray)
|
||||
public static testUsingArray() {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const method = Reflect.getMetadata('method', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
const methodUsingArray = Reflect.getMetadata('method', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql(requestPath);
|
||||
expect(method).to.be.eql(requestProps.method);
|
||||
expect(pathUsingArray).to.be.eql(requestPathUsingArray);
|
||||
expect(methodUsingArray).to.be.eql(requestPropsUsingArray.method);
|
||||
});
|
||||
|
||||
it('should set path on "/" by default', () => {
|
||||
class Test {
|
||||
@Unlock()
|
||||
public static test(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
|
||||
@Unlock([])
|
||||
public static testUsingArray(
|
||||
@Query() query,
|
||||
@Param() params,
|
||||
@HostParam() hostParams,
|
||||
) {}
|
||||
}
|
||||
|
||||
const path = Reflect.getMetadata('path', Test.test);
|
||||
const pathUsingArray = Reflect.getMetadata('path', Test.testUsingArray);
|
||||
|
||||
expect(path).to.be.eql('/');
|
||||
expect(pathUsingArray).to.be.eql('/');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -5,19 +5,30 @@ import { getInjectionProviders } from '../../../module-utils/utils/get-injection
|
||||
describe('getInjectionProviders', () => {
|
||||
it('should take only required providers', () => {
|
||||
class C {
|
||||
static token = 'a';
|
||||
static token = 'anything';
|
||||
}
|
||||
const p: Provider[] = [
|
||||
class G {
|
||||
static token = 'anything';
|
||||
static optional = true;
|
||||
}
|
||||
class H {
|
||||
static token = 'anything';
|
||||
static optional = false;
|
||||
}
|
||||
const providers: Provider[] = [
|
||||
{
|
||||
//0
|
||||
provide: 'a',
|
||||
useValue: 'a',
|
||||
},
|
||||
{
|
||||
//1
|
||||
provide: 'b',
|
||||
useValue: 'b',
|
||||
},
|
||||
C,
|
||||
C, //2
|
||||
{
|
||||
//3
|
||||
provide: 'd',
|
||||
useFactory: (c, b) => [c, b],
|
||||
inject: [
|
||||
@@ -27,23 +38,36 @@ describe('getInjectionProviders', () => {
|
||||
optional: true,
|
||||
},
|
||||
'x',
|
||||
G,
|
||||
H,
|
||||
],
|
||||
},
|
||||
{
|
||||
//4
|
||||
provide: 'e',
|
||||
useFactory: (d, b) => [d, b],
|
||||
inject: ['d', 'b'],
|
||||
},
|
||||
{
|
||||
//5
|
||||
provide: 'f',
|
||||
useValue: 'f',
|
||||
},
|
||||
G, //6
|
||||
H, //7
|
||||
];
|
||||
// should not include 'a' and 'f'
|
||||
const expected = p.slice(1, -1);
|
||||
const result = getInjectionProviders(p, ['e']);
|
||||
expect(result).to.have.length(expected.length);
|
||||
|
||||
const expected = [
|
||||
providers[1],
|
||||
providers[2],
|
||||
providers[3],
|
||||
providers[4],
|
||||
providers[6],
|
||||
providers[7],
|
||||
];
|
||||
|
||||
const result = getInjectionProviders(providers, ['e']);
|
||||
|
||||
expect(result).to.have.members(expected);
|
||||
expect(result).not.to.have.members([p[0], p[5]]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
import { expect } from 'chai';
|
||||
import { BadRequestException } from '../../exceptions';
|
||||
import { ParseDatePipe } from '../../pipes/parse-date.pipe';
|
||||
|
||||
describe('ParseDatePipe', () => {
|
||||
let target: ParseDatePipe;
|
||||
|
||||
beforeEach(() => {
|
||||
target = new ParseDatePipe();
|
||||
});
|
||||
|
||||
describe('transform', () => {
|
||||
describe('when validation passes', () => {
|
||||
it('should return a valid date object', () => {
|
||||
const date = new Date().toISOString();
|
||||
|
||||
const transformedDate = target.transform(date);
|
||||
expect(transformedDate).to.be.instanceOf(Date);
|
||||
expect(transformedDate.toISOString()).to.equal(date);
|
||||
|
||||
const asNumber = transformedDate.getTime();
|
||||
const transformedNumber = target.transform(asNumber);
|
||||
expect(transformedNumber).to.be.instanceOf(Date);
|
||||
expect(transformedNumber.getTime()).to.equal(asNumber);
|
||||
});
|
||||
|
||||
it('should not throw an error if the value is undefined/null and optional is true', () => {
|
||||
const target = new ParseDatePipe({ optional: true });
|
||||
const value = target.transform(undefined);
|
||||
expect(value).to.equal(undefined);
|
||||
});
|
||||
});
|
||||
describe('when default value is provided', () => {
|
||||
it('should return the default value if the value is undefined/null', () => {
|
||||
const defaultValue = new Date();
|
||||
const target = new ParseDatePipe({
|
||||
optional: true,
|
||||
default: () => defaultValue,
|
||||
});
|
||||
const value = target.transform(undefined);
|
||||
expect(value).to.equal(defaultValue);
|
||||
});
|
||||
});
|
||||
describe('when validation fails', () => {
|
||||
it('should throw an error', () => {
|
||||
try {
|
||||
target.transform('123abc');
|
||||
expect.fail();
|
||||
} catch (error) {
|
||||
expect(error).to.be.instanceOf(BadRequestException);
|
||||
expect(error.message).to.equal(
|
||||
'Validation failed (invalid date format)',
|
||||
);
|
||||
}
|
||||
});
|
||||
});
|
||||
describe('when empty value', () => {
|
||||
it('should throw an error', () => {
|
||||
try {
|
||||
target.transform('');
|
||||
expect.fail();
|
||||
} catch (error) {
|
||||
expect(error).to.be.instanceOf(BadRequestException);
|
||||
expect(error.message).to.equal(
|
||||
'Validation failed (no Date provided)',
|
||||
);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -205,18 +205,6 @@ describe('ValidationPipe', () => {
|
||||
}),
|
||||
).to.be.equal(+value);
|
||||
});
|
||||
it('should parse undefined to undefined', async () => {
|
||||
target = new ValidationPipe({ transform: true });
|
||||
const value = undefined;
|
||||
|
||||
expect(
|
||||
await target.transform(value, {
|
||||
metatype: Number,
|
||||
data: 'test',
|
||||
type: 'query',
|
||||
}),
|
||||
).to.be.undefined;
|
||||
});
|
||||
});
|
||||
describe('when input is a path parameter (number)', () => {
|
||||
it('should parse to number', async () => {
|
||||
@@ -231,18 +219,6 @@ describe('ValidationPipe', () => {
|
||||
}),
|
||||
).to.be.equal(+value);
|
||||
});
|
||||
it('should parse undefined to undefined', async () => {
|
||||
target = new ValidationPipe({ transform: true });
|
||||
const value = undefined;
|
||||
|
||||
expect(
|
||||
await target.transform(value, {
|
||||
metatype: Number,
|
||||
data: 'test',
|
||||
type: 'param',
|
||||
}),
|
||||
).to.be.undefined;
|
||||
});
|
||||
});
|
||||
describe('when input is a query parameter (boolean)', () => {
|
||||
it('should parse the string "true" to the boolean true', async () => {
|
||||
|
||||
@@ -125,12 +125,9 @@ describe('Logger', () => {
|
||||
Logger.error(error);
|
||||
|
||||
expect(processStderrWriteSpy.calledOnce).to.be.true;
|
||||
|
||||
expect(processStderrWriteSpy.firstCall.firstArg).to.include(`Object:`);
|
||||
expect(processStderrWriteSpy.firstCall.firstArg).to.include(
|
||||
`Object(${Object.keys(error).length})`,
|
||||
);
|
||||
expect(processStderrWriteSpy.firstCall.firstArg).to.include(
|
||||
`randomError: \x1b[33mtrue`,
|
||||
`{\n "randomError": true\n}`,
|
||||
);
|
||||
});
|
||||
|
||||
@@ -184,153 +181,6 @@ describe('Logger', () => {
|
||||
expect(processStderrWriteSpy.thirdCall.firstArg).to.equal(stack + '\n');
|
||||
});
|
||||
});
|
||||
|
||||
describe('when the default logger is used and json mode is enabled', () => {
|
||||
const logger = new ConsoleLogger({ json: true });
|
||||
|
||||
let processStdoutWriteSpy: sinon.SinonSpy;
|
||||
let processStderrWriteSpy: sinon.SinonSpy;
|
||||
|
||||
beforeEach(() => {
|
||||
processStdoutWriteSpy = sinon.spy(process.stdout, 'write');
|
||||
processStderrWriteSpy = sinon.spy(process.stderr, 'write');
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
processStdoutWriteSpy.restore();
|
||||
processStderrWriteSpy.restore();
|
||||
});
|
||||
|
||||
it('should print error with stack as JSON to the console', () => {
|
||||
const errorMessage = 'error message';
|
||||
const error = new Error(errorMessage);
|
||||
|
||||
logger.error(error.message, error.stack);
|
||||
|
||||
const json = JSON.parse(processStderrWriteSpy.firstCall?.firstArg);
|
||||
|
||||
expect(json.pid).to.equal(process.pid);
|
||||
expect(json.level).to.equal('error');
|
||||
expect(json.message).to.equal(errorMessage);
|
||||
});
|
||||
it('should log out to stdout as JSON', () => {
|
||||
const message = 'message 1';
|
||||
|
||||
logger.log(message);
|
||||
|
||||
const json = JSON.parse(processStdoutWriteSpy.firstCall?.firstArg);
|
||||
|
||||
expect(json.pid).to.equal(process.pid);
|
||||
expect(json.level).to.equal('log');
|
||||
expect(json.message).to.equal(message);
|
||||
});
|
||||
it('should log out an error to stderr as JSON', () => {
|
||||
const message = 'message 1';
|
||||
|
||||
logger.error(message);
|
||||
|
||||
const json = JSON.parse(processStderrWriteSpy.firstCall?.firstArg);
|
||||
|
||||
expect(json.pid).to.equal(process.pid);
|
||||
expect(json.level).to.equal('error');
|
||||
expect(json.message).to.equal(message);
|
||||
});
|
||||
it('should log Map object', () => {
|
||||
const map = new Map([
|
||||
['key1', 'value1'],
|
||||
['key2', 'value2'],
|
||||
]);
|
||||
|
||||
logger.log(map);
|
||||
|
||||
const json = JSON.parse(processStdoutWriteSpy.firstCall?.firstArg);
|
||||
|
||||
expect(json.pid).to.equal(process.pid);
|
||||
expect(json.level).to.equal('log');
|
||||
expect(json.message).to.equal(
|
||||
`Map(2) { 'key1' => 'value1', 'key2' => 'value2' }`,
|
||||
);
|
||||
});
|
||||
it('should log Set object', () => {
|
||||
const set = new Set(['value1', 'value2']);
|
||||
|
||||
logger.log(set);
|
||||
|
||||
const json = JSON.parse(processStdoutWriteSpy.firstCall?.firstArg);
|
||||
|
||||
expect(json.pid).to.equal(process.pid);
|
||||
expect(json.level).to.equal('log');
|
||||
expect(json.message).to.equal(`Set(2) { 'value1', 'value2' }`);
|
||||
});
|
||||
it('should log bigint', () => {
|
||||
const bigInt = BigInt(9007199254740991);
|
||||
|
||||
logger.log(bigInt);
|
||||
|
||||
const json = JSON.parse(processStdoutWriteSpy.firstCall?.firstArg);
|
||||
|
||||
expect(json.pid).to.equal(process.pid);
|
||||
expect(json.level).to.equal('log');
|
||||
expect(json.message).to.equal('9007199254740991');
|
||||
});
|
||||
it('should log symbol', () => {
|
||||
const symbol = Symbol('test');
|
||||
|
||||
logger.log(symbol);
|
||||
|
||||
const json = JSON.parse(processStdoutWriteSpy.firstCall?.firstArg);
|
||||
|
||||
expect(json.pid).to.equal(process.pid);
|
||||
expect(json.level).to.equal('log');
|
||||
expect(json.message).to.equal('Symbol(test)');
|
||||
});
|
||||
});
|
||||
|
||||
describe('when the default logger is used, json mode is enabled and compact is false (utils.inspect)', () => {
|
||||
const logger = new ConsoleLogger({ json: true, compact: false });
|
||||
|
||||
let processStdoutWriteSpy: sinon.SinonSpy;
|
||||
let processStderrWriteSpy: sinon.SinonSpy;
|
||||
|
||||
beforeEach(() => {
|
||||
processStdoutWriteSpy = sinon.spy(process.stdout, 'write');
|
||||
processStderrWriteSpy = sinon.spy(process.stderr, 'write');
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
processStdoutWriteSpy.restore();
|
||||
processStderrWriteSpy.restore();
|
||||
});
|
||||
|
||||
it('should log out to stdout as JSON (utils.inspect)', () => {
|
||||
const message = 'message 1';
|
||||
|
||||
logger.log(message);
|
||||
|
||||
const json = convertInspectToJSON(
|
||||
processStdoutWriteSpy.firstCall?.firstArg,
|
||||
);
|
||||
|
||||
expect(json.pid).to.equal(process.pid);
|
||||
expect(json.level).to.equal('log');
|
||||
expect(json.message).to.equal(message);
|
||||
});
|
||||
|
||||
it('should log out an error to stderr as JSON (utils.inspect)', () => {
|
||||
const message = 'message 1';
|
||||
|
||||
logger.error(message);
|
||||
|
||||
const json = convertInspectToJSON(
|
||||
processStderrWriteSpy.firstCall?.firstArg,
|
||||
);
|
||||
|
||||
expect(json.pid).to.equal(process.pid);
|
||||
expect(json.level).to.equal('error');
|
||||
expect(json.message).to.equal(message);
|
||||
});
|
||||
});
|
||||
|
||||
describe('when logging is disabled', () => {
|
||||
let processStdoutWriteSpy: sinon.SinonSpy;
|
||||
let previousLoggerRef: LoggerService;
|
||||
@@ -718,7 +568,6 @@ describe('Logger', () => {
|
||||
expect(processStdoutWriteSpy.called).to.be.false;
|
||||
});
|
||||
});
|
||||
|
||||
describe('when custom logger is being used', () => {
|
||||
class CustomLogger implements LoggerService {
|
||||
log(message: any, context?: string) {}
|
||||
@@ -874,7 +723,7 @@ describe('Logger', () => {
|
||||
}
|
||||
}
|
||||
|
||||
const consoleLogger = new CustomConsoleLogger({ colors: false });
|
||||
const consoleLogger = new CustomConsoleLogger();
|
||||
const consoleLoggerSpy = sinon.spy(
|
||||
consoleLogger,
|
||||
'stringifyMessage' as keyof ConsoleLogger,
|
||||
@@ -890,40 +739,30 @@ describe('Logger', () => {
|
||||
|
||||
expect(consoleLoggerSpy.getCall(0).returnValue).to.equal('str1');
|
||||
expect(consoleLoggerSpy.getCall(1).returnValue).to.equal(
|
||||
`Object(1) {
|
||||
key: 'str2'
|
||||
}`,
|
||||
`Object:
|
||||
{
|
||||
"key": "str2"
|
||||
}
|
||||
`,
|
||||
);
|
||||
expect(consoleLoggerSpy.getCall(2).returnValue).to.equal(
|
||||
`Array(1) [
|
||||
'str3'
|
||||
]`,
|
||||
`Object:
|
||||
[
|
||||
"str3"
|
||||
]
|
||||
`,
|
||||
);
|
||||
expect(consoleLoggerSpy.getCall(3).returnValue).to.equal(
|
||||
`Array(1) [
|
||||
`Object:
|
||||
[
|
||||
{
|
||||
key: 'str4'
|
||||
"key": "str4"
|
||||
}
|
||||
]`,
|
||||
]
|
||||
`,
|
||||
);
|
||||
expect(consoleLoggerSpy.getCall(4).returnValue).to.equal('null');
|
||||
expect(consoleLoggerSpy.getCall(5).returnValue).to.equal('1');
|
||||
expect(consoleLoggerSpy.getCall(4).returnValue).to.equal(null);
|
||||
expect(consoleLoggerSpy.getCall(5).returnValue).to.equal(1);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
function convertInspectToJSON(inspectOutput: string) {
|
||||
const jsonLikeString = inspectOutput
|
||||
.replace(/'([^']+)'/g, '"$1"') // single-quoted strings
|
||||
.replace(/([a-zA-Z0-9_]+):/g, '"$1":') // unquoted object keys
|
||||
.replace(/\bundefined\b/g, 'null')
|
||||
.replace(/\[Function(: [^\]]+)?\]/g, '"[Function]"')
|
||||
.replace(/\[Circular\]/g, '"[Circular]"');
|
||||
|
||||
try {
|
||||
return JSON.parse(jsonLikeString);
|
||||
} catch (error) {
|
||||
console.error('Error parsing the modified inspect output:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
|
||||
<td><a href="https://www.mercedes-benz.com/" target="_blank"><img src="https://nestjs.com/img/logos/mercedes-logo.png" width="100" valign="middle" /></a></td>
|
||||
<td><a href="https://www.dinii.jp/" target="_blank"><img src="https://nestjs.com/img/logos/dinii-logo.png" width="65" valign="middle" /></a></td>
|
||||
<td><a href="https://bloodycase.com/?promocode=NEST" target="_blank"><img src="https://nestjs.com/img/logos/bloodycase-logo.png" width="65" valign="middle" /></a></td>
|
||||
<td><a href="https://handsontable.com/docs/react-data-grid/?utm_source=NestJS_GH&utm_medium=sponsorship&utm_campaign=library_sponsorship_2024" target="_blank"><img src="https://nestjs.com/img/logos/handsontable-logo.svg" width="150" valign="middle" /></a></td>
|
||||
<td><a href="https://handsontable.com/docs/react-data-grid/?utm_source=NestJS_GH&utm_medium=sponsorship&utm_campaign=library_sponsorship_2024" target="_blank"><img src="https://nestjs.com/img/logos/handsontable-dark-logo.svg#2" width="150" valign="middle" /></a></td>
|
||||
<td align="center" valign="middle"><a href="https://www.itflashcards.com/" target="_blank"><img src="https://nestjs.com/img/logos/it_flashcards-logo.png" width="170" valign="middle" /></a></td>
|
||||
<td align="center" valign="middle"><a href="https://arcjet.com/?ref=nestjs" target="_blank"><img src="https://nestjs.com/img/logos/arcjet-logo.svg" width="170" valign="middle" /></a></td>
|
||||
</tr>
|
||||
|
||||
@@ -62,48 +62,6 @@ export abstract class AbstractHttpAdapter<
|
||||
return this.instance.patch(...args);
|
||||
}
|
||||
|
||||
public propfind(handler: RequestHandler);
|
||||
public propfind(path: any, handler: RequestHandler);
|
||||
public propfind(...args: any[]) {
|
||||
return this.instance.propfind(...args);
|
||||
}
|
||||
|
||||
public proppatch(handler: RequestHandler);
|
||||
public proppatch(path: any, handler: RequestHandler);
|
||||
public proppatch(...args: any[]) {
|
||||
return this.instance.proppatch(...args);
|
||||
}
|
||||
|
||||
public mkcol(handler: RequestHandler);
|
||||
public mkcol(path: any, handler: RequestHandler);
|
||||
public mkcol(...args: any[]) {
|
||||
return this.instance.mkcol(...args);
|
||||
}
|
||||
|
||||
public copy(handler: RequestHandler);
|
||||
public copy(path: any, handler: RequestHandler);
|
||||
public copy(...args: any[]) {
|
||||
return this.instance.copy(...args);
|
||||
}
|
||||
|
||||
public move(handler: RequestHandler);
|
||||
public move(path: any, handler: RequestHandler);
|
||||
public move(...args: any[]) {
|
||||
return this.instance.move(...args);
|
||||
}
|
||||
|
||||
public lock(handler: RequestHandler);
|
||||
public lock(path: any, handler: RequestHandler);
|
||||
public lock(...args: any[]) {
|
||||
return this.instance.lock(...args);
|
||||
}
|
||||
|
||||
public unlock(handler: RequestHandler);
|
||||
public unlock(path: any, handler: RequestHandler);
|
||||
public unlock(...args: any[]) {
|
||||
return this.instance.unlock(...args);
|
||||
}
|
||||
|
||||
public all(handler: RequestHandler);
|
||||
public all(path: any, handler: RequestHandler);
|
||||
public all(...args: any[]) {
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
import { RuntimeException } from './exceptions/runtime.exception';
|
||||
import { Logger } from '@nestjs/common/services/logger.service';
|
||||
|
||||
export class ExceptionHandler {
|
||||
private static readonly logger = new Logger(ExceptionHandler.name);
|
||||
|
||||
public handle(exception: Error) {
|
||||
ExceptionHandler.logger.error(exception);
|
||||
public handle(exception: RuntimeException | Error) {
|
||||
if (!(exception instanceof RuntimeException)) {
|
||||
ExceptionHandler.logger.error(exception.message, exception.stack);
|
||||
return;
|
||||
}
|
||||
ExceptionHandler.logger.error(exception.what(), exception.stack);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,6 +68,12 @@ export class BaseExceptionFilter<T = any> implements ExceptionFilter<T> {
|
||||
applicationRef.end(response);
|
||||
}
|
||||
|
||||
if (this.isExceptionObject(exception)) {
|
||||
return BaseExceptionFilter.logger.error(
|
||||
exception.message,
|
||||
exception.stack,
|
||||
);
|
||||
}
|
||||
return BaseExceptionFilter.logger.error(exception);
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ export class ExternalExceptionFilter<T = any, R = any> {
|
||||
|
||||
catch(exception: T, host: ArgumentsHost): R | Promise<R> {
|
||||
if (exception instanceof Error && !(exception instanceof HttpException)) {
|
||||
ExternalExceptionFilter.logger.error(exception);
|
||||
ExternalExceptionFilter.logger.error(exception.message, exception.stack);
|
||||
}
|
||||
throw exception;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { Observable, Subject } from 'rxjs';
|
||||
import { AbstractHttpAdapter } from '../adapters/http-adapter';
|
||||
|
||||
/**
|
||||
@@ -16,6 +17,8 @@ export class HttpAdapterHost<
|
||||
T extends AbstractHttpAdapter = AbstractHttpAdapter,
|
||||
> {
|
||||
private _httpAdapter?: T;
|
||||
private _listen$ = new Subject<void>();
|
||||
private isListening = false;
|
||||
|
||||
/**
|
||||
* Accessor for the underlying `HttpAdapter`
|
||||
@@ -35,4 +38,31 @@ export class HttpAdapterHost<
|
||||
get httpAdapter(): T {
|
||||
return this._httpAdapter;
|
||||
}
|
||||
|
||||
/**
|
||||
* Observable that allows to subscribe to the `listen` event.
|
||||
* This event is emitted when the HTTP application is listening for incoming requests.
|
||||
*/
|
||||
get listen$(): Observable<void> {
|
||||
return this._listen$.asObservable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the listening state of the application.
|
||||
*/
|
||||
set listening(listening: boolean) {
|
||||
this.isListening = listening;
|
||||
|
||||
if (listening) {
|
||||
this._listen$.next();
|
||||
this._listen$.complete();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a boolean indicating whether the application is listening for incoming requests.
|
||||
*/
|
||||
get listening(): boolean {
|
||||
return this.isListening;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,13 +11,6 @@ const REQUEST_METHOD_MAP = {
|
||||
[RequestMethod.OPTIONS]: 'options',
|
||||
[RequestMethod.HEAD]: 'head',
|
||||
[RequestMethod.SEARCH]: 'search',
|
||||
[RequestMethod.PROPFIND]: 'propfind',
|
||||
[RequestMethod.PROPPATCH]: 'proppatch',
|
||||
[RequestMethod.MKCOL]: 'mkcol',
|
||||
[RequestMethod.COPY]: 'copy',
|
||||
[RequestMethod.MOVE]: 'move',
|
||||
[RequestMethod.LOCK]: 'lock',
|
||||
[RequestMethod.UNLOCK]: 'unlock',
|
||||
} as const satisfies Record<RequestMethod, keyof HttpServer>;
|
||||
|
||||
export class RouterMethodFactory {
|
||||
|
||||
@@ -3,7 +3,7 @@ import {
|
||||
ForwardReference,
|
||||
Type,
|
||||
} from '@nestjs/common/interfaces';
|
||||
import { ModuleOpaqueKeyFactory } from './opaque-key-factory/interfaces/module-opaque-key-factory.interface';
|
||||
import { ModuleTokenFactory } from './module-token-factory';
|
||||
|
||||
export interface ModuleFactory {
|
||||
type: Type<any>;
|
||||
@@ -12,59 +12,36 @@ export interface ModuleFactory {
|
||||
}
|
||||
|
||||
export class ModuleCompiler {
|
||||
constructor(
|
||||
private readonly _moduleOpaqueKeyFactory: ModuleOpaqueKeyFactory,
|
||||
) {}
|
||||
|
||||
get moduleOpaqueKeyFactory(): ModuleOpaqueKeyFactory {
|
||||
return this._moduleOpaqueKeyFactory;
|
||||
}
|
||||
constructor(private readonly moduleTokenFactory = new ModuleTokenFactory()) {}
|
||||
|
||||
public async compile(
|
||||
moduleClsOrDynamic:
|
||||
| Type
|
||||
| DynamicModule
|
||||
| ForwardReference
|
||||
| Promise<DynamicModule>,
|
||||
metatype: Type<any> | DynamicModule | Promise<DynamicModule>,
|
||||
): Promise<ModuleFactory> {
|
||||
moduleClsOrDynamic = await moduleClsOrDynamic;
|
||||
|
||||
const { type, dynamicMetadata } = this.extractMetadata(moduleClsOrDynamic);
|
||||
const token = dynamicMetadata
|
||||
? this._moduleOpaqueKeyFactory.createForDynamic(
|
||||
type,
|
||||
dynamicMetadata,
|
||||
moduleClsOrDynamic as DynamicModule | ForwardReference,
|
||||
)
|
||||
: this._moduleOpaqueKeyFactory.createForStatic(
|
||||
type,
|
||||
moduleClsOrDynamic as Type,
|
||||
);
|
||||
|
||||
const { type, dynamicMetadata } = this.extractMetadata(await metatype);
|
||||
const token = this.moduleTokenFactory.create(type, dynamicMetadata);
|
||||
return { type, dynamicMetadata, token };
|
||||
}
|
||||
|
||||
public extractMetadata(
|
||||
moduleClsOrDynamic: Type | ForwardReference | DynamicModule,
|
||||
metatype: Type<any> | ForwardReference | DynamicModule,
|
||||
): {
|
||||
type: Type;
|
||||
dynamicMetadata: Omit<DynamicModule, 'module'> | undefined;
|
||||
type: Type<any>;
|
||||
dynamicMetadata?: Partial<DynamicModule> | undefined;
|
||||
} {
|
||||
if (!this.isDynamicModule(moduleClsOrDynamic)) {
|
||||
if (!this.isDynamicModule(metatype)) {
|
||||
return {
|
||||
type: (moduleClsOrDynamic as ForwardReference)?.forwardRef
|
||||
? (moduleClsOrDynamic as ForwardReference).forwardRef()
|
||||
: moduleClsOrDynamic,
|
||||
dynamicMetadata: undefined,
|
||||
type: (metatype as ForwardReference)?.forwardRef
|
||||
? (metatype as ForwardReference).forwardRef()
|
||||
: metatype,
|
||||
};
|
||||
}
|
||||
const { module: type, ...dynamicMetadata } = moduleClsOrDynamic;
|
||||
const { module: type, ...dynamicMetadata } = metatype;
|
||||
return { type, dynamicMetadata };
|
||||
}
|
||||
|
||||
public isDynamicModule(
|
||||
moduleClsOrDynamic: Type | DynamicModule | ForwardReference,
|
||||
): moduleClsOrDynamic is DynamicModule {
|
||||
return !!(moduleClsOrDynamic as DynamicModule).module;
|
||||
module: Type<any> | DynamicModule | ForwardReference,
|
||||
): module is DynamicModule {
|
||||
return !!(module as DynamicModule).module;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import {
|
||||
GLOBAL_MODULE_METADATA,
|
||||
} from '@nestjs/common/constants';
|
||||
import { Injectable, Type } from '@nestjs/common/interfaces';
|
||||
import { NestApplicationContextOptions } from '@nestjs/common/interfaces/nest-application-context-options.interface';
|
||||
import { ApplicationConfig } from '../application-config';
|
||||
import { DiscoverableMetaHostCollection } from '../discovery/discoverable-meta-host-collection';
|
||||
import {
|
||||
@@ -20,16 +19,16 @@ import { ContextId } from './instance-wrapper';
|
||||
import { InternalCoreModule } from './internal-core-module/internal-core-module';
|
||||
import { InternalProvidersStorage } from './internal-providers-storage';
|
||||
import { Module } from './module';
|
||||
import { ModuleTokenFactory } from './module-token-factory';
|
||||
import { ModulesContainer } from './modules-container';
|
||||
import { ByReferenceModuleOpaqueKeyFactory } from './opaque-key-factory/by-reference-module-opaque-key-factory';
|
||||
import { DeepHashedModuleOpaqueKeyFactory } from './opaque-key-factory/deep-hashed-module-opaque-key-factory';
|
||||
import { ModuleOpaqueKeyFactory } from './opaque-key-factory/interfaces/module-opaque-key-factory.interface';
|
||||
|
||||
type ModuleMetatype = Type<any> | DynamicModule | Promise<DynamicModule>;
|
||||
type ModuleScope = Type<any>[];
|
||||
|
||||
export class NestContainer {
|
||||
private readonly globalModules = new Set<Module>();
|
||||
private readonly moduleTokenFactory = new ModuleTokenFactory();
|
||||
private readonly moduleCompiler = new ModuleCompiler(this.moduleTokenFactory);
|
||||
private readonly modules = new ModulesContainer();
|
||||
private readonly dynamicModulesMetadata = new Map<
|
||||
string,
|
||||
@@ -37,27 +36,11 @@ export class NestContainer {
|
||||
>();
|
||||
private readonly internalProvidersStorage = new InternalProvidersStorage();
|
||||
private readonly _serializedGraph = new SerializedGraph();
|
||||
private moduleCompiler: ModuleCompiler;
|
||||
private internalCoreModule: Module;
|
||||
|
||||
constructor(
|
||||
private readonly _applicationConfig:
|
||||
| ApplicationConfig
|
||||
| undefined = undefined,
|
||||
private readonly _contextOptions:
|
||||
| NestApplicationContextOptions
|
||||
| undefined = undefined,
|
||||
) {
|
||||
const moduleOpaqueKeyFactory =
|
||||
this._contextOptions?.moduleIdGeneratorAlgorithm === 'deep-hash'
|
||||
? new DeepHashedModuleOpaqueKeyFactory()
|
||||
: new ByReferenceModuleOpaqueKeyFactory({
|
||||
keyGenerationStrategy: this._contextOptions?.snapshot
|
||||
? 'shallow'
|
||||
: 'random',
|
||||
});
|
||||
this.moduleCompiler = new ModuleCompiler(moduleOpaqueKeyFactory);
|
||||
}
|
||||
private readonly _applicationConfig: ApplicationConfig = undefined,
|
||||
) {}
|
||||
|
||||
get serializedGraph(): SerializedGraph {
|
||||
return this._serializedGraph;
|
||||
@@ -338,8 +321,8 @@ export class NestContainer {
|
||||
this.modules[InternalCoreModule.name] = moduleRef;
|
||||
}
|
||||
|
||||
public getModuleTokenFactory(): ModuleOpaqueKeyFactory {
|
||||
return this.moduleCompiler.moduleOpaqueKeyFactory;
|
||||
public getModuleTokenFactory(): ModuleTokenFactory {
|
||||
return this.moduleTokenFactory;
|
||||
}
|
||||
|
||||
public registerRequestProvider<T = any>(request: T, contextId: ContextId) {
|
||||
|
||||
@@ -170,6 +170,11 @@ export class Injector {
|
||||
inquirer,
|
||||
);
|
||||
} catch (err) {
|
||||
wrapper.removeInstanceByContextId(
|
||||
this.getContextId(contextId, wrapper),
|
||||
inquirerId,
|
||||
);
|
||||
|
||||
settlementSignal.error(err);
|
||||
throw err;
|
||||
}
|
||||
@@ -338,11 +343,20 @@ export class Injector {
|
||||
wrapper: InstanceWrapper<T>,
|
||||
): [InjectorDependency[], number[]] {
|
||||
const optionalDependenciesIds = [];
|
||||
const isOptionalFactoryDep = (
|
||||
item: InjectionToken | OptionalFactoryDependency,
|
||||
): item is OptionalFactoryDependency =>
|
||||
!isUndefined((item as OptionalFactoryDependency).token) &&
|
||||
!isUndefined((item as OptionalFactoryDependency).optional);
|
||||
|
||||
/**
|
||||
* Same as the internal utility function `isOptionalFactoryDependency` from `@nestjs/common`.
|
||||
* We are duplicating it here because that one is not supposed to be exported.
|
||||
*/
|
||||
function isOptionalFactoryDependency(
|
||||
value: InjectionToken | OptionalFactoryDependency,
|
||||
): value is OptionalFactoryDependency {
|
||||
return (
|
||||
!isUndefined((value as OptionalFactoryDependency).token) &&
|
||||
!isUndefined((value as OptionalFactoryDependency).optional) &&
|
||||
!(value as any).prototype
|
||||
);
|
||||
}
|
||||
|
||||
const mapFactoryProviderInjectArray = (
|
||||
item: InjectionToken | OptionalFactoryDependency,
|
||||
@@ -351,7 +365,7 @@ export class Injector {
|
||||
if (typeof item !== 'object') {
|
||||
return item;
|
||||
}
|
||||
if (isOptionalFactoryDep(item)) {
|
||||
if (isOptionalFactoryDependency(item)) {
|
||||
if (item.optional) {
|
||||
optionalDependenciesIds.push(index);
|
||||
}
|
||||
|
||||
@@ -168,6 +168,21 @@ export class InstanceWrapper<T = any> {
|
||||
collection.set(contextId, value);
|
||||
}
|
||||
|
||||
public removeInstanceByContextId(contextId: ContextId, inquirerId?: string) {
|
||||
if (this.scope === Scope.TRANSIENT && inquirerId) {
|
||||
return this.removeInstanceByInquirerId(contextId, inquirerId);
|
||||
}
|
||||
this.values.delete(contextId);
|
||||
}
|
||||
|
||||
public removeInstanceByInquirerId(contextId: ContextId, inquirerId: string) {
|
||||
const collection = this.transientMap.get(inquirerId);
|
||||
if (!collection) {
|
||||
return;
|
||||
}
|
||||
collection.delete(contextId);
|
||||
}
|
||||
|
||||
public addCtorMetadata(index: number, wrapper: InstanceWrapper) {
|
||||
if (!this[INSTANCE_METADATA_SYMBOL].dependencies) {
|
||||
this[INSTANCE_METADATA_SYMBOL].dependencies = [];
|
||||
|
||||
@@ -1,48 +1,34 @@
|
||||
import { DynamicModule } from '@nestjs/common/interfaces/modules/dynamic-module.interface';
|
||||
import { DynamicModule, Logger } from '@nestjs/common';
|
||||
import { Type } from '@nestjs/common/interfaces/type.interface';
|
||||
import { Logger } from '@nestjs/common/services/logger.service';
|
||||
import { randomStringGenerator } from '@nestjs/common/utils/random-string-generator.util';
|
||||
import { isFunction, isSymbol } from '@nestjs/common/utils/shared.utils';
|
||||
import { createHash } from 'crypto';
|
||||
import stringify from 'fast-safe-stringify';
|
||||
import { ModuleOpaqueKeyFactory } from './interfaces/module-opaque-key-factory.interface';
|
||||
import { performance } from 'perf_hooks';
|
||||
|
||||
const CLASS_STR = 'class ';
|
||||
const CLASS_STR_LEN = CLASS_STR.length;
|
||||
|
||||
export class DeepHashedModuleOpaqueKeyFactory
|
||||
implements ModuleOpaqueKeyFactory
|
||||
{
|
||||
private readonly moduleIdsCache = new WeakMap<Type<unknown>, string>();
|
||||
export class ModuleTokenFactory {
|
||||
private readonly moduleTokenCache = new Map<string, string>();
|
||||
private readonly logger = new Logger(DeepHashedModuleOpaqueKeyFactory.name, {
|
||||
private readonly moduleIdsCache = new WeakMap<Type<unknown>, string>();
|
||||
private readonly logger = new Logger(ModuleTokenFactory.name, {
|
||||
timestamp: true,
|
||||
});
|
||||
|
||||
public createForStatic(moduleCls: Type): string {
|
||||
const moduleId = this.getModuleId(moduleCls);
|
||||
const moduleName = this.getModuleName(moduleCls);
|
||||
|
||||
const key = `${moduleId}_${moduleName}`;
|
||||
if (this.moduleTokenCache.has(key)) {
|
||||
return this.moduleTokenCache.get(key);
|
||||
}
|
||||
|
||||
const hash = this.hashString(key);
|
||||
this.moduleTokenCache.set(key, hash);
|
||||
return hash;
|
||||
}
|
||||
|
||||
public createForDynamic(
|
||||
moduleCls: Type<unknown>,
|
||||
dynamicMetadata: Omit<DynamicModule, 'module'>,
|
||||
public create(
|
||||
metatype: Type<unknown>,
|
||||
dynamicModuleMetadata?: Partial<DynamicModule> | undefined,
|
||||
): string {
|
||||
const moduleId = this.getModuleId(moduleCls);
|
||||
const moduleName = this.getModuleName(moduleCls);
|
||||
const moduleId = this.getModuleId(metatype);
|
||||
|
||||
if (!dynamicModuleMetadata) {
|
||||
return this.getStaticModuleToken(moduleId, this.getModuleName(metatype));
|
||||
}
|
||||
const opaqueToken = {
|
||||
id: moduleId,
|
||||
module: moduleName,
|
||||
dynamic: dynamicMetadata,
|
||||
module: this.getModuleName(metatype),
|
||||
dynamic: dynamicModuleMetadata,
|
||||
};
|
||||
const start = performance.now();
|
||||
const opaqueTokenString = this.getStringifiedOpaqueToken(opaqueToken);
|
||||
@@ -51,13 +37,24 @@ export class DeepHashedModuleOpaqueKeyFactory
|
||||
if (timeSpentInMs > 10) {
|
||||
const formattedTimeSpent = timeSpentInMs.toFixed(2);
|
||||
this.logger.warn(
|
||||
`The module "${opaqueToken.module}" is taking ${formattedTimeSpent}ms to serialize, this may be caused by larger objects statically assigned to the module. Consider changing the "moduleIdGeneratorAlgorithm" option to "reference" to improve the performance.`,
|
||||
`The module "${opaqueToken.module}" is taking ${formattedTimeSpent}ms to serialize, this may be caused by larger objects statically assigned to the module. More details: https://github.com/nestjs/nest/issues/12738`,
|
||||
);
|
||||
}
|
||||
|
||||
return this.hashString(opaqueTokenString);
|
||||
}
|
||||
|
||||
public getStaticModuleToken(moduleId: string, moduleName: string): string {
|
||||
const key = `${moduleId}_${moduleName}`;
|
||||
if (this.moduleTokenCache.has(key)) {
|
||||
return this.moduleTokenCache.get(key);
|
||||
}
|
||||
|
||||
const hash = this.hashString(key);
|
||||
this.moduleTokenCache.set(key, hash);
|
||||
return hash;
|
||||
}
|
||||
|
||||
public getStringifiedOpaqueToken(opaqueToken: object | undefined): string {
|
||||
// Uses safeStringify instead of JSON.stringify to support circular dynamic modules
|
||||
// The replacer function is also required in order to obtain real class names
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
InjectionToken,
|
||||
NestModule,
|
||||
Provider,
|
||||
Scope,
|
||||
Type,
|
||||
ValueProvider,
|
||||
} from '@nestjs/common/interfaces';
|
||||
@@ -253,6 +254,11 @@ export class Module {
|
||||
return this.addCustomProvider(provider, this._providers, enhancerSubtype);
|
||||
}
|
||||
|
||||
const isAlreadyDeclared = this._providers.has(provider);
|
||||
if (this.isTransientProvider(provider) && isAlreadyDeclared) {
|
||||
return provider;
|
||||
}
|
||||
|
||||
this._providers.set(
|
||||
provider,
|
||||
new InstanceWrapper({
|
||||
@@ -653,12 +659,11 @@ export class Module {
|
||||
|
||||
private generateUuid(): string {
|
||||
const prefix = 'M_';
|
||||
const key = this.token
|
||||
? this.token.includes(':')
|
||||
? this.token.split(':')[1]
|
||||
: this.token
|
||||
: this.name;
|
||||
|
||||
const key = this.name?.toString() ?? this.token?.toString();
|
||||
return key ? UuidFactory.get(`${prefix}_${key}`) : randomStringGenerator();
|
||||
}
|
||||
|
||||
private isTransientProvider(provider: Type<any>): boolean {
|
||||
return getClassScope(provider) === Scope.TRANSIENT;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
import { DynamicModule } from '@nestjs/common/interfaces/modules/dynamic-module.interface';
|
||||
import { ForwardReference } from '@nestjs/common/interfaces/modules/forward-reference.interface';
|
||||
import { Type } from '@nestjs/common/interfaces/type.interface';
|
||||
import { randomStringGenerator } from '@nestjs/common/utils/random-string-generator.util';
|
||||
import { createHash } from 'crypto';
|
||||
import { ModuleOpaqueKeyFactory } from './interfaces/module-opaque-key-factory.interface';
|
||||
|
||||
const K_MODULE_ID = Symbol('K_MODULE_ID');
|
||||
|
||||
export class ByReferenceModuleOpaqueKeyFactory
|
||||
implements ModuleOpaqueKeyFactory
|
||||
{
|
||||
private readonly keyGenerationStrategy: 'random' | 'shallow';
|
||||
|
||||
constructor(options?: { keyGenerationStrategy: 'random' | 'shallow' }) {
|
||||
this.keyGenerationStrategy = options?.keyGenerationStrategy ?? 'random';
|
||||
}
|
||||
|
||||
public createForStatic(
|
||||
moduleCls: Type,
|
||||
originalRef: Type | ForwardReference = moduleCls,
|
||||
): string {
|
||||
return this.getOrCreateModuleId(moduleCls, undefined, originalRef);
|
||||
}
|
||||
|
||||
public createForDynamic(
|
||||
moduleCls: Type<unknown>,
|
||||
dynamicMetadata: Omit<DynamicModule, 'module'>,
|
||||
originalRef: DynamicModule | ForwardReference,
|
||||
): string {
|
||||
return this.getOrCreateModuleId(moduleCls, dynamicMetadata, originalRef);
|
||||
}
|
||||
|
||||
private getOrCreateModuleId(
|
||||
moduleCls: Type<unknown>,
|
||||
dynamicMetadata: Partial<DynamicModule> | undefined,
|
||||
originalRef: Type | DynamicModule | ForwardReference,
|
||||
): string {
|
||||
if (originalRef[K_MODULE_ID]) {
|
||||
return originalRef[K_MODULE_ID];
|
||||
}
|
||||
|
||||
let moduleId: string;
|
||||
if (this.keyGenerationStrategy === 'random') {
|
||||
moduleId = this.generateRandomString();
|
||||
} else {
|
||||
moduleId = dynamicMetadata
|
||||
? `${this.generateRandomString()}:${this.hashString(moduleCls.name + JSON.stringify(dynamicMetadata))}`
|
||||
: `${this.generateRandomString()}:${this.hashString(moduleCls.toString())}`;
|
||||
}
|
||||
|
||||
originalRef[K_MODULE_ID] = moduleId;
|
||||
return moduleId;
|
||||
}
|
||||
|
||||
private hashString(value: string): string {
|
||||
return createHash('sha256').update(value).digest('hex');
|
||||
}
|
||||
|
||||
private generateRandomString(): string {
|
||||
return randomStringGenerator();
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
import { DynamicModule } from '@nestjs/common/interfaces/modules/dynamic-module.interface';
|
||||
import { ForwardReference } from '@nestjs/common/interfaces/modules/forward-reference.interface';
|
||||
import { Type } from '@nestjs/common/interfaces/type.interface';
|
||||
|
||||
export interface ModuleOpaqueKeyFactory {
|
||||
/**
|
||||
* Creates a unique opaque key for the given static module.
|
||||
* @param moduleCls A static module class.
|
||||
* @param originalRef Original object reference. In most cases, it's the same as `moduleCls`.
|
||||
*/
|
||||
createForStatic(
|
||||
moduleCls: Type,
|
||||
originalRef: Type | ForwardReference,
|
||||
): string;
|
||||
/**
|
||||
* Creates a unique opaque key for the given dynamic module.
|
||||
* @param moduleCls A dynamic module class reference.
|
||||
* @param dynamicMetadata Dynamic module metadata.
|
||||
* @param originalRef Original object reference.
|
||||
*/
|
||||
createForDynamic(
|
||||
moduleCls: Type<unknown>,
|
||||
dynamicMetadata: Omit<DynamicModule, 'module'>,
|
||||
originalRef: DynamicModule | ForwardReference,
|
||||
): string;
|
||||
}
|
||||
@@ -346,7 +346,9 @@ export class MiddlewareModule<
|
||||
configurable: false,
|
||||
});
|
||||
|
||||
const requestProviderValue = isTreeDurable ? contextId.payload : request;
|
||||
const requestProviderValue = isTreeDurable
|
||||
? contextId.payload
|
||||
: Object.assign(request, contextId.payload);
|
||||
this.container.registerRequestProvider(requestProviderValue, contextId);
|
||||
}
|
||||
return contextId;
|
||||
|
||||
@@ -9,7 +9,6 @@ import {
|
||||
Abstract,
|
||||
DynamicModule,
|
||||
GetOrResolveOptions,
|
||||
SelectOptions,
|
||||
Type,
|
||||
} from '@nestjs/common/interfaces';
|
||||
import { NestApplicationContextOptions } from '@nestjs/common/interfaces/nest-application-context-options.interface';
|
||||
@@ -51,10 +50,11 @@ export class NestApplicationContext<
|
||||
|
||||
private shouldFlushLogsOnOverride = false;
|
||||
private readonly activeShutdownSignals = new Array<string>();
|
||||
private readonly moduleCompiler: ModuleCompiler;
|
||||
private readonly moduleCompiler = new ModuleCompiler();
|
||||
private shutdownCleanupRef?: (...args: unknown[]) => unknown;
|
||||
private _instanceLinksHost: InstanceLinksHost;
|
||||
private _moduleRefsForHooksByDistance?: Array<Module>;
|
||||
private initializationPromise?: Promise<void>;
|
||||
|
||||
protected get instanceLinksHost() {
|
||||
if (!this._instanceLinksHost) {
|
||||
@@ -71,7 +71,6 @@ export class NestApplicationContext<
|
||||
) {
|
||||
super();
|
||||
this.injector = new Injector();
|
||||
this.moduleCompiler = container.getModuleCompiler();
|
||||
|
||||
if (this.appOptions.preview) {
|
||||
this.printInPreviewModeWarning();
|
||||
@@ -89,7 +88,6 @@ export class NestApplicationContext<
|
||||
*/
|
||||
public select<T>(
|
||||
moduleType: Type<T> | DynamicModule,
|
||||
selectOptions?: SelectOptions,
|
||||
): INestApplicationContext {
|
||||
const modulesContainer = this.container.getModules();
|
||||
const contextModuleCtor = this.contextModule.metatype;
|
||||
@@ -98,30 +96,15 @@ export class NestApplicationContext<
|
||||
const moduleTokenFactory = this.container.getModuleTokenFactory();
|
||||
const { type, dynamicMetadata } =
|
||||
this.moduleCompiler.extractMetadata(moduleType);
|
||||
const token = dynamicMetadata
|
||||
? moduleTokenFactory.createForDynamic(
|
||||
type,
|
||||
dynamicMetadata,
|
||||
moduleType as DynamicModule,
|
||||
)
|
||||
: moduleTokenFactory.createForStatic(type, moduleType as Type);
|
||||
const token = moduleTokenFactory.create(type, dynamicMetadata);
|
||||
|
||||
const selectedModule = modulesContainer.get(token);
|
||||
if (!selectedModule) {
|
||||
throw new UnknownModuleException(type.name);
|
||||
}
|
||||
|
||||
const options =
|
||||
typeof selectOptions?.abortOnError !== 'undefined'
|
||||
? {
|
||||
...this.appOptions,
|
||||
...selectOptions,
|
||||
}
|
||||
: this.appOptions;
|
||||
|
||||
return new NestApplicationContext(
|
||||
this.container,
|
||||
options,
|
||||
this.appOptions,
|
||||
selectedModule,
|
||||
scope,
|
||||
);
|
||||
@@ -252,8 +235,16 @@ export class NestApplicationContext<
|
||||
if (this.isInitialized) {
|
||||
return this;
|
||||
}
|
||||
await this.callInitHook();
|
||||
await this.callBootstrapHook();
|
||||
this.initializationPromise = new Promise(async (resolve, reject) => {
|
||||
try {
|
||||
await this.callInitHook();
|
||||
await this.callBootstrapHook();
|
||||
resolve();
|
||||
} catch (err) {
|
||||
reject(err);
|
||||
}
|
||||
});
|
||||
await this.initializationPromise;
|
||||
|
||||
this.isInitialized = true;
|
||||
return this;
|
||||
@@ -264,6 +255,7 @@ export class NestApplicationContext<
|
||||
* @returns {Promise<void>}
|
||||
*/
|
||||
public async close(signal?: string): Promise<void> {
|
||||
await this.initializationPromise;
|
||||
await this.callDestroyHook();
|
||||
await this.callBeforeShutdownHook(signal);
|
||||
await this.dispose();
|
||||
@@ -351,6 +343,7 @@ export class NestApplicationContext<
|
||||
return;
|
||||
}
|
||||
receivedSignal = true;
|
||||
await this.initializationPromise;
|
||||
await this.callDestroyHook();
|
||||
await this.callBeforeShutdownHook(signal);
|
||||
await this.dispose();
|
||||
@@ -402,10 +395,7 @@ export class NestApplicationContext<
|
||||
* modules and its children.
|
||||
*/
|
||||
protected async callDestroyHook(): Promise<void> {
|
||||
const modulesSortedByDistance = [
|
||||
...this.getModulesToTriggerHooksOn(),
|
||||
].reverse();
|
||||
|
||||
const modulesSortedByDistance = this.getModulesToTriggerHooksOn();
|
||||
for (const module of modulesSortedByDistance) {
|
||||
await callModuleDestroyHook(module);
|
||||
}
|
||||
|
||||
@@ -294,8 +294,12 @@ export class NestApplication
|
||||
public async listen(port: number | string, hostname: string): Promise<any>;
|
||||
public async listen(port: number | string, ...args: any[]): Promise<any> {
|
||||
this.assertNotInPreviewMode('listen');
|
||||
!this.isInitialized && (await this.init());
|
||||
|
||||
if (!this.isInitialized) {
|
||||
await this.init();
|
||||
}
|
||||
|
||||
const httpAdapterHost = this.container.getHttpAdapterHostRef();
|
||||
return new Promise((resolve, reject) => {
|
||||
const errorHandler = (e: any) => {
|
||||
this.logger.error(e?.toString?.());
|
||||
@@ -323,6 +327,8 @@ export class NestApplication
|
||||
if (address) {
|
||||
this.httpServer.removeListener('error', errorHandler);
|
||||
this.isListening = true;
|
||||
|
||||
httpAdapterHost.listening = true;
|
||||
resolve(this.httpServer);
|
||||
}
|
||||
if (isCallbackInOriginalArgs) {
|
||||
|
||||
@@ -3,9 +3,6 @@ import {
|
||||
INestApplication,
|
||||
INestApplicationContext,
|
||||
INestMicroservice,
|
||||
DynamicModule,
|
||||
ForwardReference,
|
||||
Type,
|
||||
} from '@nestjs/common';
|
||||
import { NestMicroserviceOptions } from '@nestjs/common/interfaces/microservices/nest-microservice-options.interface';
|
||||
import { NestApplicationContextOptions } from '@nestjs/common/interfaces/nest-application-context-options.interface';
|
||||
@@ -30,12 +27,6 @@ import { NestApplication } from './nest-application';
|
||||
import { NestApplicationContext } from './nest-application-context';
|
||||
import { DependenciesScanner } from './scanner';
|
||||
|
||||
type IEntryNestModule =
|
||||
| Type<any>
|
||||
| DynamicModule
|
||||
| ForwardReference
|
||||
| Promise<IEntryNestModule>;
|
||||
|
||||
/**
|
||||
* @publicApi
|
||||
*/
|
||||
@@ -56,7 +47,7 @@ export class NestFactoryStatic {
|
||||
* contains a reference to the NestApplication instance.
|
||||
*/
|
||||
public async create<T extends INestApplication = INestApplication>(
|
||||
module: IEntryNestModule,
|
||||
module: any,
|
||||
options?: NestApplicationOptions,
|
||||
): Promise<T>;
|
||||
/**
|
||||
@@ -71,12 +62,12 @@ export class NestFactoryStatic {
|
||||
* contains a reference to the NestApplication instance.
|
||||
*/
|
||||
public async create<T extends INestApplication = INestApplication>(
|
||||
module: IEntryNestModule,
|
||||
module: any,
|
||||
httpAdapter: AbstractHttpAdapter,
|
||||
options?: NestApplicationOptions,
|
||||
): Promise<T>;
|
||||
public async create<T extends INestApplication = INestApplication>(
|
||||
moduleCls: IEntryNestModule,
|
||||
moduleCls: any,
|
||||
serverOrOptions?: AbstractHttpAdapter | NestApplicationOptions,
|
||||
options?: NestApplicationOptions,
|
||||
): Promise<T> {
|
||||
@@ -121,7 +112,7 @@ export class NestFactoryStatic {
|
||||
* contains a reference to the NestMicroservice instance.
|
||||
*/
|
||||
public async createMicroservice<T extends object>(
|
||||
moduleCls: IEntryNestModule,
|
||||
moduleCls: any,
|
||||
options?: NestMicroserviceOptions & T,
|
||||
): Promise<INestMicroservice> {
|
||||
const { NestMicroservice } = loadPackage(
|
||||
@@ -163,7 +154,7 @@ export class NestFactoryStatic {
|
||||
* contains a reference to the NestApplicationContext instance.
|
||||
*/
|
||||
public async createApplicationContext(
|
||||
moduleCls: IEntryNestModule,
|
||||
moduleCls: any,
|
||||
options?: NestApplicationContextOptions,
|
||||
): Promise<INestApplicationContext> {
|
||||
const applicationConfig = new ApplicationConfig();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nestjs/core",
|
||||
"version": "10.4.7",
|
||||
"version": "10.4.14",
|
||||
"description": "Nest - modern, fast, powerful node.js web framework (@core)",
|
||||
"author": "Kamil Mysliwiec",
|
||||
"license": "MIT",
|
||||
@@ -32,11 +32,11 @@
|
||||
"fast-safe-stringify": "2.1.1",
|
||||
"iterare": "1.2.1",
|
||||
"path-to-regexp": "3.3.0",
|
||||
"tslib": "2.7.0",
|
||||
"tslib": "2.8.1",
|
||||
"uid": "2.0.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nestjs/common": "10.4.7"
|
||||
"@nestjs/common": "10.4.14"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@nestjs/common": "^10.0.0",
|
||||
|
||||
@@ -418,7 +418,9 @@ export class RouterExplorer {
|
||||
configurable: false,
|
||||
});
|
||||
|
||||
const requestProviderValue = isTreeDurable ? contextId.payload : request;
|
||||
const requestProviderValue = isTreeDurable
|
||||
? contextId.payload
|
||||
: Object.assign(request, contextId.payload);
|
||||
this.container.registerRequestProvider(requestProviderValue, contextId);
|
||||
}
|
||||
return contextId;
|
||||
|
||||
@@ -92,10 +92,10 @@ export class DependenciesScanner {
|
||||
overrides: options?.overrides,
|
||||
});
|
||||
await this.scanModulesForDependencies();
|
||||
this.calculateModulesDistance();
|
||||
|
||||
this.addScopedEnhancersMetadata();
|
||||
this.container.bindGlobalScope();
|
||||
|
||||
this.calculateModulesDistance();
|
||||
}
|
||||
|
||||
public async scanForModules({
|
||||
@@ -389,16 +389,12 @@ export class DependenciesScanner {
|
||||
// Skip "InternalCoreModule" from calculating distance
|
||||
modulesGenerator.next();
|
||||
|
||||
const calculateDistance = (
|
||||
moduleRef: Module,
|
||||
distance = 1,
|
||||
modulesStack = [],
|
||||
) => {
|
||||
const localModulesStack = [...modulesStack];
|
||||
if (!moduleRef || localModulesStack.includes(moduleRef)) {
|
||||
const modulesStack = [];
|
||||
const calculateDistance = (moduleRef: Module, distance = 1) => {
|
||||
if (!moduleRef || modulesStack.includes(moduleRef)) {
|
||||
return;
|
||||
}
|
||||
localModulesStack.push(moduleRef);
|
||||
modulesStack.push(moduleRef);
|
||||
|
||||
const moduleImports = moduleRef.imports;
|
||||
moduleImports.forEach(importedModuleRef => {
|
||||
@@ -406,7 +402,7 @@ export class DependenciesScanner {
|
||||
if (distance > importedModuleRef.distance) {
|
||||
importedModuleRef.distance = distance;
|
||||
}
|
||||
calculateDistance(importedModuleRef, distance + 1, localModulesStack);
|
||||
calculateDistance(importedModuleRef, distance + 1);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
@@ -127,10 +127,14 @@ export class Reflector {
|
||||
* @param targets context (decorated objects) to retrieve metadata from
|
||||
*
|
||||
*/
|
||||
public getAll<TParam = any, TTransformed = TParam>(
|
||||
decorator: ReflectableDecorator<TParam, TTransformed>,
|
||||
public getAll<T extends ReflectableDecorator<any>>(
|
||||
decorator: T,
|
||||
targets: (Type<any> | Function)[],
|
||||
): TTransformed extends Array<any> ? TTransformed : TTransformed[];
|
||||
): T extends ReflectableDecorator<infer R>
|
||||
? R extends Array<any>
|
||||
? R
|
||||
: R[]
|
||||
: unknown;
|
||||
/**
|
||||
* Retrieve metadata for a specified key for a specified set of targets.
|
||||
*
|
||||
@@ -165,14 +169,10 @@ export class Reflector {
|
||||
* @param targets context (decorated objects) to retrieve metadata from
|
||||
*
|
||||
*/
|
||||
public getAllAndMerge<TParam = any, TTransformed = TParam>(
|
||||
decorator: ReflectableDecorator<TParam, TTransformed>,
|
||||
public getAllAndMerge<T extends ReflectableDecorator<any>>(
|
||||
decorator: T,
|
||||
targets: (Type<any> | Function)[],
|
||||
): TTransformed extends Array<any>
|
||||
? TTransformed
|
||||
: TTransformed extends object
|
||||
? TTransformed
|
||||
: TTransformed[];
|
||||
): T extends ReflectableDecorator<infer R> ? R : unknown;
|
||||
/**
|
||||
* Retrieve metadata for a specified key for a specified set of targets and merge results.
|
||||
*
|
||||
@@ -203,13 +203,6 @@ export class Reflector {
|
||||
if (isEmpty(metadataCollection)) {
|
||||
return metadataCollection as TResult;
|
||||
}
|
||||
if (metadataCollection.length === 1) {
|
||||
const value = metadataCollection[0];
|
||||
if (isObject(value)) {
|
||||
return value as TResult;
|
||||
}
|
||||
return metadataCollection as TResult;
|
||||
}
|
||||
return metadataCollection.reduce((a, b) => {
|
||||
if (Array.isArray(a)) {
|
||||
return a.concat(b);
|
||||
@@ -231,10 +224,10 @@ export class Reflector {
|
||||
* @param targets context (decorated objects) to retrieve metadata from
|
||||
*
|
||||
*/
|
||||
public getAllAndOverride<TParam = any, TTransformed = TParam>(
|
||||
decorator: ReflectableDecorator<TParam, TTransformed>,
|
||||
public getAllAndOverride<T extends ReflectableDecorator<any>>(
|
||||
decorator: T,
|
||||
targets: (Type<any> | Function)[],
|
||||
): TTransformed;
|
||||
): T extends ReflectableDecorator<infer R> ? R : unknown;
|
||||
/**
|
||||
* Retrieve metadata for a specified key for a specified set of targets and return a first not undefined value.
|
||||
*
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { expect } from 'chai';
|
||||
import * as sinon from 'sinon';
|
||||
import { expect } from 'chai';
|
||||
import { ExceptionHandler } from '../../../errors/exception-handler';
|
||||
import { RuntimeException } from '../../../errors/exceptions/runtime.exception';
|
||||
import { InvalidMiddlewareException } from '../../../errors/exceptions/invalid-middleware.exception';
|
||||
|
||||
describe('ExceptionHandler', () => {
|
||||
let instance: ExceptionHandler;
|
||||
@@ -9,7 +10,7 @@ describe('ExceptionHandler', () => {
|
||||
instance = new ExceptionHandler();
|
||||
});
|
||||
describe('handle', () => {
|
||||
let logger: { error: Function };
|
||||
let logger;
|
||||
let errorSpy: sinon.SinonSpy;
|
||||
beforeEach(() => {
|
||||
logger = {
|
||||
@@ -18,10 +19,16 @@ describe('ExceptionHandler', () => {
|
||||
(ExceptionHandler as any).logger = logger;
|
||||
errorSpy = sinon.spy(logger, 'error');
|
||||
});
|
||||
it('should call the logger.error method with the thrown exception passed as an argument', () => {
|
||||
it('when exception is instanceof RuntimeException', () => {
|
||||
const exception = new RuntimeException('msg');
|
||||
instance.handle(exception);
|
||||
expect(errorSpy.calledWith(exception)).to.be.true;
|
||||
expect(errorSpy.calledWith(exception.message, exception.stack)).to.be
|
||||
.true;
|
||||
});
|
||||
it('when exception is not instanceof RuntimeException', () => {
|
||||
const exception = new InvalidMiddlewareException('msg');
|
||||
instance.handle(exception);
|
||||
expect(errorSpy.calledWith(exception.what(), exception.stack)).to.be.true;
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -2,11 +2,27 @@ import { expect } from 'chai';
|
||||
import { HttpAdapterHost } from '../../helpers/http-adapter-host';
|
||||
|
||||
describe('HttpAdapterHost', () => {
|
||||
const applicationRefHost = new HttpAdapterHost();
|
||||
let applicationRefHost: HttpAdapterHost;
|
||||
beforeEach(() => {
|
||||
applicationRefHost = new HttpAdapterHost();
|
||||
});
|
||||
|
||||
it('should wrap application reference', () => {
|
||||
const ref = {};
|
||||
applicationRefHost.httpAdapter = ref as any;
|
||||
|
||||
expect(applicationRefHost.httpAdapter).to.be.eql(ref);
|
||||
});
|
||||
|
||||
it('should emit listen event when listening is set to true', done => {
|
||||
applicationRefHost.listen$.subscribe(() => {
|
||||
expect(applicationRefHost.listening).to.be.true;
|
||||
done();
|
||||
});
|
||||
applicationRefHost.listening = true;
|
||||
});
|
||||
|
||||
it('listening should return false if the application isnt listening yet', () => {
|
||||
expect(applicationRefHost.listening).to.be.false;
|
||||
});
|
||||
});
|
||||
|
||||
@@ -14,13 +14,6 @@ describe('RouterMethodFactory', () => {
|
||||
patch: () => {},
|
||||
options: () => {},
|
||||
head: () => {},
|
||||
propfind: () => {},
|
||||
proppatch: () => {},
|
||||
mkcol: () => {},
|
||||
copy: () => {},
|
||||
move: () => {},
|
||||
lock: () => {},
|
||||
unlock: () => {},
|
||||
all: () => {},
|
||||
};
|
||||
beforeEach(() => {
|
||||
@@ -36,17 +29,6 @@ describe('RouterMethodFactory', () => {
|
||||
expect(factory.get(target, RequestMethod.PATCH)).to.equal(target.patch);
|
||||
expect(factory.get(target, RequestMethod.OPTIONS)).to.equal(target.options);
|
||||
expect(factory.get(target, RequestMethod.HEAD)).to.equal(target.head);
|
||||
expect(factory.get(target, RequestMethod.PROPFIND)).to.equal(
|
||||
target.propfind,
|
||||
);
|
||||
expect(factory.get(target, RequestMethod.PROPPATCH)).to.equal(
|
||||
target.proppatch,
|
||||
);
|
||||
expect(factory.get(target, RequestMethod.MKCOL)).to.equal(target.mkcol);
|
||||
expect(factory.get(target, RequestMethod.COPY)).to.equal(target.copy);
|
||||
expect(factory.get(target, RequestMethod.MOVE)).to.equal(target.move);
|
||||
expect(factory.get(target, RequestMethod.LOCK)).to.equal(target.lock);
|
||||
expect(factory.get(target, RequestMethod.UNLOCK)).to.equal(target.unlock);
|
||||
expect(factory.get(target, -1 as any)).to.equal(target.use);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,30 +1,28 @@
|
||||
import { expect } from 'chai';
|
||||
import { ModuleCompiler } from '../../injector/compiler';
|
||||
import { ByReferenceModuleOpaqueKeyFactory } from '../../injector/opaque-key-factory/by-reference-module-opaque-key-factory';
|
||||
|
||||
describe('ModuleCompiler', () => {
|
||||
let compiler: ModuleCompiler;
|
||||
beforeEach(() => {
|
||||
compiler = new ModuleCompiler(new ByReferenceModuleOpaqueKeyFactory());
|
||||
compiler = new ModuleCompiler();
|
||||
});
|
||||
|
||||
describe('extractMetadata', () => {
|
||||
describe('when module is a dynamic module', () => {
|
||||
it('should return object with "type" and "dynamicMetadata" property', () => {
|
||||
it('should return object with "type" and "dynamicMetadata" property', async () => {
|
||||
const obj = { module: 'test', providers: [] };
|
||||
const { module, ...dynamicMetadata } = obj;
|
||||
expect(compiler.extractMetadata(obj as any)).to.be.deep.equal({
|
||||
expect(await compiler.extractMetadata(obj as any)).to.be.deep.equal({
|
||||
type: module,
|
||||
dynamicMetadata,
|
||||
});
|
||||
});
|
||||
});
|
||||
describe('when module is a not dynamic module', () => {
|
||||
it('should return object with "type" property', () => {
|
||||
it('should return object with "type" property', async () => {
|
||||
const type = 'test';
|
||||
expect(compiler.extractMetadata(type as any)).to.be.deep.equal({
|
||||
expect(await compiler.extractMetadata(type as any)).to.be.deep.equal({
|
||||
type,
|
||||
dynamicMetadata: undefined,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -9,7 +9,6 @@ import { NoopHttpAdapter } from '../utils/noop-adapter.spec';
|
||||
|
||||
describe('NestContainer', () => {
|
||||
let container: NestContainer;
|
||||
let untypedContainer: any;
|
||||
|
||||
@Module({})
|
||||
class TestModule {}
|
||||
@@ -20,7 +19,6 @@ describe('NestContainer', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
container = new NestContainer();
|
||||
untypedContainer = container as any;
|
||||
});
|
||||
|
||||
it('should "addProvider" throw "UnknownModuleException" when module is not stored in collection', () => {
|
||||
@@ -55,7 +53,7 @@ describe('NestContainer', () => {
|
||||
|
||||
describe('clear', () => {
|
||||
it('should call `clear` on modules collection', () => {
|
||||
const clearSpy = sinon.spy(untypedContainer.modules, 'clear');
|
||||
const clearSpy = sinon.spy((container as any).modules, 'clear');
|
||||
container.clear();
|
||||
expect(clearSpy.called).to.be.true;
|
||||
});
|
||||
@@ -65,7 +63,7 @@ describe('NestContainer', () => {
|
||||
it('should not add module if already exists in collection', async () => {
|
||||
const modules = new Map();
|
||||
const setSpy = sinon.spy(modules, 'set');
|
||||
untypedContainer.modules = modules;
|
||||
(container as any).modules = modules;
|
||||
|
||||
await container.addModule(TestModule as any, []);
|
||||
await container.addModule(TestModule as any, []);
|
||||
@@ -91,7 +89,7 @@ describe('NestContainer', () => {
|
||||
|
||||
const modules = new Map();
|
||||
const setSpy = sinon.spy(modules, 'set');
|
||||
untypedContainer.modules = modules;
|
||||
(container as any).modules = modules;
|
||||
|
||||
await container.addModule(TestModule as any, []);
|
||||
await container.replaceModule(
|
||||
@@ -176,7 +174,7 @@ describe('NestContainer', () => {
|
||||
beforeEach(() => {
|
||||
token = 'token';
|
||||
collection = new Map();
|
||||
untypedContainer.dynamicModulesMetadata = collection;
|
||||
(container as any).dynamicModulesMetadata = collection;
|
||||
});
|
||||
describe('when dynamic metadata exists', () => {
|
||||
it('should add to the dynamic metadata collection', () => {
|
||||
@@ -217,7 +215,7 @@ describe('NestContainer', () => {
|
||||
describe('get applicationConfig', () => {
|
||||
it('should return ApplicationConfig instance', () => {
|
||||
expect(container.applicationConfig).to.be.eql(
|
||||
untypedContainer._applicationConfig,
|
||||
(container as any)._applicationConfig,
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -227,7 +225,7 @@ describe('NestContainer', () => {
|
||||
const httpAdapter = new NoopHttpAdapter({});
|
||||
container.setHttpAdapter(httpAdapter);
|
||||
|
||||
const internalStorage = untypedContainer.internalProvidersStorage;
|
||||
const internalStorage = (container as any).internalProvidersStorage;
|
||||
expect(internalStorage.httpAdapter).to.be.eql(httpAdapter);
|
||||
});
|
||||
});
|
||||
@@ -246,7 +244,7 @@ describe('NestContainer', () => {
|
||||
it('should register core module ref', () => {
|
||||
const ref = {} as any;
|
||||
container.registerCoreModuleRef(ref);
|
||||
expect(untypedContainer.internalCoreModule).to.be.eql(ref);
|
||||
expect((container as any).internalCoreModule).to.be.eql(ref);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { Scope } from '@nestjs/common';
|
||||
import { expect } from 'chai';
|
||||
import * as sinon from 'sinon';
|
||||
import { createContextId } from '../../helpers';
|
||||
import { STATIC_CONTEXT } from '../../injector/constants';
|
||||
import { InstanceWrapper } from '../../injector/instance-wrapper';
|
||||
|
||||
@@ -737,6 +738,53 @@ describe('InstanceWrapper', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('removeInstanceByContextId', () => {
|
||||
describe('without inquirer', () => {
|
||||
it('should remove instance for given context', () => {
|
||||
const wrapper = new InstanceWrapper({
|
||||
scope: Scope.TRANSIENT,
|
||||
});
|
||||
|
||||
const contextId = createContextId();
|
||||
wrapper.setInstanceByContextId(contextId, { instance: {} });
|
||||
|
||||
const existingContext = wrapper.getInstanceByContextId(contextId);
|
||||
expect(existingContext.instance).to.be.not.undefined;
|
||||
wrapper.removeInstanceByContextId(contextId);
|
||||
|
||||
const removedContext = wrapper.getInstanceByContextId(contextId);
|
||||
expect(removedContext.instance).to.be.undefined;
|
||||
});
|
||||
});
|
||||
|
||||
describe('when transient and inquirer has been passed', () => {
|
||||
it('should remove instance for given context', () => {
|
||||
const wrapper = new InstanceWrapper({
|
||||
scope: Scope.TRANSIENT,
|
||||
});
|
||||
|
||||
wrapper.setInstanceByContextId(
|
||||
STATIC_CONTEXT,
|
||||
{ instance: {} },
|
||||
'inquirerId',
|
||||
);
|
||||
|
||||
const existingContext = wrapper.getInstanceByContextId(
|
||||
STATIC_CONTEXT,
|
||||
'inquirerId',
|
||||
);
|
||||
expect(existingContext.instance).to.be.not.undefined;
|
||||
wrapper.removeInstanceByContextId(STATIC_CONTEXT, 'inquirerId');
|
||||
|
||||
const removedContext = wrapper.getInstanceByContextId(
|
||||
STATIC_CONTEXT,
|
||||
'inquirerId',
|
||||
);
|
||||
expect(removedContext.instance).to.be.undefined;
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('isInRequestScope', () => {
|
||||
describe('when tree and context are not static and is not transient', () => {
|
||||
it('should return true', () => {
|
||||
|
||||
@@ -1,48 +1,41 @@
|
||||
import { expect } from 'chai';
|
||||
import * as sinon from 'sinon';
|
||||
import { DeepHashedModuleOpaqueKeyFactory } from '../../../injector/opaque-key-factory/deep-hashed-module-opaque-key-factory';
|
||||
import { ModuleTokenFactory } from '../../injector/module-token-factory';
|
||||
|
||||
describe('DeepHashedModuleOpaqueKeyFactory', () => {
|
||||
describe('ModuleTokenFactory', () => {
|
||||
const moduleId = 'constId';
|
||||
let factory: DeepHashedModuleOpaqueKeyFactory;
|
||||
let factory: ModuleTokenFactory;
|
||||
|
||||
beforeEach(() => {
|
||||
factory = new DeepHashedModuleOpaqueKeyFactory();
|
||||
factory = new ModuleTokenFactory();
|
||||
sinon.stub(factory, 'getModuleId').returns(moduleId);
|
||||
});
|
||||
describe('createForStatic', () => {
|
||||
describe('create', () => {
|
||||
class Module {}
|
||||
|
||||
it('should return expected token', () => {
|
||||
const type = Module;
|
||||
const token1 = factory.createForStatic(type);
|
||||
const token2 = factory.createForStatic(type);
|
||||
const token1 = factory.create(type, undefined);
|
||||
const token2 = factory.create(type, undefined);
|
||||
expect(token1).to.be.deep.eq(token2);
|
||||
});
|
||||
});
|
||||
describe('createForDynamic', () => {
|
||||
class Module {}
|
||||
|
||||
it('should include dynamic metadata', () => {
|
||||
const type = Module;
|
||||
const token1 = factory.createForDynamic(type, {
|
||||
const token1 = factory.create(type, {
|
||||
providers: [{}],
|
||||
} as any);
|
||||
const token2 = factory.createForDynamic(type, {
|
||||
const token2 = factory.create(type, {
|
||||
providers: [{}],
|
||||
} as any);
|
||||
|
||||
expect(token1).to.be.deep.eq(token2);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getModuleName', () => {
|
||||
it('should map module metatype to name', () => {
|
||||
const metatype = () => {};
|
||||
expect(factory.getModuleName(metatype as any)).to.be.eql(metatype.name);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getStringifiedOpaqueToken', () => {
|
||||
describe('when metadata exists', () => {
|
||||
it('should return hash', () => {
|
||||
@@ -87,7 +80,6 @@ describe('DeepHashedModuleOpaqueKeyFactory', () => {
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('when metadata does not exist', () => {
|
||||
it('should return empty string', () => {
|
||||
expect(factory.getStringifiedOpaqueToken(undefined)).to.be.eql('');
|
||||
@@ -11,8 +11,7 @@ import { InstanceWrapper } from '../../injector/instance-wrapper';
|
||||
import { Module } from '../../injector/module';
|
||||
|
||||
describe('Module', () => {
|
||||
let moduleRef: Module;
|
||||
let untypedModuleRef: any;
|
||||
let module: Module;
|
||||
let container: NestContainer;
|
||||
|
||||
@ModuleDecorator({})
|
||||
@@ -23,24 +22,23 @@ describe('Module', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
container = new NestContainer();
|
||||
moduleRef = new Module(TestModule, container);
|
||||
untypedModuleRef = moduleRef as any;
|
||||
module = new Module(TestModule, container);
|
||||
});
|
||||
|
||||
it('should add controller', () => {
|
||||
const collection = new Map();
|
||||
const setSpy = sinon.spy(collection, 'set');
|
||||
untypedModuleRef._controllers = collection;
|
||||
(module as any)._controllers = collection;
|
||||
|
||||
@Controller({ scope: Scope.REQUEST, durable: true })
|
||||
class Test {}
|
||||
|
||||
moduleRef.addController(Test);
|
||||
module.addController(Test);
|
||||
expect(
|
||||
setSpy.calledWith(
|
||||
Test,
|
||||
new InstanceWrapper({
|
||||
host: moduleRef,
|
||||
host: module,
|
||||
token: Test,
|
||||
name: 'Test',
|
||||
scope: Scope.REQUEST,
|
||||
@@ -56,14 +54,14 @@ describe('Module', () => {
|
||||
it('should add injectable', () => {
|
||||
const collection = new Map();
|
||||
const setSpy = sinon.spy(collection, 'set');
|
||||
untypedModuleRef._injectables = collection;
|
||||
(module as any)._injectables = collection;
|
||||
|
||||
moduleRef.addInjectable(TestProvider, 'interceptor', TestModule);
|
||||
module.addInjectable(TestProvider, 'interceptor', TestModule);
|
||||
expect(
|
||||
setSpy.calledWith(
|
||||
TestProvider,
|
||||
new InstanceWrapper({
|
||||
host: moduleRef,
|
||||
host: module,
|
||||
name: 'TestProvider',
|
||||
token: TestProvider,
|
||||
scope: undefined,
|
||||
@@ -79,9 +77,9 @@ describe('Module', () => {
|
||||
|
||||
describe('when injectable is custom provided', () => {
|
||||
it('should call `addCustomProvider`', () => {
|
||||
const addCustomProviderSpy = sinon.spy(moduleRef, 'addCustomProvider');
|
||||
const addCustomProviderSpy = sinon.spy(module, 'addCustomProvider');
|
||||
|
||||
moduleRef.addInjectable({ provide: 'test' } as any, 'guard');
|
||||
module.addInjectable({ provide: 'test' } as any, 'guard');
|
||||
expect(addCustomProviderSpy.called).to.be.true;
|
||||
});
|
||||
});
|
||||
@@ -89,14 +87,14 @@ describe('Module', () => {
|
||||
it('should add provider', () => {
|
||||
const collection = new Map();
|
||||
const setSpy = sinon.spy(collection, 'set');
|
||||
untypedModuleRef._providers = collection;
|
||||
(module as any)._providers = collection;
|
||||
|
||||
moduleRef.addProvider(TestProvider);
|
||||
module.addProvider(TestProvider);
|
||||
expect(
|
||||
setSpy.calledWith(
|
||||
TestProvider,
|
||||
new InstanceWrapper({
|
||||
host: moduleRef,
|
||||
host: module,
|
||||
name: 'TestProvider',
|
||||
token: TestProvider,
|
||||
scope: undefined,
|
||||
@@ -111,81 +109,81 @@ describe('Module', () => {
|
||||
|
||||
it('should call "addCustomProvider" when "provide" property exists', () => {
|
||||
const addCustomProvider = sinon.spy();
|
||||
moduleRef.addCustomProvider = addCustomProvider;
|
||||
module.addCustomProvider = addCustomProvider;
|
||||
|
||||
const provider = { provide: 'test', useValue: 'test' };
|
||||
|
||||
moduleRef.addProvider(provider as any);
|
||||
module.addProvider(provider as any);
|
||||
expect((addCustomProvider as sinon.SinonSpy).called).to.be.true;
|
||||
});
|
||||
|
||||
it('should call "addCustomClass" when "useClass" property exists', () => {
|
||||
const addCustomClass = sinon.spy();
|
||||
moduleRef.addCustomClass = addCustomClass;
|
||||
module.addCustomClass = addCustomClass;
|
||||
|
||||
const provider = { provide: 'test', useClass: () => null };
|
||||
|
||||
moduleRef.addCustomProvider(provider as any, new Map());
|
||||
module.addCustomProvider(provider as any, new Map());
|
||||
expect((addCustomClass as sinon.SinonSpy).called).to.be.true;
|
||||
});
|
||||
|
||||
it('should call "addCustomValue" when "useValue" property exists', () => {
|
||||
const addCustomValue = sinon.spy();
|
||||
moduleRef.addCustomValue = addCustomValue;
|
||||
module.addCustomValue = addCustomValue;
|
||||
|
||||
const provider = { provide: 'test', useValue: () => null };
|
||||
|
||||
moduleRef.addCustomProvider(provider as any, new Map());
|
||||
module.addCustomProvider(provider as any, new Map());
|
||||
expect((addCustomValue as sinon.SinonSpy).called).to.be.true;
|
||||
});
|
||||
|
||||
it('should call "addCustomValue" when "useValue" property exists but its value is `undefined`', () => {
|
||||
const addCustomValue = sinon.spy();
|
||||
moduleRef.addCustomValue = addCustomValue;
|
||||
module.addCustomValue = addCustomValue;
|
||||
|
||||
const provider = { provide: 'test', useValue: undefined };
|
||||
|
||||
moduleRef.addCustomProvider(provider as any, new Map());
|
||||
module.addCustomProvider(provider as any, new Map());
|
||||
expect((addCustomValue as sinon.SinonSpy).called).to.be.true;
|
||||
});
|
||||
|
||||
it('should call "addCustomFactory" when "useFactory" property exists', () => {
|
||||
const addCustomFactory = sinon.spy();
|
||||
moduleRef.addCustomFactory = addCustomFactory;
|
||||
module.addCustomFactory = addCustomFactory;
|
||||
|
||||
const provider = { provide: 'test', useFactory: () => null };
|
||||
|
||||
moduleRef.addCustomProvider(provider as any, new Map());
|
||||
module.addCustomProvider(provider as any, new Map());
|
||||
expect((addCustomFactory as sinon.SinonSpy).called).to.be.true;
|
||||
});
|
||||
|
||||
it('should call "addCustomUseExisting" when "useExisting" property exists', () => {
|
||||
const addCustomUseExisting = sinon.spy();
|
||||
moduleRef.addCustomUseExisting = addCustomUseExisting;
|
||||
module.addCustomUseExisting = addCustomUseExisting;
|
||||
|
||||
const provider = { provide: 'test', useExisting: () => null };
|
||||
|
||||
moduleRef.addCustomUseExisting(provider as any, new Map());
|
||||
module.addCustomUseExisting(provider as any, new Map());
|
||||
expect((addCustomUseExisting as sinon.SinonSpy).called).to.be.true;
|
||||
});
|
||||
|
||||
describe('addCustomClass', () => {
|
||||
const type = { name: 'TypeTest' };
|
||||
const provider = { provide: type, useClass: type, durable: true };
|
||||
let setSpy: sinon.SinonSpy;
|
||||
let setSpy;
|
||||
|
||||
beforeEach(() => {
|
||||
const collection = new Map();
|
||||
setSpy = sinon.spy(collection, 'set');
|
||||
untypedModuleRef._providers = collection;
|
||||
(module as any)._providers = collection;
|
||||
});
|
||||
it('should store provider', () => {
|
||||
moduleRef.addCustomClass(provider as any, untypedModuleRef._providers);
|
||||
module.addCustomClass(provider as any, (module as any)._providers);
|
||||
expect(
|
||||
setSpy.calledWith(
|
||||
provider.provide,
|
||||
new InstanceWrapper({
|
||||
host: moduleRef,
|
||||
host: module,
|
||||
token: type as any,
|
||||
name: provider.provide.name,
|
||||
scope: undefined,
|
||||
@@ -201,23 +199,23 @@ describe('Module', () => {
|
||||
});
|
||||
|
||||
describe('addCustomValue', () => {
|
||||
let setSpy: sinon.SinonSpy;
|
||||
let setSpy;
|
||||
const value = () => ({});
|
||||
const provider = { provide: value, useValue: value };
|
||||
|
||||
beforeEach(() => {
|
||||
const collection = new Map();
|
||||
setSpy = sinon.spy(collection, 'set');
|
||||
untypedModuleRef._providers = collection;
|
||||
(module as any)._providers = collection;
|
||||
});
|
||||
|
||||
it('should store provider', () => {
|
||||
moduleRef.addCustomValue(provider as any, untypedModuleRef._providers);
|
||||
module.addCustomValue(provider as any, (module as any)._providers);
|
||||
expect(
|
||||
setSpy.calledWith(
|
||||
provider.provide,
|
||||
new InstanceWrapper({
|
||||
host: moduleRef,
|
||||
host: module,
|
||||
token: provider.provide,
|
||||
name: provider.provide.name,
|
||||
scope: Scope.DEFAULT,
|
||||
@@ -237,20 +235,20 @@ describe('Module', () => {
|
||||
const inject = [1, 2, 3];
|
||||
const provider = { provide: type, useFactory: type, inject, durable: true };
|
||||
|
||||
let setSpy: sinon.SinonSpy;
|
||||
let setSpy;
|
||||
beforeEach(() => {
|
||||
const collection = new Map();
|
||||
setSpy = sinon.spy(collection, 'set');
|
||||
untypedModuleRef._providers = collection;
|
||||
(module as any)._providers = collection;
|
||||
});
|
||||
it('should store provider', () => {
|
||||
moduleRef.addCustomFactory(provider as any, untypedModuleRef._providers);
|
||||
module.addCustomFactory(provider as any, (module as any)._providers);
|
||||
|
||||
expect(
|
||||
setSpy.calledWith(
|
||||
provider.provide,
|
||||
new InstanceWrapper({
|
||||
host: moduleRef,
|
||||
host: module,
|
||||
token: provider.provide as any,
|
||||
name: provider.provide.name,
|
||||
scope: undefined,
|
||||
@@ -270,18 +268,15 @@ describe('Module', () => {
|
||||
const type = { name: 'TypeTest' };
|
||||
const provider = { provide: type, useExisting: type };
|
||||
|
||||
let setSpy: sinon.SinonSpy;
|
||||
let setSpy;
|
||||
beforeEach(() => {
|
||||
const collection = new Map();
|
||||
setSpy = sinon.spy(collection, 'set');
|
||||
untypedModuleRef._providers = collection;
|
||||
(module as any)._providers = collection;
|
||||
});
|
||||
it('should store provider', () => {
|
||||
moduleRef.addCustomUseExisting(
|
||||
provider as any,
|
||||
untypedModuleRef._providers,
|
||||
);
|
||||
const factoryFn = untypedModuleRef._providers.get(
|
||||
module.addCustomUseExisting(provider as any, (module as any)._providers);
|
||||
const factoryFn = (module as any)._providers.get(
|
||||
provider.provide,
|
||||
).metatype;
|
||||
|
||||
@@ -290,7 +285,7 @@ describe('Module', () => {
|
||||
setSpy.calledWith(
|
||||
token,
|
||||
new InstanceWrapper({
|
||||
host: moduleRef,
|
||||
host: module,
|
||||
token,
|
||||
name: provider.provide.name,
|
||||
metatype: factoryFn,
|
||||
@@ -309,41 +304,41 @@ describe('Module', () => {
|
||||
describe('when get instance', () => {
|
||||
describe('when metatype does not exists in providers collection', () => {
|
||||
beforeEach(() => {
|
||||
sinon.stub(untypedModuleRef._providers, 'has').returns(false);
|
||||
sinon.stub((module as any)._providers, 'has').returns(false);
|
||||
});
|
||||
it('should throw RuntimeException', () => {
|
||||
expect(() => moduleRef.instance).to.throws(RuntimeException);
|
||||
expect(() => module.instance).to.throws(RuntimeException);
|
||||
});
|
||||
});
|
||||
describe('when metatype exists in providers collection', () => {
|
||||
it('should return null', () => {
|
||||
expect(moduleRef.instance).to.be.eql(null);
|
||||
expect(module.instance).to.be.eql(null);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('when exported provider is custom provided', () => {
|
||||
beforeEach(() => {
|
||||
sinon.stub(moduleRef, 'validateExportedProvider').callsFake(o => o);
|
||||
sinon.stub(module, 'validateExportedProvider').callsFake(o => o);
|
||||
});
|
||||
it('should call `addCustomExportedProvider`', () => {
|
||||
const addCustomExportedProviderSpy = sinon.spy(
|
||||
moduleRef,
|
||||
module,
|
||||
'addCustomExportedProvider',
|
||||
);
|
||||
|
||||
moduleRef.addExportedProvider({ provide: 'test' } as any);
|
||||
module.addExportedProvider({ provide: 'test' } as any);
|
||||
expect(addCustomExportedProviderSpy.called).to.be.true;
|
||||
});
|
||||
it('should support symbols', () => {
|
||||
const addCustomExportedProviderSpy = sinon.spy(
|
||||
moduleRef,
|
||||
module,
|
||||
'addCustomExportedProvider',
|
||||
);
|
||||
const symb = Symbol('test');
|
||||
moduleRef.addExportedProvider({ provide: symb } as any);
|
||||
module.addExportedProvider({ provide: symb } as any);
|
||||
expect(addCustomExportedProviderSpy.called).to.be.true;
|
||||
expect(untypedModuleRef._exports.has(symb)).to.be.true;
|
||||
expect((module as any)._exports.has(symb)).to.be.true;
|
||||
});
|
||||
});
|
||||
|
||||
@@ -353,10 +348,10 @@ describe('Module', () => {
|
||||
const wrapper = {
|
||||
mergeWith: sinon.spy(),
|
||||
};
|
||||
sinon.stub(moduleRef, 'hasProvider').callsFake(() => true);
|
||||
sinon.stub(moduleRef.providers, 'get').callsFake(() => wrapper as any);
|
||||
sinon.stub(module, 'hasProvider').callsFake(() => true);
|
||||
sinon.stub(module.providers, 'get').callsFake(() => wrapper as any);
|
||||
|
||||
moduleRef.replace(null, { isProvider: true });
|
||||
module.replace(null, { isProvider: true });
|
||||
expect(wrapper.mergeWith.called).to.be.true;
|
||||
});
|
||||
});
|
||||
@@ -366,12 +361,10 @@ describe('Module', () => {
|
||||
mergeWith: sinon.spy(),
|
||||
isProvider: true,
|
||||
};
|
||||
sinon.stub(moduleRef, 'hasInjectable').callsFake(() => true);
|
||||
sinon
|
||||
.stub(moduleRef.injectables, 'get')
|
||||
.callsFake(() => wrapper as any);
|
||||
sinon.stub(module, 'hasInjectable').callsFake(() => true);
|
||||
sinon.stub(module.injectables, 'get').callsFake(() => wrapper as any);
|
||||
|
||||
moduleRef.replace(null, {});
|
||||
module.replace(null, {});
|
||||
expect(wrapper.mergeWith.called).to.be.true;
|
||||
});
|
||||
});
|
||||
@@ -380,63 +373,61 @@ describe('Module', () => {
|
||||
describe('imports', () => {
|
||||
it('should return relatedModules', () => {
|
||||
const test = ['test'];
|
||||
untypedModuleRef._imports = test;
|
||||
(module as any)._imports = test;
|
||||
|
||||
expect(moduleRef.imports).to.be.eql(test);
|
||||
expect(module.imports).to.be.eql(test);
|
||||
});
|
||||
});
|
||||
|
||||
describe('injectables', () => {
|
||||
it('should return injectables', () => {
|
||||
const test = ['test'];
|
||||
untypedModuleRef._injectables = test;
|
||||
expect(moduleRef.injectables).to.be.eql(test);
|
||||
(module as any)._injectables = test;
|
||||
expect(module.injectables).to.be.eql(test);
|
||||
});
|
||||
});
|
||||
|
||||
describe('controllers', () => {
|
||||
it('should return controllers', () => {
|
||||
const test = ['test'];
|
||||
untypedModuleRef._controllers = test;
|
||||
(module as any)._controllers = test;
|
||||
|
||||
expect(moduleRef.controllers).to.be.eql(test);
|
||||
expect(module.controllers).to.be.eql(test);
|
||||
});
|
||||
});
|
||||
|
||||
describe('exports', () => {
|
||||
it('should return exports', () => {
|
||||
const test = ['test'];
|
||||
untypedModuleRef._exports = test;
|
||||
(module as any)._exports = test;
|
||||
|
||||
expect(moduleRef.exports).to.be.eql(test);
|
||||
expect(module.exports).to.be.eql(test);
|
||||
});
|
||||
});
|
||||
|
||||
describe('providers', () => {
|
||||
it('should return providers', () => {
|
||||
const test = ['test'];
|
||||
untypedModuleRef._providers = test;
|
||||
(module as any)._providers = test;
|
||||
|
||||
expect(moduleRef.providers).to.be.eql(test);
|
||||
expect(module.providers).to.be.eql(test);
|
||||
});
|
||||
});
|
||||
|
||||
describe('createModuleReferenceType', () => {
|
||||
let customModuleRef: any;
|
||||
let moduleRef: any;
|
||||
|
||||
beforeEach(() => {
|
||||
const Class = moduleRef.createModuleReferenceType();
|
||||
customModuleRef = new Class();
|
||||
const Class = module.createModuleReferenceType();
|
||||
moduleRef = new Class();
|
||||
});
|
||||
|
||||
it('should return metatype with "get" method', () => {
|
||||
expect(!!customModuleRef.get).to.be.true;
|
||||
expect(!!moduleRef.get).to.be.true;
|
||||
});
|
||||
describe('get', () => {
|
||||
it('should throw exception if not exists', () => {
|
||||
expect(() => customModuleRef.get('fail')).to.throws(
|
||||
UnknownElementException,
|
||||
);
|
||||
expect(() => moduleRef.get('fail')).to.throws(UnknownElementException);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -445,22 +436,22 @@ describe('Module', () => {
|
||||
|
||||
describe('when unit exists in provider collection', () => {
|
||||
it('should behave as identity', () => {
|
||||
untypedModuleRef._providers = new Map([[token, true]]);
|
||||
expect(moduleRef.validateExportedProvider(token)).to.be.eql(token);
|
||||
(module as any)._providers = new Map([[token, true]]);
|
||||
expect(module.validateExportedProvider(token)).to.be.eql(token);
|
||||
});
|
||||
});
|
||||
describe('when unit exists in related modules collection', () => {
|
||||
it('should behave as identity', () => {
|
||||
class Random {}
|
||||
untypedModuleRef._imports = new Set([
|
||||
(module as any)._imports = new Set([
|
||||
new Module(Random, new NestContainer()),
|
||||
]);
|
||||
expect(moduleRef.validateExportedProvider(Random)).to.be.eql(Random);
|
||||
expect(module.validateExportedProvider(Random)).to.be.eql(Random);
|
||||
});
|
||||
});
|
||||
describe('when unit does not exist in both provider and related modules collections', () => {
|
||||
it('should throw UnknownExportException', () => {
|
||||
expect(() => moduleRef.validateExportedProvider(token)).to.throws(
|
||||
expect(() => module.validateExportedProvider(token)).to.throws(
|
||||
UnknownExportException,
|
||||
);
|
||||
});
|
||||
@@ -471,13 +462,13 @@ describe('Module', () => {
|
||||
describe('when module has provider', () => {
|
||||
it('should return true', () => {
|
||||
const token = 'test';
|
||||
moduleRef.providers.set(token, new InstanceWrapper());
|
||||
expect(moduleRef.hasProvider(token)).to.be.true;
|
||||
module.providers.set(token, new InstanceWrapper());
|
||||
expect(module.hasProvider(token)).to.be.true;
|
||||
});
|
||||
});
|
||||
describe('otherwise', () => {
|
||||
it('should return false', () => {
|
||||
expect(moduleRef.hasProvider('_')).to.be.false;
|
||||
expect(module.hasProvider('_')).to.be.false;
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -486,33 +477,33 @@ describe('Module', () => {
|
||||
describe('when module has injectable', () => {
|
||||
it('should return true', () => {
|
||||
const token = 'test';
|
||||
moduleRef.injectables.set(token, new InstanceWrapper());
|
||||
expect(moduleRef.hasInjectable(token)).to.be.true;
|
||||
module.injectables.set(token, new InstanceWrapper());
|
||||
expect(module.hasInjectable(token)).to.be.true;
|
||||
});
|
||||
});
|
||||
describe('otherwise', () => {
|
||||
it('should return false', () => {
|
||||
expect(moduleRef.hasInjectable('_')).to.be.false;
|
||||
expect(module.hasInjectable('_')).to.be.false;
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('getter "id"', () => {
|
||||
it('should return module id', () => {
|
||||
expect(moduleRef.id).to.be.equal(moduleRef['_id']);
|
||||
expect(module.id).to.be.equal(module['_id']);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getProviderByKey', () => {
|
||||
describe('when does not exist', () => {
|
||||
it('should return undefined', () => {
|
||||
expect(moduleRef.getProviderByKey('test')).to.be.undefined;
|
||||
expect(module.getProviderByKey('test')).to.be.undefined;
|
||||
});
|
||||
});
|
||||
describe('otherwise', () => {
|
||||
it('should return instance wrapper', () => {
|
||||
moduleRef.addProvider(TestProvider);
|
||||
expect(moduleRef.getProviderByKey(TestProvider)).to.not.be.undefined;
|
||||
module.addProvider(TestProvider);
|
||||
expect(module.getProviderByKey(TestProvider)).to.not.be.undefined;
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
import { expect } from 'chai';
|
||||
import * as sinon from 'sinon';
|
||||
import { ByReferenceModuleOpaqueKeyFactory } from '../../../injector/opaque-key-factory/by-reference-module-opaque-key-factory';
|
||||
|
||||
describe('ByReferenceModuleOpaqueKeyFactory', () => {
|
||||
const moduleId = 'constId';
|
||||
let factory: ByReferenceModuleOpaqueKeyFactory;
|
||||
|
||||
describe('when generating algorithm is random', () => {
|
||||
beforeEach(() => {
|
||||
factory = new ByReferenceModuleOpaqueKeyFactory();
|
||||
sinon.stub(factory as any, 'generateRandomString').returns(moduleId);
|
||||
});
|
||||
|
||||
describe('createForStatic', () => {
|
||||
class Module {}
|
||||
|
||||
it('should return expected token', () => {
|
||||
const type = Module;
|
||||
const token1 = factory.createForStatic(type);
|
||||
const token2 = factory.createForStatic(type);
|
||||
expect(token1).to.be.deep.eq(token2);
|
||||
});
|
||||
});
|
||||
|
||||
describe('createForDynamic', () => {
|
||||
class Module {}
|
||||
|
||||
it('should include dynamic metadata', () => {
|
||||
const dynamicModule = {
|
||||
module: Module,
|
||||
providers: [
|
||||
{
|
||||
provide: 'test',
|
||||
useValue: 'test',
|
||||
},
|
||||
],
|
||||
};
|
||||
const token1 = factory.createForDynamic(
|
||||
dynamicModule.module,
|
||||
{
|
||||
providers: dynamicModule.providers,
|
||||
},
|
||||
dynamicModule,
|
||||
);
|
||||
const token2 = factory.createForDynamic(
|
||||
dynamicModule.module,
|
||||
{
|
||||
providers: dynamicModule.providers,
|
||||
},
|
||||
dynamicModule,
|
||||
);
|
||||
|
||||
expect(token1).to.be.deep.eq(token2);
|
||||
});
|
||||
});
|
||||
});
|
||||
describe('when generating algorithm is shallow', () => {
|
||||
beforeEach(() => {
|
||||
factory = new ByReferenceModuleOpaqueKeyFactory({
|
||||
keyGenerationStrategy: 'shallow',
|
||||
});
|
||||
sinon.stub(factory as any, 'generateRandomString').returns(moduleId);
|
||||
});
|
||||
|
||||
describe('createForStatic', () => {
|
||||
class Module {}
|
||||
|
||||
it('should return expected token', () => {
|
||||
const type = Module;
|
||||
const token1 = factory.createForStatic(type);
|
||||
const token2 = factory.createForStatic(type);
|
||||
|
||||
expect(token1).to.be.deep.eq(token2);
|
||||
});
|
||||
});
|
||||
|
||||
describe('createForDynamic', () => {
|
||||
class Module {}
|
||||
|
||||
it('should include dynamic metadata', () => {
|
||||
const dynamicModule = {
|
||||
module: Module,
|
||||
providers: [
|
||||
{
|
||||
provide: 'test',
|
||||
useValue: 'test',
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
const token1 = factory.createForDynamic(
|
||||
dynamicModule.module,
|
||||
{
|
||||
providers: dynamicModule.providers,
|
||||
},
|
||||
dynamicModule,
|
||||
);
|
||||
const token2 = factory.createForDynamic(
|
||||
dynamicModule.module,
|
||||
{
|
||||
providers: dynamicModule.providers,
|
||||
},
|
||||
dynamicModule,
|
||||
);
|
||||
|
||||
expect(token1).to.be.deep.eq(token2);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,4 +1,4 @@
|
||||
import { InjectionToken, Scope } from '@nestjs/common';
|
||||
import { InjectionToken, Provider, Scope } from '@nestjs/common';
|
||||
import { expect } from 'chai';
|
||||
import * as sinon from 'sinon';
|
||||
import { ContextIdFactory } from '../helpers/context-id-factory';
|
||||
@@ -7,6 +7,7 @@ import { Injector } from '../injector/injector';
|
||||
import { InstanceLoader } from '../injector/instance-loader';
|
||||
import { GraphInspector } from '../inspector/graph-inspector';
|
||||
import { NestApplicationContext } from '../nest-application-context';
|
||||
import { setTimeout } from 'timers/promises';
|
||||
|
||||
describe('NestApplicationContext', () => {
|
||||
class A {}
|
||||
@@ -14,6 +15,7 @@ describe('NestApplicationContext', () => {
|
||||
async function testHelper(
|
||||
injectionKey: InjectionToken,
|
||||
scope: Scope,
|
||||
additionalProviders: Array<Provider> = [],
|
||||
): Promise<NestApplicationContext> {
|
||||
const nestContainer = new NestContainer();
|
||||
const injector = new Injector();
|
||||
@@ -33,6 +35,10 @@ describe('NestApplicationContext', () => {
|
||||
moduleRef.token,
|
||||
);
|
||||
|
||||
for (const provider of additionalProviders) {
|
||||
nestContainer.addProvider(provider, moduleRef.token);
|
||||
}
|
||||
|
||||
nestContainer.addInjectable(
|
||||
{
|
||||
provide: injectionKey,
|
||||
@@ -96,6 +102,58 @@ describe('NestApplicationContext', () => {
|
||||
expect(processUp).to.be.false;
|
||||
expect(promisesResolved).to.be.true;
|
||||
});
|
||||
|
||||
it('should defer shutdown until all init hooks are resolved', async () => {
|
||||
const clock = sinon.useFakeTimers({
|
||||
toFake: ['setTimeout'],
|
||||
});
|
||||
const signal = 'SIGTERM';
|
||||
|
||||
const onModuleInitStub = sinon.stub();
|
||||
const onApplicationShutdownStub = sinon.stub();
|
||||
|
||||
class B {
|
||||
async onModuleInit() {
|
||||
await setTimeout(5000);
|
||||
onModuleInitStub();
|
||||
}
|
||||
|
||||
async onApplicationShutdown() {
|
||||
await setTimeout(1000);
|
||||
onApplicationShutdownStub();
|
||||
}
|
||||
}
|
||||
|
||||
const applicationContext = await testHelper(A, Scope.DEFAULT, [
|
||||
{ provide: B, useClass: B, scope: Scope.DEFAULT },
|
||||
]);
|
||||
applicationContext.enableShutdownHooks([signal]);
|
||||
|
||||
const ignoreProcessSignal = () => {
|
||||
// noop to prevent process from exiting
|
||||
};
|
||||
process.on(signal, ignoreProcessSignal);
|
||||
|
||||
const deferredShutdown = async () => {
|
||||
setTimeout(1);
|
||||
process.kill(process.pid, signal);
|
||||
};
|
||||
Promise.all([applicationContext.init(), deferredShutdown()]);
|
||||
|
||||
await clock.nextAsync();
|
||||
expect(onModuleInitStub.called).to.be.false;
|
||||
expect(onApplicationShutdownStub.called).to.be.false;
|
||||
|
||||
await clock.nextAsync();
|
||||
expect(onModuleInitStub.called).to.be.true;
|
||||
expect(onApplicationShutdownStub.called).to.be.false;
|
||||
|
||||
await clock.nextAsync();
|
||||
expect(onModuleInitStub.called).to.be.true;
|
||||
expect(onApplicationShutdownStub.called).to.be.true;
|
||||
|
||||
clock.restore();
|
||||
});
|
||||
});
|
||||
|
||||
describe('get', () => {
|
||||
|
||||
@@ -4,13 +4,9 @@ import { RouteParamsFactory } from '../../router/route-params-factory';
|
||||
|
||||
describe('RouteParamsFactory', () => {
|
||||
let factory: RouteParamsFactory;
|
||||
let untypedFactory: any;
|
||||
|
||||
beforeEach(() => {
|
||||
factory = new RouteParamsFactory();
|
||||
untypedFactory = factory as any;
|
||||
});
|
||||
|
||||
describe('exchangeKeyForValue', () => {
|
||||
const res = {};
|
||||
const next = () => ({});
|
||||
@@ -41,14 +37,14 @@ describe('RouteParamsFactory', () => {
|
||||
describe(`RouteParamtypes.NEXT`, () => {
|
||||
it('should return next object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(RouteParamtypes.NEXT, ...args),
|
||||
(factory as any).exchangeKeyForValue(RouteParamtypes.NEXT, ...args),
|
||||
).to.be.eql(next);
|
||||
});
|
||||
});
|
||||
describe(`RouteParamtypes.RESPONSE`, () => {
|
||||
it('should return response object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(
|
||||
(factory as any).exchangeKeyForValue(
|
||||
RouteParamtypes.RESPONSE,
|
||||
...args,
|
||||
),
|
||||
@@ -58,7 +54,7 @@ describe('RouteParamsFactory', () => {
|
||||
describe(`RouteParamtypes.REQUEST`, () => {
|
||||
it('should return request object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(
|
||||
(factory as any).exchangeKeyForValue(
|
||||
RouteParamtypes.REQUEST,
|
||||
...args,
|
||||
),
|
||||
@@ -68,14 +64,14 @@ describe('RouteParamsFactory', () => {
|
||||
describe(`RouteParamtypes.BODY`, () => {
|
||||
it('should return body object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(RouteParamtypes.BODY, ...args),
|
||||
(factory as any).exchangeKeyForValue(RouteParamtypes.BODY, ...args),
|
||||
).to.be.eql(req.body);
|
||||
});
|
||||
});
|
||||
describe(`RouteParamtypes.RAW_BODY`, () => {
|
||||
it('should return rawBody buffer', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(
|
||||
(factory as any).exchangeKeyForValue(
|
||||
RouteParamtypes.RAW_BODY,
|
||||
...args,
|
||||
),
|
||||
@@ -85,7 +81,7 @@ describe('RouteParamsFactory', () => {
|
||||
describe(`RouteParamtypes.HEADERS`, () => {
|
||||
it('should return headers object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(
|
||||
(factory as any).exchangeKeyForValue(
|
||||
RouteParamtypes.HEADERS,
|
||||
...args,
|
||||
),
|
||||
@@ -95,14 +91,14 @@ describe('RouteParamsFactory', () => {
|
||||
describe(`RouteParamtypes.IP`, () => {
|
||||
it('should return ip property', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(RouteParamtypes.IP, ...args),
|
||||
(factory as any).exchangeKeyForValue(RouteParamtypes.IP, ...args),
|
||||
).to.be.equal(req.ip);
|
||||
});
|
||||
});
|
||||
describe(`RouteParamtypes.SESSION`, () => {
|
||||
it('should return session object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(
|
||||
(factory as any).exchangeKeyForValue(
|
||||
RouteParamtypes.SESSION,
|
||||
...args,
|
||||
),
|
||||
@@ -112,41 +108,50 @@ describe('RouteParamsFactory', () => {
|
||||
describe(`RouteParamtypes.QUERY`, () => {
|
||||
it('should return query object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(RouteParamtypes.QUERY, ...args),
|
||||
(factory as any).exchangeKeyForValue(
|
||||
RouteParamtypes.QUERY,
|
||||
...args,
|
||||
),
|
||||
).to.be.eql(req.query);
|
||||
});
|
||||
});
|
||||
describe(`RouteParamtypes.PARAM`, () => {
|
||||
it('should return params object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(RouteParamtypes.PARAM, ...args),
|
||||
(factory as any).exchangeKeyForValue(
|
||||
RouteParamtypes.PARAM,
|
||||
...args,
|
||||
),
|
||||
).to.be.eql(req.params);
|
||||
});
|
||||
});
|
||||
describe(`RouteParamtypes.HOST`, () => {
|
||||
it('should return hosts object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(RouteParamtypes.HOST, ...args),
|
||||
(factory as any).exchangeKeyForValue(RouteParamtypes.HOST, ...args),
|
||||
).to.be.eql(req.hosts);
|
||||
});
|
||||
});
|
||||
describe(`RouteParamtypes.FILE`, () => {
|
||||
it('should return file object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(RouteParamtypes.FILE, ...args),
|
||||
(factory as any).exchangeKeyForValue(RouteParamtypes.FILE, ...args),
|
||||
).to.be.eql(req.file);
|
||||
});
|
||||
});
|
||||
describe(`RouteParamtypes.FILES`, () => {
|
||||
it('should return files object', () => {
|
||||
expect(
|
||||
untypedFactory.exchangeKeyForValue(RouteParamtypes.FILES, ...args),
|
||||
(factory as any).exchangeKeyForValue(
|
||||
RouteParamtypes.FILES,
|
||||
...args,
|
||||
),
|
||||
).to.be.eql(req.files);
|
||||
});
|
||||
});
|
||||
describe('not available', () => {
|
||||
it('should return null', () => {
|
||||
expect(untypedFactory.exchangeKeyForValue(-1, ...args)).to.be.eql(
|
||||
expect((factory as any).exchangeKeyForValue(-1, ...args)).to.be.eql(
|
||||
null,
|
||||
);
|
||||
});
|
||||
|
||||
@@ -52,7 +52,6 @@ describe('RoutesResolver', () => {
|
||||
|
||||
let router: any;
|
||||
let routesResolver: RoutesResolver;
|
||||
let untypedRoutesResolver: any;
|
||||
let container: NestContainer;
|
||||
let modules: Map<string, any>;
|
||||
let applicationRef: any;
|
||||
@@ -83,7 +82,6 @@ describe('RoutesResolver', () => {
|
||||
new Injector(),
|
||||
new GraphInspector(container),
|
||||
);
|
||||
untypedRoutesResolver = routesResolver as any;
|
||||
});
|
||||
|
||||
describe('registerRouters', () => {
|
||||
@@ -97,14 +95,14 @@ describe('RoutesResolver', () => {
|
||||
|
||||
const appInstance = new NoopHttpAdapter(router);
|
||||
const exploreSpy = sinon.spy(
|
||||
untypedRoutesResolver.routerExplorer,
|
||||
(routesResolver as any).routerExplorer,
|
||||
'explore',
|
||||
);
|
||||
const moduleName = '';
|
||||
modules.set(moduleName, {});
|
||||
|
||||
sinon
|
||||
.stub(untypedRoutesResolver.routerExplorer, 'extractRouterPath')
|
||||
.stub((routesResolver as any).routerExplorer, 'extractRouterPath')
|
||||
.callsFake(() => ['']);
|
||||
routesResolver.registerRouters(routes, moduleName, '', '', appInstance);
|
||||
|
||||
@@ -139,14 +137,14 @@ describe('RoutesResolver', () => {
|
||||
|
||||
const appInstance = new NoopHttpAdapter(router);
|
||||
const exploreSpy = sinon.spy(
|
||||
untypedRoutesResolver.routerExplorer,
|
||||
(routesResolver as any).routerExplorer,
|
||||
'explore',
|
||||
);
|
||||
const moduleName = '';
|
||||
modules.set(moduleName, {});
|
||||
|
||||
sinon
|
||||
.stub(untypedRoutesResolver.routerExplorer, 'extractRouterPath')
|
||||
.stub((routesResolver as any).routerExplorer, 'extractRouterPath')
|
||||
.callsFake(() => ['']);
|
||||
routesResolver.registerRouters(routes, moduleName, '', '', appInstance);
|
||||
|
||||
@@ -183,7 +181,6 @@ describe('RoutesResolver', () => {
|
||||
new Injector(),
|
||||
new GraphInspector(container),
|
||||
);
|
||||
untypedRoutesResolver = routesResolver as any;
|
||||
|
||||
const routes = new Map();
|
||||
const routeWrapper = new InstanceWrapper({
|
||||
@@ -194,14 +191,14 @@ describe('RoutesResolver', () => {
|
||||
|
||||
const appInstance = new NoopHttpAdapter(router);
|
||||
const exploreSpy = sinon.spy(
|
||||
untypedRoutesResolver.routerExplorer,
|
||||
(routesResolver as any).routerExplorer,
|
||||
'explore',
|
||||
);
|
||||
const moduleName = '';
|
||||
modules.set(moduleName, {});
|
||||
|
||||
sinon
|
||||
.stub(untypedRoutesResolver.routerExplorer, 'extractRouterPath')
|
||||
.stub((routesResolver as any).routerExplorer, 'extractRouterPath')
|
||||
.callsFake(() => ['']);
|
||||
routesResolver.registerRouters(routes, moduleName, '', '', appInstance);
|
||||
|
||||
|
||||
@@ -56,7 +56,6 @@ describe('DependenciesScanner', () => {
|
||||
class InvalidModule {}
|
||||
|
||||
let scanner: DependenciesScanner;
|
||||
let untypedScanner: any;
|
||||
let mockContainer: sinon.SinonMock;
|
||||
let container: NestContainer;
|
||||
let graphInspector: GraphInspector;
|
||||
@@ -72,7 +71,6 @@ describe('DependenciesScanner', () => {
|
||||
graphInspector,
|
||||
new ApplicationConfig(),
|
||||
);
|
||||
untypedScanner = scanner as any;
|
||||
sinon.stub(scanner, 'registerCoreModule').callsFake(async () => {});
|
||||
});
|
||||
|
||||
@@ -88,7 +86,7 @@ describe('DependenciesScanner', () => {
|
||||
.expects('replaceModule')
|
||||
.never();
|
||||
|
||||
await scanner.scan(TestModule);
|
||||
await scanner.scan(TestModule as any);
|
||||
expectationCountAddModule.verify();
|
||||
expectationCountReplaceModule.verify();
|
||||
});
|
||||
@@ -97,20 +95,20 @@ describe('DependenciesScanner', () => {
|
||||
const expectation = mockContainer.expects('addProvider').twice();
|
||||
const stub = sinon.stub(scanner, 'insertExportedProvider');
|
||||
|
||||
await scanner.scan(TestModule);
|
||||
await scanner.scan(TestModule as any);
|
||||
expectation.verify();
|
||||
stub.restore();
|
||||
});
|
||||
|
||||
it('should "insertController" call twice (2 components) container method "addController"', async () => {
|
||||
const expectation = mockContainer.expects('addController').twice();
|
||||
await scanner.scan(TestModule);
|
||||
await scanner.scan(TestModule as any);
|
||||
expectation.verify();
|
||||
});
|
||||
|
||||
it('should "insertExportedProvider" call once (1 component) container method "addExportedProvider"', async () => {
|
||||
const expectation = mockContainer.expects('addExportedProvider').once();
|
||||
await scanner.scan(TestModule);
|
||||
await scanner.scan(TestModule as any);
|
||||
expectation.verify();
|
||||
});
|
||||
|
||||
@@ -178,7 +176,7 @@ describe('DependenciesScanner', () => {
|
||||
.expects('addModule')
|
||||
.once();
|
||||
|
||||
await scanner.scan(OverrideTestModule, {
|
||||
await scanner.scan(OverrideTestModule as any, {
|
||||
overrides: modulesToOverride,
|
||||
});
|
||||
|
||||
@@ -190,13 +188,13 @@ describe('DependenciesScanner', () => {
|
||||
it('should "insertProvider" call once container method "addProvider"', async () => {
|
||||
const expectation = mockContainer.expects('addProvider').once();
|
||||
|
||||
await scanner.scan(OverrideTestModule);
|
||||
await scanner.scan(OverrideTestModule as any);
|
||||
expectation.verify();
|
||||
});
|
||||
|
||||
it('should "insertController" call twice (2 components) container method "addController"', async () => {
|
||||
const expectation = mockContainer.expects('addController').twice();
|
||||
await scanner.scan(OverrideTestModule);
|
||||
await scanner.scan(OverrideTestModule as any);
|
||||
expectation.verify();
|
||||
});
|
||||
|
||||
@@ -232,7 +230,7 @@ describe('DependenciesScanner', () => {
|
||||
})
|
||||
class OverrideForwardRefTestModule {}
|
||||
|
||||
await scanner.scan(OverrideForwardRefTestModule, {
|
||||
await scanner.scan(OverrideForwardRefTestModule as any, {
|
||||
overrides: [
|
||||
{
|
||||
moduleToReplace: Overwritten,
|
||||
@@ -292,7 +290,7 @@ describe('DependenciesScanner', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
addInjectableStub = sinon
|
||||
.stub(untypedScanner.container, 'addInjectable')
|
||||
.stub((scanner as any).container, 'addInjectable')
|
||||
.callsFake(() => instanceWrapper);
|
||||
insertEnhancerMetadataCacheStub = sinon
|
||||
.stub(graphInspector, 'insertEnhancerMetadataCache')
|
||||
@@ -429,7 +427,7 @@ describe('DependenciesScanner', () => {
|
||||
const module = { forwardRef: sinon.stub().returns({}) };
|
||||
|
||||
sinon.stub(container, 'addImport').returns({} as any);
|
||||
await scanner.insertImport(module, [] as any, 'test');
|
||||
await scanner.insertImport(module as any, [] as any, 'test');
|
||||
expect(module.forwardRef.called).to.be.true;
|
||||
});
|
||||
describe('when "related" is nil', () => {
|
||||
@@ -479,7 +477,7 @@ describe('DependenciesScanner', () => {
|
||||
it('should push new object to "applicationProvidersApplyMap" array', () => {
|
||||
mockContainer.expects('addProvider').callsFake(() => false);
|
||||
scanner.insertProvider(provider, token);
|
||||
const applyMap = untypedScanner.applicationProvidersApplyMap;
|
||||
const applyMap = (scanner as any).applicationProvidersApplyMap;
|
||||
|
||||
expect(applyMap).to.have.length(1);
|
||||
expect(applyMap[0].moduleKey).to.be.eql(token);
|
||||
@@ -516,11 +514,15 @@ describe('DependenciesScanner', () => {
|
||||
expectation.verify();
|
||||
});
|
||||
it('should not push new object to "applicationProvidersApplyMap" array', () => {
|
||||
expect(untypedScanner.applicationProvidersApplyMap).to.have.length(0);
|
||||
expect((scanner as any).applicationProvidersApplyMap).to.have.length(
|
||||
0,
|
||||
);
|
||||
|
||||
mockContainer.expects('addProvider').callsFake(() => false);
|
||||
scanner.insertProvider(component, token);
|
||||
expect(untypedScanner.applicationProvidersApplyMap).to.have.length(0);
|
||||
expect((scanner as any).applicationProvidersApplyMap).to.have.length(
|
||||
0,
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -532,7 +534,7 @@ describe('DependenciesScanner', () => {
|
||||
providerKey: 'providerToken',
|
||||
type: APP_GUARD,
|
||||
};
|
||||
untypedScanner.applicationProvidersApplyMap = [provider];
|
||||
(scanner as any).applicationProvidersApplyMap = [provider];
|
||||
|
||||
const expectedInstance = {};
|
||||
const instanceWrapper = {
|
||||
@@ -567,7 +569,7 @@ describe('DependenciesScanner', () => {
|
||||
type: APP_GUARD,
|
||||
scope: Scope.REQUEST,
|
||||
};
|
||||
untypedScanner.applicationProvidersApplyMap = [provider];
|
||||
(scanner as any).applicationProvidersApplyMap = [provider];
|
||||
|
||||
const expectedInstanceWrapper = new InstanceWrapper();
|
||||
mockContainer.expects('getModules').callsFake(() => ({
|
||||
@@ -604,7 +606,7 @@ describe('DependenciesScanner', () => {
|
||||
};
|
||||
|
||||
it('should add enhancers metadata to every controller and every entry provider', () => {
|
||||
untypedScanner.applicationProvidersApplyMap = [provider];
|
||||
(scanner as any).applicationProvidersApplyMap = [provider];
|
||||
|
||||
const instance = new InstanceWrapper({ name: 'test' });
|
||||
const controllers = new Map();
|
||||
@@ -649,7 +651,7 @@ describe('DependenciesScanner', () => {
|
||||
describe(`when token is ${APP_INTERCEPTOR}`, () => {
|
||||
it('call "addGlobalInterceptor"', () => {
|
||||
const addSpy = sinon.spy(
|
||||
untypedScanner.applicationConfig,
|
||||
(scanner as any).applicationConfig,
|
||||
'addGlobalInterceptor',
|
||||
);
|
||||
scanner.getApplyProvidersMap()[APP_INTERCEPTOR](null);
|
||||
@@ -659,7 +661,7 @@ describe('DependenciesScanner', () => {
|
||||
describe(`when token is ${APP_GUARD}`, () => {
|
||||
it('call "addGlobalGuard"', () => {
|
||||
const addSpy = sinon.spy(
|
||||
untypedScanner.applicationConfig,
|
||||
(scanner as any).applicationConfig,
|
||||
'addGlobalGuard',
|
||||
);
|
||||
scanner.getApplyProvidersMap()[APP_GUARD](null);
|
||||
@@ -669,7 +671,7 @@ describe('DependenciesScanner', () => {
|
||||
describe(`when token is ${APP_PIPE}`, () => {
|
||||
it('call "addGlobalPipe"', () => {
|
||||
const addSpy = sinon.spy(
|
||||
untypedScanner.applicationConfig,
|
||||
(scanner as any).applicationConfig,
|
||||
'addGlobalPipe',
|
||||
);
|
||||
scanner.getApplyProvidersMap()[APP_PIPE](null);
|
||||
@@ -679,7 +681,7 @@ describe('DependenciesScanner', () => {
|
||||
describe(`when token is ${APP_FILTER}`, () => {
|
||||
it('call "addGlobalFilter"', () => {
|
||||
const addSpy = sinon.spy(
|
||||
untypedScanner.applicationConfig,
|
||||
(scanner as any).applicationConfig,
|
||||
'addGlobalFilter',
|
||||
);
|
||||
scanner.getApplyProvidersMap()[APP_FILTER](null);
|
||||
@@ -691,7 +693,7 @@ describe('DependenciesScanner', () => {
|
||||
describe(`when token is ${APP_INTERCEPTOR}`, () => {
|
||||
it('call "addGlobalRequestInterceptor"', () => {
|
||||
const addSpy = sinon.spy(
|
||||
untypedScanner.applicationConfig,
|
||||
(scanner as any).applicationConfig,
|
||||
'addGlobalRequestInterceptor',
|
||||
);
|
||||
scanner.getApplyRequestProvidersMap()[APP_INTERCEPTOR](null);
|
||||
@@ -701,7 +703,7 @@ describe('DependenciesScanner', () => {
|
||||
describe(`when token is ${APP_GUARD}`, () => {
|
||||
it('call "addGlobalRequestGuard"', () => {
|
||||
const addSpy = sinon.spy(
|
||||
untypedScanner.applicationConfig,
|
||||
(scanner as any).applicationConfig,
|
||||
'addGlobalRequestGuard',
|
||||
);
|
||||
scanner.getApplyRequestProvidersMap()[APP_GUARD](null);
|
||||
@@ -711,7 +713,7 @@ describe('DependenciesScanner', () => {
|
||||
describe(`when token is ${APP_PIPE}`, () => {
|
||||
it('call "addGlobalRequestPipe"', () => {
|
||||
const addSpy = sinon.spy(
|
||||
untypedScanner.applicationConfig,
|
||||
(scanner as any).applicationConfig,
|
||||
'addGlobalRequestPipe',
|
||||
);
|
||||
scanner.getApplyRequestProvidersMap()[APP_PIPE](null);
|
||||
@@ -721,7 +723,7 @@ describe('DependenciesScanner', () => {
|
||||
describe(`when token is ${APP_FILTER}`, () => {
|
||||
it('call "addGlobalRequestFilter"', () => {
|
||||
const addSpy = sinon.spy(
|
||||
untypedScanner.applicationConfig,
|
||||
(scanner as any).applicationConfig,
|
||||
'addGlobalRequestFilter',
|
||||
);
|
||||
scanner.getApplyRequestProvidersMap()[APP_FILTER](null);
|
||||
|
||||
@@ -5,63 +5,48 @@ const transformDecorator = Reflector.createDecorator<string[], number>({
|
||||
transform: value => value.length,
|
||||
});
|
||||
|
||||
type TestObject = {
|
||||
only1?: string;
|
||||
only2?: string;
|
||||
both: string;
|
||||
};
|
||||
|
||||
describe('Reflector', () => {
|
||||
const key = 'key';
|
||||
let reflector: Reflector;
|
||||
|
||||
class Test {}
|
||||
|
||||
@transformDecorator(['a', 'b', 'c'])
|
||||
class TestTransform {}
|
||||
class Test {}
|
||||
class Test1 {}
|
||||
class Test2 {}
|
||||
|
||||
beforeEach(() => {
|
||||
Reflect.deleteMetadata(key, Test1);
|
||||
Reflect.deleteMetadata(key, Test2);
|
||||
reflector = new Reflector();
|
||||
});
|
||||
|
||||
describe('get', () => {
|
||||
it('should reflect metadata by key', () => {
|
||||
const key = 'key';
|
||||
const value = 'value';
|
||||
Reflect.defineMetadata(key, value, Test1);
|
||||
expect(reflector.get(key, Test1)).to.eql(value);
|
||||
Reflect.defineMetadata(key, value, Test);
|
||||
expect(reflector.get(key, Test)).to.eql(value);
|
||||
});
|
||||
|
||||
it('should reflect metadata by decorator', () => {
|
||||
const decorator = Reflector.createDecorator<string>();
|
||||
const value = 'value';
|
||||
Reflect.defineMetadata(decorator.KEY, value, Test1);
|
||||
Reflect.defineMetadata(decorator.KEY, value, Test);
|
||||
|
||||
// string
|
||||
let reflectedValue = reflector.get(decorator, Test1);
|
||||
let reflectedValue = reflector.get(decorator, Test);
|
||||
expect(reflectedValue).to.eql(value);
|
||||
|
||||
// @ts-expect-error 'value' is not assignable to parameter of type 'string'
|
||||
reflectedValue = true;
|
||||
|
||||
reflectedValue satisfies string;
|
||||
});
|
||||
|
||||
it('should reflect metadata by decorator (custom key)', () => {
|
||||
const decorator = Reflector.createDecorator<string[]>({ key: 'custom' });
|
||||
const value = ['value'];
|
||||
Reflect.defineMetadata('custom', value, Test1);
|
||||
Reflect.defineMetadata('custom', value, Test);
|
||||
|
||||
// string[]
|
||||
let reflectedValue = reflector.get(decorator, Test1);
|
||||
let reflectedValue = reflector.get(decorator, Test);
|
||||
expect(reflectedValue).to.eql(value);
|
||||
|
||||
// @ts-expect-error 'value' is not assignable to parameter of type 'string[]'
|
||||
reflectedValue = true;
|
||||
|
||||
reflectedValue satisfies string[];
|
||||
});
|
||||
|
||||
it('should reflect metadata by decorator (with transform option)', () => {
|
||||
@@ -70,8 +55,6 @@ describe('Reflector', () => {
|
||||
|
||||
// @ts-expect-error 'value' is not assignable to type 'number'
|
||||
reflectedValue = [];
|
||||
|
||||
reflectedValue satisfies number;
|
||||
});
|
||||
|
||||
it('should require transform option when second generic type is provided', () => {
|
||||
@@ -81,121 +64,53 @@ describe('Reflector', () => {
|
||||
});
|
||||
|
||||
describe('getAll', () => {
|
||||
it('should reflect metadata of all targets by key', () => {
|
||||
const value1 = 'value1';
|
||||
const value2 = 'value2';
|
||||
Reflect.defineMetadata(key, value1, Test1);
|
||||
Reflect.defineMetadata(key, value2, Test2);
|
||||
expect(reflector.getAll(key, [Test1, Test2])).to.eql([value1, value2]);
|
||||
});
|
||||
it('should reflect metadata of all targets by decorator', () => {
|
||||
const decorator = Reflector.createDecorator<string>();
|
||||
const value1 = 'value1';
|
||||
const value2 = 'value2';
|
||||
Reflect.defineMetadata(decorator.KEY, value1, Test1);
|
||||
Reflect.defineMetadata(decorator.KEY, value2, Test2);
|
||||
|
||||
// string[]
|
||||
const reflectedValue = reflector.getAll(decorator, [Test1, Test2]);
|
||||
expect(reflectedValue).to.eql([value1, value2]);
|
||||
|
||||
reflectedValue satisfies string[];
|
||||
it('should reflect metadata of all targets', () => {
|
||||
const key = 'key';
|
||||
const value = 'value';
|
||||
Reflect.defineMetadata(key, value, Test);
|
||||
expect(reflector.getAll(key, [Test])).to.eql([value]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getAllAndMerge', () => {
|
||||
it('should return an empty array when there are no targets', () => {
|
||||
const key = 'key';
|
||||
expect(reflector.getAllAndMerge(key, [])).to.be.empty;
|
||||
});
|
||||
it('should reflect metadata of all targets and concat arrays', () => {
|
||||
const decorator = Reflector.createDecorator<string[]>();
|
||||
const key = 'key';
|
||||
const value = 'value';
|
||||
Reflect.defineMetadata(decorator.KEY, [value], Test1);
|
||||
|
||||
// string[]
|
||||
const reflectedValue = reflector.getAllAndMerge(decorator, [
|
||||
Test1,
|
||||
Test1,
|
||||
Reflect.defineMetadata(key, [value], Test);
|
||||
expect(reflector.getAllAndMerge(key, [Test, Test])).to.eql([
|
||||
value,
|
||||
value,
|
||||
]);
|
||||
expect(reflectedValue).to.eql([value, value]);
|
||||
|
||||
reflectedValue satisfies string[];
|
||||
});
|
||||
it('should reflect metadata of all targets and concat boolean arrays', () => {
|
||||
const decorator = Reflector.createDecorator<boolean>();
|
||||
const value = true;
|
||||
Reflect.defineMetadata(decorator.KEY, [value], Test1);
|
||||
|
||||
// string[]
|
||||
const reflectedValue = reflector.getAllAndMerge(decorator, [
|
||||
Test1,
|
||||
Test1,
|
||||
]);
|
||||
expect(reflectedValue).to.eql([value, value]);
|
||||
|
||||
reflectedValue satisfies boolean[];
|
||||
});
|
||||
it('should reflect metadata of all targets and create an array', () => {
|
||||
const decorator = Reflector.createDecorator<string>();
|
||||
const key = 'key';
|
||||
const value = 'value';
|
||||
Reflect.defineMetadata(decorator.KEY, value, Test1);
|
||||
|
||||
// string[]
|
||||
const reflectedValue = reflector.getAllAndMerge(decorator, [
|
||||
Test1,
|
||||
Test1,
|
||||
Reflect.defineMetadata(key, value, Test);
|
||||
expect(reflector.getAllAndMerge(key, [Test, Test])).to.eql([
|
||||
value,
|
||||
value,
|
||||
]);
|
||||
expect(reflectedValue).to.eql([value, value]);
|
||||
|
||||
reflectedValue satisfies string[];
|
||||
});
|
||||
it('should reflect metadata of all targets and merge objects', () => {
|
||||
const decorator = Reflector.createDecorator<TestObject>();
|
||||
const value1: TestObject = { only1: 'test1', both: 'overriden' };
|
||||
const value2: TestObject = { only2: 'test2', both: 'test' };
|
||||
Reflect.defineMetadata(decorator.KEY, value1, Test1);
|
||||
Reflect.defineMetadata(decorator.KEY, value2, Test2);
|
||||
|
||||
// TestObject
|
||||
const reflectedValue = reflector.getAllAndMerge(decorator, [
|
||||
Test1,
|
||||
Test2,
|
||||
]);
|
||||
expect(reflectedValue).to.eql({
|
||||
...value1,
|
||||
...value2,
|
||||
it('should reflect metadata of all targets and merge an object', () => {
|
||||
const key = 'key';
|
||||
const value = { test: 'test' };
|
||||
Reflect.defineMetadata(key, value, Test);
|
||||
expect(reflector.getAllAndMerge(key, [Test, Test])).to.eql({
|
||||
...value,
|
||||
});
|
||||
|
||||
reflectedValue satisfies TestObject;
|
||||
});
|
||||
it('should reflect metadata of all targets and create an array from a single value', () => {
|
||||
const value = 'value';
|
||||
Reflect.defineMetadata(key, value, Test1);
|
||||
|
||||
const result = reflector.getAllAndMerge(key, [Test1, Test2]);
|
||||
expect(result).to.eql([value]);
|
||||
|
||||
result satisfies string[];
|
||||
});
|
||||
it('should reflect metadata of all targets and return a single array unmodified', () => {
|
||||
const value = ['value'];
|
||||
Reflect.defineMetadata(key, value, Test1);
|
||||
expect(reflector.getAllAndMerge(key, [Test1, Test2])).to.eql(value);
|
||||
});
|
||||
it('should reflect metadata of all targets and return a single object unmodified', () => {
|
||||
const value = { test: 'value' };
|
||||
Reflect.defineMetadata(key, value, Test1);
|
||||
expect(reflector.getAllAndMerge(key, [Test1, Test2])).to.eql(value);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getAllAndOverride', () => {
|
||||
it('should reflect metadata of all targets and return a first not undefined value', () => {
|
||||
const value1 = 'value1';
|
||||
const value2 = 'value2';
|
||||
Reflect.defineMetadata(key, value1, Test1);
|
||||
Reflect.defineMetadata(key, value2, Test2);
|
||||
expect(reflector.getAllAndOverride(key, [Test1, Test2])).to.eql(value1);
|
||||
const key = 'key';
|
||||
const value = 'value';
|
||||
Reflect.defineMetadata(key, value, Test);
|
||||
expect(reflector.getAllAndOverride(key, [Test, Test])).to.eql(value);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user