amirho/nest
1
0
Fork 0
mirror of https://github.com/nestjs/nest.git synced 2026-02-21 23:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Kamil Myśliwiec
2023-05-19 12:33:43 +02:00
parent f6f577a4df 48e25d4080
commit 5820bed145
3 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
packages/common/exceptions/http.exception.ts
View File

@@ -1,3 +1,7 @@
import {
HttpExceptionBody,
HttpExceptionBodyMessage,
} from '../interfaces/http/http-exception-body.interface';
import { isObject, isString } from '../utils/shared.utils';
export interface HttpExceptionOptions {
@@ -108,17 +112,42 @@ export class HttpException extends Error {
}
public static createBody(
objectOrErrorMessage: object | string,
description?: string,
nil: null | '',
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,
statusCode?: number,
) {
if (!objectOrErrorMessage) {
return { statusCode, message: description };
): HttpExceptionBody | Body {
if (!arg0) {
return {
message: arg1,
statusCode: statusCode,
};
}
return isObject(objectOrErrorMessage) &&
!Array.isArray(objectOrErrorMessage)
? objectOrErrorMessage
: { statusCode, message: objectOrErrorMessage, error: description };
if (isString(arg0) || Array.isArray(arg0)) {
return {
message: arg0,
error: arg1 as string,
statusCode: statusCode,
};
}
return arg0;
}
public static getDescriptionFrom(

2
packages/common/index.ts
View File

@@ -26,6 +26,8 @@ export {
FactoryProvider,
ForwardReference,
HttpServer,
HttpExceptionBody,
HttpExceptionBodyMessage,
INestApplication,
INestApplicationContext,
INestMicroservice,

1
packages/common/interfaces/http/index.ts
View File

@@ -1,3 +1,4 @@
export * from './http-exception-body.interface';
export * from './http-server.interface';
export * from './message-event.interface';
export * from './raw-body-request.interface';