Skip to content

Commit 71a023e

Browse files
Merge branch 'master' of https://github.com/nestjs/nest
2 parents aa75b52 + 6cf7cdc commit 71a023e

4 files changed

Lines changed: 3 additions & 13 deletions

File tree

packages/core/guards/guards-consumer.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ export class GuardsConsumer {
5151
if (result instanceof Observable) {
5252
return await result.toPromise();
5353
}
54-
if (result instanceof Promise) {
55-
return await result;
56-
}
5754
return result;
5855
}
5956
}

packages/core/helpers/external-context-creator.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,7 @@ export class ExternalContextCreator {
200200
}
201201

202202
public async transformToResult(resultOrDeffered) {
203-
if (resultOrDeffered instanceof Promise) {
204-
return await resultOrDeffered;
205-
} else if (resultOrDeffered && isFunction(resultOrDeffered.subscribe)) {
203+
if (resultOrDeffered && isFunction(resultOrDeffered.subscribe)) {
206204
return await resultOrDeffered.toPromise();
207205
}
208206
return resultOrDeffered;

packages/core/pipes/pipes-consumer.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ export class PipesConsumer {
2525
return await transforms.reduce(async (defferedValue, fn) => {
2626
const val = await defferedValue;
2727
const result = fn(val, { metatype, type, data });
28-
if (result instanceof Promise) {
29-
return result;
30-
}
31-
return Promise.resolve(result);
28+
return result;
3229
}, Promise.resolve(value));
3330
}
3431
}

packages/core/router/router-response-controller.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ export class RouterResponseController {
2020
}
2121

2222
public async transformToResult(resultOrDeffered) {
23-
if (resultOrDeffered instanceof Promise) {
24-
return await resultOrDeffered;
25-
} else if (resultOrDeffered && isFunction(resultOrDeffered.subscribe)) {
23+
if (resultOrDeffered && isFunction(resultOrDeffered.subscribe)) {
2624
return await resultOrDeffered.toPromise();
2725
}
2826
return resultOrDeffered;

0 commit comments

Comments
 (0)