@hyper.software/common-helpers 1.0.20 → 1.0.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.js +8 -8
- package/lib/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.js.map +1 -1
- package/lib/express/middleware/expressErrorHandlerMiddleware/index.d.ts +1 -1
- package/lib/express/middleware/expressErrorHandlerMiddleware/index.js +3 -1
- package/lib/express/middleware/expressErrorHandlerMiddleware/index.js.map +1 -1
- package/lib/express/swaggerControllersConfig.js +2 -2
- package/lib/express/swaggerControllersConfig.js.map +1 -1
- package/package.json +1 -1
|
@@ -45,7 +45,7 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
45
45
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationError Error', function () {
|
|
46
46
|
beforeEach(function () {
|
|
47
47
|
var validErr = new errors_1.ValidationError('General Validation Error Message', 'api.test.message.general', {});
|
|
48
|
-
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res);
|
|
48
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res, null);
|
|
49
49
|
});
|
|
50
50
|
it('SHOULD return the default 400 status', function () {
|
|
51
51
|
expect(res.status.mock.calls[0][0]).toBe(400);
|
|
@@ -55,7 +55,7 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
55
55
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationErrorWithStatus Error', function () {
|
|
56
56
|
beforeEach(function () {
|
|
57
57
|
var validErr = new errors_1.ValidationErrorWithStatus(123, 'Custom Error Message', 'api.test.message', {});
|
|
58
|
-
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res);
|
|
58
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res, null);
|
|
59
59
|
});
|
|
60
60
|
it('SHOULD return the status sent to ValidationErrorWithStatus', function () {
|
|
61
61
|
expect(res.status.mock.calls[0][0]).toBe(123);
|
|
@@ -65,7 +65,7 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
65
65
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationErrorWithStatusSilent Error', function () {
|
|
66
66
|
beforeEach(function () {
|
|
67
67
|
var validErr = new errors_1.ValidationErrorWithStatusSilent(123, 'Custom Error Message', 'api.test.message', {});
|
|
68
|
-
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res);
|
|
68
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res, null);
|
|
69
69
|
});
|
|
70
70
|
it('SHOULD return the status sent to ValidationErrorWithStatusSilent', function () {
|
|
71
71
|
expect(res.status.mock.calls[0][0]).toBe(123);
|
|
@@ -77,7 +77,7 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
77
77
|
describe('WHEN we call expressErrorHandlerMiddleware with ValidationErrorSilent Error', function () {
|
|
78
78
|
beforeEach(function () {
|
|
79
79
|
var validErr = new errors_1.ValidationErrorSilent('Custom Error Message', 'custom.error.locale', {});
|
|
80
|
-
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res);
|
|
80
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(validErr, req, res, null);
|
|
81
81
|
});
|
|
82
82
|
it('SHOULD call logger.info and not logger.warn', function () {
|
|
83
83
|
expect(logger.info).toBeCalled();
|
|
@@ -89,7 +89,7 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
89
89
|
beforeEach(function () {
|
|
90
90
|
var err = new Error();
|
|
91
91
|
err.name = 'Sequelize Error';
|
|
92
|
-
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res);
|
|
92
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res, null);
|
|
93
93
|
});
|
|
94
94
|
it('SHOULD set statusCode 400', function () { return expect(res.status.mock.calls[0][0]).toBe(400); });
|
|
95
95
|
});
|
|
@@ -97,7 +97,7 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
97
97
|
beforeEach(function () {
|
|
98
98
|
var err = new Error();
|
|
99
99
|
err.isJoi = true;
|
|
100
|
-
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res);
|
|
100
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res, null);
|
|
101
101
|
});
|
|
102
102
|
it('SHOULD set statusCode 400', function () { return expect(res.status.mock.calls[0][0]).toBe(400); });
|
|
103
103
|
});
|
|
@@ -105,14 +105,14 @@ describe('WHEN testing expressErrorHandlerMiddleware', function () {
|
|
|
105
105
|
beforeEach(function () {
|
|
106
106
|
var err = new Error();
|
|
107
107
|
err.code = 'SCHEMA_VALIDATION_FAILED';
|
|
108
|
-
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res);
|
|
108
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res, null);
|
|
109
109
|
});
|
|
110
110
|
it('SHOULD set statusCode 400', function () { return expect(res.status.mock.calls[0][0]).toBe(400); });
|
|
111
111
|
});
|
|
112
112
|
describe('WHEN we call expressErrorHandlerMiddleware with unexpected error', function () {
|
|
113
113
|
beforeEach(function () {
|
|
114
114
|
var err = new Error();
|
|
115
|
-
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res);
|
|
115
|
+
(0, __1.expressErrorHandlerMiddleware)({ logger: logger })(err, req, res, null);
|
|
116
116
|
});
|
|
117
117
|
it('SHOULD set statusCode 500', function () { return expect(res.status.mock.calls[0][0]).toBe(500); });
|
|
118
118
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressErrorHandlerMiddleware.test.js","sourceRoot":"","sources":["../../../../../src/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAK2B;AAC3B,yBAAmD;AAEnD,wDAA2C;AAE3C,IAAM,MAAM,GAAG;IACb,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;IACf,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;IACf,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;CACjB,CAAA;AAED,QAAQ,CAAC,4CAA4C,EAAE;IACrD,IAAI,GAAG,CAAA;IACP,IAAI,GAAG,CAAA;IAEP,UAAU,CAAC;QACT,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAA;QACjE,GAAG,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAA;QAC/B,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,cAAM,OAAA,GAAG,EAAH,CAAG,CAAC,CAAA;QAE/B,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAA;QACvB,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAA;QACvB,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAA;IAC1B,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,uEAAuE,EAAE;QAChF,UAAU,CAAC;YACT,IAAM,QAAQ,GAAG,IAAI,wBAAe,CAAC,kCAAkC,EAAE,0BAA0B,EAAE,EAAE,CAAC,CAAA;YACxG,IAAA,iCAA6B,EAAC,EAAE,MAAM,QAAA,EAAE,CAAC,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"expressErrorHandlerMiddleware.test.js","sourceRoot":"","sources":["../../../../../src/express/middleware/expressErrorHandlerMiddleware/__tests__/expressErrorHandlerMiddleware.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export interface IErrorHandlerOptions {
|
|
2
2
|
logger: any;
|
|
3
3
|
}
|
|
4
|
-
export declare const expressErrorHandlerMiddleware: (options: IErrorHandlerOptions) => (err: Error | any, req: any, res: any) => any;
|
|
4
|
+
export declare const expressErrorHandlerMiddleware: (options: IErrorHandlerOptions) => (err: Error | any, req: any, res: any, _next: any) => any;
|
|
5
5
|
export declare const expressHttpErrorHandler: (options: IErrorHandlerOptions) => (err: Error | any, req: any, res: any) => any;
|
|
6
6
|
export declare function formatErrorForLogging(req: any, error: any, prefix?: string): string;
|
|
7
7
|
export declare function formatUser(user?: any): {
|
|
@@ -27,7 +27,9 @@ exports.formatPartner = exports.formatUser = exports.formatErrorForLogging = exp
|
|
|
27
27
|
var undefsafe = __importStar(require("undefsafe"));
|
|
28
28
|
var errors_types_1 = require("./../../../errors/errors.types");
|
|
29
29
|
var errorMappers_1 = require("../../../errors/errorMappers");
|
|
30
|
-
var expressErrorHandlerMiddleware =
|
|
30
|
+
var expressErrorHandlerMiddleware =
|
|
31
|
+
// eslint-disable-next-line
|
|
32
|
+
function (options) { return function (err, req, res, _next) {
|
|
31
33
|
return (0, exports.expressHttpErrorHandler)(options)(err, req, res);
|
|
32
34
|
}; };
|
|
33
35
|
exports.expressErrorHandlerMiddleware = expressErrorHandlerMiddleware;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/expressErrorHandlerMiddleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAsC;AAEtC,+DAAiE;AACjE,6DAMqC;AAO9B,IAAM,6BAA6B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/express/middleware/expressErrorHandlerMiddleware/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,14 +85,14 @@ var getSwaggerControllersConfig = function (input) {
|
|
|
85
85
|
var errorHandler = input.errorHandler || defaultErrorHandler;
|
|
86
86
|
var logger = input.logger;
|
|
87
87
|
var controllersPath = (0, glob_1.sync)(filePattern).map(function (file) {
|
|
88
|
-
return file.replace(basePath, relativePath).replace(".".concat(fileExtension), '');
|
|
88
|
+
return file.replace(basePath, relativePath).replace(".".concat(fileExtension), '').replace('src/', '');
|
|
89
89
|
});
|
|
90
90
|
var swaggerControllersConfig = {};
|
|
91
91
|
controllersPath.forEach(function (path) { return __awaiter(void 0, void 0, void 0, function () {
|
|
92
92
|
var controller;
|
|
93
93
|
return __generator(this, function (_a) {
|
|
94
94
|
switch (_a.label) {
|
|
95
|
-
case 0: return [4 /*yield*/, Promise.resolve("".concat(
|
|
95
|
+
case 0: return [4 /*yield*/, Promise.resolve("".concat(path)).then(function (s) { return __importStar(require(s)); })];
|
|
96
96
|
case 1:
|
|
97
97
|
controller = _a.sent();
|
|
98
98
|
Object.keys(controller).forEach(function (key) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swaggerControllersConfig.js","sourceRoot":"","sources":["../../src/express/swaggerControllersConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA2B;AAE3B,oEAAiC;AAWjC,IAAM,mBAAmB,GAAG,UAAO,IAAI,EAAE,IAAI,EAAE,IAAI;;QACjD,IAAI,EAAE,CAAA;;;KACP,CAAA;AAED,IAAM,qBAAqB,GAAG,IAAI,CAAA;AAIlC;;;GAGG;AACI,IAAM,2BAA2B,GAAG,UAAC,KAAkC;IAAlC,sBAAA,EAAA,UAAkC;IAC5E,IAAM,QAAQ,GAAW,KAAK,CAAC,QAAQ,IAAI,mBAAmB,CAAA;IAC9D,IAAM,YAAY,GAAW,KAAK,CAAC,YAAY,IAAI,aAAa,CAAA;IAChE,IAAM,aAAa,GAAW,KAAK,CAAC,aAAa,IAAI,IAAI,CAAA;IACzD,IAAM,WAAW,GAAW,KAAK,CAAC,WAAW,IAAI,UAAG,QAAQ,6BAAmB,aAAa,CAAE,CAAA;IAC9F,IAAM,YAAY,GAAG,KAAK,CAAC,YAAY,IAAI,mBAAmB,CAAA;IAC9D,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;IAE3B,IAAM,eAAe,GAAa,IAAA,WAAI,EAAC,WAAW,CAAC,CAAC,GAAG,CAAC,UAAC,IAAI;QAC3D,OAAA,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,WAAI,aAAa,CAAE,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"swaggerControllersConfig.js","sourceRoot":"","sources":["../../src/express/swaggerControllersConfig.ts"],"names":[],"mappings":"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"}
|